Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add option to be notified when a followed user posts (#13546)

Browse source 
* Add bell button

Fix #4890

* Remove duplicate type from post-deployment migration

* Fix legacy class type mappings

* Improve query performance with better index

* Fix validation

* Remove redundant index from notifications
This commit is contained in:
Eugen Rochko 2020-09-18 17:26:45 +02:00 • committed by GitHub
parent 75e4bd9413
commit 974b1b79ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 330 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/serializers/rest/notification_serializer.rb
View file

@ -11,6 +11,6 @@ class REST::NotificationSerializer < ActiveModel::Serializer
end
def status_type?
[:favourite, :reblog, :mention, :poll].include?(object.type)
[:favourite, :reblog, :status, :mention, :poll].include?(object.type)
end
end

12
app/serializers/rest/relationship_serializer.rb
View file

@ -1,9 +1,9 @@
# frozen_string_literal: true
class REST::RelationshipSerializer < ActiveModel::Serializer
attributes :id, :following, :showing_reblogs, :followed_by, :blocking, :blocked_by,
:muting, :muting_notifications, :requested, :domain_blocking,
:endorsed, :note
attributes :id, :following, :showing_reblogs, :notifying, :followed_by,
:blocking, :blocked_by, :muting, :muting_notifications, :requested,
:domain_blocking, :endorsed, :note
def id
object.id.to_s
@ -19,6 +19,12 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
false
end
def notifying
(instance_options[:relationships].following[object.id] || {})[:notify] ||
(instance_options[:relationships].requested[object.id] || {})[:notify] ||
false
end
def followed_by
instance_options[:relationships].followed_by[object.id] || false
end