logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 241bd061fc60a5c90c172f46f3b4e576ba660aaf
parent 131f3219e6b895139c5647cd2050dd22adce7139
Author: Alibek Omarov <a1ba.omarov@gmail.com>
Date:   Fri, 16 Oct 2020 18:28:27 +0000

ConversationView: add current user to conversations, according to Mastodon behaviour

Diffstat:

Mlib/pleroma/web/mastodon_api/views/conversation_view.ex4+---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/conversation_view.ex b/lib/pleroma/web/mastodon_api/views/conversation_view.ex @@ -33,12 +33,10 @@ defmodule Pleroma.Web.MastodonAPI.ConversationView do end activity = Activity.get_by_id_with_object(last_activity_id) - # Conversations return all users except the current user. - users = Enum.reject(participation.recipients, &(&1.id == user.id)) %{ id: participation.id |> to_string(), - accounts: render(AccountView, "index.json", users: users, for: user), + accounts: render(AccountView, "index.json", users: participation.recipients, for: user), unread: !participation.read, last_status: render(StatusView, "show.json",