From 423194520e3fd1d2b285e7cf34a8ad7476276f5d Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Mon, 15 May 2017 18:25:21 +0200 Subject: Fix mention replacing. --- lib/pleroma/web/twitter_api/twitter_api.ex | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 6503d7222..3b575756d 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -243,7 +243,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 -- cgit v1.2.3