diff options
author | ThibG <thib@sitedethib.com> | 2020-09-29 10:29:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-29 10:29:42 +0200 |
commit | 62e3f588dee75fc6a37457f8218630daad056cba (patch) | |
tree | 69439eebc4da7137206ee82e6ec3fa21cf8c7ed0 /app/services/notify_service.rb | |
parent | 787d5d728923393f12421a480b3c7aee789a11fe (diff) | |
parent | ccfc2b6dce4bfda283bb6bc968a23fe4a76951d7 (diff) |
Merge pull request #1430 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/notify_service.rb')
-rw-r--r-- | app/services/notify_service.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index e4ca10eb1..fc187db40 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -1,10 +1,10 @@ # frozen_string_literal: true class NotifyService < BaseService - def call(recipient, activity) + def call(recipient, type, activity) @recipient = recipient @activity = activity - @notification = Notification.new(account: @recipient, activity: @activity) + @notification = Notification.new(account: @recipient, type: type, activity: @activity) return if recipient.user.nil? || blocked? @@ -22,6 +22,10 @@ class NotifyService < BaseService FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient) end + def blocked_status? + false + end + def blocked_favourite? false end |