X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Factivity_pub.ex;h=75e4101f281d8a7b41e43891993a0407f2075cad;hb=7469616f44ddca66858e6d64040b24b7986a742e;hp=121c46c51c8e952c3c78d1e6c63aa04b6f076616;hpb=569d9bac178f22e763afc9db5000415bebf70304;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 121c46c51..75e4101f2 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1,12 +1,38 @@
 defmodule Pleroma.Web.ActivityPub.ActivityPub do
   alias Pleroma.Repo
-  alias Pleroma.Activity
+  alias Pleroma.{Activity, Object, Upload}
   import Ecto.Query
 
   def insert(map) when is_map(map) do
+    map = Map.put_new_lazy(map, "id", &generate_activity_id/0)
+
+    map = if is_map(map["object"]) do
+      object = Map.put_new_lazy(map["object"], "id", &generate_object_id/0)
+      Repo.insert!(%Object{data: object})
+      Map.put(map, "object", object)
+    else
+      map
+    end
+
     Repo.insert(%Activity{data: map})
   end
 
+  def generate_activity_id do
+    generate_id("activities")
+  end
+
+  def generate_context_id do
+    generate_id("contexts")
+  end
+
+  def generate_object_id do
+    generate_id("objects")
+  end
+
+  def generate_id(type) do
+    "#{Pleroma.Web.base_url()}/#{type}/#{Ecto.UUID.generate}"
+  end
+
   def fetch_public_activities(opts \\ %{}) do
     public = ["https://www.w3.org/ns/activitystreams#Public"]
     fetch_activities(public, opts)
@@ -28,7 +54,24 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     query = from activity in query,
       where: activity.id > ^since_id
 
+    query = if opts["max_id"] do
+      from activity in query, where: activity.id < ^opts["max_id"]
+    else
+      query
+    end
+
     Repo.all(query)
     |> Enum.reverse
   end
+
+  def fetch_activities_for_context(context) do
+    query = from activity in Activity,
+      where: fragment("? @> ?", activity.data, ^%{ context: context })
+    Repo.all(query)
+  end
+
+  def upload(%Plug.Upload{} = file) do
+    data = Upload.store(file)
+    Repo.insert(%Object{data: data})
+  end
 end