Allow reacting with emojis containing a number
This commit is contained in:
parent
fd0cb148b9
commit
60bfaed368
|
@ -1,3 +1,4 @@
|
|||
firefox, /emoji/Firefox.gif, Gif,Fun
|
||||
blank, /emoji/blank.png, Fun
|
||||
dinosaur, /emoji/dino walking.gif, Gif
|
||||
100a, /emoji/100a.png, Fun
|
||||
|
|
|
@ -13,7 +13,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.EmojiReactValidator do
|
|||
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
|
||||
|
||||
@primary_key false
|
||||
@emoji_regex ~r/:[A-Za-z_-]+:/
|
||||
@emoji_regex ~r/:[A-Za-z0-9_-]+:/
|
||||
|
||||
embedded_schema do
|
||||
quote do
|
||||
|
|
BIN
priv/static/emoji/100a.png
Normal file
BIN
priv/static/emoji/100a.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 7.4 KiB |
|
@ -202,7 +202,7 @@ test "EmojiReact notification with custom emoji" do
|
|||
other_user = insert(:user)
|
||||
|
||||
{:ok, activity} = CommonAPI.post(user, %{status: "#morb"})
|
||||
{:ok, _activity} = CommonAPI.react_with_emoji(activity.id, other_user, ":dinosaur:")
|
||||
{:ok, _activity} = CommonAPI.react_with_emoji(activity.id, other_user, ":100a:")
|
||||
|
||||
activity = Repo.get(Activity, activity.id)
|
||||
|
||||
|
@ -214,8 +214,8 @@ test "EmojiReact notification with custom emoji" do
|
|||
id: to_string(notification.id),
|
||||
pleroma: %{is_seen: false, is_muted: false},
|
||||
type: "pleroma:emoji_reaction",
|
||||
emoji: ":dinosaur:",
|
||||
emoji_url: "http://localhost:4001/emoji/dino walking.gif",
|
||||
emoji: ":100a:",
|
||||
emoji_url: "http://localhost:4001/emoji/100a.png",
|
||||
account: AccountView.render("show.json", %{user: other_user, for: user}),
|
||||
status: StatusView.render("show.json", %{activity: activity, for: user}),
|
||||
created_at: Utils.to_masto_date(notification.inserted_at)
|
||||
|
|
Loading…
Reference in a new issue