Commit graph

1586 commits

Author SHA1 Message Date
Jonne Haß
148e85558a
Merge pull request #7001 from svbergerem/fix-conversation-recipient-suggestions
Fix conversations autoSuggest showing non-mutual contacts
2016-08-18 13:36:27 +02:00
Steffen van Bergerem
7b5ac656a7
Fix conversations autoSuggest showing non-mutual contacts 2016-08-18 13:02:14 +02:00
Benjamin Neff
fb318373c7 only create mentions after creating statusmessages 2016-08-17 02:26:58 +02:00
Benjamin Neff
0d338b6f79 don't create notifications if the notification-actor is ignored
Also move "shareable hidden"-logic to AlsoCommented, because it is the
only one that needs it. And write some specs for mentioned and started
sharing notifications.

Fixes #6294
2016-08-14 17:03:49 +02:00
Benjamin Neff
f4459488e5 allow other people to share with a user who ignores them
otherwise we have data-inconsistency if the user stops ignoring the
person.
2016-08-14 01:08:26 +02:00
Benjamin Neff
66b7b7e27a Cleanup legacy invitations from code
Fixes #5116
2016-08-13 01:47:27 +02:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03:00
Steffen van Bergerem
f1e9c99866
Add contacts search 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
73ce521bb3
Modify search to include contacts 2016-08-09 15:12:44 +02:00
Benjamin Neff
d3edbfd829 remove pending flag from posts 2016-08-08 19:37:10 +02:00
Benjamin Neff
89b068e474 write some more tests 2016-08-08 18:56:37 +02:00
Benjamin Neff
5aa52b36af better error message if we webfinger a person with invalid guid
this happens if a remote person changed the diaspora-id manually (renamed
domain or something) in their database.
2016-07-31 23:05:53 +02:00
Benjamin Neff
2cd831f94e also validate remote posts
all data is included in the federated status_message, so we can validate
on receive. add the photos to the status_message before save.
2016-07-17 01:40:00 +02:00
Benjamin Neff
df9874b73a remove raw_message
This was only an alias for "text", and "raw_message" is also not used
for federation anymore, so we can drop it.
2016-07-17 01:40:00 +02:00
Jonne Haß
8cffc5cfbe
bump rails to 4.2.7 2016-07-15 13:48:09 +02:00
Jonne Haß
053f69b67c
Merge pull request #6902 from svbergerem/status-message-filter-mentions
Filter mentions on status message creation
2016-07-06 22:27:13 +02:00
aoh0x7DE
d75f795cad Fix issue #6847 (#6905)
* Fix issue #6847
2016-07-06 01:57:23 +02:00
Steffen van Bergerem
46cbc6e52a
Filter mentions on status message creation 2016-07-04 10:26:45 +02:00
Jonne Haß
09908a45fb
StatusMessage#raw_message returns empty string for NULL values
Previously the federation layer has written the empty string to the
database, now it writes nil/no value to it while our code still expects
the empty string in some cases. Restore the old assumption by returning
the empty string, the real raw value by now is available again in
StatusMessage#text for those that need it, such as validations or tests.
2016-06-27 12:07:11 +02:00
Benjamin Neff
ab2118ffa5 don't participate own posts 2016-06-26 06:21:03 +02:00
Benjamin Neff
bb0d7e46dc add #object_to_receive to Diaspora::Federated::Base 2016-06-26 06:21:02 +02:00
Benjamin Neff
1cf11db634 remove diaspora_handle setter to set author 2016-06-26 06:21:02 +02:00
Benjamin Neff
5e16b9c7cd add author to subscribers of public shareables to ensure local delivery 2016-06-26 06:21:02 +02:00
Benjamin Neff
709ad6e909 Participation is not relayable anymore
only deliver to parent author
2016-06-26 06:21:02 +02:00
Benjamin Neff
cf5a72719e participates root author when receiving a reshare 2016-06-26 06:21:02 +02:00
Benjamin Neff
9fa3cc97d4 deliver message always to all participants
message doesn't include Diaspora::Relayable anymore
2016-06-26 06:21:02 +02:00
Benjamin Neff
b39f3ccc74 relay relayables after receive
also refactored relayable specs to use `let`
2016-06-26 06:21:02 +02:00
Benjamin Neff
91c6c74ca0 retract relayables if the author is ignored by the parent author 2016-06-26 06:21:02 +02:00
Benjamin Neff
0f6e0b7288 send the profile to remote persons on start shareing with them 2016-06-26 06:21:02 +02:00
Benjamin Neff
57dbcc0e67 add root author to reshare subscribers 2016-06-26 06:21:02 +02:00
Benjamin Neff
03123f1c4d remove more unused code and cleanup 2016-06-26 06:21:01 +02:00
Benjamin Neff
2476b74dbe refactoring delete from services 2016-06-26 06:21:01 +02:00
Benjamin Neff
0e6446d05f create ShareVisibilities with batch import
and delete old batch worker and receiver
2016-06-26 06:21:01 +02:00
Benjamin Neff
ae05d4e928 use Diaspora::Federation::Dispatcher everywhere 2016-06-26 06:21:01 +02:00
Benjamin Neff
fa5a35ed4a remove xml specs 2016-06-26 06:21:01 +02:00
Benjamin Neff
7893a23927 add resharers and participants to subscribers on public posts 2016-06-26 06:21:01 +02:00
Benjamin Neff
566f4890a2 merge Federated::Shareable to Shareable
also drop xml-code for Shareable
2016-06-26 06:21:01 +02:00
Benjamin Neff
7f11beae37 dispatch retractions 2016-06-26 06:21:00 +02:00
Benjamin Neff
65ba573a3b Contact retraction 2016-06-26 06:21:00 +02:00
Benjamin Neff
9ce9b4bcd0 deliver profile update with new dispatcher 2016-06-26 06:21:00 +02:00
Benjamin Neff
7184d4334e remove after_dispatch hook
handle photos in StatusMessageCreationService
2016-06-26 06:21:00 +02:00
Benjamin Neff
20dabbd15f remove user parameter from subscribers method 2016-06-26 06:21:00 +02:00
Benjamin Neff
f9f91a0e9e create new contact for local receive 2016-06-26 06:21:00 +02:00
Benjamin Neff
7bb172cefb remove old Private and Public Receiver 2016-06-26 06:21:00 +02:00
Benjamin Neff
102e2a0834 remove Request class and refactor Connecting 2016-06-26 06:20:59 +02:00
Benjamin Neff
d87756c4b7 move #add_contact_to_aspect from User-model to user_methods.rb 2016-06-26 06:20:59 +02:00
Benjamin Neff
6fbfc2bf96 write receive specs and delete old unused specs
also refactored receive methods
2016-06-26 06:20:59 +02:00
Benjamin Neff
58a5a881cf receive local
* Contact: auto-follow-back
* Shareable: create share visibilities
2016-06-26 06:20:59 +02:00
Benjamin Neff
4fb34139b0 cleanup notifications and fix tests 2016-06-26 06:20:59 +02:00
Benjamin Neff
ebfb0aa884 create NotificationService: send notifications after receive 2016-06-26 06:20:59 +02:00
Benjamin Neff
1790efad08 implement :update_pod callback 2016-06-26 06:20:58 +02:00
Benjamin Neff
4408efdff3 fetch public key for unknown person
and do some refactorings
2016-06-26 06:20:58 +02:00
Benjamin Neff
b1d30aa9cc add more "diaspora to federation entity" methods
move it to Diaspora::Federation::Entities and use it in some tests, but most of the tests can be removed later.
2016-06-26 06:20:58 +02:00
cmrd Senya
717554edac
Fix possible duplication of AspectVisibility
No uniqueness control on AspectVisibility resulted in possible having
multiple AspectVisibility objects in the DB for the same aspect and
shareable which doesn't make sense. Introduce uniqueness validation
and fix up tests where duplication happened.
2016-05-27 20:22:03 +03:00
Dennis Schubert
53808847a2 Merge branch 'stable' into develop 2016-05-07 18:52:34 +02:00
Ralin Chimev
1773e3e35d Do not change notification timestamp when making it read or unread.
Marking a notification as unread resets the timeago stamp causing
the times to look wrong. It can be reproduced by marking an old
notification as unread. Using the update_column instead of
update_attribute will not touch the updated_at attribute, and
thus will not affect the updated time ago in the view.

Fixes #6798.

closes #6821
2016-05-07 18:52:27 +02:00
Benjamin Neff
d94eae0d45 refactoring PostService
* move presenters back to controllers, this is view-logic
* use PostService in CommentService
* remove iframe route, this is not used anymore
* id/guid limit at 16 chars, hex(8) is 16 chars long
2016-03-07 05:52:54 +01:00
Benjamin Neff
10af3a8b11 fix pod table migration if someone deleted a user (owner) manually 2016-03-06 23:55:28 +01:00
Benjamin Neff
acb91c79d2 improve pod connection check
* use port for check
* respect entries in /etc/hosts
* test /.well-known/host-meta
* don't allow redirects to other domains
2016-03-05 02:57:11 +01:00
Benjamin Neff
b1a6516474 add migration for pods-table
* add port to pods
* remove url from person and link people with pod-table
2016-03-05 00:12:54 +01:00
Benjamin Neff
7011f2961d Revert "Back out #6723 due to Postgres breakage"
This reverts commit 84cfbd22fc.
2016-03-04 14:01:31 +01:00
Dennis Schubert
84cfbd22fc Back out #6723 due to Postgres breakage
This reverts commit 832a56134b, reversing
changes made to 75c3e6068c.
2016-03-04 13:33:32 +01:00
Benjamin Neff
e3d1f0fd16 fix order with two posts with the same timestamp for all streams 2016-03-03 21:43:11 +01:00
Benjamin Neff
7583568be8 update queries for new ShareVisibility
Also:
* remove ShareablesFromPerson evil-query
* improve multi-stream and aspect-stream queries
* fix logging for recieve
* don't add last 100 public posts to users streams after sharing
* delete share visibility when shareable is deleted
2016-03-03 21:43:11 +01:00
Dennis Schubert
75c3e6068c Merge branch 'stable' into develop 2016-03-03 17:58:05 +01:00
Steffen van Bergerem
b98af83c9d Sort tag search result by name
closes #6734
2016-03-03 17:57:58 +01:00
Jonne Haß
32bda8fe20 Merge branch 'stable' into develop 2016-01-28 18:47:18 +01:00
Faldrian
8e3816e64e let mention-regex only match usable strings
closes #6658
2016-01-28 18:47:13 +01:00
Jonne Haß
21cb1f44cd Merge branch 'stable' into develop 2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826
closes #6573
2015-12-08 17:30:27 +01:00
Dennis Schubert
5081d69847 Merge branch 'stable' into develop 2015-11-22 02:52:37 +01:00
Jason Robinson
9a35a0d8dd Add participation to root.author on receiving reshare
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.

closes #6481
2015-11-22 02:50:38 +01:00
Jonne Haß
17d0ddab41 Merge branch 'stable' into develop 2015-11-18 03:37:34 +01:00
Manuel Vögele
0925a26506 Do not add participation for comment if comment validation failed The same fix is also done for the other social actions
closes #6552
2015-11-18 03:16:54 +01:00
Jonne Haß
800be9b2cf Merge branch 'stable' into develop 2015-10-20 16:27:43 +02:00
cmrd Senya
00588e1ef8 Disable self-notification possibility
closes #6512
2015-10-20 16:27:39 +02:00
Lukas Matt
78f9b39e55 Use polymorphic association for the report item
* Adopt pronto suggestions

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-10-03 17:18:03 +02:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm
5813 show geolocation on osm
2015-09-23 01:43:49 +02:00
Jonne Haß
0508c1b8d4 Merge branch 'stable' into develop 2015-09-14 22:06:52 +02:00
Steffen van Bergerem
05a6d95811 Always show public photos
closes #6398
2015-09-14 22:04:53 +02:00
realtin
1cdcc50c63 fix all the pronto remarks finally
- fix map controls in stream
2015-09-11 10:24:39 +02:00
zaziemo
0f3eff8f88 add correct attributions for map tiles of Heidelberg University
remove personal credentials from mapbox and refactored some code
#5813

Signed-off-by: zaziemo <maren.heltsche@gmail.com>
2015-09-09 15:24:00 +02:00
realtin
57b7c05c4f set maptile default to OpenMapSurfer
- refactor code for toggle map function
- adjust jasmine tests for maps and add tests for SPV
- change name of access token in defaults.yml according to naming conventions
- add explanation of map use for podmins
- add location to post_presenter
- fix opening multiple maps inside the stream when clicking on a reshare location
(#5813)
2015-09-09 12:26:47 +02:00
zaziemo
f92a2ee0dd merge address & coordinates in one location object
to provide a clear arrangement of all location data
- add 'L' to predefs for pronto because it is part of the leaflet library
- fix: show address template only with an address present
with merging the location objects into one, only the objects within
the location object can be empty
(#5813)
2015-09-09 12:22:48 +02:00
zaziemo
298e195a8f add a map subview
- add coordinates in post_presenter
- add map to the SPV if location is provided
- add leaflet.js to render map and marker of position
- make coordinates available in frontend
- add map scss
- make stream post location clickable and redirect to the SPV
- prevent render map if no location data is provided
- add tests for coordinates
- use the leaflet gem instead of the JS assets
(#5813)
2015-09-09 12:19:38 +02:00
Jonne Haß
6528f1479c Merge branch 'stable' into develop 2015-09-07 13:32:19 +02:00
Jonne Haß
0dd5447e63 Fix tumblr service deletion spec to actually test deletion 2015-09-07 13:31:45 +02:00
Jonne Haß
ba61ca4bdf Merge branch 'stable' into develop 2015-09-07 13:25:14 +02:00
Jonne Haß
0e64d8de2a Refactor tumblr service spec
closes #6386
2015-09-07 13:24:53 +02:00
Vinothan Shankar
2ace9b47b1 * app/models/services/tumblr.rb (Services::Tumblr#post): Post only to primary blog
Hardly a total fix, but it's a start.  Based on meitar/diaspora:b5c01598.

* app/models/services/tumblr.rb: style: double-quote string

Line 22.  Change from single-quotes.

* app/models/services/tumblr.rb: parse URL only for blogs we care about

...which in this case is just the primary.

This also fixes the failed test in 7079fda (and by extension, 7a1d3a9).

* spec/models/services/tumblr_spec.rb: Add "primary" flag to test user-info

* spec/models/services/tumblr_spec.rb: Add a secondary blog to test user-info

This should not cause a request to be issued, so we can continue to
expect the request for the primary blog only.  Any request for the
secondary indicates a bug in the service implementation.

* spec/models/services/tumblr_spec.rb: Make the second blog returned the primary

Just to catch if it's picking the first one

* app/models/services/tumblr.rb: use blogs.find instead of blogs.each

Since we're only handling the primary blog, this should be easy enough

* app/models/services/tumblr.rb: Remove redundant if block

The condition it would have caught is dealt with by the ifnone on the find

* app/models/services/tumblr.rb: Style: remove space between { and |
2015-09-07 12:45:16 +02:00
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +02:00
zaziemo
d38741d5eb add more specs to test moderator role
fixes #5324

closes #6351
2015-09-07 12:38:12 +02:00
zaziemo
c2c6ed5dea refactor moderator role and add specs
#5324
2015-09-07 12:32:09 +02:00
zaziemo
3a3c881735 add new role moderator analogue to admin role
#5324
2015-09-07 12:24:12 +02:00
Florian Staudacher
738413c65f fix some issues with pod-checking
add tooltips in the frontend
fix a JS problem with empty hostname
use `find_in_batches` correctly
add a migration to clean up the pods table + unique index on hostname
2015-08-30 18:50:34 +02:00
Florian Staudacher
ea397ffdfb Add connection test for pods in the network
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
2015-08-24 22:04:53 +02:00
Jonne Haß
d396d5555f Merge branch 'stable' into develop 2015-08-21 14:23:46 +02:00
Benjamin Neff
d28e03f053 use discovery from diaspora_federation gem 2015-08-21 14:21:43 +02:00
Jonne Haß
6ee3843449 Merge branch 'stable' into develop 2015-07-26 13:11:49 +02:00
theworldbright
2a3dde1ae5 Refactor PostService and extract its tests
Squashed commits:

[ada0f09] Remove favorites from Posts table

closes #6208
2015-07-26 13:10:24 +02:00