mirror of
https://akkoma.dev/AkkomaGang/akkoma.git
synced 2024-12-25 02:19:31 +00:00
user: Add support for custom emojis in profile fields
This commit is contained in:
parent
68036f5a3b
commit
cc7153cd82
|
@ -527,11 +527,21 @@ defmodule Pleroma.User do
|
||||||
end
|
end
|
||||||
|
|
||||||
defp put_emoji(changeset) do
|
defp put_emoji(changeset) do
|
||||||
bio = get_change(changeset, :bio)
|
emojified_fields = [:bio, :name, :raw_fields]
|
||||||
name = get_change(changeset, :name)
|
|
||||||
|
if Enum.any?(changeset.changes, fn {k, _} -> k in emojified_fields end) do
|
||||||
|
bio = Emoji.Formatter.get_emoji_map(get_field(changeset, :bio))
|
||||||
|
name = Emoji.Formatter.get_emoji_map(get_field(changeset, :name))
|
||||||
|
|
||||||
|
emoji = Map.merge(bio, name)
|
||||||
|
|
||||||
|
emoji =
|
||||||
|
changeset
|
||||||
|
|> get_field(:raw_fields)
|
||||||
|
|> Enum.reduce(emoji, fn x, acc ->
|
||||||
|
Map.merge(acc, Emoji.Formatter.get_emoji_map(x["name"] <> x["value"]))
|
||||||
|
end)
|
||||||
|
|
||||||
if bio || name do
|
|
||||||
emoji = Map.merge(Emoji.Formatter.get_emoji_map(bio), Emoji.Formatter.get_emoji_map(name))
|
|
||||||
put_change(changeset, :emoji, emoji)
|
put_change(changeset, :emoji, emoji)
|
||||||
else
|
else
|
||||||
changeset
|
changeset
|
||||||
|
|
|
@ -344,6 +344,30 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "emojis in fields labels", %{conn: conn} do
|
||||||
|
fields = [
|
||||||
|
%{"name" => ":firefox:", "value" => "is best 2hu"},
|
||||||
|
%{"name" => "they wins", "value" => ":blank:"}
|
||||||
|
]
|
||||||
|
|
||||||
|
account_data =
|
||||||
|
conn
|
||||||
|
|> patch("/api/v1/accounts/update_credentials", %{"fields_attributes" => fields})
|
||||||
|
|> json_response_and_validate_schema(200)
|
||||||
|
|
||||||
|
assert account_data["fields"] == [
|
||||||
|
%{"name" => ":firefox:", "value" => "is best 2hu"},
|
||||||
|
%{"name" => "they wins", "value" => ":blank:"}
|
||||||
|
]
|
||||||
|
|
||||||
|
assert account_data["source"]["fields"] == [
|
||||||
|
%{"name" => ":firefox:", "value" => "is best 2hu"},
|
||||||
|
%{"name" => "they wins", "value" => ":blank:"}
|
||||||
|
]
|
||||||
|
|
||||||
|
assert [%{"shortcode" => "blank"}, %{"shortcode" => "firefox"}] = account_data["emojis"]
|
||||||
|
end
|
||||||
|
|
||||||
test "update fields via x-www-form-urlencoded", %{conn: conn} do
|
test "update fields via x-www-form-urlencoded", %{conn: conn} do
|
||||||
fields =
|
fields =
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in a new issue