fix: various fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/graphql/resolvers/conversation.ex

@@ -11,8 +11,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Conversation do
   alias Mobilizon.Storage.Page
   alias Mobilizon.Users.User
   alias Mobilizon.Web.Endpoint
-  # alias Mobilizon.Users.User
   import Mobilizon.Web.Gettext, only: [dgettext: 2]
+  require Logger
 
   @spec find_conversations_for_event(Event.t(), map(), Absinthe.Resolution.t()) ::
           {:ok, Page.t(ConversationView.t())} | {:error, :unauthenticated}
@@ -157,9 +157,17 @@ defmodule Mobilizon.GraphQL.Resolvers.Conversation do
           {:ok, conversation_to_view(conversation, conversation_participant_actor)}
 
         {:error, :empty_participants} ->
-          {:error, dgettext("errors", "Conversation needs to mention at least one participant")}
+          {:error,
+           dgettext(
+             "errors",
+             "Conversation needs to mention at least one participant that's not yourself"
+           )}
       end
     else
+      Logger.debug(
+        "Actor #{current_actor.id} is not authorized to reply to conversation #{inspect(Map.get(args, :conversation_id))}"
+      )
+
       {:error, :unauthorized}
     end
   end
@@ -259,7 +267,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Conversation do
       %Conversation{participants: participants} ->
         participant_ids = Enum.map(participants, fn participant -> to_string(participant.id) end)
 
-        current_actor_id in participant_ids or
+        to_string(current_actor_id) in participant_ids or
           Enum.any?(participant_ids, fn participant_id ->
             Actors.is_member?(current_actor_id, participant_id) and
               attributed_to_id == participant_id

lib/graphql/resolvers/participant.ex

@@ -2,8 +2,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
   @moduledoc """
   Handles the participation-related GraphQL calls.
   """
-  # alias Mobilizon.Conversations.ConversationParticipant
-  alias Mobilizon.{Actors, Config, Crypto, Events}
+  alias Mobilizon.{Actors, Config, Conversations, Crypto, Events}
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Conversations.{Conversation, ConversationView}
   alias Mobilizon.Events.{Event, Participant}
@@ -386,6 +385,13 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
       {:member, false} ->
         {:error, :unauthorized}
 
+      {:error, :empty_participants} ->
+        {:error,
+         dgettext(
+           "errors",
+           "There are no participants matching the audience you've selected."
+         )}
+
       {:error, err} ->
         {:error, err}
     end
@@ -394,11 +400,19 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
   def send_private_messages_to_participants(_parent, _args, _resolution),
     do: {:error, :unauthorized}
 
-  defp conversation_to_view(%Conversation{} = conversation, %Actor{} = actor) do
+  defp conversation_to_view(
+         %Conversation{id: conversation_id} = conversation,
+         %Actor{id: actor_id} = actor
+       ) do
     value =
       conversation
       |> Map.from_struct()
       |> Map.put(:actor, actor)
+      |> Map.put(:unread, false)
+      |> Map.put(
+        :conversation_participant_id,
+        Conversations.get_participant_by_conversation_and_actor(conversation_id, actor_id).id
+      )
 
     struct(ConversationView, value)
   end