Added Hashtag entity and objects-hashtags association with auto-sync with `data.tag...

[akkoma] / lib / pleroma / activity.ex

diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
index bda5aa616cf09665c9822703835ec8f1172ede71..07982331257d5c27ae22b324a6af9d9b07342812 100644 (file)
--- a/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@ -194,6 +194,19 @@ defmodule Pleroma.Activity do
     end
   end
 
+  def get_by_id_with_user_actor(id) do
+    case FlakeId.flake_id?(id) do
+      true ->
+        Activity
+        |> where([a], a.id == ^id)
+        |> with_preloaded_user_actor()
+        |> Repo.one()
+
+      _ ->
+        nil
+    end
+  end
+
   def get_by_id_with_object(id) do
     Activity
     |> where(id: ^id)
@@ -362,6 +375,7 @@ defmodule Pleroma.Activity do
     ap_id
     |> Queries.by_object_id()
     |> with_preloaded_object()
+    |> first()
     |> Repo.one()
   end