diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-10-29 22:23:19 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-10-29 22:23:19 +0300 |
| commit | b27a92e8faacb25540f08e32f68f37555a889aff (patch) | |
| tree | e496b859774953b644008bd7d831b65d25bc7617 /lib/pleroma/conversation.ex | |
| parent | 922e3d082c38ccd108710e21d4bda8e65b551f9c (diff) | |
| parent | eba8acff094cd63088f74424f14c9d807bb8e862 (diff) | |
| download | pleroma-b27a92e8faacb25540f08e32f68f37555a889aff.tar.gz | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'lib/pleroma/conversation.ex')
| -rw-r--r-- | lib/pleroma/conversation.ex | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/pleroma/conversation.ex b/lib/pleroma/conversation.ex index 098016af2..ade3a526a 100644 --- a/lib/pleroma/conversation.ex +++ b/lib/pleroma/conversation.ex @@ -67,7 +67,13 @@ defmodule Pleroma.Conversation do participations = Enum.map(users, fn user -> - User.increment_unread_conversation_count(conversation, user) + invisible_conversation = Enum.any?(users, &User.blocks?(user, &1)) + + unless invisible_conversation do + User.increment_unread_conversation_count(conversation, user) + end + + opts = Keyword.put(opts, :invisible_conversation, invisible_conversation) {:ok, participation} = Participation.create_for_user_and_conversation(user, conversation, opts) |