Commit graph

2597 commits

Author SHA1 Message Date
Maksim Pechnikov b9041c2097 added recount unread notifications to markers 2019-11-15 22:46:58 +03:00
Maksim Pechnikov ff6c727739 Merge branch 'develop' into issue/1276 2019-11-04 20:24:53 +03:00
rinpatch fee1276963 Merge branch 'failing-search-fixes' into 'develop'
User Search: Remove superfluous setweight and random test.

See merge request pleroma/pleroma!1935
2019-11-04 16:28:55 +00:00
lain 4e53520917 User Search: Remove superfluous setweight and random test.
The test tested for a behavior that isn't actually enforced anymore.
2019-11-04 16:57:41 +01:00
eugenijm ed29be24cb Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload. 2019-11-04 18:36:16 +03:00
lain a304a2a845 Merge branch 'transmogrifier-test-errors' into 'develop'
capture test log where errors are expected

See merge request pleroma/pleroma!1915
2019-11-04 15:19:29 +00:00
Steven Fuchs 5271bbcf11 add missing tesla mocks 2019-11-04 15:18:32 +00:00
lain 556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity

See merge request pleroma/pleroma!1849
2019-11-04 14:11:44 +00:00
rinpatch 8dd7c099a7 Merge branch 'bugfix/streamer-follows' into 'develop'
streamer: use direct object for filter checks when there is no valid child object in an activity

Closes #1291

See merge request pleroma/pleroma!1931
2019-11-03 17:09:57 +00:00
kaniini 74135e1318 Merge branch 'feature/omit-relay-user' into 'develop'
AdminAPI: Omit relay user from users list

Closes #1349

See merge request pleroma/pleroma!1924
2019-11-03 16:19:27 +00:00
kaniini 61bcd4595f Merge branch 'feature/fast_sanitize' into 'develop'
Switching to FastSanitize

See merge request pleroma/pleroma!1916
2019-11-03 16:18:19 +00:00
Ariadne Conill 4bf942583f streamer: use direct object for filter checks when there is no valid child object in an activity
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.

Closes #1291
2019-11-03 09:05:12 -06:00
Maksim Pechnikov 1b3a942a84 fix format 2019-10-31 17:38:12 +03:00
Maxim Filippov 6f9d3d30fa AdminAPI: Omit relay user from users list 2019-10-31 02:26:02 +03:00
Mark Felder fcea6a9d2c Merge branch 'develop' into feature/fast_sanitize 2019-10-30 17:51:15 -05:00
Maksim Pechnikov 209319c8d2 update marker api 2019-10-30 23:49:05 +03:00
kPherox d1ae51b02a Update test for get_recipients_from_activity 2019-10-30 20:14:16 +09:00
rinpatch ae59b38203 Rip out the rest of htmlsanitizeex 2019-10-30 09:20:13 +03:00
Maksim Pechnikov b27a92e8fa Merge branch 'develop' into issue/1276 2019-10-29 22:23:19 +03:00
rinpatch 61400d7eb7 Fix XSS emoji test 2019-10-29 20:49:32 +03:00
kPherox c2f2d7bcf6 Add test follow activity for locked account 2019-10-29 18:46:22 +09:00
rinpatch 08f6837065 Switch from HtmlSanitizeEx to FastSanitize 2019-10-29 01:18:08 +03:00
stwf 56e42602b0 capture where errors are expected 2019-10-28 12:51:58 -04:00
lain 2480200759 Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table

Closes #1233

See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
Maxim Filippov 8282b6ac3d Make sure incoming flags are updated with status data 2019-10-27 16:17:37 +03:00
Maxim Filippov 791bcfd90f Merge branch 'develop' into feature/store-statuses-data-inside-flag 2019-10-27 16:11:25 +03:00
Maxim Filippov 8eff05d4c6 Strip status data from Flag (when federating or closing/resolving report) 2019-10-27 16:05:32 +03:00
eugenijm 0580654485 Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count.
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
2019-10-26 02:29:18 +03:00
stwf 5329b361ec fix test 2019-10-24 12:48:17 -04:00
Maksim Pechnikov 922e3d082c add test 2019-10-24 12:17:50 +03:00
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Maksim Pechnikov 99cf1ef9be Merge branch 'develop' into issue/1276 2019-10-24 09:23:59 +03:00
Maksim Pechnikov d3fb9e02cc add tests 2019-10-23 22:48:04 +03:00
Maxim Filippov b08b1d5d91 Store status data inside Flag activity 2019-10-23 21:27:22 +02:00
Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
Maksim Pechnikov 9a4afbd2a0 added update unread_count for notifications 2019-10-23 11:22:48 +03:00
Ariadne Conill 3f6a596922 activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors 2019-10-22 20:50:46 -05:00
Ariadne Conill 277aea45b9 tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD.  It can, and we will add regression tests to prove that it can handle
this particular sin.  Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
2019-10-22 19:43:31 -05:00
Maksim Pechnikov d4270397dc Marker: added unread_count field 2019-10-22 14:51:46 +03:00
kaniini 6281e4795a Merge branch 'feature/push-subject-for-dm' into 'develop'
Direct messages should provide a distinct push notification subject

See merge request pleroma/pleroma!1864
2019-10-21 23:50:01 +00:00
Mark Felder 0c628fafc5 Spelling 2019-10-21 18:35:43 -05:00
Mark Felder 2cbb3f2364 Add tests for the subject of push notifications 2019-10-21 18:34:20 -05:00
rinpatch 6712b6e4de Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
Do not include notifications from blocked users when with_muted is set

See merge request pleroma/pleroma!1869
2019-10-21 16:44:17 +00:00
rinpatch 2dbee29cf5 Do not include notifications from blocked users when with_muted is set
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
2019-10-21 19:27:38 +03:00
Ivan Tashkinov 7c7f90bc4f [#1304] Merged develop, handled User.Info.invisible. 2019-10-21 11:58:22 +03:00
Maksim Pechnikov 243719a965 Merge branch 'develop' into feature/masto_api_markers 2019-10-21 11:32:28 +03:00
Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
Egor Kislitsyn c6fba62666
Fix Relay 2019-10-21 14:47:07 +07:00
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships 2019-10-21 14:19:15 +07:00
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 22:29:56 +03:00