github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-25 01:30:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: bump discourse-emojis gem (#31583)

Browse Source 
This should fix an issue with a 100 emoji alias. 100 should now be
considered as the top level emoji name and hundred_points an alias.

Other renames are also part of this gem bump: sweat_smile, grin, ...
This commit is contained in:
Joffrey JAFFEUX
2025-03-03 17:39:55 +01:00
committed by GitHub
parent 4a05f3198d
commit d456e83adc
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@ -126,7 +126,7 @@ GEM
diffy (3.4.3)
digest (3.2.0)
digest-xxhash (0.2.9)
discourse-emojis (1.0.27)
discourse-emojis (1.0.29)
discourse-fonts (0.0.18)
discourse-seed-fu (2.3.12)
activerecord (>= 3.1)
@ -838,7 +838,7 @@ CHECKSUMS
diffy (3.4.3) sha256=4264b9e7db00d1cd426fcd32e36565779163cedc2340a95b0e6f025e71f9aaa7
digest (3.2.0) sha256=fa2e7092ec683f65d82fadde5ff4ca3b32e23ee0b19f1fc1a5e09993ad2d3991
digest-xxhash (0.2.9) sha256=a989d8309c03c4136a4bea9981ec0a146a2750de7f3dfb7b5624a3038aa598d7
discourse-emojis (1.0.27) sha256=3d3aee8cd9f71f006963faa2dc45b6f6957b3fe23fc6312ca67fd2bc57f173bc
discourse-emojis (1.0.29) sha256=0421dec162af57ff325c3ee3a85fe7fda93a9be0548adcd8307edc9cc476ed9d
discourse-fonts (0.0.18) sha256=a7d25c13edd3325ae40010ca277530d69fc7952a05aa7b2ff07c1d07412b72a1
discourse-seed-fu (2.3.12) sha256=4f61d95c11ed54609046cd04eb3a51b531c5fa863fa86d1bea7d74264e5c75e4
discourse_dev_assets (0.0.4) sha256=a1e67272ff246dbd6d5b4cf65cdaea86b9371dce1ca97f6b69f8d44d86358d59

2
app/assets/javascripts/discourse/tests/integration/components/emoji-picker-test.js
View File

@ -70,7 +70,7 @@ module("Integration | Component | emoji-picker-content", function (hooks) {
test("When filtering emojis", async function (assert) {
await render(hbs`<EmojiPicker::Content />`);
await fillIn(".filter-input", "grinning");
await fillIn(".filter-input", "grin");
assert
.dom(".emoji-picker__section.filtered > img")

30
app/assets/javascripts/pretty-text/addon/emoji/data.js
View File

@ -5,9 +5,9 @@ export const emojis = new Set([
"grinning_face",
"grinning_face_with_big_eyes",
"grinning_face_with_smiling_eyes",
"beaming_face_with_smiling_eyes",
"grin",
"laughing",
"grinning_face_with_sweat",
"sweat_smile",
"rolling_on_the_floor_laughing",
"face_with_tears_of_joy",
"slightly_smiling_face",
@ -96,7 +96,7 @@ export const emojis = new Set([
"sad_but_relieved_face",
"cry",
"loudly_crying_face",
"face_screaming_in_fear",
"scream",
"confounded_face",
"persevering_face",
"disappointed_face",
@ -158,7 +158,7 @@ export const emojis = new Set([
"grey_heart",
"white_heart",
"kiss_mark",
"hundred_points",
"100",
"anger_symbol",
"collision",
"dizzy",
@ -1518,7 +1518,7 @@ export const emojis = new Set([
"name_badge",
"japanese_symbol_for_beginner",
"hollow_red_circle",
"check_mark_button",
"white_check_mark",
"check_box_with_check",
"check_mark",
"cross_mark",
@ -2365,9 +2365,9 @@ export const aliases = {
grinning_face: ["grinning"],
grinning_face_with_big_eyes: ["smiley"],
grinning_face_with_smiling_eyes: ["smile"],
beaming_face_with_smiling_eyes: ["grin"],
grin: ["beaming_face_with_smiling_eyes"],
laughing: ["grinning_squinting_face", "satisfied"],
grinning_face_with_sweat: ["sweat_smile"],
sweat_smile: ["grinning_face_with_sweat"],
rolling_on_the_floor_laughing: ["rofl"],
face_with_tears_of_joy: ["joy"],
wink: ["winking_face"],
@ -2409,7 +2409,7 @@ export const aliases = {
crying_face: ["cry"],
cry: ["crying_face"],
loudly_crying_face: ["sob"],
face_screaming_in_fear: ["scream"],
scream: ["face_screaming_in_fear"],
confounded_face: ["confounded"],
persevering_face: ["persevere"],
disappointed_face: ["disappointed"],
@ -2443,7 +2443,7 @@ export const aliases = {
"heavy_heart_exclamation_mark_ornament",
],
heart: ["red_heart"],
hundred_points: ["100"],
100: ["hundred_points"],
anger_symbol: ["anger"],
collision: ["boom"],
sweat_droplets: ["sweat_drops"],
@ -2815,7 +2815,7 @@ export const aliases = {
trident_emblem: ["trident"],
japanese_symbol_for_beginner: ["beginner"],
hollow_red_circle: ["o"],
check_mark_button: ["white_check_mark"],
white_check_mark: ["check_mark_button"],
check_box_with_check: ["ballot_box_with_check"],
check_mark: ["heavy_check_mark"],
cross_mark: ["x"],
@ -2942,9 +2942,9 @@ export const replacements = {
"😀": "grinning_face",
"😃": "grinning_face_with_big_eyes",
"😄": "grinning_face_with_smiling_eyes",
"😁": "beaming_face_with_smiling_eyes",
"😁": "grin",
"😆": "laughing",
"😅": "grinning_face_with_sweat",
"😅": "sweat_smile",
"🤣": "rolling_on_the_floor_laughing",
"😂": "face_with_tears_of_joy",
"🙂": "slightly_smiling_face",
@ -3033,7 +3033,7 @@ export const replacements = {
"😥": "sad_but_relieved_face",
"😢": "cry",
"😭": "loudly_crying_face",
"😱": "face_screaming_in_fear",
"😱": "scream",
"😖": "confounded_face",
"😣": "persevering_face",
"😞": "disappointed_face",
@ -3095,7 +3095,7 @@ export const replacements = {
"🩶": "grey_heart",
"🤍": "white_heart",
"💋": "kiss_mark",
"💯": "hundred_points",
"💯": "100",
"💢": "anger_symbol",
"💥": "collision",
"💫": "dizzy",
@ -5979,7 +5979,7 @@ export const replacements = {
"📛": "name_badge",
"🔰": "japanese_symbol_for_beginner",
"⭕": "hollow_red_circle",
"✅": "check_mark_button",
"✅": "white_check_mark",
"☑": "check_box_with_check",
"✔": "check_mark",
"❌": "cross_mark",