X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=1a5c07c8a61e73edba5ac88297090fd69aa28cbe;hb=3ea4476445a5e9b6ec1625d7caa537f79254e9d0;hp=dd971df9b98d3b02694565633794f94f507723a6;hpb=0f3e78addb4a88106120737f2eb603ec136d99f9;p=akkoma diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index dd971df9b..1a5c07c8a 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -29,8 +29,6 @@ defmodule Pleroma.Formatter do |> Enum.filter(fn {_match, user} -> user end) end - @instance Application.get_env(:pleroma, :instance) - def emojify(text) do emojify(text, Emoji.get_all()) end @@ -118,8 +116,8 @@ defmodule Pleroma.Formatter do subs ++ Enum.map(mentions, fn {match, %User{ap_id: ap_id, info: info}, uuid} -> ap_id = - if is_binary(info["source_data"]["url"]) do - info["source_data"]["url"] + if is_binary(info.source_data["url"]) do + info.source_data["url"] else ap_id end