From c4dd11d3fcb6dd2d014a4394d93ebdfd1f2e48d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Steinh=C3=BCbl?= Date: Sun, 31 Mar 2024 21:00:41 +0200 Subject: [PATCH] feat: more emojis --- bun.lockb | Bin 17834 -> 17871 bytes package.json | 1 + src/constants.ts | 3 +++ src/listeners/message_create.tsx | 3 ++- src/listeners/message_update.ts | 2 +- src/loaders/tags.ts | 7 ++----- src/util.ts | 8 +++++--- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/bun.lockb b/bun.lockb index 0a13f924d779a275c485b7d1e19ddae9de9d3c90..7de5209359bb12801fefc647b63ae5c038cbac54 100755 GIT binary patch delta 2411 zcmcIme@xX?6ubjWDNmt(8VY6EMmq_Wwx+}PS2*{{#J-}i#jR$Fzqb3dPZ z?z!il@44sQ``+r5mpWxvwKTd{7CpFI2$3K}I715I1kML00h^niUGLtyQ4B@LHQfUX z+QU{Mrem@VixPniaYD=i`hXg6*e1kWpc|MBtb#rTI0rZ%XaUXw-oX65z;jXijwlub z=Rt1=E&}!e7XY^d;lDk+280(jAb^>`9z??djYaX9#^B~=%lbAdcw4CKIO0PVm|C>g^*&W;5safrx>ykE{++j`m8^71iUM(leJ0Y&1~wYB<;rpzfUX0&0_Y?!k{2luZ^Z3D8Y^gNe16;ouv*2Eq<;KYK zC?C}rc^=2F8YA1>2SM(+4pp0i?Y}E{A=eJ$5(sKVc%x$b+vP7e&htK?#`r#?YvQWI%Q zYE{HJ-)51$k>rK1CTRHesk2!LO%~H7uO`>f zmzkQ}PPfr_kddv)KFaiH@*IuBW|&fan!G_Tcr<_Pb=mj)&Mn`y?7eA`*}5-_-NxRZ zBV!+3yK}AGd?xj}9DZS+`L7Rcz5u)qg z24aR_dN)Hb1DwjuV9owc%c+q~T{Ts2`rJkPknH_*JUdJF&}g>iioLRH2Ld~jUKVZy7_w{oxH96N;j{bu2Y>baK*L7|zFG~3~>MfT}KArXnDMnlk=_)x3CZ_eF?8X)?hlg#;M z&YUwdch1~?W6ML8oBUz?S@s&LWpD`2JBLZbl?p1IlzwgJuR;8RxyZq)?LS= zS^ZB~g-C)@k434#K!Okt0MmdPaL6XagTN%<0$?`gGl5gk7XhyV=K;ro4*^dAdHwDf zW&tyxPa@88-~s4az#1U@_Ye3W@WucVmFN5F?_Nu*x3PF2lN!oHvsvm!ojXi zOp75rDktuP%(w!`30=ZsP9zPw9oPpWV-Jw4^BXWlM81?uWyZTb-*0ay96jkS{h{W$ zIW>>$?78d-oqp{krCZx%FNLj!9HA&iji#+eLJ$QE(4W>KdjwJ;oF&qj)o1xp(y*;m zuA^z2A&-zh!LZ-3m3b92=hav4y(zlRyDyjHBPKWmnK&nyF1xV)Jh4;s$R!G~F^+QN)N?L@HG%BeV zk{R~`B<01PiCP=T)T**SNZ};I{wd}-dpt6p$V$^mhV+s@*^v7wjPWCiCL5NYlj-;5 zQt6>^iXoq(D8@^R3eQcf zh>`7R3q_1{EEw5`dOOIAYVx~>9e$8a_9D;EaPJbKUdFt;RKcGb!N zZO}DYPYoEGX}_K$yXdrDWSJ54jh^9%Ul`4)pY1$XR({4J8}syB9o;`jbKUvUMdj|T zneiKg9(_wz4$5;D*~hCqLQGoe9e0LIqKkQ&%%W>w4(L8@Ja^ z*=Qm+L#EL|gwLj%*b<;6`C2R?(}`)FHCpbHwaQA~5!-Ul2&Qjyo9Ww(JXuZuG#a-rz3s=p4Gp8;c&G6x;iB@I3K)VBb4Ul zVy^O*(_!yI$NRV<(Py`=%J{XHF3(f9S6ddh$FI!e?#GX<{Gh~-6ZgPjo}S-FSG`)v zopx?PCi9ZTuSj?CCqLD_dKNpqx~EVt5Ka8;1f3#pVHsYNT|Ik)p`Kl0Vq@v>Ohv=! z7(R38`+@NzLw|g{t?tdwq2oOn_-^0x?ddI>uUvsXANpWN!_n4?4Vjl>{^rqGVMnCa zH$R2Wmo@2ydaf(jxwkE-dmGWCx3t{#o$a0B=JrsFdtWHHr>C_$)U_)_Pp`|QU&@lG Pxy(f?3`e9ga7g|Iv-YW` diff --git a/package.json b/package.json index 43750cc..db274fb 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "dependencies": { "@lilybird/handlers": "0.4.0-alpha.2", "@lilybird/jsx": "0.2.0", + "@lilybird/transformers": "0.2.0-alpha.1", "@paperdave/logger": "^3.0.1", "algoliasearch": "^4.23.2", "gray-matter": "^4.0.3", diff --git a/src/constants.ts b/src/constants.ts index 46cd69d..b0ac994 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -37,4 +37,7 @@ export const BUN_EMOJIS = [ { name: "octobun", id: "1210663393480941598" }, { name: "bunparty", id: "1210663548963921960" }, { name: "bunsplode", id: "1210663666454634586" }, + { name: "bundowspet", id: "1222860633377341461", animated: true }, + { name: "bunpet", id: "1172808445737574591", animated: true }, + { name: "bunsegfault", id: "1175208306533486632", animated: true }, ]; diff --git a/src/listeners/message_create.tsx b/src/listeners/message_create.tsx index 9bb8735..e518bd1 100644 --- a/src/listeners/message_create.tsx +++ b/src/listeners/message_create.tsx @@ -1,4 +1,5 @@ -import { Message, ButtonStyle } from "lilybird"; +import { ButtonStyle } from "lilybird"; +import { Message } from "@lilybird/transformers"; import { ActionRow, Button } from "@lilybird/jsx"; import { extname, basename } from "node:path"; import { Event } from "@lilybird/handlers"; diff --git a/src/listeners/message_update.ts b/src/listeners/message_update.ts index 1fe355b..8f651e0 100644 --- a/src/listeners/message_update.ts +++ b/src/listeners/message_update.ts @@ -1,5 +1,5 @@ import { Event } from "@lilybird/handlers"; -import { PartialMessage } from "lilybird"; +import { PartialMessage } from "@lilybird/transformers"; import { isBunOnlyLikeMessage } from "src/util.ts"; export default { diff --git a/src/loaders/tags.ts b/src/loaders/tags.ts index a40fe4a..fe9e66e 100644 --- a/src/loaders/tags.ts +++ b/src/loaders/tags.ts @@ -1,8 +1,5 @@ -import { - PartialChannel, - GuildTextChannel, - ApplicationCommandOptionChoiceStructure, -} from "lilybird"; +import { ApplicationCommandOptionChoiceStructure } from "lilybird"; +import { PartialChannel, GuildTextChannel } from "@lilybird/transformers"; import { Tag } from "../structs/Tag.ts"; import { readFileSync } from "node:fs"; import { safeSlice } from "../util.ts"; diff --git a/src/util.ts b/src/util.ts index 147d0eb..025a407 100644 --- a/src/util.ts +++ b/src/util.ts @@ -1,4 +1,4 @@ -import { GuildMember } from "lilybird"; +import { GuildMember } from "@lilybird/transformers"; import { BUN_EMOJIS } from "./constants.ts"; export function safeSlice>( @@ -32,8 +32,10 @@ export function isBunOnlyLikeMessage(content?: string) { if (!content) return false; if (content === "bun") return true; - return BUN_EMOJIS.some( - (emoji) => content.replace(/<:|>/g, "") == `${emoji.name}:${emoji.id}` + return BUN_EMOJIS.some((emoji) => + emoji.animated + ? content.replace(//g, "") == `${emoji.name}:${emoji.id}` + : content.replace(/<:|>/g, "") == `${emoji.name}:${emoji.id}` ); }