AkkomaGang/fedibird-fe
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Eliminate duplication and provide status notifications outside of feed to home

Browse source
This commit is contained in:
noellabo 2020-09-20 20:32:31 +09:00
parent 96258f2a86
commit 2f88e910b6
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/notification.rb
View file

@ -57,6 +57,7 @@ class Notification < ApplicationRecord
belongs_to :poll, foreign_key: 'activity_id', optional: true belongs_to :poll, foreign_key: 'activity_id', optional: true
validates :type, inclusion: { in: TYPES } validates :type, inclusion: { in: TYPES }
validates :activity_id, uniqueness: { scope: [:account_id, :type] }, if: -> { type.to_sym == :status }
scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) } scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) }

2
app/workers/feed_insert_worker.rb
View file

@ -39,7 +39,7 @@ class FeedInsertWorker
end end
def notify? def notify?
return false if @type != :home || @status.reblog? || (@status.reply? && @status.in_reply_to_account_id != @status.account_id) return false if @status.reblog? || (@status.reply? && @status.in_reply_to_account_id != @status.account_id)
Follow.find_by(account: @follower, target_account: @status.account)&.notify? Follow.find_by(account: @follower, target_account: @status.account)&.notify?
end end