From d02f9cf67cc8c0806e999348197040e3042a2d56 Mon Sep 17 00:00:00 2001 From: Hri7566 Date: Tue, 15 Oct 2024 20:08:13 -0400 Subject: [PATCH] Attempt to fix Discord.js error related to duplicated commands --- bun.lockb | Bin 78729 -> 79123 bytes package.json | 14 +++++++------- src/api/behavior/register.ts | 1 + src/api/commands/groups/inventory/yeet.ts | 4 +++- src/discord/bot/Bot.ts | 9 ++++++++- src/util/types.d.ts | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/bun.lockb b/bun.lockb index 7a2b872c282a70512bc5cccb28a6d1725914285b..a2b3ffd0e9012d4791a5e65d9fd4531ace5b6eab 100755 GIT binary patch delta 10895 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 delta 10553 zcmb7K2V4|K``$S?U{RW&a2$#l8!GJ%I27f;jwePi=InFA&$_tUdal3k z$nJff+7DZOsEx1phKl{hSsJ$Z^6K5I6P}M*_SOCUnGI@mOyI|3{0O8g_%@47vX@(!4DN*dtl=q% zdFg_XOQp=ca4vG4k(+EO{iLoSc!TFa^467B6Tlt8N9CksBxeZ1$I$2Y{3m_Is$5IE zO8ZLv_GnBLgur&KvqF=v(H%MAxLiUHx|AEk_TuuBzJo> zBsY90B-a}V$=e^5?4O;HoIBhWg`8)njLOXt3I*XUY9mDN6;gBZGx9T1^AdB@MkMCu zrS?Jt+|xf`4cEI5$qky1;o%XPZjr4#o$2&^S%J56i&(11H%+BJ2 zT*p)Lyl4TWJ^C-Y$`g>qklgbut?W@EByV66^0`z&B4kC6HL|DYy<`K@6Z8CrW+kTO z4$n@^$rzVf)=)NBvOYu*u0g*Z>K%c^f6*?Sct6~L7~ZjBz?Ue1vqkeEc_`CUxxIog z8=QAM9+HPN5$+ZEm*Rqa#i~;%=U0Lfj{c~}$D;rPln3i7o6Efy1cl{*+6%jo!QI$E+pOJv zlyECi+|^R9ZtE*|Z>GD}-qG=`WLNUjQ(<+1(9Oc*AbDpdODD1|{=kYd&Dg-V}_ON!}#_*pI@NFKN>NFIu0iyUB)Z7iV)wY2^$K-Q14OvUWP+|1Mz zK?nfnBP#^SG6NFU)GO+T1j=eJE~-&`7rJ0FaP@b=^7!6^bs%}Y-}Q3)w;<7eyP`9ejJ=S&gY}TEkOaxE*+NJ+ z$P7qc-q*rA(HR?e)`#xetZdx&>rS1VRiBm=4qf*_#hjN`!2_cvH}`81?^w9gV`{5{ zELv|{R32z|Q_a*=s%cG;4MmD}tV16;1=CDNueyOc%=+?WtGf2SSf_leV~UEoN_qz! z?5Mj-&sx^<8kX8|umXZxDadQIAe18m)1v62TjyoPvsUz>tqvXzW*b3>R+NI41j@1I2+kDi*qUH6VG?7)wzknzN!0d%~$4$k5&Op22_8LT@wc!i69N6LtNM~tjNT@Q0LjOJ*< zSr001WK_=t*GYPNkZKP-HIK9UrKHE}`(rkT$?alHhEk=sQCxw%j>uC{tX~*KH#V|J zDsF64ug0a+nPObq+wlYxFeIJ^7DCZJMllaJ8Qu^oH86-9!T6MbhLb^jZYi_IYC zSlt69%~Dr`*cq%Hm?%wvm0;XVTkei{%ff8vjJHAb!Ci-kRVq^#f%T>s$8hm9Qal9q z+#1md_a5G}4aNEx#27H%x;(vRfYpZd1{n9kR*r>R=<9)jUGvk1g$yiCOJ!P`Brd&j)cVQaz-6KEj8= zxN!o%%GAz{1)+`PUVEgt3szEqMuYKrgKMa{LHs*dC>YE{(4T`@g6?h*yWwsYi87U> zxg5-5gOfpZ*@tHNMlf5d^fiixCi1F*MgqgEK>~Tdtdxpd8O5{Uymuzeue!Kn2Ga@e za27++t&L&{`1?Lor#_(XT1POE#5P8;PgA)=#LUegmVj|ZYwnzQ+fpWvYm;WOrdk^1 zAz&XvQ+9Vd7(ho~Ub3wrJTf~fs;38c?ynQQfr#A}U>Lb4d&^ zsxN?tQH)c#=-3ih0xDs!5vfQp?v8N_?<%lMRS*;<}n=pXCY zFsjrU#f`}0_974Cb*(k^&_{?`w9ca_$0pyxtfgyZJ6K1Q*+?$E1mo3V81DdgZ;SIV zvj~hkZzt8;1IF8gCe}VXiViV~UH#=NLy)eFSzvN_Fnv|W{mDKwLbSq-zjju3urOO` z2*-fEpYLKh81Dd=ZCIEch#VAteYeLlz?W6o=BZ#IV0F0%s@;KP9~L3j!}9`P86C;R zJ+CDvf`V}b@d0uu04Bl*=K&XUlp$Q zwtCbf?F9^A!aJvTkXF1$%VFK?;i5ht|M+eB4%g#1UBAkJ-}#l^3P78BgfDCHNKL0E7GdvsCLbpK3;RNUE2QgksW?dcs=j+@pjG|Ll5>Y z^!vh?B6K|eyx*l4H##=fKHhPqr)FKz#F?Ki521B^MiiEMpIXzP)8-e=vv=IvaG>6N z=LGxkZ_^jnwX5Fo?8hU??e=f_YV{6>mHUn7TU1m;KlbbSQ(|6H`PLSPg#$AW4}Wd1 zstuHj5+z9Mqm4H1d{E<`H>~HoDD|m*ubZwaoHj@2`*5+IY<$ zs~ndGZX9*StE$z6WxcoWtRHgys^6!Rjt-*DA9)mRZLz+^qo+H&e6ZZRXz;w(`wJ3o z-58nPXKS78>!&wfI6uWbZu;Ju?8PJ0KC3#jMe{FI4LiEN_2MT}OU`CkWfmKT{$&{X zgRF8`&u4qA*0#_lw3%CHZDZ52goPuI9{H+Oh5h5{UHbk;VW(clwJGlC-(GWI?dcmk z$F2W-r(b!Sg=@Af4|#d((w|@b-prE*_w|Te+iLHxdsExS#jl)YT6{LS=GQRezR=Nk z99QIDT<5XQ`0mSF`##C%3~6L`__qVD(+Zg`L;D%Xjo0%OXEY zPI{3TI%-}}!YSjHS4(zSNBp$?O?1ev>F)Zb51PLU9Mb6PJ%2y^iT#Iun_9-$H4NEW zu|Icjv!v^F3l@(av*-6?<=N&cD_S?uM2iMG(A$9~)`Fr3nW_6A2iiQy#C)j+>=oGH z!6w$4HVih?`oRw5FvP_CsQ(Z%^&8?q`@sT8j5m{AyaQ#&n^+L-2HOSJFu}z1l#yVj z^aKYw0Tx1 z4gRIUzcdqzrW&wUV1v_5%tRZ~;a@uZ%P`?FqJIYb%Yc7iACfo>{tbhF!%Qrec7yE# zYnW-mJ61*}{L6%YV0}rG1^=?(UzUlPsS@lsm|wODkKzT{@Gl$wfej?z9Qc<5|8h)h zFkJ?_1lD1=iN#a#aQHVI{(&V@+Y#_@1pFIeV##zD><(DWNE1t?#UtV0NcabqM$x(O zFBkshnpg(afV~16oM&R0v>^}v<-xyv6U(Ol`S33v{(%iAaTNR;1^-5w*htz9whOG` zXcJy+GDgF{(eMv!6luo5zcKJ{jERk*O0eT#eq&9nfC|RKzp?NSY&`iEz`p|cS72fj z=`z?Qunyx)tdNSw!M}0v4{S2E9S{G;!@uz+_6gkuy8{+8!NjJ~;tB9?0{jD;LD3W8 z-$eK~(Zq_W2J98s;7KODMs1h`|0cn|LKB-q{R`n=A^Za?A+ZSl6~VtE6CNOUgY5!q zIN8LAGA6^n$?y+s0cobdzbWuBYC9eNO^1KeO>7O_1-kEWDpc=4OV1tWIc(vS64F8JZ-z-ziW@SZ!v^LwQ4&6xqsq=u6y4!uChi&*_ z@w4B;(`@#qy!~NWr;kT89L4UO{NwD?pO@~d?%pysds>~RV$g+;CVXZ7vyJIO-7oAY zW|jx-N2^=@+Uj?QdjG` zx^4c1;D#x?*9LBid75&h-HT;MQ+D+Uen@X;dGtIs(WXJ2nJbR_z5cZ3gK0}k>80JU z^zGypA27Y_<&wCd>ML_PE&H28Pp7Y5jOn+?TBAR9you@DOousN*tgM-sUG*2yTmry zJ=@H_A(v0htei4%-cE;b-a(oPSuBz43PW1X=oi_6J!H?Q_GAr)}U0#p4*Nv9X_vpE4)WMlWKTo_-?`_SH z;1ijhLtCwm>l)%dXhvbtuBIbKE?BZ5bjRO=CWn6ex%ZRv=D)SS{Ku^YGox20Ea={S z#t-{$PWj6%>;&~+fU9AFL;3y%CDxR%8-|A_Ysy+?r@HG= zK6=?|E9a+p&B0Sr(Q8NtS*wDTC#;B;R7K@iwJ{X6rreI<W2^@O?p2Y7wf`{afAndc` z*+CWo{MZj*rf^e*sQ^C?06fngm=Eyd5Ww?bWuY*V=isOScqes%-T*i32*C5;vk(t( zqmBYR&k=YA@Z(#6=Q#m)0B+PVfOp~y+ynSg32;6Bq;nsz<3FQ+XUVJw$&KLF^J&Bt z`9lY9h#x-yJdeLclmXl$9#5Xfqqhj)c_#s$*8n&Ka6?Z4JkK3?0&qi51I!C258x@l zEjY0FPv9cJ^YAN#a2DWsmjIsE2>1rz z$7O)$c>|jOep~@~o*lOhNB)mOd7U%NO6&n*0(z3qxf%AWe&mHvyF~V9n)q;sdBAue zw*gxLzJyr=n*jsWoXc#;L&-zO!|VcZ&LMG{eBM>l8Vv8HLUW)A&=|mk$BV?~^TtA6 z+6v$$JOfpVGzljSQfG>eq zAR4bZ!!I-|3`4p*&<*GUbOt&B9f7VuZ{S0Khl+=cr(=MgKrdh|unt%XECKj5S_l*Y z1wa-s3_yQE29OS<0Yiagez7DWkq9IJLx6$60H6;L2lNL%20jA%0{sB9g%5@t1aQeO zChkNEkP2i1V}Wd7B#;M;0dg#SIOGU^vG9UiKq(xBbUvU|8jbV_fa~!*C7(Am9vBCp z8DSDI0hkCZ0OkWFz-Pdxz+_+sFddi%Oa;dCik|>eI01MAGlAm2@L5RD2Ic_s00QO$ zr54V0c@!1{ivT_hT=Jn=W8teImjj;ztAJ$yk8C8*mP)9 zke50dyL@@O=1y^+_GsqM)=cNG_t!&F*=1EW6;v$5U#=tVyJCtd+YGfO$_}lvAyHeR z?BOa~7OFy)sg^F8_uIMu+R=YD;eY7peLrLP48mb+9X)Z^XY|vxe66x`yK~#EkH2iT zwT_Af`Qr~t$y9pXjS7EOYn5HwB}r?JlIieU+q_^al>)RyZVp)J2^*hTu~dISCoR}MK{*Wmfw_j-)hvKd{p z=KDnjD~FxUfV*L^G$>FCiH7CUM(FZp8d!(v1>S~+@dg@L>u@d6+g~-*=GS1^kbl;$ z?f0MR=<&23bVGypO%u*hlzKzYdQnuhMyou|ys0_7J)yvDHxEA#aG)@hPTbIFl|An2 zpy6*;RUIlrd9Z&ViiO$4Zfe*H(%#f~DLdr7Q*YXSzcV(XR_l-p^}gv5s%)t*zkKe( z`jzDZ6m)VkRW9-#_rctRbCW#sN7t4-cA*tFd#c{L(Sw^h{Iuyp)ac z?;ooBMKwPVib{GkhY0=AfcD+evFY^qmL^2mH(#y4&}-$o8Uxhe8J~d44!Y0PfFUi0 z_*ARdq!52t#DAmja9hJd$$UFTt8BSu?&)~mbyCSqOE=K!MF(zcLX`dCqm|v=7KT=J zkZi~74HA?c=W8jYz3ZK^>90@Vi*}|)*sQ(&($8PYZ`i0-BYV< z<9qsrFKoR&s;agH6~*7tusT$5N6#kF<~tg#vXT5Yi)|gzr1KT%8sw2$K-ceRR98Le z%^eSIqE>!peULJs@3r;^J3}o9T_b{76mVCA_dzIA(p^v0c`urDSBF=^ZFluv%8q-( zCf7eWC^q5KjSn0mdew8@J)KtBu|NE^-KA#z>^|bnqE*B#oMP_9;6*m}z6O(d$GxTR z)0y}6s>&v`>V8jbYdyTbR7*bce*3*If~S9LS8_+{L|S)>sq~QszisS)pb7am9)!uJ zD4zjr8XmMg>rwKGS|b-worh8gnm^RxhmZabWAIbOmk-nM%IWk-qg6f!xOpx1SjNMK zLr_sCFIG~=H0Y71R{4gYL)z(-2{VQ@_?wJ)!>Jry*Lw{f7+UDCicun+X+`}J>08* z{`tW2jk^79t#JkF5M?~fQHN(5t@3$6T*T?tUJYHotSv93kR{6f7RlSyaHv7iswOa91@>~<5e2I$`>9wmx&)=-xHTqTYdyrHFt`_AAB%u&XSq6C6|J! z%?l4N<)e|~FN?e(_>jz=l<)@7s62xyYfquEk{=o)A zS*$N>NDE(iv%s<_Cuk0=5zDJyT~b-|XFb~YdP;qs;1wfB=tyn!N&^w2;VzDA?TeeNlI;x;D N*_Jgg(+0Cw{|8u+F{}Up diff --git a/package.json b/package.json index a35770e..2d8511a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build-talko": "bunx tsc --build tsconfig.talko.json" }, "devDependencies": { - "@types/bun": "^1.1.9", + "@types/bun": "^1.1.11", "@types/dotenv": "^8.2.0", "esbuild": "^0.24.0" }, @@ -16,19 +16,19 @@ "typescript": "^5.6.3" }, "dependencies": { - "@prisma/client": "^5.19.1", + "@prisma/client": "^5.21.0", "@trpc/client": "next", "@trpc/server": "next", - "@types/node": "^20.16.5", + "@types/node": "^20.16.11", "cli-markdown": "^3.4.0", - "discord.js": "^14.16.2", + "discord.js": "^14.16.3", "dotenv": "^16.4.5", "markdown-to-unicode": "^1.0.2", "mpp-client-net": "^1.2.3", - "prisma": "^5.19.1", + "prisma": "^5.21.0", "socket.io-client": "^4.8.0", - "trpc-bun-adapter": "^1.1.2", - "yaml": "^2.5.1", + "trpc-bun-adapter": "^1.2.0", + "yaml": "^2.6.0", "zod": "^3.23.8" } } diff --git a/src/api/behavior/register.ts b/src/api/behavior/register.ts index 68dcdc2..87ff0c6 100644 --- a/src/api/behavior/register.ts +++ b/src/api/behavior/register.ts @@ -2,4 +2,5 @@ export function registerBehaviors() { require("./objects/fish"); require("./objects/kekklefruit"); require("./objects/burger"); + require("./objects/sand"); } diff --git a/src/api/commands/groups/inventory/yeet.ts b/src/api/commands/groups/inventory/yeet.ts index 953bb31..970da99 100644 --- a/src/api/commands/groups/inventory/yeet.ts +++ b/src/api/commands/groups/inventory/yeet.ts @@ -39,11 +39,13 @@ export const yeet = new BehaviorCommand( tryKekGen = true; } + logger.debug("namespace:", bhvNamespace); + const res = await self.behave<"yeet">( { part }, - foundObject.id, + bhvNamespace, async ctx => { logger.debug("stuff"); if (tryKekGen) { diff --git a/src/discord/bot/Bot.ts b/src/discord/bot/Bot.ts index 661978a..b2c6390 100644 --- a/src/discord/bot/Bot.ts +++ b/src/discord/bot/Bot.ts @@ -59,11 +59,16 @@ export class DiscordBot extends EventEmitter { if (!groups) throw "Unable to get command list."; const builders = []; + const seen: string[] = []; for (const group of groups) { for (const command of group.commands) { + const discordCommand = command.aliases[0]; + if (seen.indexOf(discordCommand) !== -1) continue; + const builder = new SlashCommandBuilder(); - builder.setName(command.aliases[0]); + + builder.setName(discordCommand); builder.setDescription(command.description); builder.addStringOption(option => option @@ -71,6 +76,8 @@ export class DiscordBot extends EventEmitter { .setDescription("Command arguments") ); + seen.push(discordCommand); + builders.push(builder); } } diff --git a/src/util/types.d.ts b/src/util/types.d.ts index 49acb7b..dba2782 100644 --- a/src/util/types.d.ts +++ b/src/util/types.d.ts @@ -126,7 +126,7 @@ interface IShopLocation extends ILocation { type TAnyLocation = | ILocation | IFishingLocation - | ISandyFishingLocation + | ISandyLocation | IShopLocation; interface TFisher {