squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Even more refactoring.

Browse Source
This commit is contained in:
Roger Braun 2017-04-25 17:35:21 +02:00
parent 4771962a5d
commit 6c5f5e18ec
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -11,11 +11,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
"https://www.w3.org/ns/activitystreams#Public" "https://www.w3.org/ns/activitystreams#Public"
] ]
to = default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
end end
def format_input(text, mentions) do def format_input(text, mentions) do
content = HtmlSanitizeEx.strip_tags(text) HtmlSanitizeEx.strip_tags(text)
|> String.replace("\n", "<br>") |> String.replace("\n", "<br>")
|> add_user_links(mentions) |> add_user_links(mentions)
end end
@ -235,24 +235,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
Enum.reduce(mentions, text, fn ({match, %User{ap_id: ap_id}}, text) -> String.replace(text, match, "<a href='#{ap_id}'>#{match}</a>") end) Enum.reduce(mentions, text, fn ({match, %User{ap_id: ap_id}}, text) -> String.replace(text, match, "<a href='#{ap_id}'>#{match}</a>") end)
end end
defp add_conversation_id(activity) do
if is_integer(activity.data["statusnetConversationId"]) do
{:ok, activity}
else
data = activity.data
|> put_in(["object", "statusnetConversationId"], activity.id)
|> put_in(["statusnetConversationId"], activity.id)
object = Object.get_by_ap_id(activity.data["object"]["id"])
changeset = Ecto.Changeset.change(object, data: data["object"])
Repo.update(changeset)
changeset = Ecto.Changeset.change(activity, data: data)
Repo.update(changeset)
end
end
def register_user(params) do def register_user(params) do
params = %{ params = %{
nickname: params["nickname"], nickname: params["nickname"],