diff options
| author | lain <lain@soykaf.club> | 2019-11-08 13:27:11 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-08 13:27:11 +0100 |
| commit | b22ee9d9666c49d1a3b1757b275e9d303eed4afc (patch) | |
| tree | e7b4138a82c7382f2e2819f0a52481ec39cb12f3 /lib/pleroma/conversation.ex | |
| parent | d7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e (diff) | |
| parent | 278674223d36f4d789dce92cd541c47b7e19b674 (diff) | |
| download | pleroma-b22ee9d9666c49d1a3b1757b275e9d303eed4afc.tar.gz | |
Merge remote-tracking branch 'origin/develop' into reactions
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) |