From db8d32113c3e3b44c26e85d8f66075de0b184fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lera=20Elvo=C3=A9?= Date: Sun, 1 Jun 2025 07:53:53 +0300 Subject: [PATCH] add some new emoji --- THIRDPARTY.md | 2 +- data/static/emoji/lobster.png | Bin 0 -> 339 bytes data/static/emoji/pensive.png | Bin 0 -> 489 bytes data/static/emoji/smiletear.png | Bin 0 -> 549 bytes data/static/emoji/weary.png | Bin 0 -> 517 bytes lib/babycode-emoji.lua | 11 ++++++++++- views/common/bbcode_help.etlua | 28 ++++++++++++++++------------ 7 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 data/static/emoji/lobster.png create mode 100644 data/static/emoji/pensive.png create mode 100644 data/static/emoji/smiletear.png create mode 100644 data/static/emoji/weary.png diff --git a/THIRDPARTY.md b/THIRDPARTY.md index b49ae42..53c0a37 100644 --- a/THIRDPARTY.md +++ b/THIRDPARTY.md @@ -37,4 +37,4 @@ CC BY 4.0 compliance: Modified to indicate the URL. Modified size. Affected files: everything in [`data/static/emoji`](./data/static/emoji) URL: https://gh.vercte.net/forumoji/ License: CC0 1.0 -Designers: lolecksdeehaha; Scratch137; 64lu (the project has many more contributors, but these are the people whose designs were reproduced here) +Designers: lolecksdeehaha; Scratch137; 64lu; stickfiregames; mybearworld (the project has many more contributors, but these are the people whose designs were reproduced here) diff --git a/data/static/emoji/lobster.png b/data/static/emoji/lobster.png new file mode 100644 index 0000000000000000000000000000000000000000..f7354799de1a378b86ce65a0b5dc6230e28a688f GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^{2NS%G|y0G|+7AiYP%aJRIUL~ZyLQr+9gziCklXaq+D}~gyNaz9$F}j_R38W-Sg8YL2V+Raph4o$m z)o>PgL>4nJ@ErzW#^d=bQh~{{Iga?%G~x;yHOS zE8FJ%OixVK@-_BFhc508!gFgbb$poBv5$4;!850_p6F_L9GSLW z`rF^$+}cn4r?v}3*A=`usZ@Qg`tO#4FS-8j|C<``X7t_7mAd-Kixoh-89ZJ6T-G@y GGywo==7BK) literal 0 HcmV?d00001 diff --git a/data/static/emoji/pensive.png b/data/static/emoji/pensive.png new file mode 100644 index 0000000000000000000000000000000000000000..ce6246bbe9c3575add3480a330324e9c5c3c3fd9 GIT binary patch literal 489 zcmVPx$qe(J?E356nf5nfB7D>wEI zs<_Z~`hy_2v6UtgNm9lnlbsYclY2pE1jo;r(tnU1X_B1zw<>uQf3M(66 zD^mH-sOD}g5WUOA9?}cBJTLKj_gu3vteWph?cU4ou_<6FFl9;ydwyK@=Hqfhx2b z&QHZjug0)WB#}S_+6J{=j3wk0Xo2?^+<^fnuIl;_me))I z(m()2aXSX=yQbGl1K#dW!rJ}MCnzo_Li->-bUfpj1hw^4e|on22OtUp1>JDm literal 0 HcmV?d00001 diff --git a/data/static/emoji/smiletear.png b/data/static/emoji/smiletear.png new file mode 100644 index 0000000000000000000000000000000000000000..e9b338acfad4a9e8383079f0c305d18086cff420 GIT binary patch literal 549 zcmeAS@N?(olHy`uVBq!ia0vp^{2NS%Lgr0X`wFK>GhZr~i+`{y#|me>Lp?QM>0CEdRYr`Tw^1|HJD4S5xmTHhg+k z{oltVA0MB8XOgbX)BE?)*~G-;|4Fy6J6-=hmi+ft>+e^s|F^aNAJzJ?QR~SP$^Vb} z{=O0X`$h22AHjc*1q0{*|9?R6=PJR+3;6y&VEFfn;qOO=zuy`D{9<4z`u}|q!=u>@ z|L-#Vd&~KWr#0rMi!rz|dX;A_{ramp@%BMh<=UQ^ z62VPPGwsZMb&@x_Xl~Fsy=~)`t5U49*FI)Qc>AqgIj*|M_WpOPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0h&ofK~y+TjZ@7o zgFzHMQ=~$qgb+aq3q&GehlPZscD6PwJ%k7F6cQ^>L2T?K^|!I}Pbx@CX#176*SYum zhNiV}k~4GX%sq2&XTCc84T zNlw5?Pb5Y7P(I=6IE~@86IIL?(}9qOqfs-Wp#o{lz;$l^&g~gX8XBL%`Szsc>)eDR8lXd&bL$qCa@W;J{=p~$woLrr#p z;1PJHmR$E2Rwlo~#PVB6Z&Y0_$TVZFKQ%W(XjUWX576pLtr+X0Ho`r2D%=Yy<}j$) zxiO9b15ynlQb#vWKi|7Zv$m{0|IWBM " +local emoji_template = " \"$NAME\" " local emoji_pat = "%$NAME" return { @@ -13,10 +13,17 @@ return { ["angryimp"] = emoji_template:gsub(emoji_pat, "impangry"), ["impangry"] = emoji_template:gsub(emoji_pat, "impangry"), + ["lobster"] = emoji_template:gsub(emoji_pat, "lobster"), + ["|"] = emoji_template:gsub(emoji_pat, "neutral"), + ["pensive"] = emoji_template:gsub(emoji_pat, "pensive"), + [")"] = emoji_template:gsub(emoji_pat, "smile"), + ["smiletear"] = emoji_template:gsub(emoji_pat, "smiletear"), + ["crytear"] = emoji_template:gsub(emoji_pat, "smiletear"), + [","] = emoji_template:gsub(emoji_pat, "sob"), ["T"] = emoji_template:gsub(emoji_pat, "sob"), ["cry"] = emoji_template:gsub(emoji_pat, "sob"), @@ -32,6 +39,8 @@ return { ["P"] = emoji_template:gsub(emoji_pat, "tongue"), ["p"] = emoji_template:gsub(emoji_pat, "tongue"), + ["weary"] = emoji_template:gsub(emoji_pat, "weary"), + [";"] = emoji_template:gsub(emoji_pat, "wink"), ["wink"] = emoji_template:gsub(emoji_pat, "wink"), } diff --git a/views/common/bbcode_help.etlua b/views/common/bbcode_help.etlua index f888c43..02b649a 100644 --- a/views/common/bbcode_help.etlua +++ b/views/common/bbcode_help.etlua @@ -6,18 +6,22 @@
Forumoji (emoticons)
    -
  • smile - :):
    • -
  • frown - :(:
    • -
  • grin - :D:
    • -
  • neutral - :|:
    • -
  • angry - :angry:
    • -
  • sob - :,: :cry: :sob: :T:
    • -
  • surprised - :o: :O:
    • -
  • think - :hmm: :think: :thinking:
    • -
  • tongue - :p: :P:
    • -
  • wink - :;: :wink:
    • -
  • imp - :imp:
    • -
  • impangry - :angryimp: :impangry:
    • +
  • smile - :):
    • +
  • frown - :(:
    • +
  • grin - :D:
    • +
  • neutral - :|:
    • +
  • angry - :angry:
    • +
  • sob - :,: :cry: :sob: :T:
    • +
  • surprised - :o: :O:
    • +
  • think - :hmm: :think: :thinking:
    • +
  • tongue - :p: :P:
    • +
  • wink - :;: :wink:
    • +
  • imp - :imp:
    • +
  • impangry - :angryimp: :impangry:
    • +
  • lobster - :lobster:
    • +
  • pensive - :pensive:
    • +
  • weary - :weary:
    • +
  • smiletear - :smiletear: :crytear: