From b9346f7b0197c9a9c8c594d5191bcfae0304ccca Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Tue, 7 Mar 2023 22:52:34 -0500 Subject: [PATCH 1/5] use real md5 hash --- ...c25.png => 0c8138dcc0dfe2689cdd73f7952c2475.png} | Bin ...a05.png => 5ac2728593bb455250d11b848a0c36c6.png} | Bin ...09b.png => 823a3de61c4dc2415cc4dbc38fca4299.png} | Bin ...d77.png => addd2f3268df46459e1d6012ad8e75bd.png} | Bin ...03b.png => c4e0c8300fa491d94acfd2a1fb26cea8.png} | Bin ...773.png => e56a89224be0b2b1f7c04eca975be468.png} | Bin src/cdn/routes/embed.ts | 12 ++++++------ 7 files changed, 6 insertions(+), 6 deletions(-) rename assets/public/{7c8f476123d28d103efe381543274c25.png => 0c8138dcc0dfe2689cdd73f7952c2475.png} (100%) rename assets/public/{6f26ddd1bf59740c536d2274bb834a05.png => 5ac2728593bb455250d11b848a0c36c6.png} (100%) rename assets/public/{1f0bfc0865d324c2587920a7d80c609b.png => 823a3de61c4dc2415cc4dbc38fca4299.png} (100%) rename assets/public/{3c6ccb83716d1e4fb91d3082f6b21d77.png => addd2f3268df46459e1d6012ad8e75bd.png} (100%) rename assets/public/{4c1b599b1ef5b9f1874fdb9933f3e03b.png => c4e0c8300fa491d94acfd2a1fb26cea8.png} (100%) rename assets/public/{c09a43a372ba81e3018c3151d4ed4773.png => e56a89224be0b2b1f7c04eca975be468.png} (100%) diff --git a/assets/public/7c8f476123d28d103efe381543274c25.png b/assets/public/0c8138dcc0dfe2689cdd73f7952c2475.png similarity index 100% rename from assets/public/7c8f476123d28d103efe381543274c25.png rename to assets/public/0c8138dcc0dfe2689cdd73f7952c2475.png diff --git a/assets/public/6f26ddd1bf59740c536d2274bb834a05.png b/assets/public/5ac2728593bb455250d11b848a0c36c6.png similarity index 100% rename from assets/public/6f26ddd1bf59740c536d2274bb834a05.png rename to assets/public/5ac2728593bb455250d11b848a0c36c6.png diff --git a/assets/public/1f0bfc0865d324c2587920a7d80c609b.png b/assets/public/823a3de61c4dc2415cc4dbc38fca4299.png similarity index 100% rename from assets/public/1f0bfc0865d324c2587920a7d80c609b.png rename to assets/public/823a3de61c4dc2415cc4dbc38fca4299.png diff --git a/assets/public/3c6ccb83716d1e4fb91d3082f6b21d77.png b/assets/public/addd2f3268df46459e1d6012ad8e75bd.png similarity index 100% rename from assets/public/3c6ccb83716d1e4fb91d3082f6b21d77.png rename to assets/public/addd2f3268df46459e1d6012ad8e75bd.png diff --git a/assets/public/4c1b599b1ef5b9f1874fdb9933f3e03b.png b/assets/public/c4e0c8300fa491d94acfd2a1fb26cea8.png similarity index 100% rename from assets/public/4c1b599b1ef5b9f1874fdb9933f3e03b.png rename to assets/public/c4e0c8300fa491d94acfd2a1fb26cea8.png diff --git a/assets/public/c09a43a372ba81e3018c3151d4ed4773.png b/assets/public/e56a89224be0b2b1f7c04eca975be468.png similarity index 100% rename from assets/public/c09a43a372ba81e3018c3151d4ed4773.png rename to assets/public/e56a89224be0b2b1f7c04eca975be468.png diff --git a/src/cdn/routes/embed.ts b/src/cdn/routes/embed.ts index fd13d215..bf858c05 100644 --- a/src/cdn/routes/embed.ts +++ b/src/cdn/routes/embed.ts @@ -23,12 +23,12 @@ import { HTTPError } from "lambert-server"; import { join } from "path"; const defaultAvatarHashMap = new Map([ - ["0", "1f0bfc0865d324c2587920a7d80c609b"], - ["1", "c09a43a372ba81e3018c3151d4ed4773"], - ["2", "7c8f476123d28d103efe381543274c25"], - ["3", "6f26ddd1bf59740c536d2274bb834a05"], - ["4", "3c6ccb83716d1e4fb91d3082f6b21d77"], - ["5", "4c1b599b1ef5b9f1874fdb9933f3e03b"], + ["0", "823a3de61c4dc2415cc4dbc38fca4299"], + ["1", "e56a89224be0b2b1f7c04eca975be468"], + ["2", "0c8138dcc0dfe2689cdd73f7952c2475"], + ["3", "5ac2728593bb455250d11b848a0c36c6"], + ["4", "addd2f3268df46459e1d6012ad8e75bd"], + ["5", "c4e0c8300fa491d94acfd2a1fb26cea8"], ]); const router = Router(); From c25797374111692c09ddd15275c2101a5ad9fe26 Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Tue, 7 Mar 2023 22:59:47 -0500 Subject: [PATCH 2/5] add default group dm avatars --- .../1276374a404452756f3c9cc2601508a5.png | Bin 0 -> 1522 bytes .../2e46fe14586f8e95471c0917f56726b5.png | Bin 0 -> 1573 bytes .../3b70bb66089c60f8be5e214bf8574c9d.png | Bin 0 -> 1321 bytes .../4ab900144b0865430dc9be825c838faa.png | Bin 0 -> 1446 bytes .../904bf9f1b61f53ef4a3b7a893afeabe3.png | Bin 0 -> 1535 bytes .../9581acd31832465bdeaa5385b0e919a3.png | Bin 0 -> 1288 bytes .../a8a4727cf2dc2939bd3c657fad4463fa.png | Bin 0 -> 1355 bytes .../fac7e78de9753d4a37083bba74c1d9ef.png | Bin 0 -> 1318 bytes src/cdn/routes/embed.ts | 28 ++++++++++++++++++ 9 files changed, 28 insertions(+) create mode 100644 assets/public/1276374a404452756f3c9cc2601508a5.png create mode 100644 assets/public/2e46fe14586f8e95471c0917f56726b5.png create mode 100644 assets/public/3b70bb66089c60f8be5e214bf8574c9d.png create mode 100644 assets/public/4ab900144b0865430dc9be825c838faa.png create mode 100644 assets/public/904bf9f1b61f53ef4a3b7a893afeabe3.png create mode 100644 assets/public/9581acd31832465bdeaa5385b0e919a3.png create mode 100644 assets/public/a8a4727cf2dc2939bd3c657fad4463fa.png create mode 100644 assets/public/fac7e78de9753d4a37083bba74c1d9ef.png diff --git a/assets/public/1276374a404452756f3c9cc2601508a5.png b/assets/public/1276374a404452756f3c9cc2601508a5.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f7f62c42dc7fe84e82224669a3b2dc6b0f326c GIT binary patch literal 1522 zcmbu9Yd8}M7{|A{Pei$_<+349jvAtDahi7Aoz>E^SSt65xg@tbv1VCx(kQGNp(7T? zT$0P&ialm6BDpl=HZ`|$ja5gdkLTMtAKv%>JpcE3{$Jkz^Gn7ZaZ&+8!2ke2#l_j) zeN)f=7)ANbJ;sPZZi-U4vu7j#fH3?qz}NzGGyov?my7*jd@OU8Nes~lfFzA11V#sL zCDn-ZN;K6>L7;7ylJmM`?|^TeHFAU{k>M833m_$JXtJXNqL%^jyOCt9*TQJ`HGsDd zlUchtyVO|un(Fqbsw(E-uYwt2EGMudI;LJBdgTFizIHGnaO6wloaM$my60tz+v3CW zW;*Ed5-##khFCDf@_G7)P;>}o<&y6PVq#IK*R8AL#xu!k=Ym8DmPh3jK7*a0vTi%V z#9aE`lI-_HIm6~@^Zo=OHkx>l32!dQ9h(dSIv{pWiR$#+y|EW{K1hvYoYS^fpAs^z z>cZ`aPm!N|h_KeumdX{*1TuO|LlBvWigZ6NQx$MinH{7cRO@=0J3X_860LoS84Awa z=A=juveM4ZfJ$IbOz(`ZjfhEQo~}A@JMdZ<;!LDr*sUbKdnF!;v1>H*>XR;WCj8!e zbpCXtA@Mzq#w8qcL0WMK2d`hw4K#_M0=Q!5ZqISvBl3A;9{+03&pcRN%}x)b7ydxQ zhGfEzbqEl!?v1kaK&DI&&*gv2fI2Cf)5>7)x;?`Yb@Kqa8X42G7@l7t9^LJPCBt8 z*1Ggs(dU5p`=PLkAbpH(Hd);*lrSZft(q}~Nd_U9`Gg#L2ui%_LfxLQ*8#ttyVqOx zEhUZ~T1Lb9Gqh1}|j*g@BRi!!2aYkwhrr^n4_-9^owDqn;+?0@PTg%C9Kv_}xKLMvl zmND}mI_vlrsY{P8h)r>ik76er*{#zOT6d4a*U_Wp25sKgvq0%5=nHY9p7o%)6SHdH z`0uXSmggVL-%y1~eF*KAr@;8*sh+bUgLoLFKK6Z?k2!B*6h-^rw}w+cgwVaxBYFL29&YPDgR z8K6~ubgXrW>yX~JbMsWxNZ&FpYfnXSsTJQ~vx&zzBtMjE!D!rN&AU5THHCgMh3enO z1=QLU(oXmr{J?-$dWB**x>hHD-{Q;t#57skogRgxJ{}f3uC96d83FA}Aeh{BAlLc( zp!oi5(K>+YsS6!?P}!G{K%9n`!@3I+DHuwo7PC|N*ihW~$*p++9<_fgqysWaxw|7GOd%IQE&ZNIs i(6Il%?D`h~r3xrBvizaUU5HJH16&-A*t0QbDSrdWQ^h#| literal 0 HcmV?d00001 diff --git a/assets/public/2e46fe14586f8e95471c0917f56726b5.png b/assets/public/2e46fe14586f8e95471c0917f56726b5.png new file mode 100644 index 0000000000000000000000000000000000000000..bf747d73a9b368da250985d91a9f996597372f13 GIT binary patch literal 1573 zcmbtUS5T7)82p12DS=2AkfH|&NI%L67)q#yUZh1rP*gx97l8l?y#?V!#Ta@&3r!*| z2!@V;6fsnTKq3N%B1I6Ca`Ak>6W0-6A13tc zW^x}<0A-uB9oG;t(I_FL-a+zNa5E$Y-<@Xna}X*;uXhWI943;whhV65CWnOwI91Da=I#YK(zcx970Af0TfzM!uEET`XTj&p%)KR|iRqx8$QQX%uiR{e7{0@Shw zPRjMmCdlvBhmg)g2z^WZ6m-xUdt`@n#@S*18E#TGhAV6c%fHpojBYHHro=YZ;1cg0 zXmfAs5DjXd2N;OHcfFk(xEVT^Um?SETFYS=*>fQB<0aCFojO#_1*iuJdScTeP@sX{DQnUFkxI zcsT};dwU00Z;bk+9KfZXGvzmVfui%6T_` zgguyLQC?i&j6!Ye9eRufDihS$Y3@$ch(G;uD8jmaCODit7O|CMQ^E@hbDq!I=+;|E z>1E5Ix$q#4uHDXnD?x>Kp@pYxekx1-Yjv8^2em*j47ZNXo+^mEk`(YGvu^jSLjFE_ zjlHDyDz0VZ?1i6^ss(1^8Jvpu_bb0v?97%c7<_<-$ZgA%zLxbgOi^&Pzjjlu$Vb}P zIUF-iN!U+8N5045_F&6q5V^8Jolw0}AL*CP1rkf9z}m3()I#te_K<0oKRGcbEc4bj zY0~?^eL8PoCTHzQv4zY86F{Z<`dkoFOTXB|zvwS4Ud3D$OG`!&XwyuxxQ;Y z9+3&d^fLv__psFOfcL6fS5e`t;;}C~fl9l{hLuXyz2x|AlG^?D)8ZqNtCrtKl%zHq ziuLHw;2~eN_HPW=M=Fn!I$hF3;5}QJlD)}xMOzk<$)V&gEyoc&P5C2(QEi`i{wa59 zt}6s!{qQI&kCj)_<-%^A#ZZy_P5G2KxKnbySn+*(y@R?TS+A6-E3BF_hBPUp-{y_0 zPRDo}D;oq-)OLM*)@*^BeGcj0cIz9?#kX=pgpC3S^VIH%&Q2a=;xy< z0wwq+Axqqeo!~h|_R?Y{D6!9!%tMwqGwJjKBsm}*H%O{^scH6FgMVA5C&fsusZ;N6 zgII3R4(eUhX>BpZSKoUr=6-KP#SB0AWx!>SgZB2Xr;PzzHgNMNQcwt(F;h|4ws4?( z%?lB&x;>2dqvxq>CC)sMKzB`4+xR>l`QmlVo>=mU^s%Rs&hu)h%Bp`MRd8Gs8arPL*k$Y$d&V@DOetTj$8%h)qI1e62n=K){iZxy zmgrf(QmGFwchIZTs<4yMRL|@3#RTB_V@TAKi=!njZ0hhB<>e^TMYfoE+}uVY#mM!o z<0aY$Vz~la0opJPXI3CuE(noB=58*R?Up7`;iP908&CUc?W!6CM__FMV4u-OC!Z#E z3d*j7PH8Kzqv%L%RW`?ZYjSCmy=PSjCK^T4PT3k0x$S!8DwsTL2F*AWWYJy}MyRtg zW#HrC>MeCk`B2`IKWEHwzq5%|iAB6m1;XF-TQDVQIfKui=B%$!G3F%oLf)FMF#dmS e-MSwZfsBV%FeHXF z7-%_2kS**vQBOh5QZ?WogN{CHyb({?;i>rx-ygbD*cuwJOL9~A!6z0m?;B1ZSGe=i z>0;+&TgIQ+5B}8(@VLg`ujT98%QH7!>38?4#BAm@YdYnw-{XjX-Gyk;r~ls{ zv$FGP5l249iYl3+(?b29(+{-W4con(_1F3{^3$W!imDj$IU>%KR;J~IPyTF~dqkS4 zYn8a%>|iFzpJBh>d!Kv0MKGU(L*$0Iy;Pa{a^DJPhds?=#{2F^eM{dl`Lfy`MTL8( z-As;3t-srif;xr5eB%a)yKFtcM<{=0GeZcDD^@$LR{Ca3=gZxRf;lzhDR z%j{b7YqNn0pP#Jv_KfD6di(6}hB>#-{PEqvZRO{1TXC~Y@0-wot(U9h3yMV!?VtUf zF}FS8%dT#ALHT)9s_XGj=c=6mS( z;=d@{|Bn3qqNN*jq}kRv#Y^*ivnc1`RMI{$pYQ3`4bKuI_A-V|Q5Unn!5n-4@X^Bs zA3fgep3^sZ!{;4er`TLc-?t&dp3ArOu@iBUH|?d&_|wzxiR|<(jdw6$xou}MT|!-AKjZQE)?)cHapAip z=UE8a=KYY8sXH~tQ}5Bc{(`fcH$3hrZswmbi*w<3#V_-IRwY@UIV&}}-T@QB0cWPm`)9{B zFWRm2yDIwO`T5WKZdWldZMO)!R&qyh!#h^v{g2J|EqRfCaH;}7$fqdfP+i;(|JrJH%`8+Yxl29|vcp00i_>zopr06?lq*8l(j literal 0 HcmV?d00001 diff --git a/assets/public/4ab900144b0865430dc9be825c838faa.png b/assets/public/4ab900144b0865430dc9be825c838faa.png new file mode 100644 index 0000000000000000000000000000000000000000..f3ba032d4878d9a614e5b83a4b6ee7d36e237986 GIT binary patch literal 1446 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F3${@^GvDChdfq^x` z)5S5QV$Rz+{uwf%GROCSes=!cyEpT9cwT;cZA;kdt4(`V+PN$_F3P=fY|+xHnk2VJ z<4cfE)kL{3L4txu8%Keo;$a~iQ*=E1%)5?w=zLsNl(|+^K zxj%WIe796J{{3xl<@}l7>)wA?o4C$TXJ^6*fh)W>-fdt=ieNC*X^;?e;NeziV-+~e z)RD+|glyp+r@IYhDw+`8tmi+W}*7KxUEgLU$N(g7|KPxM-P(Wej zfp^;Aolc2 z@N)&uRtD9(@y1iCrJiQ9=GT9@nLoE#No4JZTba41pG!Y&eW%zZqJn*L-rhIM;pauV8cvD_;>tD{#J>A?katbYnni!2mDQ)zSv`8$CARGJhUteV z&f#ulSWu__{9Jkb$$$P2H?`g@@517Nn_hr=`udl^ybmnqt-x`{G_2?h>rMsRKusAR|C@BAt- z)oBSjP^M&3e4wlqoH#lCMOYmCye@n@alwe`R7XRH#{{LX87E9*Ekeb&ii$sr;eF=I z{%z9s2s_KAj%F$m+8Ef!S8g$Z+i)Uyt5=o;u0Ew1BbGlXv%hlLb7#jsIGxiWkdI zneaR7^Qv1C;TzvSPB~q)^|oH#zE}<$Pw^KjbL^HSzn|HXKbN0DNlmf(lEb$pj5!rM zy25qt{M=T`e%e{++dR*NAFO+yR_^EUad^eKHg)+A*IzUGE>{T5F?Hl^JHg^&DJO zGrnKi%cOL&Vc-6pb=m87H=K~GoNQtLA=Y92dg))6+IZj3wvzi^+mvDbya`&6)W|=L z5svtG=y%#~`3UZ_I~U&Sdc4v%k0Fxt-XxW_b_MDdK)_P$nZ0CnS^AfS)h@t-m%-E3 K&t;ucLK6UgL4NH3 literal 0 HcmV?d00001 diff --git a/assets/public/904bf9f1b61f53ef4a3b7a893afeabe3.png b/assets/public/904bf9f1b61f53ef4a3b7a893afeabe3.png new file mode 100644 index 0000000000000000000000000000000000000000..0cac96782d863174ae5e5e1b1c2352b6240c4c53 GIT binary patch literal 1535 zcmb`H`#aMM9LK-IY;MPvyPe!iE>q4pamc02wMKGnXemU)%C%%Pjjb5UEzR|CgpgX3 zOXNBdm1~+?S#Gg%&vbOw)AO7^;5_Gt_vigQ@8|RR?frRCoiH{MqKcvb07%%`S~>F_ z_d`%&{``;=WyCiTf~{v50O+az5GcCTJQ4uFwRTpPF46R5IuWaRqg1AH;qm;yWneJ`UNLp?<*u?I;0|kvx=UVy2-S- z2Z*Y5qv7_U>|SnUWIzB5Lb&ucWNRSL_zr>SxZ{oKAKQ&=CQiNdCx5C`j5u_jG6Wv~ z{1EW<0Q7a^z1J_f~K6|24*W|MLXvzy%N%}#G3R&fkdAy}kke&>n%fs=U~sgeMH1OAQ&zIJg0 z0TFs`cn&jSR9^%)>}!1QIqp(%*@3jqd(floEC&L(+hQlTcio_v0B#QnxYDX_OWrB; zX#fD*jjh&`SjZgX?pV8q$ZBz^E!|vjd8E%d(@YP42@L&3lZ2g2m_C3_L<2sl4G^CAcVk@c=$^y}?+b^Fh33S!! zO(78GaU<*W(hgYxFOaq8R{V!nBLShzRJN(uFaG=p2e}4;n;P^`xs(y|I_*Ogv823 z#hr19;Rx}ix568X1^1&DWGKz6Z_4)Vq5S$yxECl6>A#j!_*~xG`6ky`>vMa+)QNuv0isdSCNm`mQ0smf9ACdR21o}KE1`IZrpEoIK8E~e%VmT`t~@+*UToiIwQ?t`pC)-4lqw!m%g zG^bhg_F}{rv&X`|_2y9)O7m1B->M}2rcg;nbAIwAeJ5(JW0Ylur~>cQo9^ZIvE64H zY?oeew?qoGX;ZHR=gRFt7wV|Xf8&K&#TljP&*s+w!v%O{Lp?(S3So`qgz<>E(?1Z3 zj&`rM{)kYvSkJhdb&O!d|DL0wLPg;Wg)RnH&!}vu-MG{Y)sOshX+^V$Rc!0^wU5E$ zc0Te>o2&JMHu3hWK(jb&)m{lVBM`swl3FHE{`9yR+2}0Ovu>UW9%}p=!ry+Q$&`y{ z)Wjsm+;LinwE zTh&N5yB^GO&D779v3t-|@)=Eh3Mc6zctbjJVO>|UbPrc*2>vAoJFh@%p!%2f&@@_& zBN~cy3PSBo_G9{C0m8FlY4eh7Qm@~IxtK4HiX)rltbStZ98ayRQd@0m8D-L!bKzN6 z%(3#;>rFueu7-2;m9|t3>id0^|BGq=f^l2UFDoVIV#%l-pXh)c8e>&`6i508j&-`n literal 0 HcmV?d00001 diff --git a/assets/public/9581acd31832465bdeaa5385b0e919a3.png b/assets/public/9581acd31832465bdeaa5385b0e919a3.png new file mode 100644 index 0000000000000000000000000000000000000000..1026155708062a7e6f6e813ef0baf86341ba1a92 GIT binary patch literal 1288 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F3${@^GvDChdfq`Y0 zr;B4q#hkaZeKTZIB^u`Emwhuoxh!eL(rH;6r^Q_f(q0sIYjToJ1;?yzITx4J3p~E8 z+9@KaFLyjCPdm}vI7Vl4S z1>2jo^^dhR>^XbSTRr;b^w403d1?RZ{p?RAGv;+|yH}cYU1ZA4rj3*LTFW=_$^8~7 z@-Ka3@ZjBR+3E9m`sU8;T5@H@2KR<)2Df_*les^pGXH$8_&XpwxR@_%JwL~3R?9og zueD6QdSw4APHy}d{NRm*-kJEO*0~SfZH;+e}Y?E|K18?lYKFE=fWiH&mP#XU0?X~ z=fgW6ekvX76MQhY`P7>agHOV-ZH~|WiN0nO{ZPk!jXBHx zz<>3P!5rOlnal*ld>y5Q!HMVCI@82r$t7j1;&Gc*cdY*T{@k(kP4R5?b`c5R>+*Du z@F*FxF5|c-nNi1n@8*wli5@BXht&Ar$xhfQeJA?hP0N@)SNfg*N?f_m7j~^>f?z_|gxQU691W(s7yIm&v5^etW3^9wd1NQkv1bQ% zZc<(+VlyXnp72gz-#CXVA+Ggo@9Q5O*w6BG`NChPUe&&8I#fX11Dy8F8MY8 zl+Kj-x%a2tVm>iixGh0lkPy71p*YCfF&saQ>>t4QuZ<64Io#qowVmIkt)f8457kmX4Z492S KelF{r5}E*t4?%bU literal 0 HcmV?d00001 diff --git a/assets/public/a8a4727cf2dc2939bd3c657fad4463fa.png b/assets/public/a8a4727cf2dc2939bd3c657fad4463fa.png new file mode 100644 index 0000000000000000000000000000000000000000..35f16cc6d26ae9f33f72de9ec16cd5c44afc8fde GIT binary patch literal 1355 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F3${@^GvDChdfq~_( zr;B4q#hkZuVtrQICj3lux``N9s{Lwf~D`8V$YuF6?Z8&*6%T#IP=Hk zmvbY_jC&92s97l%M(&9e%kMGzpL9no*`#oiuGUSVLpQj3B9Cpz>DjjU=YnqV`y zJ68m$Yy@5T|9~YHi1?xwGN> z&2y)7{I>84Ju+4+I`&iJfymo8OOv*~oYkhxQla^PCAXsBsc3nRSeB-jP5qItsmV4w zEF7id(*L|Vcj6I4smbH>*6Sq9+b1nsQ7wgPBeX(J_*PhPjiOr$svVNHeyK}7YlR9wqSbM~VrT&`>S{N2LPwSO@ zryeK%cpFsUvYT33q=JXZ$C&9MqLEjZ&$MtlAland_qR_o>CgZD&-{b(D#7Oe?J;!E zaos3yFsmZgUGVLiXtT6FiN8H-SJ-bZY-yP7VsWV8UZJ|=b91N8=hJWaG&Y{SBiOdn zQ|0}?H3tNl7^);w&VDcgHiitOL=Lg%rU4hY?tP{$=tAk!9H)^ zvPtPTPvo7t=~Wo_(Y)h>wsDQ;1jeSw)pI`IdB$#)v0S7HJ@g*N{=ICoCr-!}_REz|anX4&H= z{Mt7v=kr1a@%Ed$mi&!gR&;D?;EB~HQB%XXwsCCutUK3F{OXh?b0@_mmEGL&*X(J| z&IX}7IVU&oGoS1fvt{YsNvxaZEK}RuJ4yA?ngd0Qa_n=;mi*tl@?!6F*`25R&q=w1 z^Zdp?26|3&_;;q2np;ZxN0%(`kUFI~spNT%XqBpFkDnv?B?69O<;?zVVw|h~^L$7L PmW~Xbu6{1-oD!M<&X7#R literal 0 HcmV?d00001 diff --git a/assets/public/fac7e78de9753d4a37083bba74c1d9ef.png b/assets/public/fac7e78de9753d4a37083bba74c1d9ef.png new file mode 100644 index 0000000000000000000000000000000000000000..78b66c7ef33f70e4c50a12fa66688d7dbaf29161 GIT binary patch literal 1318 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F3${@^GvDChdfq~_Q zr;B4q#hkZuynSLqB^vfKwjFn<)M(`r;WnFMvhvdPMWu==Yb6R7F7t{#aY#b=;t}^% z*2%k8x@AiV%TLJYkxusMxp?hHThs*!5p5@4HPdN93zzDu25FpUdh}?CWZDe%GkgDg z{@8zYZ~C+O|DV^~F@8R;`oQ7a+}s*TDxTsSZUr(PTEUPQ(qN$FAR(&I!zJLx%CVTK zg>2y&A}^T^1h^;VvsP&H|NZq+`$LiTpAyXtwb6eO zqo0TV*rHw(Q`L1cFnHIZAmJ`irl83WA4h#S7I}7})DGp#_5b3+zewayIyrTgOuXLm z4NeCp&t9mb{?B5*IG>JGm(_Zw`x#$$Y?7ILnQe{0hDn8%7Tans{G8Kygp2Vu*L3;l zS-d|b|9#%?KIi;Qk2L}T54>akyy&sE6mAt|N_xAcpvUKTf34xYn`=zc7j1BISaaA- z<5=FI3rqg*(Krn;<@h;$`)?KUXY_vse~xuM_uNM%j3dL2S$Om5?%L<({|f`fLPTBq zXU;IS%ss%x7_Rmpq54nZ{4WRAPyhSeKfh7M|I3c%w`$9IBNQ1Pe8|k`dc6J9@45_| zm-hM}4tiTJI&M1GaA(dzDMoIGWNw>sqk=HuGhbw6UNx}qH#xq2$94%Lr85m~%g&~o zZ<`Ub?ZL*6`?oJMoI`Js17H)cr3|9N2X$A%+*e)HnJ z57RAknJ;{r@n5ep2Og-$rHLatt>0@NYSN0zps$XVbeZ6q2 zUCEsfA~vOWVm$L6y_)`Eb7;Yrz~@%-3a7c{-!y*zKI5)%ccyfM{y#3+>GK)y+c4?p zm9N_tutV*^N8e@1NfFxK9KE3*e!W}zHowHB&pL?t>(ss}B0}LTB0m=VtTQ)a{d7z3 zhSV0DyS6O#G2JrP_lRHH_2tARQAYh7^VimSlb>+biq>2gx71VTop=A0kMF@9N(<^H zOGi2dhx5(6cVOGQg)a(!$4a%yh);Ogy1QuZIiYz|RBlX?zae(o?`7AXrH|$uC}jMY zXI|3u;P0}@#S8C?_egJzzF@mr8l0t%eLT8jW@W|q^5vUdo+VvSK9fCp<5d&m_dd4W o7u_cvdLf`fdA>(0JpS+p?BMd78oTE=u;63xboFyt=akR{057sp?EnA( literal 0 HcmV?d00001 diff --git a/src/cdn/routes/embed.ts b/src/cdn/routes/embed.ts index fd13d215..90ec25a9 100644 --- a/src/cdn/routes/embed.ts +++ b/src/cdn/routes/embed.ts @@ -31,6 +31,17 @@ const defaultAvatarHashMap = new Map([ ["5", "4c1b599b1ef5b9f1874fdb9933f3e03b"], ]); +const defaultGroupDMAvatarHashMap = new Map([ + ["0", "3b70bb66089c60f8be5e214bf8574c9d"], + ["1", "9581acd31832465bdeaa5385b0e919a3"], + ["2", "a8a4727cf2dc2939bd3c657fad4463fa"], + ["3", "2e46fe14586f8e95471c0917f56726b5"], + ["4", "fac7e78de9753d4a37083bba74c1d9ef"], + ["5", "4ab900144b0865430dc9be825c838faa"], + ["6", "1276374a404452756f3c9cc2601508a5"], + ["7", "904bf9f1b61f53ef4a3b7a893afeabe3"], +]); + const router = Router(); async function getFile(path: string) { @@ -64,4 +75,21 @@ router.get("/avatars/:id", async (req: Request, res: Response) => { return res.send(file); }); +router.get("/group-avatars/:id", async (req: Request, res: Response) => { + let { id } = req.params; + id = id.split(".")[0]; // remove .file extension + const hash = defaultGroupDMAvatarHashMap.get(id); + if (!hash) throw new HTTPError("not found", 404); + const path = join(process.cwd(), "assets", "public", `${hash}.png`); + + const file = await getFile(path); + if (!file) throw new HTTPError("not found", 404); + const type = await FileType.fromBuffer(file); + + res.set("Content-Type", type?.mime); + res.set("Cache-Control", "public, max-age=31536000"); + + return res.send(file); +}); + export default router; From a308331e341126676cefbc4785a9ea936c1b8834 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 21:53:56 +0000 Subject: [PATCH 3/5] Bump sqlite3 from 5.1.4 to 5.1.5 Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.1.4 to 5.1.5. - [Release notes](https://github.com/TryGhost/node-sqlite3/releases) - [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.1.4...v5.1.5) --- updated-dependencies: - dependency-name: sqlite3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 15 ++++++++------- package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 10eece39..8927001f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,6 +46,7 @@ "probe-image-size": "^7.2.3", "proxy-agent": "^5.0.0", "reflect-metadata": "^0.1.13", + "sqlite3": "^5.1.5", "ts-node": "^10.9.1", "tslib": "^2.4.1", "typeorm": "^0.3.10", @@ -84,7 +85,7 @@ "nodemailer-mailgun-transport": "^2.1.5", "nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport", "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport", - "sqlite3": "^5.1.4" + "sqlite3": "^5.1.5" } }, "node_modules/@acuminous/bitsyntax": { @@ -7077,9 +7078,9 @@ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "node_modules/sqlite3": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz", - "integrity": "sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.5.tgz", + "integrity": "sha512-7sP16i4wI+yKnGOO2q2ijze7EjQ9US+Vw7DYYwxfFtqNZDGgBcEw0oeDaDvUTq66uJOzVd/z6MkIg+c9erSJKg==", "hasInstallScript": true, "optional": true, "dependencies": { @@ -13560,9 +13561,9 @@ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "sqlite3": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz", - "integrity": "sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.5.tgz", + "integrity": "sha512-7sP16i4wI+yKnGOO2q2ijze7EjQ9US+Vw7DYYwxfFtqNZDGgBcEw0oeDaDvUTq66uJOzVd/z6MkIg+c9erSJKg==", "optional": true, "requires": { "@mapbox/node-pre-gyp": "^1.0.0", diff --git a/package.json b/package.json index 85039e60..99a0f2d3 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,6 @@ "nodemailer-mailgun-transport": "^2.1.5", "nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport", "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport", - "sqlite3": "^5.1.4" + "sqlite3": "^5.1.5" } } From 2332d831014579edb63d53b2511fe00c883b298b Mon Sep 17 00:00:00 2001 From: Xanderplayz18 <98059420+Xanderplayz18@users.noreply.github.com> Date: Thu, 16 Mar 2023 13:55:31 -0400 Subject: [PATCH 4/5] Fix grammar --- env-vars.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env-vars.md b/env-vars.md index 42e8a027..9f87771a 100644 --- a/env-vars.md +++ b/env-vars.md @@ -9,7 +9,7 @@ | WS_LOGEVENTS | boolean | If set, log websocket events from gateway | | CDN | string | Lowest priority value for public CDN annoucements | | GATEWAY | string | Lowest priority value for public gateway annoucements | -| STORAGE_LOCATION | string | CDN storage location. File path or S3 bucktet | +| STORAGE_LOCATION | string | CDN storage location. File path or S3 bucket | | STORAGE_PROVIDER | "s3" or "file" | CDN storage provider | | STORAGE_BUCKET | string | S3 bucket name | | STORAGE_REGION | string | S3 storage region | From 5bbe0fc25c5295ffddfcfcc38a119e86cbb14892 Mon Sep 17 00:00:00 2001 From: "Samuel (Flam3rboy)" Date: Fri, 17 Mar 2023 14:41:29 +0100 Subject: [PATCH 5/5] Delete env-vars.md --- env-vars.md | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 env-vars.md diff --git a/env-vars.md b/env-vars.md deleted file mode 100644 index 9f87771a..00000000 --- a/env-vars.md +++ /dev/null @@ -1,15 +0,0 @@ -# Fosscord env vars: - -| Name | Value | Description | -| ---------------- | -------------- | --------------------------------------------------------------- | -| THREADS | number | Number of threads to run Fosscord on when using bundle. | -| PORT | number | Port to listen on | -| DATABASE | string | Database connection string. Defaults to SQlite3 at project root | -| CONFIG_PATH | string | File path for JSON config, if not using `config` db table | -| WS_LOGEVENTS | boolean | If set, log websocket events from gateway | -| CDN | string | Lowest priority value for public CDN annoucements | -| GATEWAY | string | Lowest priority value for public gateway annoucements | -| STORAGE_LOCATION | string | CDN storage location. File path or S3 bucket | -| STORAGE_PROVIDER | "s3" or "file" | CDN storage provider | -| STORAGE_BUCKET | string | S3 bucket name | -| STORAGE_REGION | string | S3 storage region |