Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'

Participations: Filter out participations without activities. Closes #956 and #953 See merge request pleroma/pleroma!1246
2019-06-04 15:34:55 +00:00 · 2019-06-04 15:34:55 +00:00 · ab4915edcb
commit ab4915edcb
parent f178a6f3f0 a3a7178b60
2 changed files with 14 additions and 0 deletions
--- a/lib/pleroma/conversation/participation.ex
+++ b/lib/pleroma/conversation/participation.ex
@ -79,5 +79,6 @@ defmodule Pleroma.Conversation.Participation do
        | last_activity_id: activity_id
      }
    end)
+    |> Enum.filter(& &1.last_activity_id)
  end
 end