X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Fcommon_api.ex;h=dc94e53771d75990f32024a80c15a54d96c012f3;hb=4524721fba0582774b7c38fdc1f270c43fd8d53b;hp=b08138534ad7797e87a5f4836ffc5f7452389527;hpb=d625d8db7d6041e85ef7c7c1a8b617c9bba36a98;p=akkoma

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index b08138534..dc94e5377 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -1,6 +1,9 @@
 defmodule Pleroma.Web.CommonAPI do
-  alias Pleroma.{Repo, Activity, Object}
+  alias Pleroma.{Repo, Activity, Object, User}
   alias Pleroma.Web.ActivityPub.ActivityPub
+  alias Pleroma.Formatter
+
+  import Pleroma.Web.CommonAPI.Utils
 
   def delete(activity_id, user) do
     with %Activity{data: %{"object" => %{"id" => object_id}}} <- Repo.get(Activity, activity_id),
@@ -13,7 +16,6 @@ defmodule Pleroma.Web.CommonAPI do
 
   def repeat(id_or_ap_id, user) do
     with %Activity{} = activity <- get_by_id_or_ap_id(id_or_ap_id),
-         false <- activity.data["actor"] == user.ap_id,
          object <- Object.get_by_ap_id(activity.data["object"]["id"]) do
       ActivityPub.announce(user, object)
     else
@@ -44,13 +46,24 @@ defmodule Pleroma.Web.CommonAPI do
     end
   end
 
-  # This is a hack for twidere.
-  def get_by_id_or_ap_id(id) do
-    activity = Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id)
-    if activity.data["type"] == "Create" do
-      activity
-    else
-      Activity.get_create_activity_by_object_ap_id(activity.data["object"])
+  @instance Application.get_env(:pleroma, :instance)
+  @limit Keyword.get(@instance, :limit)
+  def post(user, %{"status" => status} = data) do
+    with status <- String.trim(status),
+         length when length in 1..@limit <- String.length(status),
+         attachments <- attachments_from_ids(data["media_ids"]),
+         mentions <- Formatter.parse_mentions(status),
+         inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]),
+         to <- to_for_user_and_mentions(user, mentions, inReplyTo),
+         tags <- Formatter.parse_tags(status, data),
+         content_html <- make_content_html(status, mentions, attachments, tags),
+         context <- make_context(inReplyTo),
+         cw <- data["spoiler_text"],
+         object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw),
+         object <- Map.put(object, "emoji", Formatter.get_emoji(status) |> Enum.reduce(%{}, fn({name, file}, acc) -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url}#{file}") end)) do
+      res = ActivityPub.create(to, user, context, object)
+      User.increase_note_count(user)
+      res
     end
   end
 end