Bugfix: standardise scheme for emoji reactions

This commit is contained in:
FloatingGhost 2022-06-25 15:27:46 +01:00
parent cad4ba2ab3
commit cac39ef817
2 changed files with 41 additions and 1 deletions

View file

@ -158,10 +158,14 @@ def stripped_name(name), do: name
def maybe_quote(name) when is_binary(name) do def maybe_quote(name) when is_binary(name) do
if is_unicode_emoji?(name) do if is_unicode_emoji?(name) do
name name
else
if String.starts_with?(name, ":") do
name
else else
":#{name}:" ":#{name}:"
end end
end end
end
def maybe_quote(name), do: name def maybe_quote(name), do: name

View file

@ -34,6 +34,30 @@ test "PUT /api/v1/pleroma/statuses/:id/reactions/:emoji", %{conn: conn} do
%{"name" => "", "count" => 1, "me" => true, "url" => nil} %{"name" => "", "count" => 1, "me" => true, "url" => nil}
] ]
{:ok, activity} = CommonAPI.post(user, %{status: "#cofe"})
ObanHelpers.perform_all()
# Reacting with a custom emoji
result =
conn
|> assign(:user, other_user)
|> assign(:token, insert(:oauth_token, user: other_user, scopes: ["write:statuses"]))
|> put("/api/v1/pleroma/statuses/#{activity.id}/reactions/:dinosaur:")
|> json_response_and_validate_schema(200)
# We return the status, but this our implementation detail.
assert %{"id" => id} = result
assert to_string(activity.id) == id
assert result["pleroma"]["emoji_reactions"] == [
%{
"name" => "dinosaur",
"count" => 1,
"me" => true,
"url" => "http://localhost:4001/emoji/dino walking.gif"
}
]
# Reacting with a non-emoji # Reacting with a non-emoji
assert conn assert conn
|> assign(:user, other_user) |> assign(:user, other_user)
@ -48,6 +72,7 @@ test "DELETE /api/v1/pleroma/statuses/:id/reactions/:emoji", %{conn: conn} do
{:ok, activity} = CommonAPI.post(user, %{status: "#cofe"}) {:ok, activity} = CommonAPI.post(user, %{status: "#cofe"})
{:ok, _reaction_activity} = CommonAPI.react_with_emoji(activity.id, other_user, "") {:ok, _reaction_activity} = CommonAPI.react_with_emoji(activity.id, other_user, "")
{:ok, _reaction_activity} = CommonAPI.react_with_emoji(activity.id, other_user, ":dinosaur:")
ObanHelpers.perform_all() ObanHelpers.perform_all()
@ -60,6 +85,17 @@ test "DELETE /api/v1/pleroma/statuses/:id/reactions/:emoji", %{conn: conn} do
assert %{"id" => id} = json_response_and_validate_schema(result, 200) assert %{"id" => id} = json_response_and_validate_schema(result, 200)
assert to_string(activity.id) == id assert to_string(activity.id) == id
# Remove custom emoji
result =
conn
|> assign(:user, other_user)
|> assign(:token, insert(:oauth_token, user: other_user, scopes: ["write:statuses"]))
|> delete("/api/v1/pleroma/statuses/#{activity.id}/reactions/:dinosaur:")
assert %{"id" => id} = json_response_and_validate_schema(result, 200)
assert to_string(activity.id) == id
ObanHelpers.perform_all() ObanHelpers.perform_all()
object = Object.get_by_ap_id(activity.data["object"]) object = Object.get_by_ap_id(activity.data["object"])