20 Commits (e2f2602fdc512d502cb41b8cdf07e6cc6362cf48)

Author	SHA1	Message	Date
lain	7a60cd91ff	Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog	5 years ago
lain	e2e9299b8e	Streamer Tests: code readability improvements	5 years ago
lain	e816edbb2f	Update streamer_test.exs	5 years ago
lain	77f24525ca	Streamer: Correctly handle reblog mutes	5 years ago
rinpatch	eae65e3216	formatting	5 years ago
rinpatch	6ffbfdeeb2	tests: significantly reduce streamer timeout ... there is no reason IPC between two processes on the same node should take 4 seconds	5 years ago
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	5 years ago
Egor Kislitsyn	c4b468a95b	Cleanup tests output	5 years ago
Ivan Tashkinov	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	5 years ago
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	5 years ago
eugenijm	ed29be24cb	Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.	5 years ago
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	5 years ago
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
Egor Kislitsyn	059005ff82	Replace `user.following` with Pleroma.FollowingRelationship	5 years ago
Ariadne Conill	8325858ed2	tests: streamer: add a test for blocked transitive activities	5 years ago
Haelwenn (lanodan) Monnier	447514dfa2	Bump copyright years of files changed in 2019 ... Done via the following command: git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'	5 years ago
Egor Kislitsyn	96816ceaa2	Revert "Merge branch 'revert-4fabf83a' into 'develop'" ... This reverts commit fe7fd33126, reversing changes made to 4fabf83ad0.	5 years ago
kaniini	c623b4324d	Revert "Merge branch 'streamer-refactoring' into 'develop'" ... This reverts merge request !1653	5 years ago
Steven Fuchs	aab264db82	Streamer refactoring	5 years ago