diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-03 16:00:49 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-03 16:00:49 +0000 |
| commit | ace4231628ad1af08c8696fb7fe6983549f62631 (patch) | |
| tree | c310e7065122b6c3a6e5a07d0f3eeaad1f2ef546 /lib/pleroma/user.ex | |
| parent | 6c6a2dbfdd7ae4043633c3201693c5c49538ef84 (diff) | |
| parent | f2452d5700afc48284638ae2cd1bff4886571d8c (diff) | |
| download | pleroma-ace4231628ad1af08c8696fb7fe6983549f62631.tar.gz | |
Merge branch 'features/bio_rel_me' into 'develop'
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 78543b426..50e7e7ccd 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -22,6 +22,7 @@ defmodule Pleroma.User do alias Pleroma.Web.OAuth alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.RelMe require Logger @@ -1232,8 +1233,14 @@ defmodule Pleroma.User do {String.trim(name, ":"), url} end) + # TODO: get profile URLs other than user.ap_id + profile_urls = [user.ap_id] + bio - |> CommonUtils.format_input("text/plain", mentions_format: :full) + |> CommonUtils.format_input("text/plain", + mentions_format: :full, + rel: &RelMe.maybe_put_rel_me(&1, profile_urls) + ) |> elem(0) |> Formatter.emojify(emoji) end |