Browse Source

Move finmojis to representation.

tags/v0.9.9
Roger Braun 7 years ago
parent
commit
45c751985e
2 changed files with 2 additions and 2 deletions
  1. +2
    -1
      lib/pleroma/web/twitter_api/representers/activity_representer.ex
  2. +0
    -1
      lib/pleroma/web/twitter_api/utils.ex

+ 2
- 1
lib/pleroma/web/twitter_api/representers/activity_representer.ex View File

@@ -4,6 +4,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
alias Pleroma.{Activity, User}
alias Calendar.Strftime
alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Formatter

defp user_by_ap_id(user_list, ap_id) do
Enum.find(user_list, fn (%{ap_id: user_id}) -> ap_id == user_id end)
@@ -92,7 +93,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
"id" => activity.id,
"user" => UserRepresenter.to_map(user, opts),
"attentions" => [],
"statusnet_html" => HtmlSanitizeEx.basic_html(content),
"statusnet_html" => HtmlSanitizeEx.basic_html(content) |> Formatter.finmojifiy,
"text" => HtmlSanitizeEx.strip_tags(content),
"is_local" => true,
"is_post_verb" => true,


+ 0
- 1
lib/pleroma/web/twitter_api/utils.ex View File

@@ -22,7 +22,6 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
|> Formatter.linkify
|> String.replace("\n", "<br>\n")
|> add_user_links(mentions)
|> Formatter.finmojifiy
end

def add_user_links(text, mentions) do


Loading…
Cancel
Save