Toot

lib/mobilizon/events/comment.ex

@@ -26,7 +26,10 @@ defmodule Mobilizon.Events.Comment do
 
   @doc false
   def changeset(comment, attrs) do
-    uuid = Ecto.UUID.generate()
+    uuid =
+      if Map.has_key?(attrs, "uuid"),
+        do: attrs["uuid"],
+        else: Ecto.UUID.generate()
 
     # TODO : really change me right away
     url =
@@ -35,7 +38,15 @@ defmodule Mobilizon.Events.Comment do
         else: "#{MobilizonWeb.Endpoint.url()}/comments/#{uuid}"
 
     comment
-    |> cast(attrs, [:url, :text, :actor_id, :event_id, :in_reply_to_comment_id, :origin_comment_id, :attributed_to_id])
+    |> cast(attrs, [
+      :url,
+      :text,
+      :actor_id,
+      :event_id,
+      :in_reply_to_comment_id,
+      :origin_comment_id,
+      :attributed_to_id
+    ])
     |> put_change(:uuid, uuid)
     |> put_change(:url, url)
     |> validate_required([:text, :actor_id, :url])

lib/mobilizon/events/events.ex

@@ -885,7 +885,15 @@ defmodule Mobilizon.Events do
   """
   def get_comment!(id), do: Repo.get!(Comment, id)
 
-  def get_comment_with_uuid!(uuid), do: Repo.get_by!(Comment, uuid: uuid)
+  def get_comment_from_uuid(uuid), do: Repo.get_by(Comment, uuid: uuid)
+
+  def get_comment_from_uuid!(uuid), do: Repo.get_by!(Comment, uuid: uuid)
+
+  def get_comment_full_from_uuid(uuid) do
+    with %Comment{} = comment <- Repo.get_by!(Comment, uuid: uuid) do
+      Repo.preload(comment, [:actor, :attributed_to])
+    end
+  end
 
   def get_comment_from_url(url), do: Repo.get_by(Comment, url: url)