diff --git a/app/models/card/watchable.rb b/app/models/card/watchable.rb index 94e5e27d9..8e719f756 100644 --- a/app/models/card/watchable.rb +++ b/app/models/card/watchable.rb @@ -23,7 +23,7 @@ module Card::Watchable end def watchers_and_subscribers(include_only_watching: false) - involvements = include_only_watching ? [:watching, :everything] : :everything + involvements = include_only_watching ? [ :watching, :everything ] : :everything subscribers = collection.users.where(accesses: { involvement: involvements }) User.where(id: subscribers.pluck(:id) + diff --git a/app/models/notifier/event.rb b/app/models/notifier/event.rb index f5db7c146..a98835f5b 100644 --- a/app/models/notifier/event.rb +++ b/app/models/notifier/event.rb @@ -5,24 +5,24 @@ class Notifier::Event < Notifier private def recipients case source.action - when "assigned" + when "assigned" source.assignees.excluding(card.collection.access_only_users) - when "published" + when "published" watchers_and_subscribers(include_only_watching: true).without(creator, *mentionees) - when "commented" + when "commented" watchers_and_subscribers.without(creator, *mentionees) - else + else watchers_and_subscribers.without(creator) end end def mentionees case source.action - when "published" + when "published" source.card.mentionees - when "commented" + when "commented" source.comment.mentionees - else + else [] end end