From 134e210ff495ab6463076a88b01843bfc6f1732c Mon Sep 17 00:00:00 2001 From: mugman <53713683+nature174@users.noreply.github.com> Date: Thu, 12 Aug 2021 20:01:30 -0700 Subject: [PATCH 01/10] Add gateway support for Discord desktop clients --- gateway/src/schema/Identify.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gateway/src/schema/Identify.ts b/gateway/src/schema/Identify.ts index 646c5f05..f6d95204 100644 --- a/gateway/src/schema/Identify.ts +++ b/gateway/src/schema/Identify.ts @@ -26,6 +26,8 @@ export const IdentifySchema = { $client_event_source: String, $client_version: String, $system_locale: String, + $window_manager: String, + $distro: String, }, $presence: ActivitySchema, $compress: Boolean, From b59b5f2a4b600119fc14cbf1bd311c355161f7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Intevel=20=E3=83=84?= <59223342+Intevel@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:03:54 +0200 Subject: [PATCH 02/10] Fixed #257 Can't change nickname --- api/package-lock.json | Bin 686195 -> 316525 bytes .../#guild_id/members/#member_id/nick.ts | 4 ++-- api/src/util/Member.ts | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index 8e9a42cd38f00927240753c6b12106f1a20f90e3..311cabe75bf834b3a009ee144122f21e696c2f6a 100644 GIT binary patch delta 466 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 z

agFFxG}a-OL&w{#F+WanX0M{$FZ+fpISsQ(xdm18cdt)Ny_xkT07iyculVWFC4 zIbxi#z|&7=p#=yo7)_QEQxCj%sYYJN`Gf}MDmOPO{Xm7M-iD~ZhqvxU$RuPUC(G_> z2|whCpJ+A4Bl+SR>@%Mqzs$_VekfP2I&pHj}?}7e~`=*T9jC>LKpqC(Paxn{VG!?5LL| zTenrg&{h>5U)5!b1{+kK$9lJCZo`o3fu3S3OoESr;h$r1Aap_V-QnS}Skf4FBc0(| zdSa`pz!EU(4l+NNy##fV8^WM$3|^s^L1@t^j?3CQ?B{{YT!KMuq}ON$e_Vz4J|o-B z=q+YLyGX3Eg*P2vOUkh^tdZuh%u^SI7GZ?1dy9|LcPLErIWv*};e|fpKs{<;SQcj!H_`b2O(PG*TG^D-GqY-==?ru$G@2BHmYn@HxB8<*Ib{%FXqw+Q~2{er@;#MA^#JAat%fOLUUwF7{G6 zDHuiAm5%%wh~CSCA@_(8@UPy8zS=QV?5JKyI5AXY8DU9qYM6Mpp2ytC;H3jMSsX|O ztCh00G6aw+1%6nFzQcoPB%B>ChQq4)XrhFT5VHe$O5J@%;4WkPX8K6+8siiJeN~IC zj9qAALfSO33p05%ucplOrgA$%=nyEnfKoKlXqNI<%s(!-*1Ze5 z%Cohi%7Oo*Q~*yI8Fc6;He$I=pDsSeW)*>u;qXRB6qesl7gN-rJFCBFJv$GbbsZl> zHOMwYyh(HR&d)&iJl4Kx0r8WC1ofBh-)7>)&0glqvzcHPt(=?ty^dlso@MPQ8oVjX;k~K2pX{x7a2I!LR$|NF(jQlT{g5BSAZY6~M8==Fc!mmil?Wu!s(g zih@t!jF=q@Vapg~US*M#CriX?9_MhBikS@!T&yn@IooiAS1+O_4iYA(aB>@aa}<$p zl!-i_+ZU9h-1%(?f)xde2VaiE*!;t!REW)T!xj zW>9La&U}sdde+AmRX!V8KMQqMS`A8xfTMH8Zm@HT)CxwFi-c`;^#*8|$?8S~2dbpZ zD}+RJvl``YbDE0nMRR!eS>`@WJ7;wjKDUX_GGDd2ek!gYecIxnlUyI6cG-*3`*J*k zthyfdQH36%U}%JmWI$r2NciOKuN2daofvgc3~<|H2t1vfBl+|lL2%Vv(M-j%o+@V8 zu9iU$x78DDGp%rl>0=G$lVST<3eu$Do-uM(!gySmoCtA>J819qQo{7j#{*7oKBmDT zml)SrbBx}T6lhWKzR`>^3#C?8CEERxUX6bNgEe50ee2JjOCl`vWoUNV*_MdRc$9PU2tqXt= zEl-_MCJ^ttUUX_KAc(j@WVLG>C=kPM^a{jQi^K$D+f84$@~e=FJ?{!Ls*yzXp+({l zH4lo_iPjFr(S|^e#bSweXd4%ctjJ%(hDI(FC6R))F@E%!t8W)0$;F}&vUzPXe71zI ze0^(%!TF_Pl6&=1k(WZ}6}%2C6CDj|u$kJi=(JQ|Ldrc@)%n1JaJXwKGIHK{o7f!s zb&%uX$W7u5a@7XryDLy#{q$%2iouU_`M(TQ0MfrWflOO>HLyt;<)o~7h4N{SeLoW#fkM^5x~}xnyNQi-7;hvb|T&9?(q1DqV5v=Q!B9EV;~nk z9|22OqT}%KyTpIfyPZs*90D^}h$EEfqv}A+MkWSD70#u9_Z|jAU7#-6>9j=?65QKL zEm&RF{o)Fb8};M6#o>^9K+rAQP?tAA-b(Q||53)nf-T|z$k>L&FFRL>7yeg+w%baq zr8u+j>}n2Vbnjgwb`%>}sc^8%X`&Gzx@3L(^kgi*)JdX*C2C{Kp^sn!x%anzygBOo zhb|a7^?ou$-HQl0#^rbTVT4HstrcfB4(!)$TPq@^C`&@QW1W~rH+w%F*LIyY!S;3H zpG=L#eU-u2{yd0N8mGsw+$UpL`iVyEBqZ3uZQJj&f>ix?y}iezzj zdr(Z^!)&uw?Au6l_wYm5sP|x1HcqRs>o+7hnED9%>S>G$1x+aFH!KQnc~m^tNN>3D zG5-^WOCB@KPwq7E{JLLx98Dc+9-4GoQp`iXQGB&=2k#c6Td9CEwMjwfzgvv==M2+$ z5kGo@?k4Po9=c1tYXk2~cJ1+cee66Bd{O~BdBoHH#*lhs#MCs%oFOzJdz>+_eFs_< zBe#n$dF9}`N5m#1dTKU#erjA}F4mnpln|49!%lG;KWw!F%y=arUuk2V8FN%&f_w$p zGBJgYraRh5iU%3rGYs78#g^{do)QmNKYb^{XJ<^z|6%9RK5TnSE>Ufy>0-7gxF5z&K zFJHhg9J5YTdZw=7WvFZF$J5!IQQ{NSidd8^8*Mx%EWTeXfH`}`hrK5PP;M=19D(S5 z1#dmSOYrag;@yq11fC3b^%D5%o$Wt>fs_vW(B2Ks$DnA~K}4)HpM#Xec?an#tccNb z*m&lVPk4PC*Ls9497Gv}kU7LDxpy2CWj;aItwMzyr#=aq|3|dd0hx};UUd=}^X(4B zy?o@L*bC16hsz5>&!zMw5@?@(NzAANs+_*BvwnnRw$tRY&#{m-DG9*vLK9zBf)GAX zIX<({Tv1N8e3%HCuZXX*efRq-NQz3yu&z;^2jy9>>BWEQ60{) zBmR%NiCRM_){ZBy)KLtByhz2X%z(BjRmpT?Mv;BWcs#BiM7Q@!fY+%v8gu zW;^Y+uDm)}lVjo<_S9p?#H4`cFnyK|l~&lhtk8?D$DVcpQ=O=->L-<#wn1xQbr2?D zCA}?jzPM-7#k45C?Ns_dd9=J4>~=}bG&U->%Q>2`E{6>Ft`+m3@Evg$UBkcyQ)~X7 z9DFYoHszqRyZHxb-sZoHxKI4KpCLMxZZysd$IEzly#KY}5r&N)J!(9xdQ3sq?^U07P!y62fdc7uO@#x-0`lW-ea@Zm1_1XO?px4C(x*7E}eV+ ziT6#li4@O+oz$mQpWiVXh76LDT6?3kzV~UGpyBqj!RhTlFB*V8ujf){#X z5Mn+i@TFLRbH@4X4tyzw8Y5*h^I*#gQ9}}2Zkfk;uNWFR<10R5Jt{`M5$Dp@XaNtb zL(mx_zs9gNy`!2f$H>eotCU8|y?Gp#zBA9R2rh5wRYWT%Q8HW2-0c5ae4kyHKBx_a zM!7KkkwQ|=4abQ5SKn}B2_E@YOfsfD)7`k`_F^zk6B9|)njrYhfF)33iH0lR9_9dQPvOQ0Zq%F{2*%U|2%ZA#z&>+#RF;> z7+iHh+@sDpR(gPO-ZQ^o#M?)|wf8(`C|vuaXx6;{nIFZsST}w3S(G-g^cABAC)03w z@#n$t@lWDZ&Ck34EWWB8<;9=HgWAvb|5wR{ef}3bCR9(>BZBZKvVre1MCnnoV`Qm= zKYkHEr_r)BnA8S2m&M<-w2Lg#R*aA#TDai5d@-NwnI8u?{H9=QGJhB2jKVPbie8`J zG0RGwBuU>1Yp%nRVN?GQH}Z7vh(EVhUClN??D66dgEx%;oi0jyLMcV%!lGOxN5wESCqkhOmNZ*j7EBUV_7t!5Jj^Eobv z$%tDnij$2IM@IPV3Z#B?EHqV`Vb?ia)IL|?_Uw5{yf2JjX~mX#qhX~TztJ4NxqqVb z^xP$Jw|Wb&-69?3fWy^-l%T$IC`G=7BPJ?u!6b#>1&L=E`;sqVt0;X-S56n0sw;e8 zqaWBE1O7I^@UZg zdLl^bsMb*{ko3UfK-vSYxiT$P^%=VrYB|_`zg26gbs{kJTa*jI(z_NuP?ZKOslj<7TJOqi5tTt~xrS5#Pw{1IBM!lf;Azv@Mv zb+3Im5-xc-taa{nWy|wLXml4;I8WqdE+{NMkl;QOA<5jr_T}`E*6zayphv;x{{ zv*JNXh14hIe8`TH?&HVfaFmpxS7}R)X|BLlDp1&B(n2E4z7560)zQ-ZYT*K>qNOj{ zYI^TIy;_yJVuHT!dNkePpaWfOE8oFPz-yXGz*`)|iX03fv8X*8k+SRZ5x^a> zQkr{UtQ0J01~V*9`is48QoPiak^eNTP;kW@9dve z>{7eexLSq#@dOEBb@UGKX*LScA-uj?(19rffyN4h-N*-!fHN7_%5b^G7bvA zr_-^vD;PX3_1PNYj!u^*2zu^tOt)5hJ!^;~3Od9$X4@+%b2Q#yMJ`&QgUx4Xc9nyM9K0EG z>W6Z$sBLbAJqw3!M;hDOuQ!svIe{G7lnBpdODDAqW}Voa&<5~D$f`;iI=UK=t8Qu` z#nzxg3sxE;%OGBJeD}1J&S~E}sw9}1~kPCi)^lM9zxNKGI!Q%Yw|Pso&Jz@XotoHK$zQsfCyeJjZy*%$6n_htG7?B2>{U z%ZjmxAa&-PABYZEv9-i2l!bZyUKL<2!KPCj}%|h zR=Qc2t%UwMOO;t)F}Dgi=ha&o%jRKW6Xqki6e~7`dF`YqhR^(WJHC}^iL(%Rb)wiz z%?22#vD)daIx;YqaSL^z?~4o66l{4B6_axvr2U!++ul*)1y?tlqz?^kah9v(5ubte zc374p{Sm2ft1y+!2Fs#wWl65|Qnc!Gv&~NCo=SthB~mCk@Il*kJ+RpI);y^qR{L0? z1s%#*w$;lO#2%fKFFnj}#}=KW8`P;KHf$V!#f!8eK!Cc$6$$SBik2Y93~6oz@V^>( z&b>cXZxTwCVS=09<_S`m^OAuXORI*tpqo#;E8 zz{j1ja(B}bR089>pxi|_`$QepyxuP^DkG!!B+?YEF62;7B<$!SMZu*-m>PYoiysxm zVzwSODScL`=&+1YWkh~7Q{DqdrpYCB6Cz%&L=N@hKl#; z%5>>iHw1b-|0xn`W{Pqibm%VSz?gX$BP{QZ%jaRCFsx^wInKMfOTRGH*_#vTexrvp zN}yXmfLx$^istyMx3jn6c`P{}5ehfnhfKL|JSKN1GY-VV>0WrxK7TJRGc9gHj{X(| z6Bf(SYKFhS?HUWO$*`n1Uh3Y8wLY>j+9LO7Jc2^vmEIDgZ*%YNBlQxDiSCUzIsCV; zbgY?5?pR9gE-Pe}q1~7`69f7Q1=3pMo6yJxN2VGJ?6jdP=4gR*I?~T{wb@~3F1>6p zNKA4c&4oYvOB~0tdw|r&SF)DgStd+1MQt3iuEi^rF=zfcKsxT{^f)?D`m&wD6{@I~ zefx9^K%}w%YUyRa_Rw~Ehk6Pc2zsA3NJ`-Vk>!J>Rd8mo9NJNJ2eZN1aN@CYnM1uT z>k3KoRjyzs;eP;53OtAqb{p2M0=c*N2G2S9pVcB~BXM9QOtaJd;V?-MnyNNzC3Sej z(+~{jJNwTFDP}g`bt*gAhGr-=W~jMN|L(nJ4R$DQO&udD7fz0lzA*H+(!*bCE2Q5e z$uKVwZy)z;u`~1;DTR>{kFCfPY(b9tr zKO(U7Tckb4_J3fzx77ly@3(g>Do71U5P>6O6*ceRIBB_By>gXdwuS}rG2IY$-iiM6 ze~tI}z_6fuGyf85HB4oVF|4JJvGKNx=J=7v)NT{!axy6s=2W7z$L+$xgK$@r7(tV6 zpPe90Zxl(Najo=|HXaZ&QQFlgjUSpQ9i&k2B-nhNG`(Sp7iN~yN~lHlO07{+r&1Wx zl?0InDSx&1;WEolOuLf3QD@FaL-Z@CfNz^3b%z~$5ou;mkUi*#1YjxjqkD-FS9pFJ zw?2ZNOUqchsdW|ctYKZ=A_rELvumzfe;T*YP?$Xi$?;DQM_P~dK?p=WoFZp2J9xwh zf#oUcu`o5DgMO54m%$=;bz^Kc$e$^_#P46s#g2l$J;Y!tg&U>y1@mwWR@5M)KDGK(UTHaGVb6WNK~uq|3UBoCpg=9zYq$4 zK7r=MxFTsRyWgHJl2SA_%#k9AR{?mpSV|&ePU;eZD*6G}BQE29x*Q&eV5Yd)D;dBg z!a_sD1k0;mut>@EX6v(8Y6|k=Nu2LQ9PtN(VbYCaG!Z|{ga=E|6g*xg$LPi9bf@0y z-1`n^I|=?Mm6D8;wDem{EtCG@seB!*(&iS18XS*tM5(lVJJNA3kh0+8uh6b)J6oEk zy^lA}<~vYN>|NQQBG+>x+0s`c3loyymvh2ehNbvrj$|=X_H^g55-XfnP;f>P^f9AL zba%O8>{%2!l!QkC&) zT-mLtS`Atsu`AYpMef5Y47?^*NvqXhu$*~Pru&sDNnv96e4f-?4P;@YkgOakES-t~ z-4^qu1C4NLoSiQ{Yjh%v6#@6Q1yT)?PS~?h`rT-k=7X-BG}$CDM7G)4FawhK}NwNiJi63a)>rT1|0GAgZ)DN=(j$G*XldAD>1g z{*z^ju)&hdtJN-k?Dd&AfaI+)PGt~Q4cri+mXPF4eiE3HL}Z}e6KFDKo`-4ME0 zrw7$lf4ylo<`5K>m0N8X|91si(@+kuz(wVW8y;^7tAweiL+f9gRxGcJ<&+cr;H(F4 zSFX+l%cT~^hg_fjv~o@rp$SXJRG8u5vq+lv>Rr+UY`?M$Wi0a61U9aaM%DqprsGee zhnT$y`h^Hs+_n=c3`6dgD(J}dz~zQE$-cWKp5}b-N~woc0icoKJ-5+YEvV2R%7_*>{{s; zHG?uXTv4fTS6^C(H$Bb8_zI-_euiDv7mkqiFNxFUHos5mRHtB=fvj+r^Mcj0df}yt zk;d0F3X%Kj`z5SA!~n)~=AtjWYQ3}uA`*m9lUlr06_z8mRe_nQPhgz@!#?&=yzMy- z(Q{+v(ThGD7H^O^38(sg*O(A9H==hLnQjunvPl{OmmU;CTWNY)QE4sFcy#GI$8JCi ztMVG;!(DYVMi<1va!VMtS&6m=P%JbrPTL~wVUy>>)XZhb#_zXC&l&^0^E@g6ZtVb( zV%YwGR6QHdIZeD_I@N?SOC|%%V9ue{R+`y=%+O4$Gn3ZhvKCt$NVGk|Qfe+*n3HL< z%*T(5Et$?TdsTUHW|h;D>B3)MJ8r~yi`h|BHpc8QS2%eKn8Ii=7v~TmE>WNL(xBWp zI3AQ}%A4CFs1?-se> z;6sSan((A_M4dB(UlyC}w(^C3DJSPYK#I4;+ay|ykLUlTZkL*A25#EUAt1RsIKo!`-B&TDSDmrleZ3 zg{r$pJ8dpRxHwPJR)1-XjhU7gKrHLF$#t*0%Fvs<+^#2 zgH}E1u$N8`UNZ(f!Un^{;uIFMi{~+3w@=zkThud`=l}v4-5#48&b=sI#HmSwoYzpv zkA6vN(IxN%J1ldntPaaePojW&Tf*4akh_Ax0(QPGg}`=fh{M!Ae@SZI7!$p2zx1WC z6Is_M0O$5gZ_ydk^C}oGIa#?c0Ztr{zH5wOxsM!_GPNupkodCnyk=7!ds+G~k0+gY zMe07S{=(CcUOpF6UuE)~ZHg2|m{)%(h#TWCI_LFoVdCr3advw9zagb5l!_|r%YlZL zVtUcPQiY)wOAhP3+so%+38~g{3aezmHtT^mq{+SgRn`Dyj>;DnTguCGl?F@*Xldaq z8w0yWN@@NOJqPCUQoz$@f;ihjhq!{-Pv=U+U8n2tbXcmK)IF9AJ0HV}5tcWljdW6L zLQbuAJ{ee^l_jvSed3=wZ@j-D;w=sWT0+ZR(3zdlJttpX*FZi0)(VH2)^VfOuLiPJ zpHQo(P-RN(3kj)*6_Jiv#5v^b>rK^#{2b1C+%~)Zi1a3%soImylq#o4D$qSgp$ZHv z0o|jIq747PT_?viQFL-L_edHP9jg&IyX%p;tv;u1;Y1F|Hmjsg)x8#2C7O%0 z_*O~X>J%-pV2T*u`!!Or=Fgv>gFy}lKEm>_>d+)LR;$WgXuj6gC~qXk?kLT5R#jHE z!ooaE5b4`5i{6&@vD=+Ri1Ij^eR zW}#`+7$&e+x&${X7A9m9wm7ssUW)c2&{)qxhL*~a{;PDjz@P(@vK znPK`Ku6~4g^cb?|jWn))?0uhW9`W$&`>4IHuaH@=h1_nBg1bM!Qo=pniGv*^B<(SdGi$N$Iabh zaJhvQKjl?}6fK>rbvkRWi*cygaSU&kBd>z3)Dz9^48KHUl2!R>+{CPy>FU$y()Xm1 zu!GHvq_d|nm^IOkmQu%_7@!<*PD&Cw!nPPO8AhE!?DOc8!C1?s)M~R(-Kz#ckFl1a z(^pLi__}S=$;QiGpH6uzlQT#QRwhq^)4wvpgbR5?HF+ubkbZix*@MAkp=e_kAKEC`PE+SlWUtk}M$_JxPg1oL^8zYBa zP7&crS7y)ff;p+YDp^5^6ikyAY2}<&kUI_+YyOvbUEtZz$mY_PB|Z=N3U}+CaQ;?y&@m~h2Yl2=2n#}S+BqkG-POp6bg_?Qio*@( z)%~fYrMzyi^lL;J_Mp;WDOQ#f@sqt@<2AOVuT(NkFtqQSG?O9$ zj(>xq?96IRH2d=#Z$4oX^m_p@7yk*8V)dYx_3Dl%@gjmM95QEa`+f}GLdy>0T^|3P zw-X6a_#MXG3Z4^!^*FF~eHJy310b>}4OVYOujP>&P{TO?9gd$~-4J)yFFM9zSym;@s%u_|%ED?13sGMuBHP@XXR!mDHsi)VPdgAg-BTF*1UjtCzQ-?ze=kK$ zyfSAEdP{N^znQT|8E}%mk6moS4?L;0(bvC^P0sdZ7{j_BkW_{3zYl-lOV8ajp7QQd z^zuv_-Z;Z|mZSPlE!$)-yr?a_bWVb1l){SfW|%4Ogv(KdkDWmFO51rU!x*(^a3?Kb zNSc{8gbjUi9;tw+FZJFFUeXnvOGn@R=uOpwBNwCtfqXlGxWV;2JWklu758NIj|iS; zbwmpO7J}R>f0FtM#z>gvD)rcjR+UC!rb+&5&tY!E(1BuGz(jx4=T`{vWYO=8uELk& z-`Sw0VoPC_CMr>T(tm5VchpJ$H9Ng<^H+>P;=YWB0l!Mq0+pbK9luIH zv$cHsH>sqBq44H-LUs7bX>pkf5%@a?NxV@=Fc0wj-=*TF>Ir}y?Zr&8X=^TY_(OVJ zqh_`xawfF;QyN&)opo7vA$A2B(yQvFK9)4f`3&5H%hKQ)=9>ol-_oCI7_YO;oHLvA zI^1><<4~UPa~B2Vp>pN1hdtg@uPZOGKMbC{B<*HPNeQRd-YVy-(IwcH6X6O+<{`^0 zGo8W&nWvw;CCJ)R?Vc;QJjIF=d81Ds^o1z!i*8}6_I?K@EYnoeSXOMPs zbf*j#hl;tdPL_AF=uR^)sEa*{g!9D=N5S-SdlUIP4ax%Jjn`nlpEF2)MdRw}87%*( z`KUvPeD42tCmMRw>fl6kS}Q6sSX!#M+>wH%3oH%6qNq27%J=d+phcKGQ!~Feg~@O6 zt#)W6n(Q~lOL2*6k!3}I30lrhD~Wj%s}meYo#%sac{^KFUvW&tB~cDozZ~CV5i%nM z);q}h8xH|WSWMu~c$&@nVx&At)Af|5@?RWY&@M{;RPQy$>aDw1nv9HRcvH3oYq~sY ziq2JT+!|%!Dt4Glk#T^|rRMTv$*3p@x`KU@lu0)Hq$p}RL7e29t4(VjMMZK|kQme` zxq0sIGH`rMNU?m*W|_$B)>vbtWku9utX~#lqoln0=3d<;Mod(T&cgUP*yMQ0iPRXh zS{toXV)2z7SDl=fSGEiPi`3>?mjpYLpeY$zzwJ1+QB)zXC{S(3dL>|A@eVc0v|ZV) z*0@>Xvl>YRs@9ekxvsmXvaxO&br<}0yiN{!!{`=jJAt(taLr-hASvCCBgjVo+urkHA3tzbM>)ZLqJxZJbL5augkL(! zLp49^XOd%T3}Q@mKx3=aveI=b`R@n|(b&=caMK%naOfGZL91~U6 zwDHe^JFyR8$I*4n{1&5*V~Fc~7mRr!!CE{dbd_1IUj1#*wO!>`xo*9*o18bPVM5ns zcG1Lz1+JQIsXA$6GaKbv*XhM&YD51-e;P+2nsH@ku3kFPKhdW~QH!qlGB>VfH2q2) z(znXjHzxG3%?k2m)H8|5~*5A>t=ndeRjr$w*2sjoa})n7hJC0!zf z43GzCz8p3{zQi3C(+0{_q~D&<*6K@&l_xV%)McaJRJs*5bfX^b<=4nfYFy)Y4`MgJ zlERY=e;3GF;)rhs%iA$tN@LP`n<+pABTo)wQ&x3`1M!PT%EUvVDMRWgS(C@%-aLeM zlR;3P9V&N)i~D5Vx+40QCCq&b>xJ!^Ek~?-5u-grhskD6Q?_rIT+%S^CZ7Lgnr|(3 zm8sX6df8yv+ZeF*1$fo8xYLd2(=bJ#_V?G7_Z1n*;VKp9YXj9c(sJH&bBxn=w3Vu{ke~g zLlt+^IJty2+`x%%I$q|X3#@w?1>N@4$d014yX4#JBjCm<7-(*RIv z4mJ=k`7i94q?IdhaFYC|#@X#Mv)Xr9p;LwrCd)5ysq@Gbc|$K9NrzZdy@)N0oaXUo zPn#~U($n+xc1*6z>l)e^H3_sx`($@Hc1@WV`e9by{) zAB5ZkA&36YAw*%`EX-?IGfPgo?3r%3C98)H(YIuA`PH|Ww=zvKY$~8|+NE-HvawG* zoS7;kVf8Y($r73%;e$)EA5g*=#v0&Xp2qOD(?3!exWd9e=5nMCv(53m4*_yy`kqj~ zEB3KMB_2DcNbau$8+FdHB7S(^e8_$U`&m21YuzaH;{DP#T^1)+f>}^hUPUfEmjECC z7s)|FiWQ;tda*p-IP*$ZR=SY1!pt*t`dQ@T8lg$Qtty2rpCNRDa%@BQ68S!jPl^^< zr3C72;oDN#q>g*LuwEFJm`CEe=Fq!L-p)krUuAMq9hAaA@MeHGT?)2e}fCemea zcn)fuZgKsSQ8{#+iedgH74oCpcXPBtE;in9#?etX0>`M=ka9v&aM(ziSLFrr8y@){ z2K6)++U2tirf+cDDm`w>o94>nuG0|*`j;`~phAbMeU4QV2Cl5KEi582pCn+xdkkD;`JOpC`PZA zLMAIFqo&nzIl6SC_0U1F%Zjswynd4J|oce_4CBGi?hbQ(vbwf!9|?6mKx ze0ZY_dmDDW9L4fS@~;1Xx)ue`lzP+k3gGlKl3 za%@ZgQk#LnXD%m+`ZO8dy;0`mYx@?-8x$2rrDM4;c|gI_7bBu47r&&iHZ~cUhseJ* zab|0(iFqDUJ__(G+m4k;8^~BU{C~5AQj6J~^gH$MYHglY1XQSUykI-Sb)p8i=Puw6 zD<%3!bwq4Wnp)|5U*A5Ra=PnTU!EB#wm{6wsPJH!9vN<5EPu>wJNLXLa;%`v^7H*- z9vwUum#i_VHb(s8_YHN1)#aM@-f=a?RZLeAmy#F!pf7IkT}0K0l@wl80~j&E^hivI z9BFZx@wa~IO8!kMWeI8Rzz!-0rQeX%!p&Iar(}=n`MYvjzp|MT39jxXP3ZnVtzBzy z6jc_k?mmzW34vf@lHrwvji?aEELsGsaCKE4rVRK13twbHA{k5qOqc{H)Iv5Zm=qhG zC5NC$6!3va$V1u)N>o5m3W=_0`9qT*T5c6Ck*#8N-75X=?Rj;R+=+pInd!;x+qdsM z_ndRT^L;Mv$-^|O68UY$chj1 z!;8<^K#~(!2>bE38>m(iU)ifLS5=|h_F=CB9?i&ajgNxa?VE>az3;Cu_dSitJf_xS z?pLLS)b_1PsHAq+8nbz4E&an@O%6gt;m+U1^?#!S(iKk*V?QOCOjsDB=t*jpyCoFu zU4unbJJRLXZv-?^`1_8Vl$5TrPOqg@bIvA`%&aPDSoIS}v)}}7dm@Sir~E0Z69L7L zPd*##=vz4q|E;6x7q8we#<&CpwuspTzf#X)*r

hPZrDJ#Dm)p80(}xq?o1+Gd($ zzsfgkrtiuu+u+zHmI#}I@7$PvVarlgRqCrQ^+hfPKM&5Haqs(D$|##9@mB!Yna1^f z;4`oKJFyt$8MdDIE2QxhJ&Cys^6~~sGp}l(5mqiS62qqwJ|getANwCqBP^mTT${XME6uw z!57!N{-=bMln8Cu+11=rttWD2FVshWcnnle-)u$5C`&4bHATwS(>bvnQkz9hlyFI; zTLv6eF3i^_a9=7V1Ulydf|HNp;Gdh&B`GE|b{lvZn~rJ87dcytw$Zze^bcn}OFeSV z$Ut-AbBH$2lo*aY%TyorF3zHLbqw^jheNr@00&UA}Tbn2tL89rTg>@zG|QWp^%+rnEapp%DSI&Oyv8 zq#`Eq=tEc$wL9?sAgYlNXojqf*pDNGnSNfs4yC6N7}S6EzD!Qz(9rB`Wg3_Fp@x%(3U)xr>g-{%41smJ5;V-paC4pEtw> zy9H+#Q+8q`WL@c!os>CVy6^THGzqE7MY3}#w=UP`@Y3D1Xi#j2P=ry%B!0hFls|Cq zZtCR~vyI_5+IL95S8kD^P|c0sm#Eq^KYj^`H!&fE+Zm`}D7nqmlLEsNGkEGNG(`nP zMX(j)z|&owpNp&}f=f?jvEMPfhLZib#^y1oTL1l#cTRW;sM?iKPi;DTzC>72Y!&*n#7qX)$amdY{AROPj}U@wg~hwY`ygYd~~UZ(rw<3U z-Kvj6sy*B=8Ot@Z7#>aAJ}QWv&5cDfUR`13_hpm!wNQuCLMQDHVP2p)?BW|*!P#)r z-MWM0w`SUs+%jLTI5DtUC4RRRP?}kP&{8ZPp({;`j~ z9aJh?ezk+L9A>AWOLGODbtQ6N2YoO6Toq3t)|fI_F?-(-z+j0%`t<;1+wWy&nIWKV zRBFlnW)NI4vyEYleqTP?MOXV4hzIm5#?exuXD`uy7$63 zyq5Q=)?Q*=BWq7@KSEMGB2V>R!1ZCH8qp%;EY@h5tIu| z-jXs8NF8wikogYaI_rAmy0r#MU^t+-a~m{j9-oJhYu0hv8Vz)ReBVU=-*NiPO11WUL~}LO#;Tk+X2K^# z77Q?O{+>~scZzc6$FzA$SALDhx6~d!@ZgtcfocM(oV5$@dTE!Y3J|Is;Wbj$FXHmQ za*DRZ+SZigyVkoxaCVQi)Y7=y3UC51pUmV{pVDmA;b#m;6u|jySO<{o5_VPaGK|ylfzzf z#>^=s@AUt5`W0qHpRqqb>N5(GY9_L4w3cw-4$9NaU2|w2nR$iOTP->t7ett``(r)b Ky!I%~9Q7NWZoYW{ diff --git a/api/src/routes/guilds/#guild_id/members/#member_id/nick.ts b/api/src/routes/guilds/#guild_id/members/#member_id/nick.ts index 9078409d..77b8d72a 100644 --- a/api/src/routes/guilds/#guild_id/members/#member_id/nick.ts +++ b/api/src/routes/guilds/#guild_id/members/#member_id/nick.ts @@ -17,8 +17,8 @@ router.patch("/", check(MemberNickChangeSchema), async (req: Request, res: Respo const perms = await getPermission(req.user_id, guild_id); perms.hasThrow(permissionString); - await changeNickname(member_id, guild_id, req.body.nickname); - res.status(204); + await changeNickname(member_id, guild_id, req.body.nick); + res.status(200).send(); }); export default router; diff --git a/api/src/util/Member.ts b/api/src/util/Member.ts index 7b06720b..316d3f75 100644 --- a/api/src/util/Member.ts +++ b/api/src/util/Member.ts @@ -196,6 +196,7 @@ export async function removeRole(user_id: string, guild_id: string, role_id: str export async function changeNickname(user_id: string, guild_id: string, nickname: string) { const user = await getPublicUser(user_id); + var memberObj = await MemberModel.findOneAndUpdate( { id: user_id, From 0ab1042229334f6771d389a8d278990286c55970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Intevel=20=E3=83=84?= <59223342+Intevel@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:18:21 +0200 Subject: [PATCH 03/10] Create Emoji.ts --- api/src/schema/Emoji.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 api/src/schema/Emoji.ts diff --git a/api/src/schema/Emoji.ts b/api/src/schema/Emoji.ts new file mode 100644 index 00000000..deaccf5c --- /dev/null +++ b/api/src/schema/Emoji.ts @@ -0,0 +1,14 @@ +// https://discord.com/developers/docs/resources/emoji + + +export const EmojiCreateSchema = { + name: String, //name of the emoji + image: String, // image data the 128x128 emoji image uri + roles: Array //roles allowed to use this emoji +}; + +export interface EmojiCreateSchema { + name: string; // name of the emoji + image: string; // image data the 128x128 emoji image uri + roles: []; //roles allowed to use this emoji +} From a640384886b736606788ca3c75107ff5382ce0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Intevel=20=E3=83=84?= <59223342+Intevel@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:23:05 +0200 Subject: [PATCH 04/10] Update Permissions.ts --- util/src/util/Permissions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/src/util/Permissions.ts b/util/src/util/Permissions.ts index 445e901f..63d87e48 100644 --- a/util/src/util/Permissions.ts +++ b/util/src/util/Permissions.ts @@ -49,7 +49,7 @@ type PermissionString = | "MANAGE_NICKNAMES" | "MANAGE_ROLES" | "MANAGE_WEBHOOKS" - | "MANAGE_EMOJIS"; + | "MANAGE_EMOJIS_AND_STICKERS"; const CUSTOM_PERMISSION_OFFSET = BigInt(1) << BigInt(48); // 16 free custom permission bits, and 16 for discord to add new ones @@ -87,7 +87,7 @@ export class Permissions extends BitField { MANAGE_NICKNAMES: BigInt(1) << BigInt(27), MANAGE_ROLES: BigInt(1) << BigInt(28), MANAGE_WEBHOOKS: BigInt(1) << BigInt(29), - MANAGE_EMOJIS: BigInt(1) << BigInt(30), + MANAGE_EMOJIS_AND_STICKERS: BigInt(1) << BigInt(30), /** * CUSTOM PERMISSIONS ideas: * - allow user to dm members From ad7f1eeb868c83651296c3e7bd761ba3bfcad79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Intevel=20=E3=83=84?= <59223342+Intevel@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:23:13 +0200 Subject: [PATCH 05/10] Update package-lock.json --- util/package-lock.json | Bin 47678 -> 22265 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/util/package-lock.json b/util/package-lock.json index 4977468dc5b18a77ddc1d0cd28ac95acaf85febf..b5e6f0cb45a767598b527a6d301a78c8b7bd3f8d 100644 GIT binary patch delta 41 zcmV+^0M`G$^aA;<0gz4sF_BLflLG`3v%X{HMzip%3IUTSLJYI7szCv>`m96^a8MCx delta 4781 zcmb_gYfKzf6wXxJWmljqu)82oU}y_fc4i+u%Ci8s655auc0+-R_g!M{+mcAk@tOwJGy-I@vlFD9nNI2YA* zH>$^I8! zYx1lg4KpoFTUtFK@Z*A@aWabU5n{q*3pTY@G?5#pS1@vARz&ic#EA;Ah%bw!RTy__ z{Kn8s9~>$1sFeE6*9>ZsSe!`Hybwcs6GAK*M>4x`fTG}RhZk#h6c~0=Z&FUmxCHO5 z_(m6YK-a1=_WxLA9US3Sig!bH5_&gxgiUi!_{zb)w@J+kE1<5QwV-{ zRKbm{J~-#NpbO-~I+xEVwB5NTwaTeqYLA0R7;!?U>xZID!z_*#IO8pazAF}qVQ>CD za~iR?C;1r1k7L%=XxBZV`e2+>CX&&#Gm}zWU7S!9QEq2hZIc-j609r=yevpEi$o!c zBy?bk@I*e*EWE2XAOMmc9UcBis=#ysL)Y-o>1OWa`R3b$^**@&%zMHvgBR=IXU|)vz<$~L zL9Z6Kw(wh+V4K|y;BExF~mLn{;KF9xQ{?bu6wc z#V}YmXe{p3S`R!?_giKrT)eCvX95e~uRW^zEj7Px19ekYC{5|g&5H@WkTQ6Futhkz zFM{vtg>TnuX?eO{F)ja-`Gz(lQ&SNMp#)(nzQLTe%~vg&?EG@oYo?WxSDRN3 zHk!3M{O_2wT#Q-f9CO?#le&v_QAU!_2P#v?0uCyZBuv=zLh zNJ&JRvS!CgNAWD_NBh+oNmI5LpPNDwZplJ=mQ~xkop~~`#iIVPIEQ$}kHJc_|BPY-{nUN_{UL(N3g$) zF$D8XmB+-5RE?oJqzBxL;tn{BsAiaM4Z~kSH!QT*KxxY;Y57M(J@8&jEz~y`!KOjH3jB*^=Vv%SZ z`DF$Fn=txvIoj4(&@Q2Iv|q$kM&R*iQ%;)UiT=k;pdy2R6HwDzyNuQQ`GHcH9JrXv z9Ejhkmrr#yyr0{8%5?0+wa@)8maDh@XtM0yuCcsks5*OQ+PY9ii5XZN@xpCGi~U-X zNAXKny4up}K9cY=jh9*d$)`SrT5^+DFaf+CNlDNz3< zJmC)wvW%n*c9xzAKRHy)kX1+(UHaaTlsNySHsDjc&JrFz+Er`h6_3sMqYKQ}l|%XN jb42Es-TfvOJ8pPsA^K;3YGQDRN{tS Date: Fri, 13 Aug 2021 12:23:34 +0200 Subject: [PATCH 06/10] v.1.3.53 --- util/package-lock.json | Bin 22265 -> 22265 bytes util/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/util/package-lock.json b/util/package-lock.json index b5e6f0cb45a767598b527a6d301a78c8b7bd3f8d..9ba2adfd37d6ce0922396aa4f2ee3f7c9a3bc0ea 100644 GIT binary patch delta 14 WcmeylmhtCW#tCMO#v9EKg#iFGK?X?x delta 14 WcmeylmhtCW#tCMOMjOo!g#iFGJO)Sr diff --git a/util/package.json b/util/package.json index 0478fe69..a69f2439 100644 --- a/util/package.json +++ b/util/package.json @@ -1,6 +1,6 @@ { "name": "@fosscord/server-util", - "version": "1.3.52", + "version": "1.3.53", "description": "Utility functions for the all server repositories", "main": "dist/index.js", "types": "dist/index.d.ts", From e213512d170669162dbd76b6dc2cd1ec33d71c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Intevel=20=E3=83=84?= <59223342+Intevel@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:25:02 +0200 Subject: [PATCH 07/10] 1.3.54 --- util/package-lock.json | Bin 22265 -> 22265 bytes util/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/util/package-lock.json b/util/package-lock.json index 9ba2adfd37d6ce0922396aa4f2ee3f7c9a3bc0ea..ffac896a32d52f582f2684d1ba3fdd0a9e635d9b 100644 GIT binary patch delta 14 WcmeylmhtCW#tCMOCL7HUg#iFGMg~d% delta 14 WcmeylmhtCW#tCMO#v9EKg#iFGK?X?x diff --git a/util/package.json b/util/package.json index a69f2439..0ac6af31 100644 --- a/util/package.json +++ b/util/package.json @@ -1,6 +1,6 @@ { "name": "@fosscord/server-util", - "version": "1.3.53", + "version": "1.3.54", "description": "Utility functions for the all server repositories", "main": "dist/index.js", "types": "dist/index.d.ts", From 920b7d49b0ddac417d2ae1cbc98d2a954f782dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Intevel=20=E3=83=84?= <59223342+Intevel@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:28:39 +0200 Subject: [PATCH 08/10] 1.3.55 hab vergessen zu rebuilden --- util/package-lock.json | Bin 22265 -> 22265 bytes util/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/util/package-lock.json b/util/package-lock.json index ffac896a32d52f582f2684d1ba3fdd0a9e635d9b..9a158b619f4065c2c7487137409eab9b6a38647f 100644 GIT binary patch delta 14 WcmeylmhtCW#tCMOrW?% Date: Fri, 13 Aug 2021 12:28:59 +0200 Subject: [PATCH 09/10] server-util 1.3.54 --- api/package-lock.json | Bin 316525 -> 316525 bytes api/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/package-lock.json b/api/package-lock.json index 311cabe75bf834b3a009ee144122f21e696c2f6a..22a82541020947f500f6b707958bb095bf79fc85 100644 GIT binary patch delta 253 zcmaF6Lip_p;SKD8lRsJ-Og0bHU^JP$P*OhBJHI5g)UndCz|SvVyUZsrz&9(%r*~#}8uuayQ&EL!x)Xo;f2*ga=*@Bq4M5h;&FzQdYPiNMcF5r++gmuHez77^s@66BW=;+}3$ zTv6&Bkz?SN7v)@%ms)ON>XTpOSK*lyRbc9$nv?12li>?=flT|4bmr|p(pgG#0Ar9? ATL1t6 delta 244 zcmaF6Lip_p;SKD8lMT}iCYuLpOkS9)5b6@(kyGjDQ{k2#q90!BZ0;5uXb_%kX%L{F z7Lgj{o?lRz6yaBrZK)qz6>O?sQjuj@m{FPG7#{AG7M$doW@7A@UTPZTS?QD#l5J?{ zZ041!onAEk;t@uf<`04G9|9SHm}&cmKxPHe$ty4GPq$BJ)|g)0%c2k(P!eR~k?mCB zVGvZ1T9T1pU|g6Q6{&5Jo*0qkXQJ(yZRzM$l;|I-?HK5mYgT4i6ku#p5m*#h=;dOW s;pgjQZWbC@;b&Zx>F!#QQj+at>TDPiIz8|MvrPMsbmr|p(pgG#0NZL;5dZ)H diff --git a/api/package.json b/api/package.json index bb22f94c..9f5eb034 100644 --- a/api/package.json +++ b/api/package.json @@ -33,7 +33,7 @@ }, "homepage": "https://github.com/fosscord/fosscord-api#readme", "dependencies": { - "@fosscord/server-util": "^1.3.52", + "@fosscord/server-util": "^1.3.54", "@types/jest": "^26.0.22", "@types/json-schema": "^7.0.7", "ajv": "^8.4.0", From 937c3c99642979b1d0e4ff3a52536c646069ad03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Intevel=20=E3=83=84?= <59223342+Intevel@users.noreply.github.com> Date: Fri, 13 Aug 2021 12:29:52 +0200 Subject: [PATCH 10/10] server-util 1.3.55 --- api/package-lock.json | Bin 316525 -> 316525 bytes api/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/package-lock.json b/api/package-lock.json index 22a82541020947f500f6b707958bb095bf79fc85..967a56941154228e5483995eec9908179c1531d1 100644 GIT binary patch delta 136 zcmaF6Lip_p;SKD8lMQ7ICYuLpO#axc5NceQ?CEJ*;uGkVSnd~=>u=;9>>imKY3}J( zYG9Dz6B3YT=5A?Vlwnw*?dWG7oL1oJ>XM%0R1zMLUmTN0S)nwMyt l%r*~#}8uuayQ&EL!x)Xo;f2*gZ4%)Ff~h$X!V04A9*i~s-t diff --git a/api/package.json b/api/package.json index 9f5eb034..a3935b5c 100644 --- a/api/package.json +++ b/api/package.json @@ -33,7 +33,7 @@ }, "homepage": "https://github.com/fosscord/fosscord-api#readme", "dependencies": { - "@fosscord/server-util": "^1.3.54", + "@fosscord/server-util": "^1.3.55", "@types/jest": "^26.0.22", "@types/json-schema": "^7.0.7", "ajv": "^8.4.0",