From 44207b6af6977f44200b6fd82f3e18ba70fd7cc7 Mon Sep 17 00:00:00 2001 From: Surinna Curtis Date: Mon, 17 Jul 2017 21:10:37 -0500 Subject: Add muting_notifications? and a notifications argument to mute! --- app/models/concerns/account_interactions.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/models/concerns/account_interactions.rb') diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb index b26520f5b..976452f12 100644 --- a/app/models/concerns/account_interactions.rb +++ b/app/models/concerns/account_interactions.rb @@ -70,8 +70,8 @@ module AccountInteractions block_relationships.find_or_create_by!(target_account: other_account) end - def mute!(other_account) - mute_relationships.find_or_create_by!(target_account: other_account) + def mute!(other_account, notifications: true) + mute_relationships.create_with(hide_notifications: notifications).find_or_create_by!(target_account: other_account) end def mute_conversation!(conversation) @@ -127,6 +127,10 @@ module AccountInteractions conversation_mutes.where(conversation: conversation).exists? end + def muting_notifications?(other_account) + mute_relationships.where(target_account: other_account, hide_notifications: true).exists? + end + def requested?(other_account) follow_requests.where(target_account: other_account).exists? end -- cgit