diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-17 17:13:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 17:13:04 +0200 |
| commit | ddd30f331c7a2af38176d72d9ce2265068984bed (patch) | |
| tree | 78ff80eee6e2a10ba8539c6e3211a71fc6ca0ead /app/lib/activitypub/activity.rb | |
| parent | 00387be2898cab016fa730d4f5683202cc540442 (diff) | |
Improve support for aspects/circles (#8950)
* Add silent column to mentions
* Save silent mentions in ActivityPub Create handler and optimize it
Move networking calls out of the database transaction
* Add "limited" visibility level masked as "private" in the API
Unlike DMs, limited statuses are pushed into home feeds. The access
control rules between direct and limited statuses is almost the same,
except for counter and conversation logic
* Ensure silent column is non-null, add spec
* Ensure filters don't check silent mentions for blocks/mutes
As those are "this person is also allowed to see" rather than "this
person is involved", therefore does not warrant filtering
* Clean up code
* Use Status#active_mentions to limit returned mentions
* Fix code style issues
* Use Status#active_mentions in Notification
And remove stream_entry eager-loading from Notification
Diffstat (limited to 'app/lib/activitypub/activity.rb')
| -rw-r--r-- | app/lib/activitypub/activity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 3a39b723ed1..999954cb5bc 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -96,7 +96,7 @@ class ActivityPub::Activity end def notify_about_mentions(status) - status.mentions.includes(:account).each do |mention| + status.active_mentions.includes(:account).each do |mention| next unless mention.account.local? && audience_includes?(mention.account) NotifyService.new.call(mention.account, mention) end |