diff options
| author | lain <lain@soykaf.club> | 2019-11-08 13:27:11 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-08 13:27:11 +0100 |
| commit | b22ee9d9666c49d1a3b1757b275e9d303eed4afc (patch) | |
| tree | e7b4138a82c7382f2e2819f0a52481ec39cb12f3 /lib/pleroma/formatter.ex | |
| parent | d7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e (diff) | |
| parent | 278674223d36f4d789dce92cd541c47b7e19b674 (diff) | |
| download | pleroma-b22ee9d9666c49d1a3b1757b275e9d303eed4afc.tar.gz | |
Merge remote-tracking branch 'origin/develop' into reactions
Diffstat (limited to 'lib/pleroma/formatter.ex')
| -rw-r--r-- | lib/pleroma/formatter.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 931b9af2b..19b9af46c 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -127,7 +127,7 @@ defmodule Pleroma.Formatter do end end - defp get_ap_id(%User{info: %{source_data: %{"url" => url}}}) when is_binary(url), do: url + defp get_ap_id(%User{source_data: %{"url" => url}}) when is_binary(url), do: url defp get_ap_id(%User{ap_id: ap_id}), do: ap_id defp get_nickname_text(nickname, %{mentions_format: :full}), do: User.full_nickname(nickname) |