Add href to in-reply-to.

[akkoma] / lib / pleroma / web / twitter_api / twitter_api.ex

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index cf96107238f396b61c9ee57a0d34e9b32989e3ee..dc66e27adba77965769539eed976b15a7daa8cdf 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,17 +1,18 @@
 defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   alias Pleroma.{User, Activity, Repo, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
-  alias Pleroma.Web.ActivityPub.Utils
-  alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
+  alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
+  alias Pleroma.Web.TwitterAPI.UserView
   alias Pleroma.Web.OStatus
   alias Pleroma.Formatter
 
-  import Ecto.Query
   import Pleroma.Web.TwitterAPI.Utils
 
+  @httpoison Application.get_env(:pleroma, :httpoison)
+
   def to_for_user_and_mentions(user, mentions, inReplyTo) do
     default_to = [
-      User.ap_followers(user),
+      user.follower_address,
       "https://www.w3.org/ns/activitystreams#Public"
     ]
 
@@ -31,14 +32,16 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def create_status(%User{} = user, %{"status" => status} = data) do
     with attachments <- attachments_from_ids(data["media_ids"]),
-         mentions <- parse_mentions(status),
+         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),
          content_html <- make_content_html(status, mentions, attachments),
          context <- make_context(inReplyTo),
          tags <- Formatter.parse_tags(status),
          object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags) do
-      ActivityPub.create(to, user, context, object)
+      res = ActivityPub.create(to, user, context, object)
+      User.update_note_count(user)
+      res
     end
   end
 
@@ -182,17 +185,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   end
 
-  def parse_mentions(text) do
-    # Modified from https://www.w3.org/TR/html5/forms.html#valid-e-mail-address
-    regex = ~r/@[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@?[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*/
-
-    Regex.scan(regex, text)
-    |> List.flatten
-    |> Enum.uniq
-    |> Enum.map(fn ("@" <> match = full_match) -> {full_match, User.get_cached_by_nickname(match)} end)
-    |> Enum.filter(fn ({_match, user}) -> user end)
-  end
-
   def register_user(params) do
     params = %{
       nickname: params["nickname"],
@@ -206,7 +198,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     changeset = User.register_changeset(%User{}, params)
 
     with {:ok, user} <- Repo.insert(changeset) do
-      {:ok, UserRepresenter.to_map(user)}
+      {:ok, user}
     else
       {:error, changeset} ->
         errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end)
@@ -292,10 +284,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   def context_to_conversation_id(context) do
     with %Object{id: id} <- Object.get_cached_by_ap_id(context) do
       id
-    else _e ->
-      changeset = Object.context_mapping(context)
-      {:ok, %{id: id}} = Repo.insert(changeset)
-      id
+      else _e ->
+        changeset = Object.context_mapping(context)
+        case Repo.insert(changeset) do
+          {:ok, %{id: id}} -> id
+          # This should be solved by an upsert, but it seems ecto
+          # has problems accessing the constraint inside the jsonb.
+          {:error, _} -> Object.get_cached_by_ap_id(context).id
+        end
     end
   end
 
@@ -309,7 +305,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def get_external_profile(for_user, uri) do
     with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do
-      {:ok, UserRepresenter.to_map(user, %{for: for_user})}
+      with url <- user.info["topic"],
+           {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
+        OStatus.handle_incoming(body)
+      end
+      {:ok, UserView.render("show.json", %{user: user, for: for_user})}
     else _e ->
         {:error, "Couldn't find user"}
     end