diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-12-03 16:31:00 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-12-03 16:31:00 +0000 |
commit | 88b05aeabb23412530f6b74934bc3d2d3fe8c29f (patch) | |
tree | cc533e19e236ac317a003771d63cf707f5f974f7 /lib/pleroma/user.ex | |
parent | 42ef7cd227ba075fbd05e9625dc880feddee4417 (diff) | |
parent | 4b70e5eae93f34c1b98263a96d4e1380ef579ede (diff) | |
download | pleroma-88b05aeabb23412530f6b74934bc3d2d3fe8c29f.tar.gz |
Merge branch 'fix/parse-user-bio' into 'develop'
Parse user's bio on register
See merge request pleroma/pleroma!492
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r-- | lib/pleroma/user.ex | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 76712b4bf..3bd92c157 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -4,6 +4,8 @@ defmodule Pleroma.User do import Ecto.{Changeset, Query} alias Pleroma.{Repo, User, Object, Web, Activity, Notification} alias Comeonin.Pbkdf2 + alias Pleroma.Formatter + alias Pleroma.Web.CommonAPI.Utils, as: CommonUtils alias Pleroma.Web.{OStatus, Websub, OAuth} alias Pleroma.Web.ActivityPub.{Utils, ActivityPub} @@ -802,4 +804,18 @@ defmodule Pleroma.User do :error end end + + def parse_bio(bio, user \\ %User{info: %{source_data: %{}}}) do + mentions = Formatter.parse_mentions(bio) + tags = Formatter.parse_tags(bio) + + emoji = + (user.info.source_data["tag"] || []) + |> Enum.filter(fn %{"type" => t} -> t == "Emoji" end) + |> Enum.map(fn %{"icon" => %{"url" => url}, "name" => name} -> + {String.trim(name, ":"), url} + end) + + CommonUtils.format_input(bio, mentions, tags, "text/plain") |> Formatter.emojify(emoji) + end end |