X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Ftransmogrifier.ex;h=d759ca2b2faf21a65074a0a09d7fac1cc21dc6b4;hb=3fcdfb75d03efa27903ba5fdd5c78f2b93a4d55b;hp=f3e869f4d0ac218b40ec30b1243a35e1e5d15f3d;hpb=82df16f7c30251e64eaa28fb20c752e61e04cd2e;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index f3e869f4d..d759ca2b2 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -21,6 +21,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> fix_attachments
     |> fix_context
     |> fix_in_reply_to
+    |> fix_emoji
   end
 
   def fix_in_reply_to(%{"inReplyTo" => in_reply_to_id} = object) when not is_nil(in_reply_to_id) do
@@ -56,6 +57,25 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> Map.put("attachment", attachments)
   end
 
+  def fix_emoji(object) do
+    tags = (object["tag"] || [])
+    emoji = tags |> Enum.filter(fn (data) -> data["type"] == "Emoji" and data["icon"] end)
+    emoji = emoji |> Enum.reduce(%{}, fn (data, mapping) ->
+      name = data["name"]
+      if String.starts_with?(name, ":") do
+        name = name |> String.slice(1..-2)
+      end
+
+      mapping |> Map.put(name, data["icon"]["url"])
+    end)
+
+    # we merge mastodon and pleroma emoji into a single mapping, to allow for both wire formats
+    emoji = Map.merge(object["emoji"] || %{}, emoji)
+
+    object
+    |> Map.put("emoji", emoji)
+  end
+
   # TODO: validate those with a Ecto scheme
   # - tags
   # - emoji
@@ -138,6 +158,21 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     end
   end
 
+  # TODO: Make secure.
+  def handle_incoming(%{"type" => "Delete", "object" => object_id, "actor" => actor, "id" => id} = data) do
+    object_id = case object_id do
+                  %{"id" => id} -> id
+                  id -> id
+                end
+    with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
+         {:ok, object} <- get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
+         {:ok, activity} <- ActivityPub.delete(object, false) do
+      {:ok, activity}
+    else
+      e -> :error
+    end
+  end
+
   # TODO
   # Accept
   # Undo
@@ -153,6 +188,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> set_sensitive
     |> add_hashtags
     |> add_mention_tags
+    |> add_emoji_tags
     |> add_attributed_to
     |> prepare_attachments
     |> set_conversation
@@ -174,11 +210,31 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
 
   def prepare_outgoing(%{"type" => type} = data) do
     data = data
+    |> maybe_fix_object_url
     |> Map.put("@context", "https://www.w3.org/ns/activitystreams")
 
     {:ok, data}
   end
 
+  def maybe_fix_object_url(data) do
+    if is_binary(data["object"]) and not String.starts_with?(data["object"], "http") do
+      case ActivityPub.fetch_object_from_id(data["object"]) do
+        {:ok, relative_object} ->
+          if relative_object.data["external_url"] do
+            data = data
+            |> Map.put("object", relative_object.data["external_url"])
+          else
+            data
+          end
+        e ->
+          Logger.error("Couldn't fetch #{data["object"]} #{inspect(e)}")
+          data
+      end
+    else
+      data
+    end
+  end
+
   def add_hashtags(object) do
     tags = (object["tag"] || [])
     |> Enum.map fn (tag) -> %{"href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}", "name" => "##{tag}", "type" => "Hashtag"} end
@@ -200,6 +256,22 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     |> Map.put("tag", tags ++ mentions)
   end
 
+  # TODO: we should probably send mtime instead of unix epoch time for updated
+  def add_emoji_tags(object) do
+    tags = object["tag"] || []
+    emoji = object["emoji"] || []
+    out = emoji |> Enum.map(fn {name, url} ->
+      %{"icon" => %{"url" => url, "type" => "Image"},
+        "name" => ":" <> name <> ":",
+        "type" => "Emoji",
+        "updated" => "1970-01-01T00:00:00Z",
+        "id" => url}
+    end)
+
+    object
+    |> Map.put("tag", tags ++ out)
+  end
+
   def set_conversation(object) do
     Map.put(object, "conversation", object["context"])
   end
@@ -237,7 +309,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     maybe_retire_websub(user.ap_id)
 
     # Only do this for recent activties, don't go through the whole db.
-    since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
+    # Only look at the last 1000 activities.
+    since = (Repo.aggregate(Activity, :max, :id) || 0) - 1_000
     q  = from a in Activity,
     where: ^old_follower_address in a.recipients,
     where: a.id > ^since,
@@ -251,16 +324,19 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       data = data
       |> Map.put(:info, Map.merge(user.info, data[:info]))
 
+      already_ap = User.ap_enabled?(user)
       {:ok, user} = User.upgrade_changeset(user, data)
       |> Repo.update()
 
-      # This could potentially take a long time, do it in the background
-      if async do
-        Task.start(fn ->
+      if !already_ap do
+        # This could potentially take a long time, do it in the background
+        if async do
+          Task.start(fn ->
+            user_upgrade_task(user)
+          end)
+        else
           user_upgrade_task(user)
-        end)
-      else
-        user_upgrade_task(user)
+        end
       end
 
       {:ok, user}