X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=0b1bc473a7f1bdaa0a2e195b9c55d84e5fe3736f;hb=70024632ba32121bd63a439b2d708d4b4ff1a190;hp=d048d07c32aef0dadaf3ac992ca8afa410c45041;hpb=36448d6483c7f53266052e72bd39b04558478410;p=akkoma
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index d048d07c3..0b1bc473a 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,7 +1,9 @@
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.OStatus
import Ecto.Query
@@ -43,7 +45,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def create_status(%User{} = user, %{"status" => status} = data) do
attachments = attachments_from_ids(data["media_ids"])
- context = ActivityPub.generate_context_id
+ context = Utils.generate_context_id
mentions = parse_mentions(status)
content_html = status
|> format_input(mentions)
@@ -242,7 +244,21 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def add_user_links(text, mentions) do
- Enum.reduce(mentions, text, fn ({match, %User{ap_id: ap_id}}, text) -> String.replace(text, match, "#{match}") end)
+ mentions = mentions
+ |> Enum.sort_by(fn ({name, _}) -> -String.length(name) end)
+ |> Enum.map(fn({name, user}) -> {name, user, Ecto.UUID.generate} end)
+
+ # This replaces the mention with a unique reference first so it doesn't
+ # contain parts of other replaced mentions. There probably is a better
+ # solution for this...
+ step_one = mentions
+ |> Enum.reduce(text, fn ({match, _user, uuid}, text) ->
+ String.replace(text, match, uuid)
+ end)
+
+ Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
+ String.replace(text, uuid, "#{match}")
+ end)
end
def register_user(params) do
@@ -352,10 +368,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def get_external_profile(for_user, uri) do
- with %User{} = user <- User.get_cached_by_ap_id(uri) do
+ with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do
{:ok, UserRepresenter.to_map(user, %{for: for_user})}
else _e ->
- {:error, "Couldn't find user"}
+ {:error, "Couldn't find user"}
end
end
end