From 1de0dbe50942803c00eff92dd695694db4a771f3 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:36:25 +0100 Subject: [PATCH 01/28] build: update dependencies --- package-lock.json | Bin 524405 -> 520418 bytes package.json | 19 +++++++++---------- src/api/middlewares/Translation.ts | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8927001f2df6072364d354786fe4a8d69ffa7112..a19a12cd480b7f0e80d1d619bbe92820f538f589 100644 GIT binary patch delta 55114 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¬#N?L; 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

k?89zZ-@x8>@Le#zVpz3|IfcH*PF5Ae z?UEWf6md*p)k+noyOi!~q1n!92xR5M8JodcGd|5o{vw~ZDYr%hP%kadyHK;&bvUoT z%;!PaaL@YNd=tVQe!%|?pSEGo`lJwNo^kfIC-L!%*KZLH1>ASiyY8PSQ=fQ5aED zvqBJVb-XM$>&>()4CNNZ`RqWk$Z)l^HL}4BjEOhF)%F4zi!453oI_dq_|IH*ATK~r zzNK)SS%0Z}Z7fEwl9T+acnGBH*!r||n8yNw7I-%AQ6-qKw#gN03>P9@Ev_^H)yo;l zma+tHTK>G@RK_-37i@&IhCY(9g$7m<=Znxc(8(g~$>gN98qsyyt6LjE`4(0~zI&gR zO*Z|^!^hTNmv1>R7r8m(bNGT^t}^=6k;jFR*UwE$(!k9y4HQi`f)3U-CIfA@aF*F| zqsI@+Y_A?v#zB9PUWa=`iPi=Hb&IgF6yE@KeBQ?3-K1mk3OeD+R3~PK#F4 z4e=%HF=ZCfnze<@_`{&vn^YyfjaubSO|K(%snnVb!}gpR2Pb0PCs%nrh^* zChAMf!AwUF{Y>h@Wj1Z&1ORm}&43eVKYZt_Sy(@ysfgujp*u`lVMQ-us;#6eB3bAO zo(b~{u7(Vkt#01(#MQ!RWpcb$gn$(m>+OmebZ9C=Im<9zVT!89%enk0r)aKIG}hBc zu$Yv~XgI#U?@b3bKc2?O{pnQZfQV+7vYX>(c~viPt+CO}wGCc!Yf#UW^|_WS&0Gl3 zk|r@Q$Nk=bTx5G_+UTY$`W$U8?7TS>Lvewl0%2kKa@c^#rZfU`i0ys-hu(Pd+cD-t zZ#=fXrGGhL>v-lq^u{Zr2Y>dGPh#^3aB9z?{W%%5^0=3}WFFVS?EA;+TrHSJYu z*wSNCH=q_)CKlaFj>-l#r(;ye&{Ub~T-1;nTJc)}E=*_3uHq=oVW`X)D4cU3J1rEz z7kJaUXA&we6l>)|t1}bXMW?ew`Zd208-wW0A5ZPUSHyw{771I@q z{8i@3^)DF*PH1Dat}+izr#fs2HLHsA15#mozFC>fson||ah{^lM!D(NJIr_vS)@SE z#975o>+=Olq(_JjjTVEf(pq9ZvKkJO^tzVS!z7=6s@ZMBPDa6?r@$mV>;;uwA%aEOnVtlU!Mie0H%Y1>w>ZGqX&gQYlre zdAH}w`TATR=4ydVXAS*wZp6a!H`bjAc!R#JUH{58J-Gv%Zrq*7Xe(?=jWUDQ(1**C z&6J@jJn1wfJnI#aJX=9?qfV>c&FDqbz`N+uTYAAjQM>IR>@BRIJL_<2bK<2fB}C}* z)Gg9FkmDGIRMulVb_^RU{FrxT#QZ|)^nnyqTE?)!wdR9qILZYxb%f+{yqp~lhvXpB zTgeT4I3~m_(PeB6&XOvZDUG{)JD<z z4E#MuW85uz%P(FM*vGtUz%}@Q(jwBCVqLVCH;005PSqweF&)wwRbkg*(gi(OQiZ(E z(uZ5+Y zR_k`X;=Csz6U{=+bf-VGCk@e9l1;Il>kHLVNz;9-Ge88s-On~A#ly>&1%=7zIk$lJ5w*hWnT$|rH)n%^vCz;7DPR;wv~u*EQHOx}-=3clz;3UNn!k3K zfvth`#TQRUyT6vYeUH7j3B^L&FBJ3nLRMrjpRQRbZRl&c7l^O6chr5L{Powa zA6$V%HV#u`2=~Co$MX2-r#H@cPqDw}I}U_kq;$sJ&L~$BnPqd>U5=^Tth^A$s@z>P z%mrX4h(Zl^&Rckmk_RhNDB*?M323Y!VhSfl7^&|Bt}KKOuiY^(D`&Gipx=UKJ!?b)N5nU6+}D023fDRqB9c$ zQvy~kTq=g3@`k}(vfrq=Y!MuHo!zn zr*eJEBP{;%_-RvdSpWVzK@eWp7u`#UOl%zX$_2{1eio1v*QJ1GJhNuL_f~Ma=NW4X zzt9!~R8TNVWh8uSo<)ad|J@%rkZ1S@&#a%hFSTaA@1}!UY_$pkGE5xar*48$o0+%U z#WAl31tC}sn$-aAq5ZOD*zKU^P0M-1(F@M@!&ABcF})Abrp6gvB%#(~jV0^Ik=`rrT1r6lWz zp*;Zuy(h~mTA&up!gaJk4%WeN617|)vO9oO8YWP*%kx!ciST?wo3^tlu zx{ztsbK`0@Q?HNPL?cb*YrYpU^TSv$j0^>7|4WVY>7S*Xg$&cq! z<}#uAR>;(MecNus$LFXq<=ua?BHR&?>CIbNTz62WII{P zuW5CuUgnXF`AZD_~q-+SlTi2hOvWG)3zaVbPU{-x9#;$u*45eD|E+ht*> z<#cIL#t69F%?y|cyd;ozJ|{uE+w9L9t1dGRkct%MJlxHoRG2Ln7UIflmit^y&*BnU zucG7jxHOrg2oWLgO5VA4ne_UXf8zejzI)x^uUq3Ex`aOFkPfTqvmzIC!mxu@dxZ|T zl(t*L`ed9}TIfi!s!dDDm58OR)AleusQ6_#=+wd?!sy%*o-Qg2jAFxp?hHv)2XWXGQ-%X(kS80Z9Nwc>Zs4_;F@oV0Qe2Fy<2fiF0?RQT zk4ddxS#>KVpd%eu)N->~)?*67R0ZM?FmpxsE0dAwN*k-OABrDf!iTWup=-HZIAYYp zdGgqr`S9`Rj;~xwY-6AgkQ?8Kxws*j1^ClkFNAgz1ual{DFeXSnUWz^cxX$Vyxi6^ zvr=PF_vaO#Y~|)5)C`oi=P%qUUdPDL&f=tsudsb!-0E-#@WTJx-feh+pn*tP&drC z`r|C#p2JH}mhVUm*(DhsbPXw!YPZde+sjGQZ_+wh4CTdSY7`lbos!k@G%Yqp-7t(j z!(NKXyl*eXJYX^4;a~mqiReRr0r%4IzBv$5km@L=mBA3b$2uk-|%SFfwJvlGS6FWvUi zD~@`WwwU_uPC=$rGRuwZ8b(bxRfD-|yXXdJmUNnxmR=>)c1TQs8kDSAkC+B^_-PvRb~}*T`93pA$?MWA}r*xZUt}K*F);nGm$m zzGrKDzu)kHjLnVI`lHX@yvLXe{K~{&4IActh-P&x!_Ve(UWZ4O3bmsBGS2mIBA?R{ z6!>5VEvZVjN>LK2!GhcmRGlTA2@Z|giY8Y=A*7ulJ+z{iUza$)e*RPX`ow3ij^6mo z+piUf6Q4aAef8_9*8v)$r=H)sAW(2mG=f$INT^t2v{E&LX*RJa6?#^>nd8~nr0)US z&15E4r!X1LyL_3Q_S>bUgw#E_-RYNeBqX<4F+Zw91 z@z`JZox}x!=cY@q!ih5>lbsLKifz%Qdew1CmD-ZVYnn;qr!Xu*g*xN0AqF>rt}fCpl%do?@V0F@uyUj1WKXJuDdbFph(bNAag@Z=9^Xuj>gIxQUPDdyI{^_*UAylDM6;vg{ifGK(Mkvh)WpnVGb&#Z7ZZ%Ey7M+Y?#<-!ycep?5wWC7 zYDMf?3%?=xoY@wU6|XYvqEMq71C;HtL(9!%jrJyA*{^2A+WqCHPDJ+}Po7GFs^=b# zzo7xu=I4E6!69xZXa?}a@d1ur@amZf6tvtth_Ys+&tRdGZ86y*=LTT| z)}1lvYLReWRYUH7Ig{HE4(fdK#9jMhx@3d;Jr?cKhX${NO*O?u^f4!(z-8 zq==@Oe4|k*lbzwB=Wz{wF|$G1I`bvI#@eNhJF1J8Hd$IZyM>k0tT*hN6~g!W0k^`H znN%hD)o3uP5YtxLuNtL&N&ddeoLlthKc@}>tx_RJu=cW-9dZj$dS}N2(Vs5L3;^}~ z4whahxoSsiv>jE1%6(pDBFI)#sqf^ojFkDRm_(KLU>@rNP>h!$F)g_6Aa22t-^bk^YV=Aik zVigfw#kX8}4lMsfgbmGeOV#-x&!<=A;ShGT$tc}2@xU_HkAH5@<^SG0Z;OYG(x=|ziiNhP3R^sOwcMG@(MM8%Tuu{G$&M^ngu#D@|UZ!xf{=0roNf?^6N> zO>qVJP3>Dydu08k-#iQp$YQx?)Q9Do(^CnGZ_XLpBq$JUzy<+ZtLfAZC-S^NqE)9z z$fHInUtTl{l+9oWvse}^otUS?1-0taQ=S?0dp_Ogx_iWaayxqEZF}uD`%%GV6~I`1 z+}}RGU;f%t8~3-bijF6?uRG8iK@+gicKW1Nu4?T9xmZd|)~82EXd9&! z47+SU$ND*`)2;{|));egy2r803P3@iK{1oZMAxdjMu=r&*yY{pum8^Fg+DNjJL^|| z=T!7?a{DlEWk#j?93ACmOoLGuXgyz{^s2EMSeV-~s4S%io-(5esmG2Ri;nH|Rz6uo zf;7SQd-Z`Yx9gT`5^2!4QdTSQd}O-|eIJ|MU_P}!N4K^&u}YlX z0s^kODQ*gf?uX{SVcj1;vFQ@OKeoqvX3%U(c)qAE;ILa7RD&SbUueoO#Hy0HN)P-F zUT1_nD3MmsF4H9ub>-9tbaAZWK3}(+8AQktoK1Gel#EQJCD9*pdWGBgfp|5=Ws%<3 zK6eOm#*ugI)ydBv0z^}ZrMbYKV`F^E8ly(fsdwpdscpjP-k2m!Xy8$UK4&kfoNeS< zY7I}P)meeglzFqR29sb|h4MV*mQBzil$jBERdPV1KB&VTfJ2w%M<03d!oFT@QlqUe z+_I-pw+S9MC?QMGMrU>_cAK3o@+)2()!F$dU#=Lcr_Ze7lyuxIpREE0WNK`YAGz#w z*mh~5Rh3j%={6@7NJ8kwq$TA8im;=j>jTMC9l$HiLO_H=#}A_%`Dvzdk9qOlov2) zu)$T!^ylMF6H&%tI^9Ef6U@N5^$macj`fRwcIEEb)7w`ho?CqJ8;SMHFW(X|FD5hV z7r%UDjeq6Z=qt&@?P9Ozkp)rlY1xE(@3X5X4JJ zx&qWX*I5ZUN)0gGE5n@(+%vRk19p0aI@&Wa#i668KD`A;Pp5Zw*5CL_Hj#Y}`Re<& zqOZI)@ly2f-jh5Tz4-dX>(+nv@`?2`e|a)`>u)8$8h!lJTenB6kM3L_*P!HO@#(?~)opuC0XcmufJdLKlp#YVO|aqN1K%kwZy>zPrW!R^LWTiMlaO^wd~ zr^JoVwZHbpGtsYO33&a*f4M9AjhB<>#9YnwX{k&DRUrkjX@k~_@{E(kHq@i}Vcnjg zV=quAD3#|cm4G9c%CZVt%37t-w8d}*vawubXm4ILsz`s-f|pv(%+=zVirzBay8aiR zN&E}wfyUQ~uOQLai`z${`(D2d7VqHE+yC&$1!1|c=L;K}ctu^E54#RggEH>4T=&Ew ziTP>Ln9&WowuDCoLCs{EQ*Sb*%LLm2&ero#x9csT#atw+g9%RbMY4fsPzQ{CK6>nE z;&ckdFCr0hCUMi=(aU2{V}AZrqP=_fu|zuYDyrUhJaOxWDg&e#RzQ0OmGphkc%tn&1(CVu1*IJAV`n`mVnV-;N8WHHCB+uOD zw9)e`rEg2sn;+PIDEj=V#6!FPboFbgdiZ1_=GFRzljlV{U+lY$sSFl!GH$a~Q!#A9 zAgo=QwHl2jl7>ulHltO$x$IY*0*h8^8lQ{4@P_0a(M#7Q9*T!K z6z@r88+6p|i#Gr+S1i*8z|QY!~TbzD^JQo1$G4MWk$VWFlLRZhy-lCug0Q&ya3r6|&{Uuu~@}R-0hmfZMZ!@B@h>SM;s9);GLC^enr5Uj*NmIJ0}hg+wtC zea8nAw`^e-Gtqhb2o%8&C63&9@GNlN2Zz9IgJ`T86F2~9s_Qta^e$=xex^DKq*Hq)Hzp}^I>0DBe^=tvp7E6y@HpG=)!JklSJL@@ zg&LsDlw@afqu45?i@1^<+N?L`x+`zowEDRwsdPZI?r1uLv$IYYYIm(Z6G{O$l&pG> z(!IG(M_+hP5{_bSMQ^z~K_tL3#=8^mjSy)&7mxp)Yxa-NiRFMEN$FN`CM;>XN|pq_ zQEj={)F7LUyZ}mk4w_kYDs(}y1O%*q%Cnh36-YQ(26mnWZj4qtl}398(_5OmWm$26MLev zdj?K?EfM>wT=dHiZ=Z=ye?9?Rqd}>9XId-CMA#y1g3MI2pg(U?25k``OlqZ$-LgWt zmem~`myJq+cZ`w-)>EU}YQF577C@-dOj$qUv8iPz#5q(=Hgh(9)NnK*r+0y-VEgD3vz;rW$FRipyGQZFe@H}c`-vk* zqJMdO`|d+RFGM>Z+BzrpmK|T~vS9JSSm&5fsg0NTpwjn<;@IKje8#PV7C&2*>h7vf z=q_8zh<4fHFu|S-Mw)L4I9~9@Mh!HIb)7=s4Fz{*M9N!^TvDp&Lph*XfA{)C@ksO` zIk`83(J_1beDsY^0uokO5LR>Z5pdFGaSl36;AXiw1L>t&4rJ7?60>5Ktka-Twmt^U z#67*^DCw+TX!g?87A#XUgdF}G9bvYMHCJh49bL4t z?6~ZUL~dlJWmF^B#jw{lz=HHhVdEv!pf0`pOXbAJlF97G+UBB1I*H@aLpAWfU#umr z0hc$1cgDdrQznVI7ml8d{`#)u^-)ky+KT~F7zAkc|0%#-9)6uiy7Et{MK;#a1e)_7Ici6=Z(-UvmzCRxN3n#bk zikOEJ9|h{V6Fu1iRJ}xk|D9zwq7eJzjf9+v9`d($A~*yA!oGyCoo-E_jwimP@YqMs>s}wVBBS6OK`C>N4i5V``8o4nG z+k>L2y_&hVA9C|Dx!8T2OZ@z+*m*j7pO83uK-Z{}9~ATXAeiS%VM)z3iIp)P>RebN zgqfck$gI0mgb>9HT58+wMwG_vkq-~`qT^3CSoC_0z~;uZ9a|8-=CD$ zCtli#9=bPqDtc5*{B+E|1NLAWUS0{pZ==5`XI44GvYk#Kma3KExDAhCrMeK+EaCe; zJSciv#Y@{>ksNhb<2IgQDxJ>U&_Ms*R2@>ePO*s%#;YdY6FVlT@NbO8Ms2=n3J+xL z?CvMJiJyBFQ;tU;k`nuqb%7rtI0#KZ2M|FAftI zqM!WZbDsJ$dE}G_i$6pL%xtis+>$kEEh+eE;^DZ4ey*1N-?= zVibMJ`>z}U((>V7jWLFfL56v%sR^sB)3V1Z)ks?%p2{s; zqpJ0C&>-XRBo2DN@?yZCj;)Ty>4i`$A=ykYubL#E8EC?A+;n=qaMGKG6Qe!=DC@c1 zFNKNo+tEw!O{CUu_mS=bvxQs)(Jz*|AUYW5ggL)e%kmUdZI6j!E61%&LmA6F z3To9-)l+HTZ%q4x0bc5Qb}_BjR#+bJp6SCmcTuV>ENlp(-7G$6SThTNB0}^mkvf0E z^?-Kh_nRBtcqiapWtVV?-c4Y#8<$ut1wsSXNuV=+QYK~Q`E+CImXuI@>bpq3-h zzEjq)rrKhsay8?4rYGw)A0$s>k6Fzn$hg5Q}$WA0?4hdMjk z(bs!BzZ^aPzQonLAX~~5K|rI(N0==XWKA!aTj#|}f8^lJtXc1qMSvs*M&1Ec5>E!m zpe(f1nQZ24t{IAx@rbHUae}P-E~JOK5i8H-2?N=gP%d;zV&BcKR?wt}gXO?X#Qyr$ z`RHrW*2UfL`{Ts&is;-3BxpbU#l#iS+5dI>`smId-8lyULMBtGFf-gQ6^a5vrCZ|E zUxLnrS#~l;Wv7o9=x&cDO|m;IObn|EnOSFM+bq>95v6Kr4Ec+C4e~{`FlmbogDH)e zUQ~QMd3W^Kml9`puY5VdpN^a

ml1&{Xt+PXn=Bq05Hc^ClWOSV#>Q5(5ld*3GGd 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 b>fYDM=kZ4I-k6Ny?3bYLw(o87F2R2R3FJ(4 diff --git a/package.json b/package.json index 99a0f2d3a..5578849a6 100644 --- a/package.json +++ b/package.json @@ -38,14 +38,13 @@ }, "homepage": "https://fosscord.com", "devDependencies": { - "@types/amqplib": "^0.8.2", + "@types/amqplib": "^0.10.1", "@types/bcrypt": "^5.0.0", "@types/body-parser": "^1.19.2", "@types/cookie-parser": "^1.4.3", "@types/express": "^4.17.15", - "@types/i18next-node-fs-backend": "^2.1.1", "@types/json-bigint": "^1.0.1", - "@types/jsonwebtoken": "^8.5.9", + "@types/jsonwebtoken": "^9.0.1", "@types/morgan": "^1.9.3", "@types/multer": "^1.4.7", "@types/node": "^18.7.20", @@ -62,7 +61,7 @@ "husky": "^8.0.0", "prettier": "^2.7.1", "pretty-quick": "^3.1.3", - "typescript": "^4.9.4" + "typescript": "^5.0.2" }, "dependencies": { "@aws-sdk/client-s3": "^3.178.0", @@ -80,21 +79,21 @@ "exif-be-gone": "^1.3.1", "fast-zlib": "^2.0.1", "fido2-lib": "^3.3.5", - "file-type": "16.5", + "file-type": "16.5.4", "form-data": "^4.0.0", - "i18next": "^21.9.2", + "i18next": "^22.4.12", + "i18next-fs-backend": "^2.1.1", "i18next-http-middleware": "^3.2.1", - "i18next-node-fs-backend": "^2.1.3", "image-size": "^1.0.2", "json-bigint": "^1.0.0", - "jsonwebtoken": "^8.5.1", + "jsonwebtoken": "^9.0.0", "lambert-server": "^1.2.12", "missing-native-js-functions": "^1.2.18", "module-alias": "^2.2.2", "morgan": "^1.10.0", "multer": "^1.4.5-lts.1", "node-2fa": "^2.0.3", - "node-fetch": "^2.6.7", + "node-fetch": "^2.6.9", "node-os-utils": "^1.3.7", "nodemailer": "^6.9.0", "picocolors": "^1.0.0", @@ -118,6 +117,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.5" + "sqlite3": "^5.1.6" } } diff --git a/src/api/middlewares/Translation.ts b/src/api/middlewares/Translation.ts index 928d29ff2..999d42a31 100644 --- a/src/api/middlewares/Translation.ts +++ b/src/api/middlewares/Translation.ts @@ -20,7 +20,7 @@ import fs from "fs"; import path from "path"; import i18next from "i18next"; import i18nextMiddleware from "i18next-http-middleware"; -import i18nextBackend from "i18next-node-fs-backend"; +import i18nextBackend from "i18next-fs-backend"; import { Router } from "express"; const ASSET_FOLDER_PATH = path.join(__dirname, "..", "..", "..", "assets"); From 5b6b97e86c77b7ce0df1da7eb1c75b7989b028a1 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 16:36:44 +0100 Subject: [PATCH 02/28] fix: types when using yarn --- .gitignore | 4 ++++ src/util/schemas/Validator.ts | 2 +- src/util/util/index.ts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bc780d640..9ac5d9443 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,10 @@ assets/cache .env config.json assets/cacheMisses +assets/client_test +scripts/client.js +src/api/middlewares/TestClient.ts +yarn.lock .vscode/settings.json diff --git a/src/util/schemas/Validator.ts b/src/util/schemas/Validator.ts index 3190dd056..7ddd9b72a 100644 --- a/src/util/schemas/Validator.ts +++ b/src/util/schemas/Validator.ts @@ -43,7 +43,7 @@ export const ajv = new Ajv({ allowUnionTypes: true, }); -addFormats(ajv); +addFormats(ajv as never); export function validateSchema(schema: string, data: G): G { const valid = ajv.validate(schema, normalizeBody(data)); diff --git a/src/util/util/index.ts b/src/util/util/index.ts index 93656ecb8..fa9dd3269 100644 --- a/src/util/util/index.ts +++ b/src/util/util/index.ts @@ -24,7 +24,7 @@ export * from "./cdn"; export * from "./Config"; export * from "./Constants"; export * from "./Database"; -export * from "./email"; +export * from "./email/index"; export * from "./Event"; export * from "./FieldError"; export * from "./Intents"; From 810f5dd84cab8249f90276ce3acde5ffe6938c8d Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 17:47:43 +0100 Subject: [PATCH 03/28] perf: cache jwt secret as key --- src/api/Server.ts | 8 ++++++-- src/api/middlewares/Authentication.ts | 17 +++++++++++++---- src/util/util/Token.ts | 3 ++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/api/Server.ts b/src/api/Server.ts index 49229494a..ced82dcee 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -32,7 +32,7 @@ import "missing-native-js-functions"; import morgan from "morgan"; import path from "path"; import { red } from "picocolors"; -import { Authentication, CORS } from "./middlewares/"; +import { CORS, initAuthentication } from "./middlewares/"; import { BodyParser } from "./middlewares/BodyParser"; import { ErrorHandler } from "./middlewares/ErrorHandler"; import { initRateLimits } from "./middlewares/RateLimit"; @@ -97,7 +97,7 @@ export class FosscordServer extends Server { // @ts-ignore this.app = api; - api.use(Authentication); + initAuthentication(api); await initRateLimits(api); await initTranslation(api); @@ -126,6 +126,10 @@ export class FosscordServer extends Server { app.use("/api/v9", api); app.use("/api", api); // allow unversioned requests + try { + require("./middlewares/TestClient").default(this.app); + // eslint-disable-next-line no-empty + } catch (error) {} this.app.use(ErrorHandler); Sentry.errorHandler(this.app); diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index 771f0de88..e6e2f59a6 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -18,8 +18,9 @@ import { checkToken, Config, Rights } from "@fosscord/util"; import * as Sentry from "@sentry/node"; -import { NextFunction, Request, Response } from "express"; +import { NextFunction, Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; +import { createSecretKey, KeyObject } from "crypto"; export const NO_AUTHORIZATION_ROUTES = [ // Authentication routes @@ -69,6 +70,16 @@ declare global { } } +let jwtPublicKey: KeyObject; + +// Initialize the jwt secret as a key object so it does not need to be regenerated for each request. +export function initAuthentication(api: Router) { + jwtPublicKey = createSecretKey( + Buffer.from(Config.get().security.jwtSecret), + ); + api.use(Authentication); +} + export async function Authentication( req: Request, res: Response, @@ -90,11 +101,9 @@ export async function Authentication( Sentry.setUser({ id: req.user_id }); try { - const { jwtSecret } = Config.get().security; - const { decoded, user } = await checkToken( req.headers.authorization, - jwtSecret, + jwtPublicKey, ); req.token = decoded; diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts index ffc442aa1..67e4b8794 100644 --- a/src/util/util/Token.ts +++ b/src/util/util/Token.ts @@ -19,6 +19,7 @@ import jwt, { VerifyOptions } from "jsonwebtoken"; import { Config } from "./Config"; import { User } from "../entities"; +import { KeyObject } from "crypto"; export const JWTOptions: VerifyOptions = { algorithms: ["HS256"] }; @@ -62,7 +63,7 @@ async function checkEmailToken( export function checkToken( token: string, - jwtSecret: string, + jwtSecret: string | KeyObject, isEmailVerification = false, ): Promise { return new Promise((res, rej) => { From d086c053bbfb50a24403a270ce8d45f04ef000b7 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 17:49:12 +0100 Subject: [PATCH 04/28] perf: custom i18next middleware that only initializes when needed --- package.json | 1 - src/api/middlewares/Translation.ts | 56 ++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 5578849a6..03cc7981e 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,6 @@ "form-data": "^4.0.0", "i18next": "^22.4.12", "i18next-fs-backend": "^2.1.1", - "i18next-http-middleware": "^3.2.1", "image-size": "^1.0.2", "json-bigint": "^1.0.0", "jsonwebtoken": "^9.0.0", diff --git a/src/api/middlewares/Translation.ts b/src/api/middlewares/Translation.ts index 999d42a31..bf6ea0340 100644 --- a/src/api/middlewares/Translation.ts +++ b/src/api/middlewares/Translation.ts @@ -18,11 +18,20 @@ import fs from "fs"; import path from "path"; -import i18next from "i18next"; -import i18nextMiddleware from "i18next-http-middleware"; +import i18next, { TFunction } from "i18next"; import i18nextBackend from "i18next-fs-backend"; import { Router } from "express"; +declare global { + // eslint-disable-next-line @typescript-eslint/no-namespace + namespace Express { + interface Request { + t: TFunction; + language?: string; + } + } +} + const ASSET_FOLDER_PATH = path.join(__dirname, "..", "..", "..", "assets"); export async function initTranslation(router: Router) { @@ -34,21 +43,32 @@ export async function initTranslation(router: Router) { .filter((x) => x.endsWith(".json")) .map((x) => x.slice(0, x.length - 5)); - await i18next - .use(i18nextBackend) - .use(i18nextMiddleware.LanguageDetector) - .init({ - preload: languages, - // debug: true, - fallbackLng: "en", - ns, - backend: { - loadPath: - path.join(ASSET_FOLDER_PATH, "locales") + - "/{{lng}}/{{ns}}.json", - }, - load: "all", - }); + await i18next.use(i18nextBackend).init({ + preload: languages, + // debug: true, + fallbackLng: "en", + ns, + backend: { + loadPath: + path.join(ASSET_FOLDER_PATH, "locales") + + "/{{lng}}/{{ns}}.json", + }, + load: "all", + }); - router.use(i18nextMiddleware.handle(i18next, {})); + router.use((req, res, next) => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + req.t = (key: string | string[], options?: any) => { + let lng = "en"; + if (req.headers["accept-language"]) { + lng = req.headers["accept-language"].split(",")[0]; + } + req.language = lng; + return i18next.t(key, { + ...options, + lng, + }); + }; + next(); + }); } From 197f1aacd2dad264cf0cb415efeb57d1ea08c849 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:18:31 +0100 Subject: [PATCH 05/28] feat: better-sqlite3 support --- package.json | 1 + src/util/util/Database.ts | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 03cc7981e..101a5f530 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,7 @@ "@fosscord/util": "dist/util" }, "optionalDependencies": { + "better-sqlite3": "^8.2.0", "erlpack": "^0.1.4", "nodemailer-mailgun-transport": "^2.1.5", "nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport", diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 64d7ca145..e625ea9b2 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -36,9 +36,17 @@ if (!process.env) { const dbConnectionString = process.env.DATABASE || path.join(process.cwd(), "database.db"); -const DatabaseType = dbConnectionString.includes("://") +let DatabaseType = dbConnectionString.includes("://") ? dbConnectionString.split(":")[0]?.replace("+srv", "") : "sqlite"; + +if (DatabaseType === "sqlite") { + try { + require("better-sqlite3"); + DatabaseType = "better-sqlite3"; + // eslint-disable-next-line no-empty + } catch (error) {} +} const isSqlite = DatabaseType.includes("sqlite"); const DataSourceOptions = new DataSource({ @@ -55,6 +63,7 @@ const DataSourceOptions = new DataSource({ supportBigNumbers: true, name: "default", migrations: [path.join(__dirname, "..", "migration", DatabaseType, "*.js")], + cache: true, }); // Gets the existing database connection @@ -77,7 +86,13 @@ export async function initDatabase(): Promise { } if (!process.env.DB_SYNC) { - const supported = ["mysql", "mariadb", "postgres", "sqlite"]; + const supported = [ + "mysql", + "mariadb", + "postgres", + "sqlite", + "better-sqlite3", + ]; if (!supported.includes(DatabaseType)) { console.log( "[Database]" + From 5ba7c6b5bc87d5874de881f675ad92811837aaac Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:18:57 +0100 Subject: [PATCH 06/28] perf: optimize getPermission() --- src/util/util/Permissions.ts | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/util/util/Permissions.ts b/src/util/util/Permissions.ts index 996c72ea5..4aeb9268e 100644 --- a/src/util/util/Permissions.ts +++ b/src/util/util/Permissions.ts @@ -257,23 +257,26 @@ export async function getPermission( } if (guild_id) { - guild = await Guild.findOneOrFail({ - where: { id: guild_id }, - select: ["id", "owner_id", ...(opts.guild_select || [])], - relations: opts.guild_relations, - }); + const result = await Promise.all([ + Guild.findOneOrFail({ + where: { id: guild_id }, + select: ["id", "owner_id", ...(opts.guild_select || [])], + relations: opts.guild_relations, + }), + Member.findOneOrFail({ + where: { guild_id, id: user_id }, + relations: ["roles", ...(opts.member_relations || [])], + // select: [ + // "id", // TODO: Bug in typeorm? adding these selects breaks the query. + // "roles", + // ...(opts.member_select || []), + // ], + }), + ]); + guild = result[0]; + member = result[1]; if (guild.owner_id === user_id) return new Permissions(Permissions.FLAGS.ADMINISTRATOR); - - member = await Member.findOneOrFail({ - where: { guild_id, id: user_id }, - relations: ["roles", ...(opts.member_relations || [])], - // select: [ - // "id", // TODO: Bug in typeorm? adding these selects breaks the query. - // "roles", - // ...(opts.member_select || []), - // ], - }); } let recipient_ids = channel?.recipients?.map((x) => x.user_id); From cae6fcc72a61608d594b3a7c3077c8e01a0b5045 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:30:54 +0100 Subject: [PATCH 07/28] fix: request language property --- src/api/middlewares/Translation.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/api/middlewares/Translation.ts b/src/api/middlewares/Translation.ts index bf6ea0340..0e2929628 100644 --- a/src/api/middlewares/Translation.ts +++ b/src/api/middlewares/Translation.ts @@ -57,13 +57,14 @@ export async function initTranslation(router: Router) { }); router.use((req, res, next) => { + let lng = "en"; + if (req.headers["accept-language"]) { + lng = req.headers["accept-language"].split(",")[0]; + } + req.language = lng; + // eslint-disable-next-line @typescript-eslint/no-explicit-any req.t = (key: string | string[], options?: any) => { - let lng = "en"; - if (req.headers["accept-language"]) { - lng = req.headers["accept-language"].split(",")[0]; - } - req.language = lng; return i18next.t(key, { ...options, lng, From 2e473576cf765f5c5e83888056c889d0da43e7fc Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 19:47:23 +0100 Subject: [PATCH 08/28] wip: cache --- src/util/util/Cache.ts | 42 +++++++++++++++++++++++++++++++++++++++ src/util/util/Database.ts | 1 - 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 src/util/util/Cache.ts diff --git a/src/util/util/Cache.ts b/src/util/util/Cache.ts new file mode 100644 index 000000000..44839a652 --- /dev/null +++ b/src/util/util/Cache.ts @@ -0,0 +1,42 @@ +/* eslint-disable */ +import { DataSource, QueryRunner } from "typeorm"; +import { QueryResultCache } from "typeorm/cache/QueryResultCache"; +import { QueryResultCacheOptions } from "typeorm/cache/QueryResultCacheOptions"; + +export class CustomQueryResultCache implements QueryResultCache { + constructor(private dataSource: DataSource) {} + connect(): Promise { + throw new Error("Method not implemented."); + } + disconnect(): Promise { + throw new Error("Method not implemented."); + } + synchronize(queryRunner?: QueryRunner | undefined): Promise { + throw new Error("Method not implemented."); + } + getFromCache( + options: QueryResultCacheOptions, + queryRunner?: QueryRunner | undefined, + ): Promise { + throw new Error("Method not implemented."); + } + storeInCache( + options: QueryResultCacheOptions, + savedCache: QueryResultCacheOptions | undefined, + queryRunner?: QueryRunner | undefined, + ): Promise { + throw new Error("Method not implemented."); + } + isExpired(savedCache: QueryResultCacheOptions): boolean { + throw new Error("Method not implemented."); + } + clear(queryRunner?: QueryRunner | undefined): Promise { + throw new Error("Method not implemented."); + } + remove( + identifiers: string[], + queryRunner?: QueryRunner | undefined, + ): Promise { + throw new Error("Method not implemented."); + } +} diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index e625ea9b2..5c5c8b4c8 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -63,7 +63,6 @@ const DataSourceOptions = new DataSource({ supportBigNumbers: true, name: "default", migrations: [path.join(__dirname, "..", "migration", DatabaseType, "*.js")], - cache: true, }); // Gets the existing database connection From 6c009c3b8838f4a2c70bc966150ff6282708c362 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:36:33 +0100 Subject: [PATCH 09/28] fix: package-lock.json --- package-lock.json | Bin 520418 -> 540103 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/package-lock.json b/package-lock.json index a19a12cd480b7f0e80d1d619bbe92820f538f589..43a1114ef79f491c5e9673b330616b2574c0af69 100644 GIT binary patch delta 8336 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 NcDMZM*slSc^*E`#C+PjS@|6W zovJbf+?^qXHxz1B_?uj=W_P&mkUJwUEu%)0s~*juzfnD_<0PYrOf8kr^xGY1ak+aE z=?$Y^wwD}BiN%yy>OlH386r>Ey-=G)ahXf66rP}>zOKRN4!D#Gh+al{%_m*_pZlDep&)EI<^Uc#^X{p?q??FA}*E)VG+h#UrUsCYcGg*xuR z-t$xo!TbSARE_Qh>bo39TFFKz9VhYd%*INfRYnqVES2=Bu&0d7DDhMm35el`Nw5~T z^^z0mFmjJ@qUB|RYK)RXz(6#rKY5oM+)JAHOMzJryUAI(U)SE&=?L#{XmC0FO213% z+>>3lRlm!kZamml+!1N)XmmvD)gjZK%2K;QXE8OYi>)2Dh88_<4uzUqokpwA<1;xO zP7AMBYIWvdxj77VC#huceIjXaX@Z@^+xN+|5RX14S1iC-1nc|G&;ooRq;IW4NTa(& zP@|%SSjy8=F?c$U?kvVH-SnDuFzH?FX!tCb4-dL%5gxuquTH?hyR=<_H{R2qvq799 z5aGpS!P9jorZobb)-dCamCH)u5R;Si4=cGU6=1MF)d%7)omne@L)Td8oMe}cUdkMmP(QUS^(+|ER7 z%iyF!?B}^R9K=26;-N2(p2NXBuBredQBIfyjv+>lizHl+g>(H}3{=l?BG@4jB!KuO bD?sICF1!h|#<{ndSpAh#it#BOvtaxQE&-G6 From 366c4935a42d5056c51cdbd7c82c2674f1b8b128 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:11:48 +0100 Subject: [PATCH 10/28] feat: Database Query Cache --- src/util/cache/Cache.ts | 85 +++++++++++ src/util/cache/EntityCache.ts | 160 ++++++++++++++++++++ src/util/cache/LocalCache.ts | 91 +++++++++++ src/util/cache/index.ts | 3 + src/util/config/Config.ts | 2 + src/util/config/types/CacheConfiguration.ts | 22 +++ src/util/config/types/index.ts | 1 + src/util/entities/Application.ts | 4 +- src/util/entities/Attachment.ts | 4 +- src/util/entities/AuditLog.ts | 4 +- src/util/entities/BackupCodes.ts | 4 +- src/util/entities/Ban.ts | 4 +- src/util/entities/BaseClass.ts | 48 +++--- src/util/entities/Channel.ts | 4 +- src/util/entities/ClientRelease.ts | 4 +- src/util/entities/ConnectedAccount.ts | 4 +- src/util/entities/EmbedCache.ts | 4 +- src/util/entities/Emoji.ts | 4 +- src/util/entities/Encryption.ts | 4 +- src/util/entities/Guild.ts | 4 +- src/util/entities/Message.ts | 4 +- src/util/entities/Note.ts | 4 +- src/util/entities/RateLimit.ts | 4 +- src/util/entities/ReadState.ts | 4 +- src/util/entities/Recipient.ts | 4 +- src/util/entities/Relationship.ts | 4 +- src/util/entities/Role.ts | 4 +- src/util/entities/SecurityKey.ts | 4 +- src/util/entities/Session.ts | 4 +- src/util/entities/Sticker.ts | 4 +- src/util/entities/StickerPack.ts | 4 +- src/util/entities/Team.ts | 4 +- src/util/entities/TeamMember.ts | 4 +- src/util/entities/Template.ts | 4 +- src/util/entities/User.ts | 4 +- src/util/entities/VoiceState.ts | 4 +- src/util/entities/Webhook.ts | 4 +- src/util/util/Cache.ts | 42 ----- 38 files changed, 444 insertions(+), 126 deletions(-) create mode 100644 src/util/cache/Cache.ts create mode 100644 src/util/cache/EntityCache.ts create mode 100644 src/util/cache/LocalCache.ts create mode 100644 src/util/cache/index.ts create mode 100644 src/util/config/types/CacheConfiguration.ts delete mode 100644 src/util/util/Cache.ts diff --git a/src/util/cache/Cache.ts b/src/util/cache/Cache.ts new file mode 100644 index 000000000..fb66c2e31 --- /dev/null +++ b/src/util/cache/Cache.ts @@ -0,0 +1,85 @@ +/* + Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ +/* eslint-disable @typescript-eslint/ban-ts-comment */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + +import { EntityMetadata, FindOptionsWhere } from "typeorm"; +import { LocalCache } from "./LocalCache"; + +declare module "typeorm" { + interface BaseEntity { + metadata?: EntityMetadata; + cache: CacheManager; + } +} + +export type BaseEntityWithId = { id: string; [name: string]: any }; +export type Criteria = + | string + | string[] + | number + | number[] + | FindOptionsWhere; + +export interface Cache { + get(id: string): BaseEntityWithId | undefined; + set(id: string, entity: BaseEntityWithId): this; + find(options: Record): BaseEntityWithId | undefined; + filter(options: Record): BaseEntityWithId[]; + delete(id: string): boolean; +} + +export class CacheManager { + // last access time to automatically remove old entities from cache after 5 minutes of inactivity (to prevent memory leaks) + cache: Cache; + + constructor() { + this.cache = new LocalCache(); + // TODO: Config.get().cache.redis; + } + + delete(id: string) { + return this.cache.delete(id); + } + + insert(entity: BaseEntityWithId) { + if (!entity.id) return; + + return this.cache.set(entity.id, entity); + } + + find(options?: Record, select?: string[] | undefined) { + if (!options) return null; + const entity = this.cache.find(options); + if (!entity) return null; + if (!select) return entity; + + const result = {}; + for (const prop of select) { + // @ts-ignore + result[prop] = entity[prop]; + } + + // @ts-ignore + return entity.constructor.create(result); + } + + filter(options: Record) { + return this.cache.filter(options); + } +} diff --git a/src/util/cache/EntityCache.ts b/src/util/cache/EntityCache.ts new file mode 100644 index 000000000..9135fef3b --- /dev/null +++ b/src/util/cache/EntityCache.ts @@ -0,0 +1,160 @@ +/* + Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ +/* eslint-disable */ +import { + DataSource, + FindOneOptions, + EntityNotFoundError, + FindOptionsWhere, +} from "typeorm"; +import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity"; +import { BaseClassWithId } from "../entities/BaseClass"; +import { Config, getDatabase } from "../util"; +import { CacheManager } from "./Cache"; + +function getObjectKeysAsArray(obj?: Record) { + if (!obj) return []; + if (Array.isArray(obj)) return obj; + return Object.keys(obj); +} + +export type ThisType = { + new (): T; +} & typeof BaseEntityCache; + +interface BaseEntityCache { + constructor: typeof BaseEntityCache; +} + +// @ts-ignore +class BaseEntityCache extends BaseClassWithId { + static cache: CacheManager; + static cacheEnabled: boolean; + + public get metadata() { + return getDatabase()?.getMetadata(this.constructor)!; + } + + static useDataSource(dataSource: DataSource | null) { + super.useDataSource(dataSource); + this.cacheEnabled = Config.get().cache.enabled ?? true; + if (Config.get().cache.redis) return; // TODO: Redis cache + if (!this.cacheEnabled) return; + this.cache = new CacheManager(); + } + + static async findOne( + this: ThisType, + options: FindOneOptions, + ) { + // @ts-ignore + if (!this.cacheEnabled) return super.findOne(options); + let select = getObjectKeysAsArray(options.select); + + if (!select.length) { + // get all columns that are marked as select + getDatabase() + ?.getMetadata(this) + .columns.forEach((x) => { + if (!x.isSelect) return; + select.push(x.propertyName); + }); + } + if (options.relations) { + select.push(...getObjectKeysAsArray(options.relations)); + } + + const cacheResult = this.cache.find(options.where as never, select); + if (cacheResult) { + const hasAllProps = select.every((key) => { + if (key.includes(".")) return true; // @ts-ignore + return cacheResult[key] !== undefined; + }); + // console.log(`[Cache] get ${cacheResult.id} from ${cacheResult.constructor.name}`,); + if (hasAllProps) return cacheResult; + } + + // @ts-ignore + const result = await super.findOne(options); + if (!result) return null; + + this.cache.insert(result as any); + + return result; + } + + static async findOneOrFail( + this: ThisType, + options: FindOneOptions, + ) { + const result = await this.findOne(options); + if (!result) throw new EntityNotFoundError(this, options); + return result; + } + + save() { + if (this.constructor.cacheEnabled) this.constructor.cache.insert(this); + return super.save(); + } + + remove() { + if (this.constructor.cacheEnabled) + this.constructor.cache.delete(this.id); + return super.remove(); + } + + static async update( + this: ThisType, + criteria: FindOptionsWhere, + partialEntity: QueryDeepPartialEntity, + ) { + // @ts-ignore + const result = super.update(criteria, partialEntity); + if (!this.cacheEnabled) return result; + + const entities = this.cache.filter(criteria as never); + for (const entity of entities) { + // @ts-ignore + partialEntity.id = entity.id; + this.cache.insert(partialEntity as never); + } + + return result; + } + + static async delete( + this: ThisType, + criteria: FindOptionsWhere, + ) { + // @ts-ignore + const result = super.delete(criteria); + if (!this.cacheEnabled) return result; + + const entities = this.cache.filter(criteria as never); + for (const entity of entities) { + this.cache.delete(entity.id); + } + + return result; + } +} + +// needed, because typescript can't infer the type of the static methods with generics +const EntityCache = BaseEntityCache as unknown as typeof BaseClassWithId; + +export { EntityCache }; diff --git a/src/util/cache/LocalCache.ts b/src/util/cache/LocalCache.ts new file mode 100644 index 000000000..547899ac9 --- /dev/null +++ b/src/util/cache/LocalCache.ts @@ -0,0 +1,91 @@ +/* + Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ +/* eslint-disable @typescript-eslint/ban-ts-comment */ +import { BaseEntityWithId, Cache } from "./Cache"; + +export const cacheTimeout = 1000 * 60 * 5; + +export class LocalCache extends Map implements Cache { + last_access = new Map(); + + constructor() { + super(); + + setInterval(() => { + const now = Date.now(); + for (const [key, value] of this.last_access) { + if (now - value > cacheTimeout) { + this.delete(key); + this.last_access.delete(key); + } + } + }, cacheTimeout); + } + + set(key: string, value: BaseEntityWithId): this { + this.last_access.set(key, Date.now()); + if (this.has(key)) this.update(key, value); + return super.set(key, value as never); + } + + get(key: string) { + const value = super.get(key); + if (value) this.last_access.set(key, Date.now()); + return value; + } + + update(id: string, entity: BaseEntityWithId) { + const oldEntity = this.get(id); + if (!oldEntity) return; + for (const key in entity) { + // @ts-ignore + if (entity[key] === undefined) continue; // @ts-ignore + oldEntity[key] = entity[key]; + } + } + + find(options: Record): BaseEntityWithId | undefined { + if (options.id && Object.keys(options).length === 1) { + return this.get(options.id); + } + for (const entity of this.values()) { + if (objectFulfillsQuery(entity, options)) return entity; + } + } + + filter(options: Record): BaseEntityWithId[] { + const result = []; + for (const entity of this.values()) { + if (objectFulfillsQuery(entity, options)) { + result.push(entity); + } + } + return result; + } +} + +function objectFulfillsQuery( + entity: BaseEntityWithId, + options: Record, +) { + for (const key in options) { + // @ts-ignore + if (entity[key] !== options[key]) return false; + } + return true; +} diff --git a/src/util/cache/index.ts b/src/util/cache/index.ts new file mode 100644 index 000000000..43f0aa961 --- /dev/null +++ b/src/util/cache/index.ts @@ -0,0 +1,3 @@ +export * from "./EntityCache"; +export * from "./Cache"; +export * from "./LocalCache"; diff --git a/src/util/config/Config.ts b/src/util/config/Config.ts index f130e760f..3cd18d3d3 100644 --- a/src/util/config/Config.ts +++ b/src/util/config/Config.ts @@ -37,6 +37,7 @@ import { SecurityConfiguration, SentryConfiguration, TemplateConfiguration, + CacheConfiguration, } from "../config"; export class ConfigValue { @@ -61,4 +62,5 @@ export class ConfigValue { email: EmailConfiguration = new EmailConfiguration(); passwordReset: PasswordResetConfiguration = new PasswordResetConfiguration(); + cache: CacheConfiguration = new CacheConfiguration(); } diff --git a/src/util/config/types/CacheConfiguration.ts b/src/util/config/types/CacheConfiguration.ts new file mode 100644 index 000000000..4178090e1 --- /dev/null +++ b/src/util/config/types/CacheConfiguration.ts @@ -0,0 +1,22 @@ +/* + Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +export class CacheConfiguration { + enabled: boolean | null = true; + redis: string | null = null; +} diff --git a/src/util/config/types/index.ts b/src/util/config/types/index.ts index cd3335e09..03cc2e8bc 100644 --- a/src/util/config/types/index.ts +++ b/src/util/config/types/index.ts @@ -17,6 +17,7 @@ */ export * from "./ApiConfiguration"; +export * from "./CacheConfiguration"; export * from "./CdnConfiguration"; export * from "./DefaultsConfiguration"; export * from "./EmailConfiguration"; diff --git a/src/util/entities/Application.ts b/src/util/entities/Application.ts index 94709320a..5613109e7 100644 --- a/src/util/entities/Application.ts +++ b/src/util/entities/Application.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Team } from "./Team"; import { User } from "./User"; @Entity("applications") -export class Application extends BaseClass { +export class Application extends EntityCache { @Column() name: string; diff --git a/src/util/entities/Attachment.ts b/src/util/entities/Attachment.ts index fdc1b3f10..da879fad8 100644 --- a/src/util/entities/Attachment.ts +++ b/src/util/entities/Attachment.ts @@ -25,11 +25,11 @@ import { RelationId, } from "typeorm"; import { URL } from "url"; +import { EntityCache } from "../cache"; import { deleteFile } from "../util/cdn"; -import { BaseClass } from "./BaseClass"; @Entity("attachments") -export class Attachment extends BaseClass { +export class Attachment extends EntityCache { @Column() filename: string; // name of file attached diff --git a/src/util/entities/AuditLog.ts b/src/util/entities/AuditLog.ts index 0cc2fc046..0c10c6f09 100644 --- a/src/util/entities/AuditLog.ts +++ b/src/util/entities/AuditLog.ts @@ -17,7 +17,7 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { ChannelPermissionOverwrite } from "./Channel"; import { User } from "./User"; @@ -112,7 +112,7 @@ export enum AuditLogEvents { } @Entity("audit_logs") -export class AuditLog extends BaseClass { +export class AuditLog extends EntityCache { @JoinColumn({ name: "target_id" }) @ManyToOne(() => User) target?: User; diff --git a/src/util/entities/BackupCodes.ts b/src/util/entities/BackupCodes.ts index 467e1fe38..d6a38a63d 100644 --- a/src/util/entities/BackupCodes.ts +++ b/src/util/entities/BackupCodes.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { User } from "./User"; import crypto from "crypto"; @Entity("backup_codes") -export class BackupCode extends BaseClass { +export class BackupCode extends EntityCache { @JoinColumn({ name: "user_id" }) @ManyToOne(() => User, { onDelete: "CASCADE" }) user: User; diff --git a/src/util/entities/Ban.ts b/src/util/entities/Ban.ts index 4ed6e201c..7accc153a 100644 --- a/src/util/entities/Ban.ts +++ b/src/util/entities/Ban.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Guild } from "./Guild"; import { User } from "./User"; @Entity("bans") -export class Ban extends BaseClass { +export class Ban extends EntityCache { @Column({ nullable: true }) @RelationId((ban: Ban) => ban.user) user_id: string; diff --git a/src/util/entities/BaseClass.ts b/src/util/entities/BaseClass.ts index 445b3fc97..87b394c5b 100644 --- a/src/util/entities/BaseClass.ts +++ b/src/util/entities/BaseClass.ts @@ -25,16 +25,12 @@ import { PrimaryColumn, } from "typeorm"; import { Snowflake } from "../util/Snowflake"; -import { getDatabase } from "../util/Database"; import { OrmUtils } from "../imports/OrmUtils"; +import { getDatabase } from "../util"; export class BaseClassWithoutId extends BaseEntity { - private get construct() { - return this.constructor; - } - - private get metadata() { - return getDatabase()?.getMetadata(this.construct); + public get metadata() { + return getDatabase()?.getMetadata(this.constructor); } assign(props: object) { @@ -61,31 +57,13 @@ export class BaseClassWithoutId extends BaseEntity { ), ); } - - static increment( - conditions: FindOptionsWhere, - propertyPath: string, - value: number | string, - ) { - const repository = this.getRepository(); - return repository.increment(conditions, propertyPath, value); - } - - static decrement( - conditions: FindOptionsWhere, - propertyPath: string, - value: number | string, - ) { - const repository = this.getRepository(); - return repository.decrement(conditions, propertyPath, value); - } } export const PrimaryIdColumn = process.env.DATABASE?.startsWith("mongodb") ? ObjectIdColumn : PrimaryColumn; -export class BaseClass extends BaseClassWithoutId { +export class BaseClassWithId extends BaseClassWithoutId { @PrimaryIdColumn() id: string = Snowflake.generate(); @@ -94,4 +72,22 @@ export class BaseClass extends BaseClassWithoutId { _do_validate() { if (!this.id) this.id = Snowflake.generate(); } + + static increment( + conditions: FindOptionsWhere, + propertyPath: string, + value: number | string, + ) { + const repository = this.getRepository(); + return repository.increment(conditions, propertyPath, value); + } + + static decrement( + conditions: FindOptionsWhere, + propertyPath: string, + value: number | string, + ) { + const repository = this.getRepository(); + return repository.decrement(conditions, propertyPath, value); + } } diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts index 1f1287130..1cad928b9 100644 --- a/src/util/entities/Channel.ts +++ b/src/util/entities/Channel.ts @@ -24,7 +24,7 @@ import { OneToMany, RelationId, } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Guild } from "./Guild"; import { PublicUserProjection, User } from "./User"; import { HTTPError } from "lambert-server"; @@ -70,7 +70,7 @@ export enum ChannelType { } @Entity("channels") -export class Channel extends BaseClass { +export class Channel extends EntityCache { @Column() created_at: Date; diff --git a/src/util/entities/ClientRelease.ts b/src/util/entities/ClientRelease.ts index 4b8150fdb..577101942 100644 --- a/src/util/entities/ClientRelease.ts +++ b/src/util/entities/ClientRelease.ts @@ -17,10 +17,10 @@ */ import { Column, Entity } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; @Entity("client_release") -export class Release extends BaseClass { +export class Release extends EntityCache { @Column() name: string; diff --git a/src/util/entities/ConnectedAccount.ts b/src/util/entities/ConnectedAccount.ts index 9f0ce35e2..dabdb9443 100644 --- a/src/util/entities/ConnectedAccount.ts +++ b/src/util/entities/ConnectedAccount.ts @@ -17,7 +17,7 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { User } from "./User"; export type PublicConnectedAccount = Pick< @@ -26,7 +26,7 @@ export type PublicConnectedAccount = Pick< >; @Entity("connected_accounts") -export class ConnectedAccount extends BaseClass { +export class ConnectedAccount extends EntityCache { @Column({ nullable: true }) @RelationId((account: ConnectedAccount) => account.user) user_id: string; diff --git a/src/util/entities/EmbedCache.ts b/src/util/entities/EmbedCache.ts index 800ee4e77..fd6db90e3 100644 --- a/src/util/entities/EmbedCache.ts +++ b/src/util/entities/EmbedCache.ts @@ -16,12 +16,12 @@ along with this program. If not, see . */ -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Entity, Column } from "typeorm"; import { Embed } from "./Message"; @Entity("embed_cache") -export class EmbedCache extends BaseClass { +export class EmbedCache extends EntityCache { @Column() url: string; diff --git a/src/util/entities/Emoji.ts b/src/util/entities/Emoji.ts index 94ce3d54c..c76783619 100644 --- a/src/util/entities/Emoji.ts +++ b/src/util/entities/Emoji.ts @@ -18,11 +18,11 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { User } from "."; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Guild } from "./Guild"; @Entity("emojis") -export class Emoji extends BaseClass { +export class Emoji extends EntityCache { @Column() animated: boolean; diff --git a/src/util/entities/Encryption.ts b/src/util/entities/Encryption.ts index 016b43316..19cb39870 100644 --- a/src/util/entities/Encryption.ts +++ b/src/util/entities/Encryption.ts @@ -17,10 +17,10 @@ */ import { Column, Entity } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; @Entity("security_settings") -export class SecuritySettings extends BaseClass { +export class SecuritySettings extends EntityCache { @Column({ nullable: true }) guild_id: string; diff --git a/src/util/entities/Guild.ts b/src/util/entities/Guild.ts index c835f5fc2..b08e37d11 100644 --- a/src/util/entities/Guild.ts +++ b/src/util/entities/Guild.ts @@ -26,7 +26,7 @@ import { } from "typeorm"; import { Config, handleFile, Snowflake } from ".."; import { Ban } from "./Ban"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Channel } from "./Channel"; import { Emoji } from "./Emoji"; import { Invite } from "./Invite"; @@ -67,7 +67,7 @@ export const PublicGuildRelations = [ ]; @Entity("guilds") -export class Guild extends BaseClass { +export class Guild extends EntityCache { @Column({ nullable: true }) @RelationId((guild: Guild) => guild.afk_channel) afk_channel_id?: string; diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts index fc8c011ce..feee84a72 100644 --- a/src/util/entities/Message.ts +++ b/src/util/entities/Message.ts @@ -34,7 +34,7 @@ import { OneToMany, RelationId, } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Guild } from "./Guild"; import { Webhook } from "./Webhook"; import { Sticker } from "./Sticker"; @@ -70,7 +70,7 @@ export enum MessageType { @Entity("messages") @Index(["channel_id", "id"], { unique: true }) -export class Message extends BaseClass { +export class Message extends EntityCache { @Column({ nullable: true }) @RelationId((message: Message) => message.channel) @Index() diff --git a/src/util/entities/Note.ts b/src/util/entities/Note.ts index 0f2a5ce34..9f13b257f 100644 --- a/src/util/entities/Note.ts +++ b/src/util/entities/Note.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne, Unique } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { User } from "./User"; @Entity("notes") @Unique(["owner", "target"]) -export class Note extends BaseClass { +export class Note extends EntityCache { @JoinColumn({ name: "owner_id" }) @ManyToOne(() => User, { onDelete: "CASCADE" }) owner: User; diff --git a/src/util/entities/RateLimit.ts b/src/util/entities/RateLimit.ts index 79ebbb014..23f0952cb 100644 --- a/src/util/entities/RateLimit.ts +++ b/src/util/entities/RateLimit.ts @@ -17,10 +17,10 @@ */ import { Column, Entity } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; @Entity("rate_limits") -export class RateLimit extends BaseClass { +export class RateLimit extends EntityCache { @Column() // no relation as it also executor_id: string; diff --git a/src/util/entities/ReadState.ts b/src/util/entities/ReadState.ts index 825beb037..d39bfb4bb 100644 --- a/src/util/entities/ReadState.ts +++ b/src/util/entities/ReadState.ts @@ -24,7 +24,7 @@ import { ManyToOne, RelationId, } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Channel } from "./Channel"; import { User } from "./User"; @@ -34,7 +34,7 @@ import { User } from "./User"; @Entity("read_states") @Index(["channel_id", "user_id"], { unique: true }) -export class ReadState extends BaseClass { +export class ReadState extends EntityCache { @Column() @RelationId((read_state: ReadState) => read_state.channel) channel_id: string; diff --git a/src/util/entities/Recipient.ts b/src/util/entities/Recipient.ts index 1cf028dd2..4c301827e 100644 --- a/src/util/entities/Recipient.ts +++ b/src/util/entities/Recipient.ts @@ -17,10 +17,10 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; @Entity("recipients") -export class Recipient extends BaseClass { +export class Recipient extends EntityCache { @Column() @RelationId((recipient: Recipient) => recipient.channel) channel_id: string; diff --git a/src/util/entities/Relationship.ts b/src/util/entities/Relationship.ts index 1bf04c2cc..48fbc81d0 100644 --- a/src/util/entities/Relationship.ts +++ b/src/util/entities/Relationship.ts @@ -24,7 +24,7 @@ import { ManyToOne, RelationId, } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { User } from "./User"; export enum RelationshipType { @@ -36,7 +36,7 @@ export enum RelationshipType { @Entity("relationships") @Index(["from_id", "to_id"], { unique: true }) -export class Relationship extends BaseClass { +export class Relationship extends EntityCache { @Column({}) @RelationId((relationship: Relationship) => relationship.from) from_id: string; diff --git a/src/util/entities/Role.ts b/src/util/entities/Role.ts index d3275ede7..c44fa2b10 100644 --- a/src/util/entities/Role.ts +++ b/src/util/entities/Role.ts @@ -18,11 +18,11 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Guild } from "./Guild"; @Entity("roles") -export class Role extends BaseClass { +export class Role extends EntityCache { @Column({ nullable: true }) @RelationId((role: Role) => role.guild) guild_id: string; diff --git a/src/util/entities/SecurityKey.ts b/src/util/entities/SecurityKey.ts index 8f377d9d4..86e5531e0 100644 --- a/src/util/entities/SecurityKey.ts +++ b/src/util/entities/SecurityKey.ts @@ -17,11 +17,11 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { User } from "./User"; @Entity("security_keys") -export class SecurityKey extends BaseClass { +export class SecurityKey extends EntityCache { @Column({ nullable: true }) @RelationId((key: SecurityKey) => key.user) user_id: string; diff --git a/src/util/entities/Session.ts b/src/util/entities/Session.ts index f416b9f52..f6e169167 100644 --- a/src/util/entities/Session.ts +++ b/src/util/entities/Session.ts @@ -17,7 +17,7 @@ */ import { User } from "./User"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { Status } from "../interfaces/Status"; import { Activity } from "../interfaces/Activity"; @@ -25,7 +25,7 @@ import { Activity } from "../interfaces/Activity"; //TODO we need to remove all sessions on server start because if the server crashes without closing websockets it won't delete them @Entity("sessions") -export class Session extends BaseClass { +export class Session extends EntityCache { @Column({ nullable: true }) @RelationId((session: Session) => session.user) user_id: string; diff --git a/src/util/entities/Sticker.ts b/src/util/entities/Sticker.ts index 513a4c9f6..dd3d39dde 100644 --- a/src/util/entities/Sticker.ts +++ b/src/util/entities/Sticker.ts @@ -18,7 +18,7 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { User } from "./User"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Guild } from "./Guild"; export enum StickerType { @@ -34,7 +34,7 @@ export enum StickerFormatType { } @Entity("stickers") -export class Sticker extends BaseClass { +export class Sticker extends EntityCache { @Column() name: string; diff --git a/src/util/entities/StickerPack.ts b/src/util/entities/StickerPack.ts index ce8d5e87d..ad1a9c0f2 100644 --- a/src/util/entities/StickerPack.ts +++ b/src/util/entities/StickerPack.ts @@ -25,10 +25,10 @@ import { RelationId, } from "typeorm"; import { Sticker } from "."; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; @Entity("sticker_packs") -export class StickerPack extends BaseClass { +export class StickerPack extends EntityCache { @Column() name: string; diff --git a/src/util/entities/Team.ts b/src/util/entities/Team.ts index 828594091..5b86bfa62 100644 --- a/src/util/entities/Team.ts +++ b/src/util/entities/Team.ts @@ -24,12 +24,12 @@ import { OneToMany, RelationId, } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { TeamMember } from "./TeamMember"; import { User } from "./User"; @Entity("teams") -export class Team extends BaseClass { +export class Team extends EntityCache { @Column({ nullable: true }) icon?: string; diff --git a/src/util/entities/TeamMember.ts b/src/util/entities/TeamMember.ts index df70050c6..c8c07ea99 100644 --- a/src/util/entities/TeamMember.ts +++ b/src/util/entities/TeamMember.ts @@ -17,7 +17,7 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { User } from "./User"; export enum TeamMemberState { @@ -26,7 +26,7 @@ export enum TeamMemberState { } @Entity("team_members") -export class TeamMember extends BaseClass { +export class TeamMember extends EntityCache { @Column({ type: "int" }) membership_state: TeamMemberState; diff --git a/src/util/entities/Template.ts b/src/util/entities/Template.ts index 17f26e1c6..7349367c1 100644 --- a/src/util/entities/Template.ts +++ b/src/util/entities/Template.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Guild } from "./Guild"; import { User } from "./User"; @Entity("templates") -export class Template extends BaseClass { +export class Template extends EntityCache { @Column({ unique: true }) code: string; diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index f99a85e74..2b182c168 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -34,7 +34,7 @@ import { trimSpecial, } from ".."; import { BitField } from "../util/BitField"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { ConnectedAccount } from "./ConnectedAccount"; import { Member } from "./Member"; import { Relationship } from "./Relationship"; @@ -94,7 +94,7 @@ export interface UserPrivate extends Pick { } @Entity("users") -export class User extends BaseClass { +export class User extends EntityCache { @Column() username: string; // username max length 32, min 2 (should be configurable) diff --git a/src/util/entities/VoiceState.ts b/src/util/entities/VoiceState.ts index f790945f7..32d94ed1e 100644 --- a/src/util/entities/VoiceState.ts +++ b/src/util/entities/VoiceState.ts @@ -17,7 +17,7 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Channel } from "./Channel"; import { Guild } from "./Guild"; import { User } from "./User"; @@ -25,7 +25,7 @@ import { Member } from "./Member"; //https://gist.github.com/vassjozsef/e482c65df6ee1facaace8b3c9ff66145#file-voice_state-ex @Entity("voice_states") -export class VoiceState extends BaseClass { +export class VoiceState extends EntityCache { @Column({ nullable: true }) @RelationId((voice_state: VoiceState) => voice_state.guild) guild_id: string; diff --git a/src/util/entities/Webhook.ts b/src/util/entities/Webhook.ts index 9be86c6d6..3e845ddc3 100644 --- a/src/util/entities/Webhook.ts +++ b/src/util/entities/Webhook.ts @@ -18,7 +18,7 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { Application } from "./Application"; -import { BaseClass } from "./BaseClass"; +import { EntityCache } from "../cache"; import { Channel } from "./Channel"; import { Guild } from "./Guild"; import { User } from "./User"; @@ -30,7 +30,7 @@ export enum WebhookType { } @Entity("webhooks") -export class Webhook extends BaseClass { +export class Webhook extends EntityCache { @Column({ type: "int" }) type: WebhookType; diff --git a/src/util/util/Cache.ts b/src/util/util/Cache.ts deleted file mode 100644 index 44839a652..000000000 --- a/src/util/util/Cache.ts +++ /dev/null @@ -1,42 +0,0 @@ -/* eslint-disable */ -import { DataSource, QueryRunner } from "typeorm"; -import { QueryResultCache } from "typeorm/cache/QueryResultCache"; -import { QueryResultCacheOptions } from "typeorm/cache/QueryResultCacheOptions"; - -export class CustomQueryResultCache implements QueryResultCache { - constructor(private dataSource: DataSource) {} - connect(): Promise { - throw new Error("Method not implemented."); - } - disconnect(): Promise { - throw new Error("Method not implemented."); - } - synchronize(queryRunner?: QueryRunner | undefined): Promise { - throw new Error("Method not implemented."); - } - getFromCache( - options: QueryResultCacheOptions, - queryRunner?: QueryRunner | undefined, - ): Promise { - throw new Error("Method not implemented."); - } - storeInCache( - options: QueryResultCacheOptions, - savedCache: QueryResultCacheOptions | undefined, - queryRunner?: QueryRunner | undefined, - ): Promise { - throw new Error("Method not implemented."); - } - isExpired(savedCache: QueryResultCacheOptions): boolean { - throw new Error("Method not implemented."); - } - clear(queryRunner?: QueryRunner | undefined): Promise { - throw new Error("Method not implemented."); - } - remove( - identifiers: string[], - queryRunner?: QueryRunner | undefined, - ): Promise { - throw new Error("Method not implemented."); - } -} From 52f8508b38aa0a0aed67c3ac1fab72b35bbfe3bb Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:12:16 +0100 Subject: [PATCH 11/28] fix: missing id in select query --- src/api/routes/guilds/#guild_id/templates.ts | 1 + src/util/util/Token.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts index 284bbccff..7c4a69611 100644 --- a/src/api/routes/guilds/#guild_id/templates.ts +++ b/src/api/routes/guilds/#guild_id/templates.ts @@ -39,6 +39,7 @@ const TemplateGuildProjection: (keyof Guild)[] = [ "system_channel_id", "system_channel_flags", "icon", + "id", ]; router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts index 67e4b8794..0a8e73782 100644 --- a/src/util/util/Token.ts +++ b/src/util/util/Token.ts @@ -87,7 +87,7 @@ export function checkToken( const user = await User.findOne({ where: { id: decoded.id }, - select: ["data", "bot", "disabled", "deleted", "rights"], + select: ["id", "data", "bot", "disabled", "deleted", "rights"], }); if (!user) return rej("Invalid Token"); From 7b00e9905327c826b82fc47cfa22e37b9c5161a9 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:13:04 +0100 Subject: [PATCH 12/28] fix: use entity.save() instead of insert (needed for caching) --- src/api/routes/users/@me/notes.ts | 6 +++--- src/api/util/handlers/Message.ts | 2 +- src/util/util/Database.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts index 64730c1ad..f82c3ca1b 100644 --- a/src/api/routes/users/@me/notes.ts +++ b/src/api/routes/users/@me/notes.ts @@ -52,17 +52,17 @@ router.put("/:id", route({}), async (req: Request, res: Response) => { where: { owner: { id: owner.id }, target: { id: target.id } }, }) ) { - Note.update( + await Note.update( { owner: { id: owner.id }, target: { id: target.id } }, { owner, target, content: note }, ); } else { - Note.insert({ + await Note.create({ id: Snowflake.generate(), owner, target, content: note, - }); + }).save(); } } else { await Note.delete({ diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index e514d4008..8fbbf4bf0 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -274,7 +274,7 @@ export async function sendMessage(opts: MessageOptions) { const message = await handleMessage({ ...opts, timestamp: new Date() }); await Promise.all([ - Message.insert(message), + message.save(), emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 5c5c8b4c8..5d48ac030 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -127,10 +127,10 @@ export async function initDatabase(): Promise { // Manually insert every current migration to prevent this: await Promise.all( dbConnection.migrations.map((migration) => - Migration.insert({ + Migration.create({ name: migration.name, timestamp: Date.now(), - }), + }).save(), ), ); } else { From d97dbdf73cb4a5b21492575fce9b24cdcc337402 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:18:18 +0100 Subject: [PATCH 13/28] fix: remove proxy --- src/api/Server.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/api/Server.ts b/src/api/Server.ts index ced82dcee..fb32e5111 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -126,10 +126,6 @@ export class FosscordServer extends Server { app.use("/api/v9", api); app.use("/api", api); // allow unversioned requests - try { - require("./middlewares/TestClient").default(this.app); - // eslint-disable-next-line no-empty - } catch (error) {} this.app.use(ErrorHandler); Sentry.errorHandler(this.app); From fd1c99db2d0004cbdfa6e5a1e00f691614c249fd Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:20:03 +0100 Subject: [PATCH 14/28] build: remove sqlite3 in favor of better-sqlite3 --- package-lock.json | Bin 540103 -> 541638 bytes package.json | 3 +-- src/util/util/Database.ts | 11 ++--------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 43a1114ef79f491c5e9673b330616b2574c0af69..3713fc53f85f20cb78b29efd2a61d1beb8c4ab64 100644 GIT binary patch delta 1744 zcmZuxYfM~46wb`tduLxf3UtAReX$EQ_Cbv?CPum~r3?!$P*m#C|q4!ndLhF;{ zY@Ja9=jP=_0(<6J2~4a|7mN=Pj>V^m&7i=_Psko|M78P*BwaOnJ|!>Z2+FB#^!7d* zbAo$}WWfqkW^m*?($*-V-ZIIL^$yxkbpau^244PFDT0AZG=yO%{fwpaV6&I*rRnwH znx9JelaKCtEj@r$AJbB<5om@D{zDY(jMDC0K{_-_gRo_o#xr2|pQm<9#$D(4bYh(b z!=^>rCS+->su{araEZFHHcsujEln%*^9)-~``GJwhM3M`mJeqOSvg!dz+BL2XJ&Ng zGs&?QHv^1|lx(Y%B^Ypjh=ogq5Y^x^yxPvD???kW@sDH7Vl;)OOJR z737A&aaF-gm<0Nkxfw@da<0ykh@!f%bN3~)J&6r1)Ysz9YVLzZiI+p*Z~2B%3o91n z?9AHObVCN4A$^J|QgxEo4Iu}0z|VeOg6nG)tF9nX0e99Z9g+dWkPmG)!BlxC zWd6W^n$72YhuCveWrRdN9xdYU>rnN!4%;1EA3#W);o$;xde0T}Wl>(etH$dk{42LO zt8gzI*~H>7;pcXotmMvAA-MrwlX`w?GcVA;HtnT8Z04)s%^GIIQ&qf2m!wACPEn6% zw(+&8B=I1B-etG}v+c|c4Grpd5pCuBN)6lW-Q1xANm%iK`8cb94|;eGb{*n1ZX6qvY2O)Qz+(}9>)1xp(FEOpG9L!EkdIX!UffD5 z!xk8qB}g5!&`>c&*Mt8{B4Brt=M;|RPve%RSba=kSg5ONi zm1<6ubH1yDfVP8d2Hfr!9*8ca9M%{@Kjvjy{xk9+!rDEGVvUz=wsG>9hokxIboL&_ zhkVRs3*1`7p0z{r7{Mot+4V9t&Q~?!4z|^>Zf30ocJ}cq2sD!-JW$J4*r49sv=Vx1 zg^msN>^`ZY+%E22$?n+k;UoiaH!=<{gxPeApJ0Cz*yD1PXCEQ+2PuOytJ$czgL;(N zo{(xG^SlVaK$Mk2>KCFzu$67b@t4@rd0FM2*v|~R*01l23UHnxbD?^W6hP-8reQkH zZr*Qi!9#Vp+$RlI^&KlLH!Bq4>nRq_E*P#}V`HkcDIB~uD4bYwgRR}F2K!)>W05L` zsb?HxSFAShRs#>`!9ZMiVjbya_}NCDEB7L=FfU0A9NEN|kXZDz7po%t@u$p)7o^AQ zFms$2sZ3m&fRI8?WQJS|S#|puWK~32e z%g<{Qy2^iKSPRTn1$T1cR$YSZau#0DMUbHEx>?QInIjt9iaI#UY-mvAKyRrizy&43 zX-^&Ti#Khl?n#;(5T5^yz(hWC!QP;_eGfTG^53Ofr0yuKyMQVQ^H+#^f~~b;j`fg_ zU)PH+r4)9K@ZTuJtA!3Hdq^>AkFuGvsQPg^@WLuFRiX%`5%-0Z23>oEG@MmN8m?Vd xl==AT=OQf=%%yKnu{s<&E7n^=z=m^TOa;slQR+~>TETlm`W&0dS*G^{{s9=!@LT`@ diff --git a/package.json b/package.json index 101a5f530..85edb0e5b 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,6 @@ "erlpack": "^0.1.4", "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.6" + "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport" } } diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 5d48ac030..1cf7adfdd 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -36,17 +36,10 @@ if (!process.env) { const dbConnectionString = process.env.DATABASE || path.join(process.cwd(), "database.db"); -let DatabaseType = dbConnectionString.includes("://") +const DatabaseType = dbConnectionString.includes("://") ? dbConnectionString.split(":")[0]?.replace("+srv", "") - : "sqlite"; + : "better-sqlite"; -if (DatabaseType === "sqlite") { - try { - require("better-sqlite3"); - DatabaseType = "better-sqlite3"; - // eslint-disable-next-line no-empty - } catch (error) {} -} const isSqlite = DatabaseType.includes("sqlite"); const DataSourceOptions = new DataSource({ From c6708f744369ce6967abe074b637201fe203986b Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 04:20:03 +0100 Subject: [PATCH 15/28] build: remove sqlite3 in favor of better-sqlite3 --- src/util/util/Database.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 1cf7adfdd..5a5a4b757 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -38,7 +38,7 @@ const dbConnectionString = const DatabaseType = dbConnectionString.includes("://") ? dbConnectionString.split(":")[0]?.replace("+srv", "") - : "better-sqlite"; + : "better-sqlite3"; const isSqlite = DatabaseType.includes("sqlite"); From f1f7e5ad7d7f197cd741f248011cc45636a0f434 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 05:11:14 +0100 Subject: [PATCH 16/28] fix: local cache --- src/util/cache/LocalCache.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/cache/LocalCache.ts b/src/util/cache/LocalCache.ts index 547899ac9..9c4f23b39 100644 --- a/src/util/cache/LocalCache.ts +++ b/src/util/cache/LocalCache.ts @@ -38,8 +38,11 @@ export class LocalCache extends Map implements Cache { } set(key: string, value: BaseEntityWithId): this { + if (this.has(key)) { + this.update(key, value); + return this; + } this.last_access.set(key, Date.now()); - if (this.has(key)) this.update(key, value); return super.set(key, value as never); } From 3dc0e68534f9c30f29f5b7e039f439706edf0a16 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sat, 18 Mar 2023 05:11:33 +0100 Subject: [PATCH 17/28] feat: add DB_LOGGING env --- src/util/util/Database.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 5a5a4b757..122a87937 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -51,7 +51,7 @@ const DataSourceOptions = new DataSource({ database: isSqlite ? dbConnectionString : undefined, entities: [path.join(__dirname, "..", "entities", "*.js")], synchronize: !!process.env.DB_SYNC, - logging: false, + logging: process.env["DB_LOGGING"] === "true", bigNumberStrings: false, supportBigNumbers: true, name: "default", From 240076a5d8ea85dd9c235fd0a1f5bbaed6b55c6e Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sun, 19 Mar 2023 21:43:10 +1100 Subject: [PATCH 18/28] Add basic information page to / --- assets/public/index.html | 64 ++++++++++++++++++++++++++++++++++++++++ src/api/Server.ts | 11 +++++++ 2 files changed, 75 insertions(+) create mode 100644 assets/public/index.html diff --git a/assets/public/index.html b/assets/public/index.html new file mode 100644 index 000000000..2fa07ca9b --- /dev/null +++ b/assets/public/index.html @@ -0,0 +1,64 @@ + + + + + + + + Fosscord Server + + + + + + + + + +

+ Fosscord Logo + +

Welcome!

+

If you're viewing this page, that means you've successfully set up your very own Fosscord instance!

+

For information on how to configure your shiny new setup, you should visit our documentation

+

For information on how to connect and use your instance, click here

+
+ + + \ No newline at end of file diff --git a/src/api/Server.ts b/src/api/Server.ts index 49229494a..dbe614442 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -38,6 +38,15 @@ import { ErrorHandler } from "./middlewares/ErrorHandler"; import { initRateLimits } from "./middlewares/RateLimit"; import { initTranslation } from "./middlewares/Translation"; import { initInstance } from "./util/handlers/Instance"; +import express from "express"; + +const PUBLIC_ASSETS_FOLDER = path.join( + __dirname, + "..", + "..", + "assets", + "public", +); export type FosscordServerOptions = ServerOptions; @@ -126,6 +135,8 @@ export class FosscordServer extends Server { app.use("/api/v9", api); app.use("/api", api); // allow unversioned requests + app.get("/", express.static(PUBLIC_ASSETS_FOLDER)); + this.app.use(ErrorHandler); Sentry.errorHandler(this.app); From 002480df9d0f135adf68cea727316e5c3a1a53cc Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Tue, 21 Mar 2023 22:32:55 -0400 Subject: [PATCH 19/28] fix totp using wrong settings key --- src/api/routes/auth/mfa/totp.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/routes/auth/mfa/totp.ts b/src/api/routes/auth/mfa/totp.ts index 6236d2093..bbbd12368 100644 --- a/src/api/routes/auth/mfa/totp.ts +++ b/src/api/routes/auth/mfa/totp.ts @@ -63,7 +63,7 @@ router.post( return res.json({ token: await generateToken(user.id), - user_settings: user.settings, + settings: { ...user.settings, index: undefined }, }); }, ); From 0f928e479cbd81b17710da5dad14a092f23cdf0d Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 24 Mar 2023 04:16:58 +1100 Subject: [PATCH 20/28] Work towards fixing openapi spec --- assets/openapi.json | Bin 234568 -> 240160 bytes assets/schemas.json | Bin 1177730 -> 1426718 bytes scripts/openapi.js | 16 +++++----- scripts/schema.js | 34 ++++++++++++++++++---- src/api/routes/gateway/bot.ts | 11 ------- src/api/routes/gateway/index.ts | 4 --- src/api/routes/users/#id/profile.ts | 9 ------ src/api/routes/users/#id/relationships.ts | 10 ------- src/util/entities/User.ts | 2 +- src/util/schemas/GatewayBotResponse.ts | 10 +++++++ src/util/schemas/GatewayResponse.ts | 3 ++ src/util/schemas/UserProfileResponse.ts | 8 +++++ src/util/schemas/UserRelationsResponse.ts | 9 ++++++ src/util/schemas/index.ts | 4 +++ 14 files changed, 72 insertions(+), 48 deletions(-) create mode 100644 src/util/schemas/GatewayBotResponse.ts create mode 100644 src/util/schemas/GatewayResponse.ts create mode 100644 src/util/schemas/UserProfileResponse.ts create mode 100644 src/util/schemas/UserRelationsResponse.ts diff --git a/assets/openapi.json b/assets/openapi.json index 92847d12297164b1376f108345d4851aa451cbf7..069eacedaad4c5477b7c1188eb27cc7ea4dcc2ee 100644 GIT binary patch delta 4907 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 delta 721 zcmbQ&72fpGeZ!}U>H9AWgiT*Qn^khNb<0A3Fn2T0{l^g2c6lpCHUI7MQy9zrr}uj@ zMQuOzj`6ksb|BNle>zY&bo-~pOlSP2zu(Lpwf)myre^^VCQlSIr~h`K=&4YUK*ILV zA}sF$Avy$#SelX{%!3bDHU&VKi)>icpbEavU=;|Me&3%hal6wO*24kYflRi5?fX}; zef66TBxAO}VqxcsfiSgl*bhd76o+k>zRZ5w55g4FkLW)YcgkRc#8eZxdXx#G`r{H;)bY>wu?90U>Fx|9DCG-R%c3iw5WA~|e(NR_}uzwN*jwE*hfK0U!1(C`5= zIkv}k2wsF57W+u>DU?}gBlH5woW&w?$`@kA ({ name: x })); specification.components = specification.components || {}; - specification.components.securitySchemes = { - bearer: { - type: "http", - scheme: "bearer", - description: "Bearer/Bot prefixes are not required.", + specification.components.securitySchemes = [ + { + bearer: { + type: "http", + scheme: "bearer", + description: "Bearer/Bot prefixes are not required.", + }, }, - }; + ]; routes.forEach((route, pathAndMethod) => { const [p, method] = pathAndMethod.split("|"); @@ -109,7 +111,7 @@ function apiRoutes() { return x.test(path); }) ) { - obj.security = [{ bearer: true }]; + obj.security = [{ bearer: [] }]; } if (route.body) { diff --git a/scripts/schema.js b/scripts/schema.js index be1a7a3f4..bd0f73d38 100644 --- a/scripts/schema.js +++ b/scripts/schema.js @@ -91,9 +91,9 @@ function main() { if (!part) continue; // this is a hack. want some want to check if its a @column, instead - if (part.properties) - Object.keys(part.properties) - .filter((key) => + if (part.properties) { + for (let key in part.properties) { + if ( [ // BaseClass methods "toJSON", @@ -104,9 +104,31 @@ function main() { "recover", "reload", "assign", - ].includes(key), - ) - .forEach((key) => delete part.properties[key]); + ].includes(key) + ) { + delete part.properties[key]; + continue; + } + + if (part.properties[key].anyOf) { + const nullIndex = part.properties[key].anyOf.findIndex( + (x) => x.type == "null", + ); + if (nullIndex != -1) { + part.properties[key].nullable = true; + part.properties[key].anyOf.splice(nullIndex, 1); + + if (part.properties[key].anyOf.length == 1) { + Object.assign( + part.properties[key], + part.properties[key].anyOf[0], + ); + delete part.properties[key].anyOf; + } + } + } + } + } definitions = { ...definitions, [name]: { ...part } }; } diff --git a/src/api/routes/gateway/bot.ts b/src/api/routes/gateway/bot.ts index 070debe34..02049b191 100644 --- a/src/api/routes/gateway/bot.ts +++ b/src/api/routes/gateway/bot.ts @@ -22,17 +22,6 @@ import { route, RouteOptions } from "@fosscord/api"; const router = Router(); -export interface GatewayBotResponse { - url: string; - shards: number; - session_start_limit: { - total: number; - remaining: number; - reset_after: number; - max_concurrency: number; - }; -} - const options: RouteOptions = { test: { response: { diff --git a/src/api/routes/gateway/index.ts b/src/api/routes/gateway/index.ts index e6fcf5e3a..f5ed4c1f1 100644 --- a/src/api/routes/gateway/index.ts +++ b/src/api/routes/gateway/index.ts @@ -22,10 +22,6 @@ import { route, RouteOptions } from "@fosscord/api"; const router = Router(); -export interface GatewayResponse { - url: string; -} - const options: RouteOptions = { test: { response: { diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#id/profile.ts index dbf95a52c..92b4a0fc9 100644 --- a/src/api/routes/users/#id/profile.ts +++ b/src/api/routes/users/#id/profile.ts @@ -18,9 +18,7 @@ import { Router, Request, Response } from "express"; import { - PublicConnectedAccount, User, - UserPublic, Member, UserProfileModifySchema, handleFile, @@ -32,13 +30,6 @@ import { route } from "@fosscord/api"; const router: Router = Router(); -export interface UserProfileResponse { - user: UserPublic; - connected_accounts: PublicConnectedAccount; - premium_guild_since?: Date; - premium_since?: Date; -} - router.get( "/", route({ test: { response: { body: "UserProfileResponse" } } }), diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts index e915e3ffe..04a407b7b 100644 --- a/src/api/routes/users/#id/relationships.ts +++ b/src/api/routes/users/#id/relationships.ts @@ -22,16 +22,6 @@ import { route } from "@fosscord/api"; const router: Router = Router(); -export interface UserRelationsResponse { - object: { - id?: string; - username?: string; - avatar?: string; - discriminator?: string; - public_flags?: number; - }; -} - router.get( "/", route({ test: { response: { body: "UserRelationsResponse" } } }), diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index f99a85e74..8dfb02546 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -111,7 +111,7 @@ export class User extends BaseClass { banner?: string; // hash of the user banner @Column({ nullable: true, type: "simple-array" }) - theme_colors?: number[]; // TODO: Separate `User` and `UserProfile` models + theme_colors?: [number, number]; // TODO: Separate `User` and `UserProfile` models @Column({ nullable: true }) pronouns?: string; diff --git a/src/util/schemas/GatewayBotResponse.ts b/src/util/schemas/GatewayBotResponse.ts new file mode 100644 index 000000000..30f1f57ff --- /dev/null +++ b/src/util/schemas/GatewayBotResponse.ts @@ -0,0 +1,10 @@ +export interface GatewayBotResponse { + url: string; + shards: number; + session_start_limit: { + total: number; + remaining: number; + reset_after: number; + max_concurrency: number; + }; +} diff --git a/src/util/schemas/GatewayResponse.ts b/src/util/schemas/GatewayResponse.ts new file mode 100644 index 000000000..e909f7bd4 --- /dev/null +++ b/src/util/schemas/GatewayResponse.ts @@ -0,0 +1,3 @@ +export interface GatewayResponse { + url: string; +} diff --git a/src/util/schemas/UserProfileResponse.ts b/src/util/schemas/UserProfileResponse.ts new file mode 100644 index 000000000..467d787f2 --- /dev/null +++ b/src/util/schemas/UserProfileResponse.ts @@ -0,0 +1,8 @@ +import { PublicConnectedAccount, UserPublic } from ".."; + +export interface UserProfileResponse { + user: UserPublic; + connected_accounts: PublicConnectedAccount; + premium_guild_since?: Date; + premium_since?: Date; +} diff --git a/src/util/schemas/UserRelationsResponse.ts b/src/util/schemas/UserRelationsResponse.ts new file mode 100644 index 000000000..1ec15eca8 --- /dev/null +++ b/src/util/schemas/UserRelationsResponse.ts @@ -0,0 +1,9 @@ +export interface UserRelationsResponse { + object: { + id?: string; + username?: string; + avatar?: string; + discriminator?: string; + public_flags?: number; + }; +} diff --git a/src/util/schemas/index.ts b/src/util/schemas/index.ts index 44909a3a3..150a2dea3 100644 --- a/src/util/schemas/index.ts +++ b/src/util/schemas/index.ts @@ -76,3 +76,7 @@ export * from "./VoiceVideoSchema"; export * from "./WebAuthnSchema"; export * from "./WebhookCreateSchema"; export * from "./WidgetModifySchema"; +export * from "./UserRelationsResponse"; +export * from "./GatewayResponse"; +export * from "./GatewayBotResponse"; +export * from "./UserProfileResponse"; From b272c56d1a3dd84fcbbd27db1bf61a03c3b3ca5d Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Sat, 25 Mar 2023 19:24:00 +1100 Subject: [PATCH 21/28] Ajv and openapi spec use different versions of typescript json schema?????? --- assets/openapi.json | Bin 240160 -> 240112 bytes assets/schemas.json | Bin 1426718 -> 1427012 bytes scripts/openapi.js | 42 +++++++++++++++++++++++++++++++++--------- scripts/schema.js | 34 ++++++++++++++++++---------------- 4 files changed, 51 insertions(+), 25 deletions(-) diff --git a/assets/openapi.json b/assets/openapi.json index 069eacedaad4c5477b7c1188eb27cc7ea4dcc2ee..7e1f3cac579e54face9b52e03e0a2447447ca5f6 100644 GIT binary patch delta 70 zcmV-M0J;C5)DG~|4zQR4lXevjm(7s@3X=xs5|e;H36tRh7nd;Q0S1!-10I*~?*R~# cGy^l2{>lLsgO3A;j{^aRj{^d?j{^gdrsD1zbpQYW delta 92 zcmexxnQy@rz6~>&n4-C+H*8~+o8GXOk!$h>CZXv83mI7_Kak{@e40sonluyFDCNj!RZ|LA|)oO9Kb6uecdj0sp$@$Y;w~d>|_>b&+Fjbp4Y**PYj!`$px+A(`)AQ oNluOz7n)vhikYola{(U^^8>K}5DNma5D*IkvB-AK1)|bw05hmIVgLXD diff --git a/scripts/openapi.js b/scripts/openapi.js index 86297967b..889a68cbe 100644 --- a/scripts/openapi.js +++ b/scripts/openapi.js @@ -16,6 +16,8 @@ along with this program. If not, see . */ +/* eslint-env node */ + require("module-alias/register"); const getRouteDescriptions = require("./util/getRouteDescriptions"); const path = require("path"); @@ -27,7 +29,31 @@ require("missing-native-js-functions"); const openapiPath = path.join(__dirname, "..", "assets", "openapi.json"); const SchemaPath = path.join(__dirname, "..", "assets", "schemas.json"); -const schemas = JSON.parse(fs.readFileSync(SchemaPath, { encoding: "utf8" })); +let schemas = JSON.parse(fs.readFileSync(SchemaPath, { encoding: "utf8" })); + +for (var schema in schemas) { + const part = schemas[schema]; + for (var key in part.properties) { + if (part.properties[key].anyOf) { + const nullIndex = part.properties[key].anyOf.findIndex( + (x) => x.type == "null", + ); + if (nullIndex != -1) { + part.properties[key].nullable = true; + part.properties[key].anyOf.splice(nullIndex, 1); + + if (part.properties[key].anyOf.length == 1) { + Object.assign( + part.properties[key], + part.properties[key].anyOf[0], + ); + delete part.properties[key].anyOf; + } + } + } + } +} + const specification = JSON.parse( fs.readFileSync(openapiPath, { encoding: "utf8" }), ); @@ -85,15 +111,13 @@ function apiRoutes() { .map((x) => ({ name: x })); specification.components = specification.components || {}; - specification.components.securitySchemes = [ - { - bearer: { - type: "http", - scheme: "bearer", - description: "Bearer/Bot prefixes are not required.", - }, + specification.components.securitySchemes = { + bearer: { + type: "http", + scheme: "bearer", + description: "Bearer/Bot prefixes are not required.", }, - ]; + }; routes.forEach((route, pathAndMethod) => { const [p, method] = pathAndMethod.split("|"); diff --git a/scripts/schema.js b/scripts/schema.js index bd0f73d38..ae4b525a5 100644 --- a/scripts/schema.js +++ b/scripts/schema.js @@ -20,6 +20,8 @@ Regenerates the `fosscord-server/assets/schemas.json` file, used for API/Gateway input validation. */ +/* eslint-env node */ + const path = require("path"); const fs = require("fs"); const TJS = require("typescript-json-schema"); @@ -110,23 +112,23 @@ function main() { continue; } - if (part.properties[key].anyOf) { - const nullIndex = part.properties[key].anyOf.findIndex( - (x) => x.type == "null", - ); - if (nullIndex != -1) { - part.properties[key].nullable = true; - part.properties[key].anyOf.splice(nullIndex, 1); + // if (part.properties[key].anyOf) { + // const nullIndex = part.properties[key].anyOf.findIndex( + // (x) => x.type == "null", + // ); + // if (nullIndex != -1) { + // part.properties[key].nullable = true; + // part.properties[key].anyOf.splice(nullIndex, 1); - if (part.properties[key].anyOf.length == 1) { - Object.assign( - part.properties[key], - part.properties[key].anyOf[0], - ); - delete part.properties[key].anyOf; - } - } - } + // if (part.properties[key].anyOf.length == 1) { + // Object.assign( + // part.properties[key], + // part.properties[key].anyOf[0], + // ); + // delete part.properties[key].anyOf; + // } + // } + // } } } From 14c1b5324468d62586336facc2ac1cc0115bb0d1 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 31 Mar 2023 01:51:15 +1100 Subject: [PATCH 22/28] SPACEBAR --- scripts/benchmark/connections.js | 2 +- scripts/benchmark/index.js | 2 +- scripts/benchmark/users.js | 2 +- scripts/changelog.js | 2 +- scripts/openapi.js | 2 +- scripts/rights.js | 2 +- scripts/schema.js | 2 +- scripts/stagingMigration/index.js | 2 +- scripts/stagingMigration/maria/1672833135670-staging.js | 2 +- scripts/stagingMigration/mysql/1672833135670-staging.js | 2 +- scripts/stagingMigration/postgres/1672815835837-staging.js | 2 +- scripts/stresstest/index.js | 2 +- scripts/stresstest/src/login/index.js | 2 +- scripts/stresstest/src/message/send.js | 2 +- scripts/stresstest/src/register/index.js | 2 +- scripts/syncronise.js | 2 +- scripts/util/getRouteDescriptions.js | 2 +- scripts/util/walk.js | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/benchmark/connections.js b/scripts/benchmark/connections.js index 6e65b8c7c..f3bafb7ff 100644 --- a/scripts/benchmark/connections.js +++ b/scripts/benchmark/connections.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/benchmark/index.js b/scripts/benchmark/index.js index e56d6f062..3164f13ac 100644 --- a/scripts/benchmark/index.js +++ b/scripts/benchmark/index.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/benchmark/users.js b/scripts/benchmark/users.js index ac927aab1..22b88dedd 100644 --- a/scripts/benchmark/users.js +++ b/scripts/benchmark/users.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/changelog.js b/scripts/changelog.js index 9f564bcdf..f36992c59 100644 --- a/scripts/changelog.js +++ b/scripts/changelog.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/openapi.js b/scripts/openapi.js index 889a68cbe..61d4acdbe 100644 --- a/scripts/openapi.js +++ b/scripts/openapi.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/rights.js b/scripts/rights.js index 473d48505..86f8df4ec 100644 --- a/scripts/rights.js +++ b/scripts/rights.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/schema.js b/scripts/schema.js index ae4b525a5..a6e3c7cf2 100644 --- a/scripts/schema.js +++ b/scripts/schema.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/stagingMigration/index.js b/scripts/stagingMigration/index.js index 505405c87..7e279c89d 100644 --- a/scripts/stagingMigration/index.js +++ b/scripts/stagingMigration/index.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/stagingMigration/maria/1672833135670-staging.js b/scripts/stagingMigration/maria/1672833135670-staging.js index fc04ba58c..b1fe4719c 100644 --- a/scripts/stagingMigration/maria/1672833135670-staging.js +++ b/scripts/stagingMigration/maria/1672833135670-staging.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/stagingMigration/mysql/1672833135670-staging.js b/scripts/stagingMigration/mysql/1672833135670-staging.js index fc04ba58c..b1fe4719c 100644 --- a/scripts/stagingMigration/mysql/1672833135670-staging.js +++ b/scripts/stagingMigration/mysql/1672833135670-staging.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/stagingMigration/postgres/1672815835837-staging.js b/scripts/stagingMigration/postgres/1672815835837-staging.js index 64031e5fc..1865fe2fe 100644 --- a/scripts/stagingMigration/postgres/1672815835837-staging.js +++ b/scripts/stagingMigration/postgres/1672815835837-staging.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/stresstest/index.js b/scripts/stresstest/index.js index 07e17de76..d61199cb3 100644 --- a/scripts/stresstest/index.js +++ b/scripts/stresstest/index.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/stresstest/src/login/index.js b/scripts/stresstest/src/login/index.js index fb68c8b2f..2c9058c0e 100644 --- a/scripts/stresstest/src/login/index.js +++ b/scripts/stresstest/src/login/index.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/stresstest/src/message/send.js b/scripts/stresstest/src/message/send.js index 622fc1fba..3bc5954e2 100644 --- a/scripts/stresstest/src/message/send.js +++ b/scripts/stresstest/src/message/send.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/stresstest/src/register/index.js b/scripts/stresstest/src/register/index.js index 4097d854c..494500ddd 100644 --- a/scripts/stresstest/src/register/index.js +++ b/scripts/stresstest/src/register/index.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/syncronise.js b/scripts/syncronise.js index b1658debd..c13bafbdd 100644 --- a/scripts/syncronise.js +++ b/scripts/syncronise.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/util/getRouteDescriptions.js b/scripts/util/getRouteDescriptions.js index 649cafafa..e77aeffca 100644 --- a/scripts/util/getRouteDescriptions.js +++ b/scripts/util/getRouteDescriptions.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/scripts/util/walk.js b/scripts/util/walk.js index 66e984473..c02030f6a 100644 --- a/scripts/util/walk.js +++ b/scripts/util/walk.js @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify From a86a673db3012667bc94a556920f60851fb8817e Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 31 Mar 2023 01:53:24 +1100 Subject: [PATCH 23/28] SPACEBAR --- scripts/util/licensePreamble.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/util/licensePreamble.txt b/scripts/util/licensePreamble.txt index f6c70e008..999c3a8c3 100644 --- a/scripts/util/licensePreamble.txt +++ b/scripts/util/licensePreamble.txt @@ -1,4 +1,4 @@ -Fosscord: A FOSS re-implementation and extension of the Discord.com backend. +Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify From 64e747a4d29220ef285124c98d22646842f03cd6 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 31 Mar 2023 02:04:36 +1100 Subject: [PATCH 24/28] SPACEBAR --- README.md | 18 +++++++++--------- assets/openapi.json | Bin 240112 -> 240113 bytes ...er.code-workspace => server.code-workspace | 0 src/api/Server.ts | 2 +- src/api/global.d.ts | 2 +- src/api/index.ts | 2 +- src/api/middlewares/Authentication.ts | 2 +- src/api/middlewares/BodyParser.ts | 2 +- src/api/middlewares/CORS.ts | 2 +- src/api/middlewares/ErrorHandler.ts | 2 +- src/api/middlewares/RateLimit.ts | 2 +- src/api/middlewares/Translation.ts | 2 +- src/api/middlewares/index.ts | 2 +- src/api/routes/-/healthz.ts | 2 +- src/api/routes/-/readyz.ts | 2 +- src/api/routes/applications/#id/bot/index.ts | 2 +- .../routes/applications/#id/entitlements.ts | 2 +- src/api/routes/applications/#id/index.ts | 2 +- src/api/routes/applications/#id/skus.ts | 2 +- src/api/routes/applications/detectable.ts | 2 +- src/api/routes/applications/index.ts | 2 +- src/api/routes/auth/forgot.ts | 18 ++++++++++++++++++ .../auth/generate-registration-tokens.ts | 2 +- src/api/routes/auth/location-metadata.ts | 2 +- src/api/routes/auth/login.ts | 2 +- src/api/routes/auth/logout.ts | 2 +- src/api/routes/auth/mfa/totp.ts | 2 +- src/api/routes/auth/mfa/webauthn.ts | 2 +- src/api/routes/auth/register.ts | 2 +- src/api/routes/auth/reset.ts | 18 ++++++++++++++++++ src/api/routes/auth/verify/index.ts | 2 +- src/api/routes/auth/verify/resend.ts | 2 +- .../verify/view-backup-codes-challenge.ts | 2 +- .../routes/channels/#channel_id/followers.ts | 2 +- src/api/routes/channels/#channel_id/index.ts | 2 +- .../routes/channels/#channel_id/invites.ts | 2 +- .../#channel_id/messages/#message_id/ack.ts | 2 +- .../messages/#message_id/crosspost.ts | 2 +- .../#channel_id/messages/#message_id/index.ts | 2 +- .../messages/#message_id/reactions.ts | 2 +- .../#channel_id/messages/bulk-delete.ts | 2 +- .../channels/#channel_id/messages/index.ts | 2 +- .../channels/#channel_id/permissions.ts | 2 +- src/api/routes/channels/#channel_id/pins.ts | 2 +- src/api/routes/channels/#channel_id/purge.ts | 2 +- .../routes/channels/#channel_id/recipients.ts | 2 +- src/api/routes/channels/#channel_id/typing.ts | 2 +- .../routes/channels/#channel_id/webhooks.ts | 2 +- src/api/routes/discoverable-guilds.ts | 2 +- src/api/routes/discovery.ts | 2 +- src/api/routes/download.ts | 2 +- src/api/routes/experiments.ts | 2 +- src/api/routes/gateway/bot.ts | 2 +- src/api/routes/gateway/index.ts | 2 +- src/api/routes/gifs/search.ts | 2 +- src/api/routes/gifs/trending-gifs.ts | 2 +- src/api/routes/gifs/trending.ts | 2 +- src/api/routes/guild-recommendations.ts | 2 +- src/api/routes/guilds/#guild_id/audit-logs.ts | 2 +- src/api/routes/guilds/#guild_id/bans.ts | 2 +- src/api/routes/guilds/#guild_id/channels.ts | 2 +- src/api/routes/guilds/#guild_id/delete.ts | 2 +- .../#guild_id/discovery-requirements.ts | 2 +- src/api/routes/guilds/#guild_id/emojis.ts | 2 +- src/api/routes/guilds/#guild_id/index.ts | 2 +- .../routes/guilds/#guild_id/integrations.ts | 2 +- src/api/routes/guilds/#guild_id/invites.ts | 2 +- .../guilds/#guild_id/member-verification.ts | 2 +- .../#guild_id/members/#member_id/index.ts | 2 +- .../#guild_id/members/#member_id/nick.ts | 2 +- .../#member_id/roles/#role_id/index.ts | 2 +- .../routes/guilds/#guild_id/members/index.ts | 2 +- .../guilds/#guild_id/messages/search.ts | 2 +- src/api/routes/guilds/#guild_id/premium.ts | 2 +- .../routes/guilds/#guild_id/profile/index.ts | 2 +- src/api/routes/guilds/#guild_id/prune.ts | 2 +- src/api/routes/guilds/#guild_id/regions.ts | 2 +- .../guilds/#guild_id/roles/#role_id/index.ts | 2 +- .../routes/guilds/#guild_id/roles/index.ts | 2 +- src/api/routes/guilds/#guild_id/stickers.ts | 2 +- src/api/routes/guilds/#guild_id/templates.ts | 2 +- src/api/routes/guilds/#guild_id/vanity-url.ts | 2 +- .../#guild_id/voice-states/#user_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/webhooks.ts | 2 +- .../routes/guilds/#guild_id/welcome-screen.ts | 2 +- .../routes/guilds/#guild_id/widget.json.ts | 2 +- src/api/routes/guilds/#guild_id/widget.png.ts | 2 +- src/api/routes/guilds/#guild_id/widget.ts | 2 +- src/api/routes/guilds/index.ts | 2 +- src/api/routes/guilds/templates/index.ts | 2 +- src/api/routes/invites/index.ts | 2 +- src/api/routes/oauth2/authorize.ts | 2 +- src/api/routes/oauth2/tokens.ts | 2 +- src/api/routes/outbound-promotions.ts | 2 +- .../routes/partners/#guild_id/requirements.ts | 2 +- src/api/routes/ping.ts | 2 +- src/api/routes/policies/instance/domains.ts | 2 +- src/api/routes/policies/instance/index.ts | 2 +- src/api/routes/policies/instance/limits.ts | 2 +- src/api/routes/policies/stats.ts | 2 +- src/api/routes/read-states/ack-bulk.ts | 2 +- .../scheduled-maintenances/upcoming_json.ts | 2 +- src/api/routes/science.ts | 2 +- src/api/routes/stage-instances.ts | 2 +- src/api/routes/sticker-packs/index.ts | 2 +- src/api/routes/stickers/#sticker_id/index.ts | 2 +- src/api/routes/stop.ts | 2 +- .../store/published-listings/applications.ts | 2 +- .../applications/#id/subscription-plans.ts | 2 +- .../routes/store/published-listings/skus.ts | 2 +- .../skus/#sku_id/subscription-plans.ts | 2 +- src/api/routes/teams.ts | 2 +- src/api/routes/track.ts | 2 +- src/api/routes/updates.ts | 2 +- src/api/routes/users/#id/delete.ts | 2 +- src/api/routes/users/#id/index.ts | 2 +- src/api/routes/users/#id/profile.ts | 2 +- src/api/routes/users/#id/relationships.ts | 2 +- .../@me/activities/statistics/applications.ts | 2 +- src/api/routes/users/@me/affinities/guilds.ts | 2 +- src/api/routes/users/@me/affinities/users.ts | 2 +- .../@me/applications/#app_id/entitlements.ts | 2 +- .../routes/users/@me/billing/country-code.ts | 2 +- .../users/@me/billing/payment-sources.ts | 2 +- .../routes/users/@me/billing/subscriptions.ts | 2 +- src/api/routes/users/@me/channels.ts | 2 +- src/api/routes/users/@me/connections.ts | 2 +- src/api/routes/users/@me/delete.ts | 2 +- src/api/routes/users/@me/devices.ts | 2 +- src/api/routes/users/@me/disable.ts | 2 +- src/api/routes/users/@me/email-settings.ts | 2 +- src/api/routes/users/@me/entitlements.ts | 2 +- src/api/routes/users/@me/guilds.ts | 2 +- .../users/@me/guilds/#guild_id/settings.ts | 2 +- .../@me/guilds/premium/subscription-slots.ts | 2 +- src/api/routes/users/@me/index.ts | 2 +- src/api/routes/users/@me/library.ts | 2 +- .../users/@me/mfa/codes-verification.ts | 2 +- src/api/routes/users/@me/mfa/codes.ts | 2 +- src/api/routes/users/@me/mfa/totp/disable.ts | 2 +- src/api/routes/users/@me/mfa/totp/enable.ts | 2 +- .../mfa/webauthn/credentials/#key_id/index.ts | 2 +- .../@me/mfa/webauthn/credentials/index.ts | 2 +- src/api/routes/users/@me/notes.ts | 2 +- src/api/routes/users/@me/relationships.ts | 2 +- src/api/routes/users/@me/settings.ts | 2 +- src/api/routes/voice/regions.ts | 2 +- src/api/start.ts | 2 +- src/api/util/handlers/Instance.ts | 2 +- src/api/util/handlers/Message.ts | 2 +- src/api/util/handlers/Voice.ts | 2 +- src/api/util/handlers/route.ts | 2 +- src/api/util/index.ts | 2 +- src/api/util/utility/Base64.ts | 2 +- src/api/util/utility/EmbedHandlers.ts | 2 +- src/api/util/utility/RandomInviteID.ts | 2 +- src/api/util/utility/String.ts | 2 +- src/api/util/utility/captcha.ts | 2 +- src/api/util/utility/ipAddress.ts | 2 +- src/api/util/utility/passwordStrength.ts | 2 +- src/bundle/Server.ts | 2 +- src/bundle/index.ts | 2 +- src/bundle/start.ts | 2 +- src/bundle/stats.ts | 2 +- src/cdn/Server.ts | 2 +- src/cdn/index.ts | 2 +- src/cdn/routes/attachments.ts | 2 +- src/cdn/routes/avatars.ts | 2 +- src/cdn/routes/embed.ts | 2 +- src/cdn/routes/guild-profiles.ts | 2 +- src/cdn/routes/ping.ts | 2 +- src/cdn/routes/role-icons.ts | 2 +- src/cdn/start.ts | 2 +- src/cdn/util/FileStorage.ts | 2 +- src/cdn/util/S3Storage.ts | 2 +- src/cdn/util/Storage.ts | 2 +- src/cdn/util/index.ts | 2 +- src/cdn/util/multer.ts | 2 +- src/gateway/Server.ts | 2 +- src/gateway/events/Close.ts | 2 +- src/gateway/events/Connection.ts | 2 +- src/gateway/events/Message.ts | 2 +- src/gateway/index.ts | 2 +- src/gateway/listener/listener.ts | 2 +- src/gateway/opcodes/Heartbeat.ts | 2 +- src/gateway/opcodes/Identify.ts | 2 +- src/gateway/opcodes/LazyRequest.ts | 2 +- src/gateway/opcodes/PresenceUpdate.ts | 2 +- src/gateway/opcodes/RequestGuildMembers.ts | 2 +- src/gateway/opcodes/Resume.ts | 2 +- src/gateway/opcodes/VoiceStateUpdate.ts | 2 +- src/gateway/opcodes/index.ts | 2 +- src/gateway/opcodes/instanceOf.ts | 2 +- src/gateway/start.ts | 2 +- src/gateway/util/Constants.ts | 2 +- src/gateway/util/Heartbeat.ts | 2 +- src/gateway/util/Send.ts | 2 +- src/gateway/util/SessionUtils.ts | 2 +- src/gateway/util/WebSocket.ts | 2 +- src/gateway/util/index.ts | 2 +- src/util/config/Config.ts | 2 +- src/util/config/index.ts | 2 +- src/util/config/types/ApiConfiguration.ts | 2 +- src/util/config/types/CdnConfiguration.ts | 2 +- .../config/types/DefaultsConfiguration.ts | 2 +- src/util/config/types/EmailConfiguration.ts | 2 +- .../config/types/EndpointConfiguration.ts | 2 +- .../types/ExternalTokensConfiguration.ts | 2 +- src/util/config/types/GeneralConfiguration.ts | 2 +- src/util/config/types/GifConfiguration.ts | 2 +- src/util/config/types/GuildConfiguration.ts | 2 +- src/util/config/types/KafkaConfiguration.ts | 2 +- src/util/config/types/LimitConfigurations.ts | 2 +- src/util/config/types/LoginConfiguration.ts | 2 +- src/util/config/types/MetricsConfiguration.ts | 2 +- .../types/PasswordResetConfiguration.ts | 2 +- .../config/types/RabbitMQConfiguration.ts | 2 +- src/util/config/types/RegionConfiguration.ts | 2 +- .../config/types/RegisterConfiguration.ts | 2 +- .../config/types/SecurityConfiguration.ts | 2 +- src/util/config/types/SentryConfiguration.ts | 2 +- .../config/types/TemplateConfiguration.ts | 2 +- src/util/config/types/index.ts | 2 +- .../client/ClientReleaseConfiguration.ts | 2 +- .../types/subconfigurations/client/index.ts | 2 +- .../defaults/GuildDefaults.ts | 2 +- .../defaults/UserDefaults.ts | 2 +- .../types/subconfigurations/defaults/index.ts | 2 +- .../types/subconfigurations/email/MailGun.ts | 2 +- .../types/subconfigurations/email/MailJet.ts | 2 +- .../types/subconfigurations/email/SMTP.ts | 2 +- .../types/subconfigurations/email/SendGrid.ts | 2 +- .../types/subconfigurations/email/index.ts | 2 +- .../types/subconfigurations/guild/AutoJoin.ts | 2 +- .../subconfigurations/guild/Discovery.ts | 2 +- .../types/subconfigurations/guild/index.ts | 2 +- .../config/types/subconfigurations/index.ts | 2 +- .../subconfigurations/kafka/KafkaBroker.ts | 2 +- .../types/subconfigurations/kafka/index.ts | 2 +- .../subconfigurations/limits/ChannelLimits.ts | 2 +- .../limits/GlobalRateLimits.ts | 2 +- .../subconfigurations/limits/GuildLimits.ts | 2 +- .../subconfigurations/limits/MessageLimits.ts | 2 +- .../subconfigurations/limits/RateLimits.ts | 2 +- .../subconfigurations/limits/UserLimits.ts | 2 +- .../types/subconfigurations/limits/index.ts | 2 +- .../limits/ratelimits/Auth.ts | 2 +- .../limits/ratelimits/RateLimitOptions.ts | 2 +- .../limits/ratelimits/Route.ts | 2 +- .../limits/ratelimits/index.ts | 2 +- .../types/subconfigurations/region/Region.ts | 2 +- .../types/subconfigurations/region/index.ts | 2 +- .../subconfigurations/register/DateOfBirth.ts | 2 +- .../types/subconfigurations/register/Email.ts | 2 +- .../subconfigurations/register/Password.ts | 2 +- .../types/subconfigurations/register/index.ts | 2 +- .../subconfigurations/security/Captcha.ts | 2 +- .../subconfigurations/security/TwoFactor.ts | 2 +- .../types/subconfigurations/security/index.ts | 2 +- src/util/dtos/DmChannelDTO.ts | 2 +- src/util/dtos/ReadyGuildDTO.ts | 2 +- src/util/dtos/UserDTO.ts | 2 +- src/util/dtos/index.ts | 2 +- src/util/entities/Application.ts | 2 +- src/util/entities/Attachment.ts | 2 +- src/util/entities/AuditLog.ts | 2 +- src/util/entities/BackupCodes.ts | 2 +- src/util/entities/Ban.ts | 2 +- src/util/entities/BaseClass.ts | 2 +- src/util/entities/Categories.ts | 2 +- src/util/entities/Channel.ts | 2 +- src/util/entities/ClientRelease.ts | 2 +- src/util/entities/Config.ts | 2 +- src/util/entities/ConnectedAccount.ts | 2 +- src/util/entities/EmbedCache.ts | 2 +- src/util/entities/Emoji.ts | 2 +- src/util/entities/Encryption.ts | 2 +- src/util/entities/Guild.ts | 2 +- src/util/entities/Invite.ts | 2 +- src/util/entities/Member.ts | 2 +- src/util/entities/Message.ts | 2 +- src/util/entities/Migration.ts | 2 +- src/util/entities/Note.ts | 2 +- src/util/entities/RateLimit.ts | 2 +- src/util/entities/ReadState.ts | 2 +- src/util/entities/Recipient.ts | 2 +- src/util/entities/Relationship.ts | 2 +- src/util/entities/Role.ts | 2 +- src/util/entities/SecurityKey.ts | 2 +- src/util/entities/Session.ts | 2 +- src/util/entities/Sticker.ts | 2 +- src/util/entities/StickerPack.ts | 2 +- src/util/entities/Team.ts | 2 +- src/util/entities/TeamMember.ts | 2 +- src/util/entities/Template.ts | 2 +- src/util/entities/User.ts | 2 +- src/util/entities/UserSettings.ts | 2 +- src/util/entities/ValidRegistrationTokens.ts | 2 +- src/util/entities/VoiceState.ts | 2 +- src/util/entities/Webhook.ts | 2 +- src/util/entities/index.ts | 2 +- src/util/imports/index.ts | 2 +- src/util/index.ts | 2 +- src/util/interfaces/Activity.ts | 2 +- src/util/interfaces/Event.ts | 2 +- src/util/interfaces/Interaction.ts | 2 +- src/util/interfaces/Presence.ts | 2 +- src/util/interfaces/Status.ts | 2 +- src/util/interfaces/index.ts | 2 +- .../1673609465036-templateDeleteCascade.ts | 2 +- .../mariadb/1675045120206-webauthn.ts | 2 +- .../1673609465036-templateDeleteCascade.ts | 2 +- .../migration/mysql/1675045120206-webauthn.ts | 2 +- .../1673609867556-templateDeleteCascade.ts | 2 +- .../postgres/1675044825710-webauthn.ts | 2 +- src/util/schemas/AckBulkSchema.ts | 2 +- src/util/schemas/ActivitySchema.ts | 2 +- .../schemas/ApplicationAuthorizeSchema.ts | 2 +- src/util/schemas/ApplicationCreateSchema.ts | 2 +- src/util/schemas/ApplicationModifySchema.ts | 2 +- .../schemas/BackupCodesChallengeSchema.ts | 2 +- src/util/schemas/BanCreateSchema.ts | 2 +- src/util/schemas/BanModeratorSchema.ts | 2 +- src/util/schemas/BanRegistrySchema.ts | 2 +- src/util/schemas/BotModifySchema.ts | 2 +- src/util/schemas/BulkDeleteSchema.ts | 2 +- src/util/schemas/ChannelModifySchema.ts | 2 +- .../ChannelPermissionOverwriteSchema.ts | 2 +- src/util/schemas/ChannelReorderSchema.ts | 2 +- src/util/schemas/CodesVerificationSchema.ts | 2 +- src/util/schemas/DmChannelCreateSchema.ts | 2 +- src/util/schemas/EmojiCreateSchema.ts | 2 +- src/util/schemas/EmojiModifySchema.ts | 2 +- src/util/schemas/ForgotPasswordSchema.ts | 2 +- src/util/schemas/GatewayBotResponse.ts | 18 ++++++++++++++++++ src/util/schemas/GatewayPayloadSchema.ts | 2 +- src/util/schemas/GatewayResponse.ts | 18 ++++++++++++++++++ src/util/schemas/GuildCreateSchema.ts | 2 +- src/util/schemas/GuildTemplateCreateSchema.ts | 2 +- src/util/schemas/GuildUpdateSchema.ts | 2 +- .../schemas/GuildUpdateWelcomeScreenSchema.ts | 2 +- src/util/schemas/IdentifySchema.ts | 2 +- src/util/schemas/InviteCreateSchema.ts | 2 +- src/util/schemas/LazyRequestSchema.ts | 2 +- src/util/schemas/LoginSchema.ts | 2 +- src/util/schemas/MemberChangeProfileSchema.ts | 2 +- src/util/schemas/MemberChangeSchema.ts | 2 +- src/util/schemas/MemberNickChangeSchema.ts | 2 +- src/util/schemas/MessageAcknowledgeSchema.ts | 2 +- src/util/schemas/MessageCreateSchema.ts | 2 +- src/util/schemas/MessageEditSchema.ts | 2 +- src/util/schemas/MfaCodesSchema.ts | 2 +- src/util/schemas/ModifyGuildStickerSchema.ts | 2 +- src/util/schemas/PasswordResetSchema.ts | 2 +- src/util/schemas/PruneSchema.ts | 2 +- src/util/schemas/PurgeSchema.ts | 2 +- src/util/schemas/RegisterSchema.ts | 2 +- src/util/schemas/RelationshipPostSchema.ts | 2 +- src/util/schemas/RelationshipPutSchema.ts | 2 +- src/util/schemas/RoleModifySchema.ts | 2 +- src/util/schemas/RolePositionUpdateSchema.ts | 2 +- src/util/schemas/SelectProtocolSchema.ts | 2 +- src/util/schemas/TemplateCreateSchema.ts | 2 +- src/util/schemas/TemplateModifySchema.ts | 2 +- src/util/schemas/TotpDisableSchema.ts | 2 +- src/util/schemas/TotpEnableSchema.ts | 2 +- src/util/schemas/TotpSchema.ts | 2 +- src/util/schemas/UserDeleteSchema.ts | 2 +- src/util/schemas/UserGuildSettingsSchema.ts | 2 +- src/util/schemas/UserModifySchema.ts | 2 +- src/util/schemas/UserProfileModifySchema.ts | 2 +- src/util/schemas/UserProfileResponse.ts | 18 ++++++++++++++++++ src/util/schemas/UserRelationsResponse.ts | 18 ++++++++++++++++++ src/util/schemas/UserSettingsSchema.ts | 2 +- src/util/schemas/Validator.ts | 2 +- src/util/schemas/VanityUrlSchema.ts | 2 +- src/util/schemas/VerifyEmailSchema.ts | 2 +- src/util/schemas/VoiceIdentifySchema.ts | 2 +- src/util/schemas/VoiceStateUpdateSchema.ts | 2 +- src/util/schemas/VoiceVideoSchema.ts | 2 +- src/util/schemas/WebAuthnSchema.ts | 2 +- src/util/schemas/WebhookCreateSchema.ts | 2 +- src/util/schemas/WidgetModifySchema.ts | 2 +- src/util/schemas/index.ts | 2 +- src/util/util/ApiError.ts | 2 +- src/util/util/Array.ts | 2 +- src/util/util/AutoUpdate.ts | 2 +- src/util/util/Categories.ts | 2 +- src/util/util/Config.ts | 2 +- src/util/util/Constants.ts | 2 +- src/util/util/Database.ts | 2 +- src/util/util/Event.ts | 2 +- src/util/util/FieldError.ts | 2 +- src/util/util/Intents.ts | 2 +- src/util/util/InvisibleCharacters.ts | 2 +- src/util/util/JSON.ts | 18 ++++++++++++++++++ src/util/util/RabbitMQ.ts | 2 +- src/util/util/Regex.ts | 2 +- src/util/util/Rights.ts | 2 +- src/util/util/Sentry.ts | 2 +- src/util/util/String.ts | 2 +- src/util/util/Token.ts | 2 +- src/util/util/TraverseDirectory.ts | 2 +- src/util/util/WebAuthn.ts | 2 +- src/util/util/cdn.ts | 2 +- src/util/util/email/index.ts | 2 +- src/util/util/email/transports/MailGun.ts | 18 ++++++++++++++++++ src/util/util/email/transports/MailJet.ts | 18 ++++++++++++++++++ src/util/util/email/transports/SMTP.ts | 18 ++++++++++++++++++ src/util/util/email/transports/SendGrid.ts | 18 ++++++++++++++++++ src/util/util/email/transports/index.ts | 18 ++++++++++++++++++ src/util/util/index.ts | 2 +- src/webrtc/Server.ts | 2 +- src/webrtc/events/Close.ts | 2 +- src/webrtc/events/Connection.ts | 2 +- src/webrtc/events/Message.ts | 2 +- src/webrtc/index.ts | 2 +- src/webrtc/opcodes/BackendVersion.ts | 2 +- src/webrtc/opcodes/Heartbeat.ts | 2 +- src/webrtc/opcodes/Identify.ts | 2 +- src/webrtc/opcodes/SelectProtocol.ts | 2 +- src/webrtc/opcodes/Speaking.ts | 2 +- src/webrtc/opcodes/Video.ts | 2 +- src/webrtc/opcodes/index.ts | 2 +- src/webrtc/start.ts | 2 +- src/webrtc/util/Constants.ts | 2 +- src/webrtc/util/MediaServer.ts | 2 +- src/webrtc/util/index.ts | 2 +- 428 files changed, 638 insertions(+), 422 deletions(-) rename fosscord-server.code-workspace => server.code-workspace (100%) diff --git a/README.md b/README.md index 2133865dd..589cac472 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,28 @@

- +

-

Fosscord Server

+

Spacebar Server

- - - + + +

-## [About](https://fosscord.com) +## [About](https://spacebar.chat) This repository contains: -- [Fosscord HTTP API Server](/src/api) +- [Spacebar HTTP API Server](/src/api) - [WebSocket Gateway Server](/src/gateway) - [HTTP CDN Server](/src/cdn) - [Utility and Database Models](/src/util) -## [Contributing](https://docs.fosscord.com/contributing/) +## [Contributing](https://docs.spacebar.chat/contributing/) -## [Setup](https://docs.fosscord.com/setup/server/) +## [Setup](https://docs.spacebar.chat/setup/server/) diff --git a/assets/openapi.json b/assets/openapi.json index 7e1f3cac579e54face9b52e03e0a2447447ca5f6..e0b2e564e1150ccea8c7a809f373a2e484287b07 100644 GIT binary patch delta 112 zcmexxneXFez6p_{#RZAUsY!`NddV4yCHjd4nfgjPT+v#kICu&OH@ diff --git a/fosscord-server.code-workspace b/server.code-workspace similarity index 100% rename from fosscord-server.code-workspace rename to server.code-workspace diff --git a/src/api/Server.ts b/src/api/Server.ts index 6ec531e0b..dc84a943b 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/global.d.ts b/src/api/global.d.ts index e996933ad..da2f42720 100644 --- a/src/api/global.d.ts +++ b/src/api/global.d.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/index.ts b/src/api/index.ts index 88dcdb3a3..185180722 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index 771f0de88..7a30312f3 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/middlewares/BodyParser.ts b/src/api/middlewares/BodyParser.ts index 646f33b13..e5c037d30 100644 --- a/src/api/middlewares/BodyParser.ts +++ b/src/api/middlewares/BodyParser.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/middlewares/CORS.ts b/src/api/middlewares/CORS.ts index e89fb9090..2197c7078 100644 --- a/src/api/middlewares/CORS.ts +++ b/src/api/middlewares/CORS.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/middlewares/ErrorHandler.ts b/src/api/middlewares/ErrorHandler.ts index a0664ccde..469e8ee66 100644 --- a/src/api/middlewares/ErrorHandler.ts +++ b/src/api/middlewares/ErrorHandler.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/middlewares/RateLimit.ts b/src/api/middlewares/RateLimit.ts index 1a28f356e..576bbb960 100644 --- a/src/api/middlewares/RateLimit.ts +++ b/src/api/middlewares/RateLimit.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/middlewares/Translation.ts b/src/api/middlewares/Translation.ts index 928d29ff2..1d651f117 100644 --- a/src/api/middlewares/Translation.ts +++ b/src/api/middlewares/Translation.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/middlewares/index.ts b/src/api/middlewares/index.ts index 096a77934..e4b67d813 100644 --- a/src/api/middlewares/index.ts +++ b/src/api/middlewares/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/-/healthz.ts b/src/api/routes/-/healthz.ts index a6be5a83c..2d414832f 100644 --- a/src/api/routes/-/healthz.ts +++ b/src/api/routes/-/healthz.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/-/readyz.ts b/src/api/routes/-/readyz.ts index a6be5a83c..2d414832f 100644 --- a/src/api/routes/-/readyz.ts +++ b/src/api/routes/-/readyz.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/applications/#id/bot/index.ts b/src/api/routes/applications/#id/bot/index.ts index 9bc3c571a..f0826ffb0 100644 --- a/src/api/routes/applications/#id/bot/index.ts +++ b/src/api/routes/applications/#id/bot/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/applications/#id/entitlements.ts b/src/api/routes/applications/#id/entitlements.ts index 98d992e3e..7903f5140 100644 --- a/src/api/routes/applications/#id/entitlements.ts +++ b/src/api/routes/applications/#id/entitlements.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/applications/#id/index.ts b/src/api/routes/applications/#id/index.ts index 59e90168b..695173aec 100644 --- a/src/api/routes/applications/#id/index.ts +++ b/src/api/routes/applications/#id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/applications/#id/skus.ts b/src/api/routes/applications/#id/skus.ts index 5a3a479f8..fea252429 100644 --- a/src/api/routes/applications/#id/skus.ts +++ b/src/api/routes/applications/#id/skus.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/applications/detectable.ts b/src/api/routes/applications/detectable.ts index 85062aa63..0ec342ea6 100644 --- a/src/api/routes/applications/detectable.ts +++ b/src/api/routes/applications/detectable.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/applications/index.ts b/src/api/routes/applications/index.ts index 859ee145f..56605e455 100644 --- a/src/api/routes/applications/index.ts +++ b/src/api/routes/applications/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts index 04df97d73..31ebb16d9 100644 --- a/src/api/routes/auth/forgot.ts +++ b/src/api/routes/auth/forgot.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + import { getIpAdress, route, verifyCaptcha } from "@fosscord/api"; import { Config, diff --git a/src/api/routes/auth/generate-registration-tokens.ts b/src/api/routes/auth/generate-registration-tokens.ts index c79d2a59b..4458cfc81 100644 --- a/src/api/routes/auth/generate-registration-tokens.ts +++ b/src/api/routes/auth/generate-registration-tokens.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/location-metadata.ts b/src/api/routes/auth/location-metadata.ts index 1ee8cd62e..f6da3bdfb 100644 --- a/src/api/routes/auth/location-metadata.ts +++ b/src/api/routes/auth/location-metadata.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts index 9c6f23358..dab87e4e1 100644 --- a/src/api/routes/auth/login.ts +++ b/src/api/routes/auth/login.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/logout.ts b/src/api/routes/auth/logout.ts index 43ba72a2b..adb995e51 100644 --- a/src/api/routes/auth/logout.ts +++ b/src/api/routes/auth/logout.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/mfa/totp.ts b/src/api/routes/auth/mfa/totp.ts index bbbd12368..3c2025aa0 100644 --- a/src/api/routes/auth/mfa/totp.ts +++ b/src/api/routes/auth/mfa/totp.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/mfa/webauthn.ts b/src/api/routes/auth/mfa/webauthn.ts index a9fa78b2d..63b12ca89 100644 --- a/src/api/routes/auth/mfa/webauthn.ts +++ b/src/api/routes/auth/mfa/webauthn.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts index 0bf8efae3..51efbc998 100644 --- a/src/api/routes/auth/register.ts +++ b/src/api/routes/auth/register.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts index 9ab25dca7..79ef296c7 100644 --- a/src/api/routes/auth/reset.ts +++ b/src/api/routes/auth/reset.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + import { route } from "@fosscord/api"; import { checkToken, diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts index ac12bbb7e..cd95d59d0 100644 --- a/src/api/routes/auth/verify/index.ts +++ b/src/api/routes/auth/verify/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts index 918af9a15..104361632 100644 --- a/src/api/routes/auth/verify/resend.ts +++ b/src/api/routes/auth/verify/resend.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/auth/verify/view-backup-codes-challenge.ts b/src/api/routes/auth/verify/view-backup-codes-challenge.ts index 3e1a6a92d..31a9d1668 100644 --- a/src/api/routes/auth/verify/view-backup-codes-challenge.ts +++ b/src/api/routes/auth/verify/view-backup-codes-challenge.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/followers.ts b/src/api/routes/channels/#channel_id/followers.ts index a9d5d4eeb..093eb3c33 100644 --- a/src/api/routes/channels/#channel_id/followers.ts +++ b/src/api/routes/channels/#channel_id/followers.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts index 4a2023d2a..d2228ebaf 100644 --- a/src/api/routes/channels/#channel_id/index.ts +++ b/src/api/routes/channels/#channel_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/invites.ts b/src/api/routes/channels/#channel_id/invites.ts index 49620aaf9..af7dff0ba 100644 --- a/src/api/routes/channels/#channel_id/invites.ts +++ b/src/api/routes/channels/#channel_id/invites.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts index 16c2de290..4800518af 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts index bbbefad3c..b054d413b 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts index 400b8f3a4..7152afbb1 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts index c3598b241..94449cc8d 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts index ee039d3e6..c816e04b7 100644 --- a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts +++ b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index 76f6a0dc3..43814846d 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/permissions.ts b/src/api/routes/channels/#channel_id/permissions.ts index da448678b..4669eb739 100644 --- a/src/api/routes/channels/#channel_id/permissions.ts +++ b/src/api/routes/channels/#channel_id/permissions.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/pins.ts b/src/api/routes/channels/#channel_id/pins.ts index 284193834..cf20d077c 100644 --- a/src/api/routes/channels/#channel_id/pins.ts +++ b/src/api/routes/channels/#channel_id/pins.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/purge.ts b/src/api/routes/channels/#channel_id/purge.ts index 04d8cfa2c..1e6c2f50b 100644 --- a/src/api/routes/channels/#channel_id/purge.ts +++ b/src/api/routes/channels/#channel_id/purge.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/recipients.ts b/src/api/routes/channels/#channel_id/recipients.ts index 252a8ef03..111a24324 100644 --- a/src/api/routes/channels/#channel_id/recipients.ts +++ b/src/api/routes/channels/#channel_id/recipients.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/typing.ts b/src/api/routes/channels/#channel_id/typing.ts index b50123c2b..ba21283b0 100644 --- a/src/api/routes/channels/#channel_id/typing.ts +++ b/src/api/routes/channels/#channel_id/typing.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts index 31cae7476..85530e33c 100644 --- a/src/api/routes/channels/#channel_id/webhooks.ts +++ b/src/api/routes/channels/#channel_id/webhooks.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/discoverable-guilds.ts b/src/api/routes/discoverable-guilds.ts index 8f90d73c3..cc3c61d80 100644 --- a/src/api/routes/discoverable-guilds.ts +++ b/src/api/routes/discoverable-guilds.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/discovery.ts b/src/api/routes/discovery.ts index 1414a617a..50d9d96e2 100644 --- a/src/api/routes/discovery.ts +++ b/src/api/routes/discovery.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/download.ts b/src/api/routes/download.ts index b6c03a481..e32d86b80 100644 --- a/src/api/routes/download.ts +++ b/src/api/routes/download.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/experiments.ts b/src/api/routes/experiments.ts index 8c32afda7..3138e58db 100644 --- a/src/api/routes/experiments.ts +++ b/src/api/routes/experiments.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/gateway/bot.ts b/src/api/routes/gateway/bot.ts index 02049b191..72f8d9033 100644 --- a/src/api/routes/gateway/bot.ts +++ b/src/api/routes/gateway/bot.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/gateway/index.ts b/src/api/routes/gateway/index.ts index f5ed4c1f1..b7dd4903a 100644 --- a/src/api/routes/gateway/index.ts +++ b/src/api/routes/gateway/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/gifs/search.ts b/src/api/routes/gifs/search.ts index ae63d6438..cbd89c382 100644 --- a/src/api/routes/gifs/search.ts +++ b/src/api/routes/gifs/search.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/gifs/trending-gifs.ts b/src/api/routes/gifs/trending-gifs.ts index d0698fa06..389f72f7b 100644 --- a/src/api/routes/gifs/trending-gifs.ts +++ b/src/api/routes/gifs/trending-gifs.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/gifs/trending.ts b/src/api/routes/gifs/trending.ts index 5c872df82..2631eab4b 100644 --- a/src/api/routes/gifs/trending.ts +++ b/src/api/routes/gifs/trending.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guild-recommendations.ts b/src/api/routes/guild-recommendations.ts index ac2ad9e7a..e7112b930 100644 --- a/src/api/routes/guild-recommendations.ts +++ b/src/api/routes/guild-recommendations.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/audit-logs.ts b/src/api/routes/guilds/#guild_id/audit-logs.ts index c0e8e6345..b27c23240 100644 --- a/src/api/routes/guilds/#guild_id/audit-logs.ts +++ b/src/api/routes/guilds/#guild_id/audit-logs.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts index b044689f0..ee0e4dd4e 100644 --- a/src/api/routes/guilds/#guild_id/bans.ts +++ b/src/api/routes/guilds/#guild_id/bans.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts index acdb5f19b..176d4f7b4 100644 --- a/src/api/routes/guilds/#guild_id/channels.ts +++ b/src/api/routes/guilds/#guild_id/channels.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/delete.ts b/src/api/routes/guilds/#guild_id/delete.ts index 9a13c9b4e..236d53b20 100644 --- a/src/api/routes/guilds/#guild_id/delete.ts +++ b/src/api/routes/guilds/#guild_id/delete.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/discovery-requirements.ts b/src/api/routes/guilds/#guild_id/discovery-requirements.ts index de2da6eed..8dbf68a5f 100644 --- a/src/api/routes/guilds/#guild_id/discovery-requirements.ts +++ b/src/api/routes/guilds/#guild_id/discovery-requirements.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/emojis.ts b/src/api/routes/guilds/#guild_id/emojis.ts index 491c9be28..e907fe913 100644 --- a/src/api/routes/guilds/#guild_id/emojis.ts +++ b/src/api/routes/guilds/#guild_id/emojis.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/index.ts b/src/api/routes/guilds/#guild_id/index.ts index c262a088c..01da7f09c 100644 --- a/src/api/routes/guilds/#guild_id/index.ts +++ b/src/api/routes/guilds/#guild_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/integrations.ts b/src/api/routes/guilds/#guild_id/integrations.ts index 4a274fbfb..758828847 100644 --- a/src/api/routes/guilds/#guild_id/integrations.ts +++ b/src/api/routes/guilds/#guild_id/integrations.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/invites.ts b/src/api/routes/guilds/#guild_id/invites.ts index dd0999927..7b37b4955 100644 --- a/src/api/routes/guilds/#guild_id/invites.ts +++ b/src/api/routes/guilds/#guild_id/invites.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/member-verification.ts b/src/api/routes/guilds/#guild_id/member-verification.ts index 6d1f7bb5e..ab6c7281e 100644 --- a/src/api/routes/guilds/#guild_id/member-verification.ts +++ b/src/api/routes/guilds/#guild_id/member-verification.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts index 6ac0dd3bd..01b91d735 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts index c93eab087..fc12ded3b 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts index 16c5e789d..b6d56d1bd 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/members/index.ts b/src/api/routes/guilds/#guild_id/members/index.ts index 51e9eb1f4..f2079639f 100644 --- a/src/api/routes/guilds/#guild_id/members/index.ts +++ b/src/api/routes/guilds/#guild_id/members/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/messages/search.ts b/src/api/routes/guilds/#guild_id/messages/search.ts index 601167eee..1ccff8033 100644 --- a/src/api/routes/guilds/#guild_id/messages/search.ts +++ b/src/api/routes/guilds/#guild_id/messages/search.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/premium.ts b/src/api/routes/guilds/#guild_id/premium.ts index 61f6a220f..b975f17b4 100644 --- a/src/api/routes/guilds/#guild_id/premium.ts +++ b/src/api/routes/guilds/#guild_id/premium.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/profile/index.ts b/src/api/routes/guilds/#guild_id/profile/index.ts index cbf0ff6a6..fe7a58b3d 100644 --- a/src/api/routes/guilds/#guild_id/profile/index.ts +++ b/src/api/routes/guilds/#guild_id/profile/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/prune.ts b/src/api/routes/guilds/#guild_id/prune.ts index 37b70f637..5c123b2e1 100644 --- a/src/api/routes/guilds/#guild_id/prune.ts +++ b/src/api/routes/guilds/#guild_id/prune.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/regions.ts b/src/api/routes/guilds/#guild_id/regions.ts index 61ba00bf6..8441edb9a 100644 --- a/src/api/routes/guilds/#guild_id/regions.ts +++ b/src/api/routes/guilds/#guild_id/regions.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts index 48e77897a..ee91454ca 100644 --- a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/roles/index.ts b/src/api/routes/guilds/#guild_id/roles/index.ts index 54d4b12c3..226feac53 100644 --- a/src/api/routes/guilds/#guild_id/roles/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/stickers.ts b/src/api/routes/guilds/#guild_id/stickers.ts index 47fa373e3..5d691eb95 100644 --- a/src/api/routes/guilds/#guild_id/stickers.ts +++ b/src/api/routes/guilds/#guild_id/stickers.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts index 284bbccff..52703b4eb 100644 --- a/src/api/routes/guilds/#guild_id/templates.ts +++ b/src/api/routes/guilds/#guild_id/templates.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/vanity-url.ts b/src/api/routes/guilds/#guild_id/vanity-url.ts index b11bead58..6ce4d176d 100644 --- a/src/api/routes/guilds/#guild_id/vanity-url.ts +++ b/src/api/routes/guilds/#guild_id/vanity-url.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts index 3577df17e..ae41a5964 100644 --- a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts +++ b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/webhooks.ts b/src/api/routes/guilds/#guild_id/webhooks.ts index f4bf1da04..aeee38ed5 100644 --- a/src/api/routes/guilds/#guild_id/webhooks.ts +++ b/src/api/routes/guilds/#guild_id/webhooks.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/welcome-screen.ts b/src/api/routes/guilds/#guild_id/welcome-screen.ts index f366201a1..27cab5917 100644 --- a/src/api/routes/guilds/#guild_id/welcome-screen.ts +++ b/src/api/routes/guilds/#guild_id/welcome-screen.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/widget.json.ts b/src/api/routes/guilds/#guild_id/widget.json.ts index 9319d0581..5c738012d 100644 --- a/src/api/routes/guilds/#guild_id/widget.json.ts +++ b/src/api/routes/guilds/#guild_id/widget.json.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/widget.png.ts b/src/api/routes/guilds/#guild_id/widget.png.ts index 65de8978f..614f0cb25 100644 --- a/src/api/routes/guilds/#guild_id/widget.png.ts +++ b/src/api/routes/guilds/#guild_id/widget.png.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/#guild_id/widget.ts b/src/api/routes/guilds/#guild_id/widget.ts index d2fcf5898..f0b12f952 100644 --- a/src/api/routes/guilds/#guild_id/widget.ts +++ b/src/api/routes/guilds/#guild_id/widget.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/index.ts b/src/api/routes/guilds/index.ts index 64af4bd1d..2469ee7b0 100644 --- a/src/api/routes/guilds/index.ts +++ b/src/api/routes/guilds/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts index a43337d8d..c393b27bc 100644 --- a/src/api/routes/guilds/templates/index.ts +++ b/src/api/routes/guilds/templates/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/invites/index.ts b/src/api/routes/invites/index.ts index b1afee527..b94823a52 100644 --- a/src/api/routes/invites/index.ts +++ b/src/api/routes/invites/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts index e238b72fb..99865ac6d 100644 --- a/src/api/routes/oauth2/authorize.ts +++ b/src/api/routes/oauth2/authorize.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/oauth2/tokens.ts b/src/api/routes/oauth2/tokens.ts index 778011786..0f7fa5bba 100644 --- a/src/api/routes/oauth2/tokens.ts +++ b/src/api/routes/oauth2/tokens.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/outbound-promotions.ts b/src/api/routes/outbound-promotions.ts index 74315bfe6..7b8e486f3 100644 --- a/src/api/routes/outbound-promotions.ts +++ b/src/api/routes/outbound-promotions.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/partners/#guild_id/requirements.ts b/src/api/routes/partners/#guild_id/requirements.ts index de2da6eed..8dbf68a5f 100644 --- a/src/api/routes/partners/#guild_id/requirements.ts +++ b/src/api/routes/partners/#guild_id/requirements.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/ping.ts b/src/api/routes/ping.ts index f13117bf9..c567f7c97 100644 --- a/src/api/routes/ping.ts +++ b/src/api/routes/ping.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/policies/instance/domains.ts b/src/api/routes/policies/instance/domains.ts index c95493b06..472fd6d47 100644 --- a/src/api/routes/policies/instance/domains.ts +++ b/src/api/routes/policies/instance/domains.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/policies/instance/index.ts b/src/api/routes/policies/instance/index.ts index 394933b8d..a4fd70697 100644 --- a/src/api/routes/policies/instance/index.ts +++ b/src/api/routes/policies/instance/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/policies/instance/limits.ts b/src/api/routes/policies/instance/limits.ts index a169a1b9d..406d88c37 100644 --- a/src/api/routes/policies/instance/limits.ts +++ b/src/api/routes/policies/instance/limits.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/policies/stats.ts b/src/api/routes/policies/stats.ts index b7ff4773f..782101b65 100644 --- a/src/api/routes/policies/stats.ts +++ b/src/api/routes/policies/stats.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/read-states/ack-bulk.ts b/src/api/routes/read-states/ack-bulk.ts index 2e4da957a..582cf7fe9 100644 --- a/src/api/routes/read-states/ack-bulk.ts +++ b/src/api/routes/read-states/ack-bulk.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/scheduled-maintenances/upcoming_json.ts b/src/api/routes/scheduled-maintenances/upcoming_json.ts index deacdac0d..c117c7c74 100644 --- a/src/api/routes/scheduled-maintenances/upcoming_json.ts +++ b/src/api/routes/scheduled-maintenances/upcoming_json.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/science.ts b/src/api/routes/science.ts index e2ce9e03f..fc74bca1b 100644 --- a/src/api/routes/science.ts +++ b/src/api/routes/science.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/stage-instances.ts b/src/api/routes/stage-instances.ts index 74315bfe6..7b8e486f3 100644 --- a/src/api/routes/stage-instances.ts +++ b/src/api/routes/stage-instances.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/sticker-packs/index.ts b/src/api/routes/sticker-packs/index.ts index 6c5ce9f53..71104cbd8 100644 --- a/src/api/routes/sticker-packs/index.ts +++ b/src/api/routes/sticker-packs/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/stickers/#sticker_id/index.ts b/src/api/routes/stickers/#sticker_id/index.ts index 956bea617..aa2990fbc 100644 --- a/src/api/routes/stickers/#sticker_id/index.ts +++ b/src/api/routes/stickers/#sticker_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/stop.ts b/src/api/routes/stop.ts index fb6ac4690..1b21f68a0 100644 --- a/src/api/routes/stop.ts +++ b/src/api/routes/stop.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/store/published-listings/applications.ts b/src/api/routes/store/published-listings/applications.ts index ec9168b12..2afee7c3f 100644 --- a/src/api/routes/store/published-listings/applications.ts +++ b/src/api/routes/store/published-listings/applications.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts b/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts index b21714449..638dec400 100644 --- a/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/store/published-listings/skus.ts b/src/api/routes/store/published-listings/skus.ts index ec9168b12..2afee7c3f 100644 --- a/src/api/routes/store/published-listings/skus.ts +++ b/src/api/routes/store/published-listings/skus.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts index 26285d3aa..e9f160378 100644 --- a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/teams.ts b/src/api/routes/teams.ts index 38371b920..fdd0c2e12 100644 --- a/src/api/routes/teams.ts +++ b/src/api/routes/teams.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/track.ts b/src/api/routes/track.ts index e2ce9e03f..fc74bca1b 100644 --- a/src/api/routes/track.ts +++ b/src/api/routes/track.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/updates.ts b/src/api/routes/updates.ts index 5c237465b..be39cd3fd 100644 --- a/src/api/routes/updates.ts +++ b/src/api/routes/updates.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/#id/delete.ts b/src/api/routes/users/#id/delete.ts index 9bc3f9f87..e20817391 100644 --- a/src/api/routes/users/#id/delete.ts +++ b/src/api/routes/users/#id/delete.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/#id/index.ts b/src/api/routes/users/#id/index.ts index 14313c1f3..95d6a1c90 100644 --- a/src/api/routes/users/#id/index.ts +++ b/src/api/routes/users/#id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#id/profile.ts index 92b4a0fc9..a368a135d 100644 --- a/src/api/routes/users/#id/profile.ts +++ b/src/api/routes/users/#id/profile.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts index 04a407b7b..edd028d06 100644 --- a/src/api/routes/users/#id/relationships.ts +++ b/src/api/routes/users/#id/relationships.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/activities/statistics/applications.ts b/src/api/routes/users/@me/activities/statistics/applications.ts index 105249e6e..44f35b67d 100644 --- a/src/api/routes/users/@me/activities/statistics/applications.ts +++ b/src/api/routes/users/@me/activities/statistics/applications.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/affinities/guilds.ts b/src/api/routes/users/@me/affinities/guilds.ts index 502b776c1..080ba0663 100644 --- a/src/api/routes/users/@me/affinities/guilds.ts +++ b/src/api/routes/users/@me/affinities/guilds.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/affinities/users.ts b/src/api/routes/users/@me/affinities/users.ts index 292532c00..626297531 100644 --- a/src/api/routes/users/@me/affinities/users.ts +++ b/src/api/routes/users/@me/affinities/users.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/applications/#app_id/entitlements.ts b/src/api/routes/users/@me/applications/#app_id/entitlements.ts index 74315bfe6..7b8e486f3 100644 --- a/src/api/routes/users/@me/applications/#app_id/entitlements.ts +++ b/src/api/routes/users/@me/applications/#app_id/entitlements.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/billing/country-code.ts b/src/api/routes/users/@me/billing/country-code.ts index bd3d3ac7d..9d149fef7 100644 --- a/src/api/routes/users/@me/billing/country-code.ts +++ b/src/api/routes/users/@me/billing/country-code.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/billing/payment-sources.ts b/src/api/routes/users/@me/billing/payment-sources.ts index 105249e6e..44f35b67d 100644 --- a/src/api/routes/users/@me/billing/payment-sources.ts +++ b/src/api/routes/users/@me/billing/payment-sources.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/billing/subscriptions.ts b/src/api/routes/users/@me/billing/subscriptions.ts index 74315bfe6..7b8e486f3 100644 --- a/src/api/routes/users/@me/billing/subscriptions.ts +++ b/src/api/routes/users/@me/billing/subscriptions.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/channels.ts b/src/api/routes/users/@me/channels.ts index 5d05c5c6f..01151f2e1 100644 --- a/src/api/routes/users/@me/channels.ts +++ b/src/api/routes/users/@me/channels.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/connections.ts b/src/api/routes/users/@me/connections.ts index 74315bfe6..7b8e486f3 100644 --- a/src/api/routes/users/@me/connections.ts +++ b/src/api/routes/users/@me/connections.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/delete.ts b/src/api/routes/users/@me/delete.ts index 8043eae3c..bd7ac8bbb 100644 --- a/src/api/routes/users/@me/delete.ts +++ b/src/api/routes/users/@me/delete.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/devices.ts b/src/api/routes/users/@me/devices.ts index e2ce9e03f..fc74bca1b 100644 --- a/src/api/routes/users/@me/devices.ts +++ b/src/api/routes/users/@me/devices.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts index 9cb6e5c40..25cfb2148 100644 --- a/src/api/routes/users/@me/disable.ts +++ b/src/api/routes/users/@me/disable.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/email-settings.ts b/src/api/routes/users/@me/email-settings.ts index a95fa6580..277c8dbfe 100644 --- a/src/api/routes/users/@me/email-settings.ts +++ b/src/api/routes/users/@me/email-settings.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/entitlements.ts b/src/api/routes/users/@me/entitlements.ts index c4376cd44..fac7d9e03 100644 --- a/src/api/routes/users/@me/entitlements.ts +++ b/src/api/routes/users/@me/entitlements.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts index 4166643f3..61f4ca069 100644 --- a/src/api/routes/users/@me/guilds.ts +++ b/src/api/routes/users/@me/guilds.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/guilds/#guild_id/settings.ts b/src/api/routes/users/@me/guilds/#guild_id/settings.ts index 72c95d6b5..914204b28 100644 --- a/src/api/routes/users/@me/guilds/#guild_id/settings.ts +++ b/src/api/routes/users/@me/guilds/#guild_id/settings.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts index 105249e6e..44f35b67d 100644 --- a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts +++ b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index 300913449..2252e22a4 100644 --- a/src/api/routes/users/@me/index.ts +++ b/src/api/routes/users/@me/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/library.ts b/src/api/routes/users/@me/library.ts index b04cbe576..520420b79 100644 --- a/src/api/routes/users/@me/library.ts +++ b/src/api/routes/users/@me/library.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts index 24f018c9d..fc38a7616 100644 --- a/src/api/routes/users/@me/mfa/codes-verification.ts +++ b/src/api/routes/users/@me/mfa/codes-verification.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts index e2600400a..9b977bb30 100644 --- a/src/api/routes/users/@me/mfa/codes.ts +++ b/src/api/routes/users/@me/mfa/codes.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts index e35691aeb..10cb83f64 100644 --- a/src/api/routes/users/@me/mfa/totp/disable.ts +++ b/src/api/routes/users/@me/mfa/totp/disable.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts index f6519ad01..e0c351ae8 100644 --- a/src/api/routes/users/@me/mfa/totp/enable.ts +++ b/src/api/routes/users/@me/mfa/totp/enable.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts index a4381f37c..e21886188 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts index 85fb251c5..f3de9c377 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts index 64730c1ad..7948015b6 100644 --- a/src/api/routes/users/@me/notes.ts +++ b/src/api/routes/users/@me/notes.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index 4dfb4c338..910b55db4 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/users/@me/settings.ts b/src/api/routes/users/@me/settings.ts index cfcedec17..045d4aec4 100644 --- a/src/api/routes/users/@me/settings.ts +++ b/src/api/routes/users/@me/settings.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/routes/voice/regions.ts b/src/api/routes/voice/regions.ts index b7e877307..45834fc2b 100644 --- a/src/api/routes/voice/regions.ts +++ b/src/api/routes/voice/regions.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/start.ts b/src/api/start.ts index 7975d0856..560f8584d 100644 --- a/src/api/start.ts +++ b/src/api/start.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/handlers/Instance.ts b/src/api/util/handlers/Instance.ts index 081572086..8670a880f 100644 --- a/src/api/util/handlers/Instance.ts +++ b/src/api/util/handlers/Instance.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index e514d4008..65facb3a0 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/handlers/Voice.ts b/src/api/util/handlers/Voice.ts index 24bfa7b3f..d49878ceb 100644 --- a/src/api/util/handlers/Voice.ts +++ b/src/api/util/handlers/Voice.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/handlers/route.ts b/src/api/util/handlers/route.ts index cb1606375..7b56e17c4 100644 --- a/src/api/util/handlers/route.ts +++ b/src/api/util/handlers/route.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/index.ts b/src/api/util/index.ts index 09b6170ed..4cc93afb6 100644 --- a/src/api/util/index.ts +++ b/src/api/util/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/utility/Base64.ts b/src/api/util/utility/Base64.ts index 892e0ada0..4f7034cd6 100644 --- a/src/api/util/utility/Base64.ts +++ b/src/api/util/utility/Base64.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts index 8466a3744..40d7679a3 100644 --- a/src/api/util/utility/EmbedHandlers.ts +++ b/src/api/util/utility/EmbedHandlers.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/utility/RandomInviteID.ts b/src/api/util/utility/RandomInviteID.ts index 7ce54ad28..0bcca2db8 100644 --- a/src/api/util/utility/RandomInviteID.ts +++ b/src/api/util/utility/RandomInviteID.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/utility/String.ts b/src/api/util/utility/String.ts index 3137e3c89..4c6338835 100644 --- a/src/api/util/utility/String.ts +++ b/src/api/util/utility/String.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/utility/captcha.ts b/src/api/util/utility/captcha.ts index bd05582fd..8b11b231e 100644 --- a/src/api/util/utility/captcha.ts +++ b/src/api/util/utility/captcha.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/utility/ipAddress.ts b/src/api/util/utility/ipAddress.ts index 71a486825..99f58b719 100644 --- a/src/api/util/utility/ipAddress.ts +++ b/src/api/util/utility/ipAddress.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/api/util/utility/passwordStrength.ts b/src/api/util/utility/passwordStrength.ts index b293b8564..638df5db5 100644 --- a/src/api/util/utility/passwordStrength.ts +++ b/src/api/util/utility/passwordStrength.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/bundle/Server.ts b/src/bundle/Server.ts index 119bb52b6..74969dcc5 100644 --- a/src/bundle/Server.ts +++ b/src/bundle/Server.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/bundle/index.ts b/src/bundle/index.ts index 617dc7155..a883cadde 100644 --- a/src/bundle/index.ts +++ b/src/bundle/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/bundle/start.ts b/src/bundle/start.ts index 8da3cc20d..604064c02 100644 --- a/src/bundle/start.ts +++ b/src/bundle/start.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/bundle/stats.ts b/src/bundle/stats.ts index 6e5bed369..73175c0d1 100644 --- a/src/bundle/stats.ts +++ b/src/bundle/stats.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts index 37317bff7..b3bcfc5f8 100644 --- a/src/cdn/Server.ts +++ b/src/cdn/Server.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/index.ts b/src/cdn/index.ts index 0c06b8d11..1f8ac7201 100644 --- a/src/cdn/index.ts +++ b/src/cdn/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts index 398a243f2..d5950f129 100644 --- a/src/cdn/routes/attachments.ts +++ b/src/cdn/routes/attachments.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/routes/avatars.ts b/src/cdn/routes/avatars.ts index 7dc23d60c..6493462b5 100644 --- a/src/cdn/routes/avatars.ts +++ b/src/cdn/routes/avatars.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/routes/embed.ts b/src/cdn/routes/embed.ts index d49d69f74..811ddb9b8 100644 --- a/src/cdn/routes/embed.ts +++ b/src/cdn/routes/embed.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/routes/guild-profiles.ts b/src/cdn/routes/guild-profiles.ts index ae8786ae3..f872e03fb 100644 --- a/src/cdn/routes/guild-profiles.ts +++ b/src/cdn/routes/guild-profiles.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/routes/ping.ts b/src/cdn/routes/ping.ts index 682c38cce..46afeca00 100644 --- a/src/cdn/routes/ping.ts +++ b/src/cdn/routes/ping.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/routes/role-icons.ts b/src/cdn/routes/role-icons.ts index 8f10ab788..93702f8d2 100644 --- a/src/cdn/routes/role-icons.ts +++ b/src/cdn/routes/role-icons.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/start.ts b/src/cdn/start.ts index c36a6b73a..0080691f9 100644 --- a/src/cdn/start.ts +++ b/src/cdn/start.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/util/FileStorage.ts b/src/cdn/util/FileStorage.ts index ee087c859..956ea21e2 100644 --- a/src/cdn/util/FileStorage.ts +++ b/src/cdn/util/FileStorage.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/util/S3Storage.ts b/src/cdn/util/S3Storage.ts index 480fd9fd0..f2d8265c3 100644 --- a/src/cdn/util/S3Storage.ts +++ b/src/cdn/util/S3Storage.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/util/Storage.ts b/src/cdn/util/Storage.ts index 0d55bbd08..7cf4fb269 100644 --- a/src/cdn/util/Storage.ts +++ b/src/cdn/util/Storage.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/util/index.ts b/src/cdn/util/index.ts index 4574fb104..c87c23c69 100644 --- a/src/cdn/util/index.ts +++ b/src/cdn/util/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/cdn/util/multer.ts b/src/cdn/util/multer.ts index 5e0e4473f..ef0df57bd 100644 --- a/src/cdn/util/multer.ts +++ b/src/cdn/util/multer.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/Server.ts b/src/gateway/Server.ts index 3eec5c8fa..61a83201b 100644 --- a/src/gateway/Server.ts +++ b/src/gateway/Server.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/events/Close.ts b/src/gateway/events/Close.ts index 296ab5ee7..544362df1 100644 --- a/src/gateway/events/Close.ts +++ b/src/gateway/events/Close.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/events/Connection.ts b/src/gateway/events/Connection.ts index 1c902de01..b166321e1 100644 --- a/src/gateway/events/Connection.ts +++ b/src/gateway/events/Connection.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts index 16e4518d1..53e96b30e 100644 --- a/src/gateway/events/Message.ts +++ b/src/gateway/events/Message.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/index.ts b/src/gateway/index.ts index 0748e80ef..fe4b76cdc 100644 --- a/src/gateway/index.ts +++ b/src/gateway/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/listener/listener.ts b/src/gateway/listener/listener.ts index 824341f9b..5700b4e0d 100644 --- a/src/gateway/listener/listener.ts +++ b/src/gateway/listener/listener.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/Heartbeat.ts b/src/gateway/opcodes/Heartbeat.ts index 77c8671fd..88968a32d 100644 --- a/src/gateway/opcodes/Heartbeat.ts +++ b/src/gateway/opcodes/Heartbeat.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts index 1a632b840..e465516d7 100644 --- a/src/gateway/opcodes/Identify.ts +++ b/src/gateway/opcodes/Identify.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts index b7fff4d1a..d1806f913 100644 --- a/src/gateway/opcodes/LazyRequest.ts +++ b/src/gateway/opcodes/LazyRequest.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/PresenceUpdate.ts b/src/gateway/opcodes/PresenceUpdate.ts index 016aa33cc..7951422f1 100644 --- a/src/gateway/opcodes/PresenceUpdate.ts +++ b/src/gateway/opcodes/PresenceUpdate.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts index 7822813ba..159bcd693 100644 --- a/src/gateway/opcodes/RequestGuildMembers.ts +++ b/src/gateway/opcodes/RequestGuildMembers.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/Resume.ts b/src/gateway/opcodes/Resume.ts index a8650cc41..b50d785f9 100644 --- a/src/gateway/opcodes/Resume.ts +++ b/src/gateway/opcodes/Resume.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/VoiceStateUpdate.ts b/src/gateway/opcodes/VoiceStateUpdate.ts index d300d7b7c..93c227865 100644 --- a/src/gateway/opcodes/VoiceStateUpdate.ts +++ b/src/gateway/opcodes/VoiceStateUpdate.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/index.ts b/src/gateway/opcodes/index.ts index 1e32f1e68..96d609a9a 100644 --- a/src/gateway/opcodes/index.ts +++ b/src/gateway/opcodes/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/opcodes/instanceOf.ts b/src/gateway/opcodes/instanceOf.ts index 6c23cb08f..c367e2345 100644 --- a/src/gateway/opcodes/instanceOf.ts +++ b/src/gateway/opcodes/instanceOf.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/start.ts b/src/gateway/start.ts index 79448f91b..513223214 100644 --- a/src/gateway/start.ts +++ b/src/gateway/start.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/util/Constants.ts b/src/gateway/util/Constants.ts index cb60005ca..8600340a2 100644 --- a/src/gateway/util/Constants.ts +++ b/src/gateway/util/Constants.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/util/Heartbeat.ts b/src/gateway/util/Heartbeat.ts index 2d04b4368..d2397d958 100644 --- a/src/gateway/util/Heartbeat.ts +++ b/src/gateway/util/Heartbeat.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/util/Send.ts b/src/gateway/util/Send.ts index e39554a42..e67d30116 100644 --- a/src/gateway/util/Send.ts +++ b/src/gateway/util/Send.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/util/SessionUtils.ts b/src/gateway/util/SessionUtils.ts index 806f4f9db..cd6cf9cd2 100644 --- a/src/gateway/util/SessionUtils.ts +++ b/src/gateway/util/SessionUtils.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/util/WebSocket.ts b/src/gateway/util/WebSocket.ts index 14917f21f..617e1d957 100644 --- a/src/gateway/util/WebSocket.ts +++ b/src/gateway/util/WebSocket.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/gateway/util/index.ts b/src/gateway/util/index.ts index c44a7d142..f04be4b62 100644 --- a/src/gateway/util/index.ts +++ b/src/gateway/util/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/Config.ts b/src/util/config/Config.ts index f130e760f..280e05d45 100644 --- a/src/util/config/Config.ts +++ b/src/util/config/Config.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/index.ts b/src/util/config/index.ts index 18a2fd2c6..5bfc9d909 100644 --- a/src/util/config/index.ts +++ b/src/util/config/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/ApiConfiguration.ts b/src/util/config/types/ApiConfiguration.ts index 0389ed3ed..ebfc303fe 100644 --- a/src/util/config/types/ApiConfiguration.ts +++ b/src/util/config/types/ApiConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/CdnConfiguration.ts b/src/util/config/types/CdnConfiguration.ts index e547b9af2..72898dd80 100644 --- a/src/util/config/types/CdnConfiguration.ts +++ b/src/util/config/types/CdnConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/DefaultsConfiguration.ts b/src/util/config/types/DefaultsConfiguration.ts index 5561e7d51..60174c8f3 100644 --- a/src/util/config/types/DefaultsConfiguration.ts +++ b/src/util/config/types/DefaultsConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/EmailConfiguration.ts b/src/util/config/types/EmailConfiguration.ts index 989d59eb8..1f288355b 100644 --- a/src/util/config/types/EmailConfiguration.ts +++ b/src/util/config/types/EmailConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/EndpointConfiguration.ts b/src/util/config/types/EndpointConfiguration.ts index e7afe4947..cae6ca438 100644 --- a/src/util/config/types/EndpointConfiguration.ts +++ b/src/util/config/types/EndpointConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/ExternalTokensConfiguration.ts b/src/util/config/types/ExternalTokensConfiguration.ts index 7fb6c1a8d..a04c4897b 100644 --- a/src/util/config/types/ExternalTokensConfiguration.ts +++ b/src/util/config/types/ExternalTokensConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/GeneralConfiguration.ts b/src/util/config/types/GeneralConfiguration.ts index ba7503b75..5a067a70c 100644 --- a/src/util/config/types/GeneralConfiguration.ts +++ b/src/util/config/types/GeneralConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/GifConfiguration.ts b/src/util/config/types/GifConfiguration.ts index 0e5583faf..bd573be9c 100644 --- a/src/util/config/types/GifConfiguration.ts +++ b/src/util/config/types/GifConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/GuildConfiguration.ts b/src/util/config/types/GuildConfiguration.ts index addff7091..cad084192 100644 --- a/src/util/config/types/GuildConfiguration.ts +++ b/src/util/config/types/GuildConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/KafkaConfiguration.ts b/src/util/config/types/KafkaConfiguration.ts index dd1aae8b1..99750823a 100644 --- a/src/util/config/types/KafkaConfiguration.ts +++ b/src/util/config/types/KafkaConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/LimitConfigurations.ts b/src/util/config/types/LimitConfigurations.ts index 6e2e2d542..6e4d8cbb3 100644 --- a/src/util/config/types/LimitConfigurations.ts +++ b/src/util/config/types/LimitConfigurations.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/LoginConfiguration.ts b/src/util/config/types/LoginConfiguration.ts index 1d5752feb..a146451ca 100644 --- a/src/util/config/types/LoginConfiguration.ts +++ b/src/util/config/types/LoginConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/MetricsConfiguration.ts b/src/util/config/types/MetricsConfiguration.ts index 184014b41..36235e542 100644 --- a/src/util/config/types/MetricsConfiguration.ts +++ b/src/util/config/types/MetricsConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/PasswordResetConfiguration.ts b/src/util/config/types/PasswordResetConfiguration.ts index 806d77beb..ee0e10aaf 100644 --- a/src/util/config/types/PasswordResetConfiguration.ts +++ b/src/util/config/types/PasswordResetConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/RabbitMQConfiguration.ts b/src/util/config/types/RabbitMQConfiguration.ts index 28e76bf0b..a25d6acb7 100644 --- a/src/util/config/types/RabbitMQConfiguration.ts +++ b/src/util/config/types/RabbitMQConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/RegionConfiguration.ts b/src/util/config/types/RegionConfiguration.ts index 039f19b25..bddc98b8a 100644 --- a/src/util/config/types/RegionConfiguration.ts +++ b/src/util/config/types/RegionConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/RegisterConfiguration.ts b/src/util/config/types/RegisterConfiguration.ts index b8db00779..aa66ebb41 100644 --- a/src/util/config/types/RegisterConfiguration.ts +++ b/src/util/config/types/RegisterConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/SecurityConfiguration.ts b/src/util/config/types/SecurityConfiguration.ts index 7ae311e4b..a7fa34d0f 100644 --- a/src/util/config/types/SecurityConfiguration.ts +++ b/src/util/config/types/SecurityConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/SentryConfiguration.ts b/src/util/config/types/SentryConfiguration.ts index ea8899054..98daf09c0 100644 --- a/src/util/config/types/SentryConfiguration.ts +++ b/src/util/config/types/SentryConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/TemplateConfiguration.ts b/src/util/config/types/TemplateConfiguration.ts index 9c6d6bc62..59efb91c3 100644 --- a/src/util/config/types/TemplateConfiguration.ts +++ b/src/util/config/types/TemplateConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/index.ts b/src/util/config/types/index.ts index cd3335e09..f435c56cc 100644 --- a/src/util/config/types/index.ts +++ b/src/util/config/types/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/client/ClientReleaseConfiguration.ts b/src/util/config/types/subconfigurations/client/ClientReleaseConfiguration.ts index 797ef4eea..f6ae1fcdf 100644 --- a/src/util/config/types/subconfigurations/client/ClientReleaseConfiguration.ts +++ b/src/util/config/types/subconfigurations/client/ClientReleaseConfiguration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/client/index.ts b/src/util/config/types/subconfigurations/client/index.ts index 7c01e505f..9caf84e8d 100644 --- a/src/util/config/types/subconfigurations/client/index.ts +++ b/src/util/config/types/subconfigurations/client/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/defaults/GuildDefaults.ts b/src/util/config/types/subconfigurations/defaults/GuildDefaults.ts index 89d515232..6148c09e4 100644 --- a/src/util/config/types/subconfigurations/defaults/GuildDefaults.ts +++ b/src/util/config/types/subconfigurations/defaults/GuildDefaults.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/defaults/UserDefaults.ts b/src/util/config/types/subconfigurations/defaults/UserDefaults.ts index cc23b677e..38e2eccf8 100644 --- a/src/util/config/types/subconfigurations/defaults/UserDefaults.ts +++ b/src/util/config/types/subconfigurations/defaults/UserDefaults.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/defaults/index.ts b/src/util/config/types/subconfigurations/defaults/index.ts index 85fcb70d2..6e927d800 100644 --- a/src/util/config/types/subconfigurations/defaults/index.ts +++ b/src/util/config/types/subconfigurations/defaults/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/email/MailGun.ts b/src/util/config/types/subconfigurations/email/MailGun.ts index 52cd90694..3fc46adc6 100644 --- a/src/util/config/types/subconfigurations/email/MailGun.ts +++ b/src/util/config/types/subconfigurations/email/MailGun.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/email/MailJet.ts b/src/util/config/types/subconfigurations/email/MailJet.ts index eccda8ac7..e9a8f9037 100644 --- a/src/util/config/types/subconfigurations/email/MailJet.ts +++ b/src/util/config/types/subconfigurations/email/MailJet.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/email/SMTP.ts b/src/util/config/types/subconfigurations/email/SMTP.ts index 11eb9e146..9f2b5fdaf 100644 --- a/src/util/config/types/subconfigurations/email/SMTP.ts +++ b/src/util/config/types/subconfigurations/email/SMTP.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/email/SendGrid.ts b/src/util/config/types/subconfigurations/email/SendGrid.ts index a4755dfbf..1b6102390 100644 --- a/src/util/config/types/subconfigurations/email/SendGrid.ts +++ b/src/util/config/types/subconfigurations/email/SendGrid.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/email/index.ts b/src/util/config/types/subconfigurations/email/index.ts index 02cc564cf..2ffa3d8b9 100644 --- a/src/util/config/types/subconfigurations/email/index.ts +++ b/src/util/config/types/subconfigurations/email/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/guild/AutoJoin.ts b/src/util/config/types/subconfigurations/guild/AutoJoin.ts index aabead63b..e4267ddf3 100644 --- a/src/util/config/types/subconfigurations/guild/AutoJoin.ts +++ b/src/util/config/types/subconfigurations/guild/AutoJoin.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/guild/Discovery.ts b/src/util/config/types/subconfigurations/guild/Discovery.ts index 25a0cb4b7..00d539555 100644 --- a/src/util/config/types/subconfigurations/guild/Discovery.ts +++ b/src/util/config/types/subconfigurations/guild/Discovery.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/guild/index.ts b/src/util/config/types/subconfigurations/guild/index.ts index 8aae00b44..b386342eb 100644 --- a/src/util/config/types/subconfigurations/guild/index.ts +++ b/src/util/config/types/subconfigurations/guild/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/index.ts b/src/util/config/types/subconfigurations/index.ts index b3737da01..b20cef0b9 100644 --- a/src/util/config/types/subconfigurations/index.ts +++ b/src/util/config/types/subconfigurations/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/kafka/KafkaBroker.ts b/src/util/config/types/subconfigurations/kafka/KafkaBroker.ts index cfcfbaaec..3dc0a9167 100644 --- a/src/util/config/types/subconfigurations/kafka/KafkaBroker.ts +++ b/src/util/config/types/subconfigurations/kafka/KafkaBroker.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/kafka/index.ts b/src/util/config/types/subconfigurations/kafka/index.ts index dcc66cd44..5cdee3911 100644 --- a/src/util/config/types/subconfigurations/kafka/index.ts +++ b/src/util/config/types/subconfigurations/kafka/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/ChannelLimits.ts b/src/util/config/types/subconfigurations/limits/ChannelLimits.ts index c45cec80a..c588016ca 100644 --- a/src/util/config/types/subconfigurations/limits/ChannelLimits.ts +++ b/src/util/config/types/subconfigurations/limits/ChannelLimits.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts b/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts index a5766aebf..1325b8b68 100644 --- a/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts +++ b/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/GuildLimits.ts b/src/util/config/types/subconfigurations/limits/GuildLimits.ts index 3019ecc02..ac0a53b38 100644 --- a/src/util/config/types/subconfigurations/limits/GuildLimits.ts +++ b/src/util/config/types/subconfigurations/limits/GuildLimits.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/MessageLimits.ts b/src/util/config/types/subconfigurations/limits/MessageLimits.ts index bb416f38b..0f51f5c5b 100644 --- a/src/util/config/types/subconfigurations/limits/MessageLimits.ts +++ b/src/util/config/types/subconfigurations/limits/MessageLimits.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/RateLimits.ts b/src/util/config/types/subconfigurations/limits/RateLimits.ts index b9539eeed..cd05a751c 100644 --- a/src/util/config/types/subconfigurations/limits/RateLimits.ts +++ b/src/util/config/types/subconfigurations/limits/RateLimits.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/UserLimits.ts b/src/util/config/types/subconfigurations/limits/UserLimits.ts index 836f71439..3e7d0874f 100644 --- a/src/util/config/types/subconfigurations/limits/UserLimits.ts +++ b/src/util/config/types/subconfigurations/limits/UserLimits.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/index.ts b/src/util/config/types/subconfigurations/limits/index.ts index c5520a87f..56946c06e 100644 --- a/src/util/config/types/subconfigurations/limits/index.ts +++ b/src/util/config/types/subconfigurations/limits/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/ratelimits/Auth.ts b/src/util/config/types/subconfigurations/limits/ratelimits/Auth.ts index ffe89e904..b3288efb3 100644 --- a/src/util/config/types/subconfigurations/limits/ratelimits/Auth.ts +++ b/src/util/config/types/subconfigurations/limits/ratelimits/Auth.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/ratelimits/RateLimitOptions.ts b/src/util/config/types/subconfigurations/limits/ratelimits/RateLimitOptions.ts index 531da7799..380c98199 100644 --- a/src/util/config/types/subconfigurations/limits/ratelimits/RateLimitOptions.ts +++ b/src/util/config/types/subconfigurations/limits/ratelimits/RateLimitOptions.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/ratelimits/Route.ts b/src/util/config/types/subconfigurations/limits/ratelimits/Route.ts index 02799be11..68c2afc1f 100644 --- a/src/util/config/types/subconfigurations/limits/ratelimits/Route.ts +++ b/src/util/config/types/subconfigurations/limits/ratelimits/Route.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/limits/ratelimits/index.ts b/src/util/config/types/subconfigurations/limits/ratelimits/index.ts index 312348aee..6a85eac14 100644 --- a/src/util/config/types/subconfigurations/limits/ratelimits/index.ts +++ b/src/util/config/types/subconfigurations/limits/ratelimits/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/region/Region.ts b/src/util/config/types/subconfigurations/region/Region.ts index 84428331c..9c4701cbf 100644 --- a/src/util/config/types/subconfigurations/region/Region.ts +++ b/src/util/config/types/subconfigurations/region/Region.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/region/index.ts b/src/util/config/types/subconfigurations/region/index.ts index d9a09d411..65ac67d54 100644 --- a/src/util/config/types/subconfigurations/region/index.ts +++ b/src/util/config/types/subconfigurations/region/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/register/DateOfBirth.ts b/src/util/config/types/subconfigurations/register/DateOfBirth.ts index debe8c446..d0182e887 100644 --- a/src/util/config/types/subconfigurations/register/DateOfBirth.ts +++ b/src/util/config/types/subconfigurations/register/DateOfBirth.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/register/Email.ts b/src/util/config/types/subconfigurations/register/Email.ts index 4f95caf1d..01b32436c 100644 --- a/src/util/config/types/subconfigurations/register/Email.ts +++ b/src/util/config/types/subconfigurations/register/Email.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/register/Password.ts b/src/util/config/types/subconfigurations/register/Password.ts index ca04e9e42..14fc88e17 100644 --- a/src/util/config/types/subconfigurations/register/Password.ts +++ b/src/util/config/types/subconfigurations/register/Password.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/register/index.ts b/src/util/config/types/subconfigurations/register/index.ts index 8be613b59..1289664e4 100644 --- a/src/util/config/types/subconfigurations/register/index.ts +++ b/src/util/config/types/subconfigurations/register/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/security/Captcha.ts b/src/util/config/types/subconfigurations/security/Captcha.ts index cf61989a4..e903dd6b4 100644 --- a/src/util/config/types/subconfigurations/security/Captcha.ts +++ b/src/util/config/types/subconfigurations/security/Captcha.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/security/TwoFactor.ts b/src/util/config/types/subconfigurations/security/TwoFactor.ts index 70f61cbc0..f03902d8b 100644 --- a/src/util/config/types/subconfigurations/security/TwoFactor.ts +++ b/src/util/config/types/subconfigurations/security/TwoFactor.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/config/types/subconfigurations/security/index.ts b/src/util/config/types/subconfigurations/security/index.ts index 9dc9acaaa..b852315e3 100644 --- a/src/util/config/types/subconfigurations/security/index.ts +++ b/src/util/config/types/subconfigurations/security/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/dtos/DmChannelDTO.ts b/src/util/dtos/DmChannelDTO.ts index 02f7e8f31..fe936f5e1 100644 --- a/src/util/dtos/DmChannelDTO.ts +++ b/src/util/dtos/DmChannelDTO.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/dtos/ReadyGuildDTO.ts b/src/util/dtos/ReadyGuildDTO.ts index 97e6931fa..9f8435ec6 100644 --- a/src/util/dtos/ReadyGuildDTO.ts +++ b/src/util/dtos/ReadyGuildDTO.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/dtos/UserDTO.ts b/src/util/dtos/UserDTO.ts index 3cbeb6e16..ce490bd2a 100644 --- a/src/util/dtos/UserDTO.ts +++ b/src/util/dtos/UserDTO.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/dtos/index.ts b/src/util/dtos/index.ts index cf3863fa8..afb3fdb43 100644 --- a/src/util/dtos/index.ts +++ b/src/util/dtos/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Application.ts b/src/util/entities/Application.ts index 94709320a..37491a5d2 100644 --- a/src/util/entities/Application.ts +++ b/src/util/entities/Application.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Attachment.ts b/src/util/entities/Attachment.ts index fdc1b3f10..d9e61a954 100644 --- a/src/util/entities/Attachment.ts +++ b/src/util/entities/Attachment.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/AuditLog.ts b/src/util/entities/AuditLog.ts index 0cc2fc046..a7dfcc5b1 100644 --- a/src/util/entities/AuditLog.ts +++ b/src/util/entities/AuditLog.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/BackupCodes.ts b/src/util/entities/BackupCodes.ts index 467e1fe38..b9914a8cd 100644 --- a/src/util/entities/BackupCodes.ts +++ b/src/util/entities/BackupCodes.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Ban.ts b/src/util/entities/Ban.ts index 4ed6e201c..f9f51e0cd 100644 --- a/src/util/entities/Ban.ts +++ b/src/util/entities/Ban.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/BaseClass.ts b/src/util/entities/BaseClass.ts index 445b3fc97..e60f40596 100644 --- a/src/util/entities/BaseClass.ts +++ b/src/util/entities/BaseClass.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Categories.ts b/src/util/entities/Categories.ts index 198348bf5..44971d00d 100644 --- a/src/util/entities/Categories.ts +++ b/src/util/entities/Categories.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts index 1f1287130..7339d70c6 100644 --- a/src/util/entities/Channel.ts +++ b/src/util/entities/Channel.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/ClientRelease.ts b/src/util/entities/ClientRelease.ts index 4b8150fdb..947221b75 100644 --- a/src/util/entities/ClientRelease.ts +++ b/src/util/entities/ClientRelease.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Config.ts b/src/util/entities/Config.ts index 4449b6ec0..0c8b6f655 100644 --- a/src/util/entities/Config.ts +++ b/src/util/entities/Config.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/ConnectedAccount.ts b/src/util/entities/ConnectedAccount.ts index 9f0ce35e2..29befa091 100644 --- a/src/util/entities/ConnectedAccount.ts +++ b/src/util/entities/ConnectedAccount.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/EmbedCache.ts b/src/util/entities/EmbedCache.ts index 800ee4e77..41b1b6365 100644 --- a/src/util/entities/EmbedCache.ts +++ b/src/util/entities/EmbedCache.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Emoji.ts b/src/util/entities/Emoji.ts index 94ce3d54c..3458302e8 100644 --- a/src/util/entities/Emoji.ts +++ b/src/util/entities/Emoji.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Encryption.ts b/src/util/entities/Encryption.ts index 016b43316..ff868c400 100644 --- a/src/util/entities/Encryption.ts +++ b/src/util/entities/Encryption.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Guild.ts b/src/util/entities/Guild.ts index c835f5fc2..daa265099 100644 --- a/src/util/entities/Guild.ts +++ b/src/util/entities/Guild.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Invite.ts b/src/util/entities/Invite.ts index b29dfcffd..f517bb446 100644 --- a/src/util/entities/Invite.ts +++ b/src/util/entities/Invite.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Member.ts b/src/util/entities/Member.ts index c097c1f09..e3f9a3ca6 100644 --- a/src/util/entities/Member.ts +++ b/src/util/entities/Member.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts index fc8c011ce..42c29ce79 100644 --- a/src/util/entities/Message.ts +++ b/src/util/entities/Message.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Migration.ts b/src/util/entities/Migration.ts index 57097d8c3..2ddc4df6d 100644 --- a/src/util/entities/Migration.ts +++ b/src/util/entities/Migration.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Note.ts b/src/util/entities/Note.ts index 0f2a5ce34..74e2e8703 100644 --- a/src/util/entities/Note.ts +++ b/src/util/entities/Note.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/RateLimit.ts b/src/util/entities/RateLimit.ts index 79ebbb014..ffb5a05ad 100644 --- a/src/util/entities/RateLimit.ts +++ b/src/util/entities/RateLimit.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/ReadState.ts b/src/util/entities/ReadState.ts index 825beb037..b40cde00c 100644 --- a/src/util/entities/ReadState.ts +++ b/src/util/entities/ReadState.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Recipient.ts b/src/util/entities/Recipient.ts index 1cf028dd2..115670349 100644 --- a/src/util/entities/Recipient.ts +++ b/src/util/entities/Recipient.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Relationship.ts b/src/util/entities/Relationship.ts index 1bf04c2cc..2ce16b9e2 100644 --- a/src/util/entities/Relationship.ts +++ b/src/util/entities/Relationship.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Role.ts b/src/util/entities/Role.ts index d3275ede7..93a0e157b 100644 --- a/src/util/entities/Role.ts +++ b/src/util/entities/Role.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/SecurityKey.ts b/src/util/entities/SecurityKey.ts index 8f377d9d4..c9186265a 100644 --- a/src/util/entities/SecurityKey.ts +++ b/src/util/entities/SecurityKey.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Session.ts b/src/util/entities/Session.ts index f416b9f52..5a54c090b 100644 --- a/src/util/entities/Session.ts +++ b/src/util/entities/Session.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Sticker.ts b/src/util/entities/Sticker.ts index 513a4c9f6..3af405641 100644 --- a/src/util/entities/Sticker.ts +++ b/src/util/entities/Sticker.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/StickerPack.ts b/src/util/entities/StickerPack.ts index ce8d5e87d..911ef4b5b 100644 --- a/src/util/entities/StickerPack.ts +++ b/src/util/entities/StickerPack.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Team.ts b/src/util/entities/Team.ts index 828594091..e494762af 100644 --- a/src/util/entities/Team.ts +++ b/src/util/entities/Team.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/TeamMember.ts b/src/util/entities/TeamMember.ts index df70050c6..cd815e920 100644 --- a/src/util/entities/TeamMember.ts +++ b/src/util/entities/TeamMember.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Template.ts b/src/util/entities/Template.ts index 17f26e1c6..11eb4d58e 100644 --- a/src/util/entities/Template.ts +++ b/src/util/entities/Template.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index 8dfb02546..3a77e5db3 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/UserSettings.ts b/src/util/entities/UserSettings.ts index 4c273591b..5cd63dbc2 100644 --- a/src/util/entities/UserSettings.ts +++ b/src/util/entities/UserSettings.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/ValidRegistrationTokens.ts b/src/util/entities/ValidRegistrationTokens.ts index ece6d00cc..94e1dacc0 100644 --- a/src/util/entities/ValidRegistrationTokens.ts +++ b/src/util/entities/ValidRegistrationTokens.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/VoiceState.ts b/src/util/entities/VoiceState.ts index f790945f7..37c92d6cf 100644 --- a/src/util/entities/VoiceState.ts +++ b/src/util/entities/VoiceState.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/Webhook.ts b/src/util/entities/Webhook.ts index 9be86c6d6..1a18c0a71 100644 --- a/src/util/entities/Webhook.ts +++ b/src/util/entities/Webhook.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/entities/index.ts b/src/util/entities/index.ts index 6dfbd8228..609b8fbaa 100644 --- a/src/util/entities/index.ts +++ b/src/util/entities/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/imports/index.ts b/src/util/imports/index.ts index da0be37c7..dd842892b 100644 --- a/src/util/imports/index.ts +++ b/src/util/imports/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/index.ts b/src/util/index.ts index a3495a0c4..939dcbfe8 100644 --- a/src/util/index.ts +++ b/src/util/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/interfaces/Activity.ts b/src/util/interfaces/Activity.ts index 7398fc62d..65adfa2a7 100644 --- a/src/util/interfaces/Activity.ts +++ b/src/util/interfaces/Activity.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts index c3bfbf9bd..e99bd7282 100644 --- a/src/util/interfaces/Event.ts +++ b/src/util/interfaces/Event.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/interfaces/Interaction.ts b/src/util/interfaces/Interaction.ts index 4158eda1a..f26f85b2b 100644 --- a/src/util/interfaces/Interaction.ts +++ b/src/util/interfaces/Interaction.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/interfaces/Presence.ts b/src/util/interfaces/Presence.ts index 452606060..6821a54f1 100644 --- a/src/util/interfaces/Presence.ts +++ b/src/util/interfaces/Presence.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/interfaces/Status.ts b/src/util/interfaces/Status.ts index 714c623b3..0bcc1de3d 100644 --- a/src/util/interfaces/Status.ts +++ b/src/util/interfaces/Status.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/interfaces/index.ts b/src/util/interfaces/index.ts index fa259ce16..475892123 100644 --- a/src/util/interfaces/index.ts +++ b/src/util/interfaces/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/migration/mariadb/1673609465036-templateDeleteCascade.ts b/src/util/migration/mariadb/1673609465036-templateDeleteCascade.ts index d34e08bd8..4d5aae68b 100644 --- a/src/util/migration/mariadb/1673609465036-templateDeleteCascade.ts +++ b/src/util/migration/mariadb/1673609465036-templateDeleteCascade.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/migration/mariadb/1675045120206-webauthn.ts b/src/util/migration/mariadb/1675045120206-webauthn.ts index 5cd74f474..03ae0226c 100644 --- a/src/util/migration/mariadb/1675045120206-webauthn.ts +++ b/src/util/migration/mariadb/1675045120206-webauthn.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/migration/mysql/1673609465036-templateDeleteCascade.ts b/src/util/migration/mysql/1673609465036-templateDeleteCascade.ts index d34e08bd8..4d5aae68b 100644 --- a/src/util/migration/mysql/1673609465036-templateDeleteCascade.ts +++ b/src/util/migration/mysql/1673609465036-templateDeleteCascade.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/migration/mysql/1675045120206-webauthn.ts b/src/util/migration/mysql/1675045120206-webauthn.ts index 5cd74f474..03ae0226c 100644 --- a/src/util/migration/mysql/1675045120206-webauthn.ts +++ b/src/util/migration/mysql/1675045120206-webauthn.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/migration/postgres/1673609867556-templateDeleteCascade.ts b/src/util/migration/postgres/1673609867556-templateDeleteCascade.ts index 41979e597..1a049b74f 100644 --- a/src/util/migration/postgres/1673609867556-templateDeleteCascade.ts +++ b/src/util/migration/postgres/1673609867556-templateDeleteCascade.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/migration/postgres/1675044825710-webauthn.ts b/src/util/migration/postgres/1675044825710-webauthn.ts index 7fc3c2fe5..2e76bbb32 100644 --- a/src/util/migration/postgres/1675044825710-webauthn.ts +++ b/src/util/migration/postgres/1675044825710-webauthn.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/AckBulkSchema.ts b/src/util/schemas/AckBulkSchema.ts index ad687fd8c..a08950720 100644 --- a/src/util/schemas/AckBulkSchema.ts +++ b/src/util/schemas/AckBulkSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ActivitySchema.ts b/src/util/schemas/ActivitySchema.ts index 2e27fc7c1..2bafb1c55 100644 --- a/src/util/schemas/ActivitySchema.ts +++ b/src/util/schemas/ActivitySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ApplicationAuthorizeSchema.ts b/src/util/schemas/ApplicationAuthorizeSchema.ts index 730f21204..1220160f2 100644 --- a/src/util/schemas/ApplicationAuthorizeSchema.ts +++ b/src/util/schemas/ApplicationAuthorizeSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ApplicationCreateSchema.ts b/src/util/schemas/ApplicationCreateSchema.ts index 50a40bfdc..214149ce6 100644 --- a/src/util/schemas/ApplicationCreateSchema.ts +++ b/src/util/schemas/ApplicationCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ApplicationModifySchema.ts b/src/util/schemas/ApplicationModifySchema.ts index ab470f522..85fd36aca 100644 --- a/src/util/schemas/ApplicationModifySchema.ts +++ b/src/util/schemas/ApplicationModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/BackupCodesChallengeSchema.ts b/src/util/schemas/BackupCodesChallengeSchema.ts index 596166912..4994c9806 100644 --- a/src/util/schemas/BackupCodesChallengeSchema.ts +++ b/src/util/schemas/BackupCodesChallengeSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/BanCreateSchema.ts b/src/util/schemas/BanCreateSchema.ts index fdbf982ff..2673c5917 100644 --- a/src/util/schemas/BanCreateSchema.ts +++ b/src/util/schemas/BanCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/BanModeratorSchema.ts b/src/util/schemas/BanModeratorSchema.ts index 8d4426dc6..d097777b8 100644 --- a/src/util/schemas/BanModeratorSchema.ts +++ b/src/util/schemas/BanModeratorSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/BanRegistrySchema.ts b/src/util/schemas/BanRegistrySchema.ts index 0415e652e..956b86486 100644 --- a/src/util/schemas/BanRegistrySchema.ts +++ b/src/util/schemas/BanRegistrySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/BotModifySchema.ts b/src/util/schemas/BotModifySchema.ts index 1d96bcc5c..511e51d10 100644 --- a/src/util/schemas/BotModifySchema.ts +++ b/src/util/schemas/BotModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/BulkDeleteSchema.ts b/src/util/schemas/BulkDeleteSchema.ts index da53a6326..05e7bb330 100644 --- a/src/util/schemas/BulkDeleteSchema.ts +++ b/src/util/schemas/BulkDeleteSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ChannelModifySchema.ts b/src/util/schemas/ChannelModifySchema.ts index 1bf84108b..47f55430e 100644 --- a/src/util/schemas/ChannelModifySchema.ts +++ b/src/util/schemas/ChannelModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ChannelPermissionOverwriteSchema.ts b/src/util/schemas/ChannelPermissionOverwriteSchema.ts index 62d0ad145..d85dbe4e0 100644 --- a/src/util/schemas/ChannelPermissionOverwriteSchema.ts +++ b/src/util/schemas/ChannelPermissionOverwriteSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ChannelReorderSchema.ts b/src/util/schemas/ChannelReorderSchema.ts index f579ae6a7..6af581057 100644 --- a/src/util/schemas/ChannelReorderSchema.ts +++ b/src/util/schemas/ChannelReorderSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/CodesVerificationSchema.ts b/src/util/schemas/CodesVerificationSchema.ts index 5bbc0713d..1028cb26d 100644 --- a/src/util/schemas/CodesVerificationSchema.ts +++ b/src/util/schemas/CodesVerificationSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/DmChannelCreateSchema.ts b/src/util/schemas/DmChannelCreateSchema.ts index 2078ac3f0..afcc7fe5b 100644 --- a/src/util/schemas/DmChannelCreateSchema.ts +++ b/src/util/schemas/DmChannelCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/EmojiCreateSchema.ts b/src/util/schemas/EmojiCreateSchema.ts index 645c0ab50..295a70ff8 100644 --- a/src/util/schemas/EmojiCreateSchema.ts +++ b/src/util/schemas/EmojiCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/EmojiModifySchema.ts b/src/util/schemas/EmojiModifySchema.ts index c6132708b..5b219b1ba 100644 --- a/src/util/schemas/EmojiModifySchema.ts +++ b/src/util/schemas/EmojiModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ForgotPasswordSchema.ts b/src/util/schemas/ForgotPasswordSchema.ts index 9a28bd184..b9d745499 100644 --- a/src/util/schemas/ForgotPasswordSchema.ts +++ b/src/util/schemas/ForgotPasswordSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/GatewayBotResponse.ts b/src/util/schemas/GatewayBotResponse.ts index 30f1f57ff..11915162e 100644 --- a/src/util/schemas/GatewayBotResponse.ts +++ b/src/util/schemas/GatewayBotResponse.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + export interface GatewayBotResponse { url: string; shards: number; diff --git a/src/util/schemas/GatewayPayloadSchema.ts b/src/util/schemas/GatewayPayloadSchema.ts index 5eb340524..9d7151a0d 100644 --- a/src/util/schemas/GatewayPayloadSchema.ts +++ b/src/util/schemas/GatewayPayloadSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/GatewayResponse.ts b/src/util/schemas/GatewayResponse.ts index e909f7bd4..4d2d06bb2 100644 --- a/src/util/schemas/GatewayResponse.ts +++ b/src/util/schemas/GatewayResponse.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + export interface GatewayResponse { url: string; } diff --git a/src/util/schemas/GuildCreateSchema.ts b/src/util/schemas/GuildCreateSchema.ts index 615192443..8f423cee9 100644 --- a/src/util/schemas/GuildCreateSchema.ts +++ b/src/util/schemas/GuildCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/GuildTemplateCreateSchema.ts b/src/util/schemas/GuildTemplateCreateSchema.ts index 2ea96eada..94fb07166 100644 --- a/src/util/schemas/GuildTemplateCreateSchema.ts +++ b/src/util/schemas/GuildTemplateCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/GuildUpdateSchema.ts b/src/util/schemas/GuildUpdateSchema.ts index b9c923b09..d857dfa41 100644 --- a/src/util/schemas/GuildUpdateSchema.ts +++ b/src/util/schemas/GuildUpdateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts b/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts index e930fd013..e073f6f10 100644 --- a/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts +++ b/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/IdentifySchema.ts b/src/util/schemas/IdentifySchema.ts index 9bb14ca36..a8a541a96 100644 --- a/src/util/schemas/IdentifySchema.ts +++ b/src/util/schemas/IdentifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/InviteCreateSchema.ts b/src/util/schemas/InviteCreateSchema.ts index bb0955ce3..8d6a92c2a 100644 --- a/src/util/schemas/InviteCreateSchema.ts +++ b/src/util/schemas/InviteCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/LazyRequestSchema.ts b/src/util/schemas/LazyRequestSchema.ts index 9d25eb37e..f37e21943 100644 --- a/src/util/schemas/LazyRequestSchema.ts +++ b/src/util/schemas/LazyRequestSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/LoginSchema.ts b/src/util/schemas/LoginSchema.ts index 872c8db3e..b77268b1d 100644 --- a/src/util/schemas/LoginSchema.ts +++ b/src/util/schemas/LoginSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/MemberChangeProfileSchema.ts b/src/util/schemas/MemberChangeProfileSchema.ts index f9f7f72c9..c652ac593 100644 --- a/src/util/schemas/MemberChangeProfileSchema.ts +++ b/src/util/schemas/MemberChangeProfileSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/MemberChangeSchema.ts b/src/util/schemas/MemberChangeSchema.ts index 6d028d806..328eda15d 100644 --- a/src/util/schemas/MemberChangeSchema.ts +++ b/src/util/schemas/MemberChangeSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/MemberNickChangeSchema.ts b/src/util/schemas/MemberNickChangeSchema.ts index daefb32a0..d7f0b35d8 100644 --- a/src/util/schemas/MemberNickChangeSchema.ts +++ b/src/util/schemas/MemberNickChangeSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/MessageAcknowledgeSchema.ts b/src/util/schemas/MessageAcknowledgeSchema.ts index c63d529d7..89701ff69 100644 --- a/src/util/schemas/MessageAcknowledgeSchema.ts +++ b/src/util/schemas/MessageAcknowledgeSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/util/schemas/MessageCreateSchema.ts index 4ee6e7380..d10773e43 100644 --- a/src/util/schemas/MessageCreateSchema.ts +++ b/src/util/schemas/MessageCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/MessageEditSchema.ts b/src/util/schemas/MessageEditSchema.ts index 6f241402c..11dabdc88 100644 --- a/src/util/schemas/MessageEditSchema.ts +++ b/src/util/schemas/MessageEditSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/MfaCodesSchema.ts b/src/util/schemas/MfaCodesSchema.ts index eb0884714..82ba8c2ad 100644 --- a/src/util/schemas/MfaCodesSchema.ts +++ b/src/util/schemas/MfaCodesSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/ModifyGuildStickerSchema.ts b/src/util/schemas/ModifyGuildStickerSchema.ts index 1c558b2e0..1127a531f 100644 --- a/src/util/schemas/ModifyGuildStickerSchema.ts +++ b/src/util/schemas/ModifyGuildStickerSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/PasswordResetSchema.ts b/src/util/schemas/PasswordResetSchema.ts index 9cc749401..c586cbc5b 100644 --- a/src/util/schemas/PasswordResetSchema.ts +++ b/src/util/schemas/PasswordResetSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/PruneSchema.ts b/src/util/schemas/PruneSchema.ts index 531213fe0..928f84ecc 100644 --- a/src/util/schemas/PruneSchema.ts +++ b/src/util/schemas/PruneSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/PurgeSchema.ts b/src/util/schemas/PurgeSchema.ts index d83251c7f..1495c0d9e 100644 --- a/src/util/schemas/PurgeSchema.ts +++ b/src/util/schemas/PurgeSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/RegisterSchema.ts b/src/util/schemas/RegisterSchema.ts index 0c8fb9231..4e41be230 100644 --- a/src/util/schemas/RegisterSchema.ts +++ b/src/util/schemas/RegisterSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/RelationshipPostSchema.ts b/src/util/schemas/RelationshipPostSchema.ts index 1ce27ca94..eb4e03623 100644 --- a/src/util/schemas/RelationshipPostSchema.ts +++ b/src/util/schemas/RelationshipPostSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/RelationshipPutSchema.ts b/src/util/schemas/RelationshipPutSchema.ts index 1c45e2457..38a31b9e2 100644 --- a/src/util/schemas/RelationshipPutSchema.ts +++ b/src/util/schemas/RelationshipPutSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/RoleModifySchema.ts b/src/util/schemas/RoleModifySchema.ts index 345186334..164a4df8c 100644 --- a/src/util/schemas/RoleModifySchema.ts +++ b/src/util/schemas/RoleModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/RolePositionUpdateSchema.ts b/src/util/schemas/RolePositionUpdateSchema.ts index 8401e2eb7..c1f6f5f0c 100644 --- a/src/util/schemas/RolePositionUpdateSchema.ts +++ b/src/util/schemas/RolePositionUpdateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/SelectProtocolSchema.ts b/src/util/schemas/SelectProtocolSchema.ts index 063462ee1..cba254172 100644 --- a/src/util/schemas/SelectProtocolSchema.ts +++ b/src/util/schemas/SelectProtocolSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/TemplateCreateSchema.ts b/src/util/schemas/TemplateCreateSchema.ts index 99ce111e2..2ed148276 100644 --- a/src/util/schemas/TemplateCreateSchema.ts +++ b/src/util/schemas/TemplateCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/TemplateModifySchema.ts b/src/util/schemas/TemplateModifySchema.ts index 34bd40a1d..ec9a70ecb 100644 --- a/src/util/schemas/TemplateModifySchema.ts +++ b/src/util/schemas/TemplateModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/TotpDisableSchema.ts b/src/util/schemas/TotpDisableSchema.ts index 004f0bf76..db42dfcbe 100644 --- a/src/util/schemas/TotpDisableSchema.ts +++ b/src/util/schemas/TotpDisableSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/TotpEnableSchema.ts b/src/util/schemas/TotpEnableSchema.ts index b6cdd17cc..4af4d50ad 100644 --- a/src/util/schemas/TotpEnableSchema.ts +++ b/src/util/schemas/TotpEnableSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/TotpSchema.ts b/src/util/schemas/TotpSchema.ts index 0ebc6d3cf..9ee268840 100644 --- a/src/util/schemas/TotpSchema.ts +++ b/src/util/schemas/TotpSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/UserDeleteSchema.ts b/src/util/schemas/UserDeleteSchema.ts index 6e6b15acf..cf56a602c 100644 --- a/src/util/schemas/UserDeleteSchema.ts +++ b/src/util/schemas/UserDeleteSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/UserGuildSettingsSchema.ts b/src/util/schemas/UserGuildSettingsSchema.ts index 6458c56eb..91b6826e4 100644 --- a/src/util/schemas/UserGuildSettingsSchema.ts +++ b/src/util/schemas/UserGuildSettingsSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/UserModifySchema.ts b/src/util/schemas/UserModifySchema.ts index 7851ec22a..33be1ec78 100644 --- a/src/util/schemas/UserModifySchema.ts +++ b/src/util/schemas/UserModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/UserProfileModifySchema.ts b/src/util/schemas/UserProfileModifySchema.ts index 5239a9ad7..fbb4f4239 100644 --- a/src/util/schemas/UserProfileModifySchema.ts +++ b/src/util/schemas/UserProfileModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/UserProfileResponse.ts b/src/util/schemas/UserProfileResponse.ts index 467d787f2..c6f395881 100644 --- a/src/util/schemas/UserProfileResponse.ts +++ b/src/util/schemas/UserProfileResponse.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + import { PublicConnectedAccount, UserPublic } from ".."; export interface UserProfileResponse { diff --git a/src/util/schemas/UserRelationsResponse.ts b/src/util/schemas/UserRelationsResponse.ts index 1ec15eca8..e6392ee43 100644 --- a/src/util/schemas/UserRelationsResponse.ts +++ b/src/util/schemas/UserRelationsResponse.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + export interface UserRelationsResponse { object: { id?: string; diff --git a/src/util/schemas/UserSettingsSchema.ts b/src/util/schemas/UserSettingsSchema.ts index f315892e1..f71cfd7ab 100644 --- a/src/util/schemas/UserSettingsSchema.ts +++ b/src/util/schemas/UserSettingsSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/Validator.ts b/src/util/schemas/Validator.ts index 3190dd056..a055ad824 100644 --- a/src/util/schemas/Validator.ts +++ b/src/util/schemas/Validator.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/VanityUrlSchema.ts b/src/util/schemas/VanityUrlSchema.ts index 4550208f4..9d87cd11a 100644 --- a/src/util/schemas/VanityUrlSchema.ts +++ b/src/util/schemas/VanityUrlSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/VerifyEmailSchema.ts b/src/util/schemas/VerifyEmailSchema.ts index d94fbbc13..84a101b56 100644 --- a/src/util/schemas/VerifyEmailSchema.ts +++ b/src/util/schemas/VerifyEmailSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/VoiceIdentifySchema.ts b/src/util/schemas/VoiceIdentifySchema.ts index 8d4b3966c..732d9ac08 100644 --- a/src/util/schemas/VoiceIdentifySchema.ts +++ b/src/util/schemas/VoiceIdentifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/VoiceStateUpdateSchema.ts b/src/util/schemas/VoiceStateUpdateSchema.ts index 467588b0b..42b668b38 100644 --- a/src/util/schemas/VoiceStateUpdateSchema.ts +++ b/src/util/schemas/VoiceStateUpdateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/VoiceVideoSchema.ts b/src/util/schemas/VoiceVideoSchema.ts index a80158814..f2839c349 100644 --- a/src/util/schemas/VoiceVideoSchema.ts +++ b/src/util/schemas/VoiceVideoSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/WebAuthnSchema.ts b/src/util/schemas/WebAuthnSchema.ts index 03e173a77..a6395db16 100644 --- a/src/util/schemas/WebAuthnSchema.ts +++ b/src/util/schemas/WebAuthnSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/WebhookCreateSchema.ts b/src/util/schemas/WebhookCreateSchema.ts index 8089ad696..32b894e2e 100644 --- a/src/util/schemas/WebhookCreateSchema.ts +++ b/src/util/schemas/WebhookCreateSchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/WidgetModifySchema.ts b/src/util/schemas/WidgetModifySchema.ts index 3ff0d8564..ad44e5b48 100644 --- a/src/util/schemas/WidgetModifySchema.ts +++ b/src/util/schemas/WidgetModifySchema.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/schemas/index.ts b/src/util/schemas/index.ts index 150a2dea3..bf8fdb542 100644 --- a/src/util/schemas/index.ts +++ b/src/util/schemas/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/ApiError.ts b/src/util/util/ApiError.ts index dc33e7183..714a50524 100644 --- a/src/util/util/ApiError.ts +++ b/src/util/util/ApiError.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Array.ts b/src/util/util/Array.ts index dbc75b85f..cb8377f9b 100644 --- a/src/util/util/Array.ts +++ b/src/util/util/Array.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/AutoUpdate.ts b/src/util/util/AutoUpdate.ts index a4a97f3f6..a4f071de0 100644 --- a/src/util/util/AutoUpdate.ts +++ b/src/util/util/AutoUpdate.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Categories.ts b/src/util/util/Categories.ts index 5343739c1..ebdaef563 100644 --- a/src/util/util/Categories.ts +++ b/src/util/util/Categories.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Config.ts b/src/util/util/Config.ts index bbe2f9626..7bb77901d 100644 --- a/src/util/util/Config.ts +++ b/src/util/util/Config.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Constants.ts b/src/util/util/Constants.ts index 1afdce492..0ff3350a2 100644 --- a/src/util/util/Constants.ts +++ b/src/util/util/Constants.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 64d7ca145..67299fad4 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Event.ts b/src/util/util/Event.ts index 79be1a10a..fd21eabf1 100644 --- a/src/util/util/Event.ts +++ b/src/util/util/Event.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/FieldError.ts b/src/util/util/FieldError.ts index eff793a8d..ab0fbbb7e 100644 --- a/src/util/util/FieldError.ts +++ b/src/util/util/FieldError.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Intents.ts b/src/util/util/Intents.ts index e31f50c2a..f5de7df43 100644 --- a/src/util/util/Intents.ts +++ b/src/util/util/Intents.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/InvisibleCharacters.ts b/src/util/util/InvisibleCharacters.ts index ae4817bce..dbe7e9a9d 100644 --- a/src/util/util/InvisibleCharacters.ts +++ b/src/util/util/InvisibleCharacters.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/JSON.ts b/src/util/util/JSON.ts index b092eb880..a69bbc186 100644 --- a/src/util/util/JSON.ts +++ b/src/util/util/JSON.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + // Discord.com sends ISO strings with +00:00 extension, not Z // This causes issues with Python bot libs const JSONReplacer = function ( diff --git a/src/util/util/RabbitMQ.ts b/src/util/util/RabbitMQ.ts index 30f5ee5c9..2db6a7363 100644 --- a/src/util/util/RabbitMQ.ts +++ b/src/util/util/RabbitMQ.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Regex.ts b/src/util/util/Regex.ts index cf973f471..3b5141828 100644 --- a/src/util/util/Regex.ts +++ b/src/util/util/Regex.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Rights.ts b/src/util/util/Rights.ts index 383f07ec9..6eee4d39a 100644 --- a/src/util/util/Rights.ts +++ b/src/util/util/Rights.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Sentry.ts b/src/util/util/Sentry.ts index e12483531..727aa9ab4 100644 --- a/src/util/util/Sentry.ts +++ b/src/util/util/Sentry.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/String.ts b/src/util/util/String.ts index 74fd02951..6ffd51be1 100644 --- a/src/util/util/String.ts +++ b/src/util/util/String.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts index ffc442aa1..14b3c863f 100644 --- a/src/util/util/Token.ts +++ b/src/util/util/Token.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/TraverseDirectory.ts b/src/util/util/TraverseDirectory.ts index 223e3ee00..e02df8220 100644 --- a/src/util/util/TraverseDirectory.ts +++ b/src/util/util/TraverseDirectory.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/WebAuthn.ts b/src/util/util/WebAuthn.ts index 1bac5b980..791893ce1 100644 --- a/src/util/util/WebAuthn.ts +++ b/src/util/util/WebAuthn.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/cdn.ts b/src/util/util/cdn.ts index 69d501590..45cf3fd08 100644 --- a/src/util/util/cdn.ts +++ b/src/util/util/cdn.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/email/index.ts b/src/util/util/email/index.ts index b9786e4f6..8f65f8c0f 100644 --- a/src/util/util/email/index.ts +++ b/src/util/util/email/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/util/util/email/transports/MailGun.ts b/src/util/util/email/transports/MailGun.ts index 3a5be13c5..adafa4703 100644 --- a/src/util/util/email/transports/MailGun.ts +++ b/src/util/util/email/transports/MailGun.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + import { Config } from "@fosscord/util"; import nodemailer from "nodemailer"; diff --git a/src/util/util/email/transports/MailJet.ts b/src/util/util/email/transports/MailJet.ts index 561d13ea0..b5551d468 100644 --- a/src/util/util/email/transports/MailJet.ts +++ b/src/util/util/email/transports/MailJet.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + import { Config } from "@fosscord/util"; import nodemailer from "nodemailer"; diff --git a/src/util/util/email/transports/SMTP.ts b/src/util/util/email/transports/SMTP.ts index 7d8e1e209..7f863ec90 100644 --- a/src/util/util/email/transports/SMTP.ts +++ b/src/util/util/email/transports/SMTP.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + import { Config } from "@fosscord/util"; import nodemailer from "nodemailer"; diff --git a/src/util/util/email/transports/SendGrid.ts b/src/util/util/email/transports/SendGrid.ts index 7b46c7be9..be039dddf 100644 --- a/src/util/util/email/transports/SendGrid.ts +++ b/src/util/util/email/transports/SendGrid.ts @@ -1,3 +1,21 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + import { Config } from "@fosscord/util"; import nodemailer from "nodemailer"; diff --git a/src/util/util/email/transports/index.ts b/src/util/util/email/transports/index.ts index d14acbf0a..992de54bc 100644 --- a/src/util/util/email/transports/index.ts +++ b/src/util/util/email/transports/index.ts @@ -1 +1,19 @@ +/* + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. + Copyright (C) 2023 Fosscord and Fosscord Contributors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + export * from "./SMTP"; diff --git a/src/util/util/index.ts b/src/util/util/index.ts index 93656ecb8..f7102ba63 100644 --- a/src/util/util/index.ts +++ b/src/util/util/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/Server.ts b/src/webrtc/Server.ts index 850992e79..423b62648 100644 --- a/src/webrtc/Server.ts +++ b/src/webrtc/Server.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/events/Close.ts b/src/webrtc/events/Close.ts index 4aed4ee00..346a5d886 100644 --- a/src/webrtc/events/Close.ts +++ b/src/webrtc/events/Close.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/events/Connection.ts b/src/webrtc/events/Connection.ts index c362c97ab..fa3bc85bd 100644 --- a/src/webrtc/events/Connection.ts +++ b/src/webrtc/events/Connection.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/events/Message.ts b/src/webrtc/events/Message.ts index 6b0c1a3ac..98d4b6caf 100644 --- a/src/webrtc/events/Message.ts +++ b/src/webrtc/events/Message.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/index.ts b/src/webrtc/index.ts index ab13c1138..25fddee22 100644 --- a/src/webrtc/index.ts +++ b/src/webrtc/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/opcodes/BackendVersion.ts b/src/webrtc/opcodes/BackendVersion.ts index ada3786e7..055764a90 100644 --- a/src/webrtc/opcodes/BackendVersion.ts +++ b/src/webrtc/opcodes/BackendVersion.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/opcodes/Heartbeat.ts b/src/webrtc/opcodes/Heartbeat.ts index e7da338b1..2aaa94721 100644 --- a/src/webrtc/opcodes/Heartbeat.ts +++ b/src/webrtc/opcodes/Heartbeat.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/opcodes/Identify.ts b/src/webrtc/opcodes/Identify.ts index 13fa647ae..99a30339a 100644 --- a/src/webrtc/opcodes/Identify.ts +++ b/src/webrtc/opcodes/Identify.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/opcodes/SelectProtocol.ts b/src/webrtc/opcodes/SelectProtocol.ts index cdb5ad912..ea2c5f3e5 100644 --- a/src/webrtc/opcodes/SelectProtocol.ts +++ b/src/webrtc/opcodes/SelectProtocol.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/opcodes/Speaking.ts b/src/webrtc/opcodes/Speaking.ts index e0d52e081..a6504c958 100644 --- a/src/webrtc/opcodes/Speaking.ts +++ b/src/webrtc/opcodes/Speaking.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/opcodes/Video.ts b/src/webrtc/opcodes/Video.ts index 7c7eec219..4ab39bb8b 100644 --- a/src/webrtc/opcodes/Video.ts +++ b/src/webrtc/opcodes/Video.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/opcodes/index.ts b/src/webrtc/opcodes/index.ts index b8be13a80..d631499f5 100644 --- a/src/webrtc/opcodes/index.ts +++ b/src/webrtc/opcodes/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/start.ts b/src/webrtc/start.ts index cceb399bc..cf3c8450f 100644 --- a/src/webrtc/start.ts +++ b/src/webrtc/start.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/util/Constants.ts b/src/webrtc/util/Constants.ts index fcf806f57..be31a1815 100644 --- a/src/webrtc/util/Constants.ts +++ b/src/webrtc/util/Constants.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/util/MediaServer.ts b/src/webrtc/util/MediaServer.ts index a8c928bc3..309652f75 100644 --- a/src/webrtc/util/MediaServer.ts +++ b/src/webrtc/util/MediaServer.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify diff --git a/src/webrtc/util/index.ts b/src/webrtc/util/index.ts index 893e96d2e..584b0c381 100644 --- a/src/webrtc/util/index.ts +++ b/src/webrtc/util/index.ts @@ -1,5 +1,5 @@ /* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. + Spacebar: A FOSS re-implementation and extension of the Discord.com backend. Copyright (C) 2023 Fosscord and Fosscord Contributors This program is free software: you can redistribute it and/or modify From 8b2faf0b18336e5dff1eeff4e849bcfd96b09e88 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 31 Mar 2023 02:15:42 +1100 Subject: [PATCH 25/28] SPACEBAR --- scripts/benchmark/connections.js | 2 +- scripts/benchmark/index.js | 2 +- scripts/benchmark/users.js | 2 +- scripts/changelog.js | 2 +- scripts/openapi.js | 2 +- scripts/rights.js | 2 +- scripts/schema.js | 2 +- scripts/stagingMigration/index.js | 2 +- scripts/stagingMigration/maria/1672833135670-staging.js | 2 +- scripts/stagingMigration/mysql/1672833135670-staging.js | 2 +- scripts/stagingMigration/postgres/1672815835837-staging.js | 2 +- scripts/stresstest/index.js | 2 +- scripts/stresstest/src/login/index.js | 2 +- scripts/stresstest/src/message/send.js | 2 +- scripts/stresstest/src/register/index.js | 2 +- scripts/syncronise.js | 2 +- scripts/util/getRouteDescriptions.js | 2 +- scripts/util/licensePreamble.txt | 2 +- scripts/util/walk.js | 2 +- src/api/Server.ts | 2 +- src/api/global.d.ts | 2 +- src/api/index.ts | 2 +- src/api/middlewares/Authentication.ts | 2 +- src/api/middlewares/BodyParser.ts | 2 +- src/api/middlewares/CORS.ts | 2 +- src/api/middlewares/ErrorHandler.ts | 2 +- src/api/middlewares/RateLimit.ts | 2 +- src/api/middlewares/Translation.ts | 2 +- src/api/middlewares/index.ts | 2 +- src/api/routes/-/healthz.ts | 2 +- src/api/routes/-/readyz.ts | 2 +- src/api/routes/applications/#id/bot/index.ts | 2 +- src/api/routes/applications/#id/entitlements.ts | 2 +- src/api/routes/applications/#id/index.ts | 2 +- src/api/routes/applications/#id/skus.ts | 2 +- src/api/routes/applications/detectable.ts | 2 +- src/api/routes/applications/index.ts | 2 +- src/api/routes/auth/forgot.ts | 2 +- src/api/routes/auth/generate-registration-tokens.ts | 2 +- src/api/routes/auth/location-metadata.ts | 2 +- src/api/routes/auth/login.ts | 2 +- src/api/routes/auth/logout.ts | 2 +- src/api/routes/auth/mfa/totp.ts | 2 +- src/api/routes/auth/mfa/webauthn.ts | 2 +- src/api/routes/auth/register.ts | 2 +- src/api/routes/auth/reset.ts | 2 +- src/api/routes/auth/verify/index.ts | 2 +- src/api/routes/auth/verify/resend.ts | 2 +- src/api/routes/auth/verify/view-backup-codes-challenge.ts | 2 +- src/api/routes/channels/#channel_id/followers.ts | 2 +- src/api/routes/channels/#channel_id/index.ts | 2 +- src/api/routes/channels/#channel_id/invites.ts | 2 +- src/api/routes/channels/#channel_id/messages/#message_id/ack.ts | 2 +- .../channels/#channel_id/messages/#message_id/crosspost.ts | 2 +- .../routes/channels/#channel_id/messages/#message_id/index.ts | 2 +- .../channels/#channel_id/messages/#message_id/reactions.ts | 2 +- src/api/routes/channels/#channel_id/messages/bulk-delete.ts | 2 +- src/api/routes/channels/#channel_id/messages/index.ts | 2 +- src/api/routes/channels/#channel_id/permissions.ts | 2 +- src/api/routes/channels/#channel_id/pins.ts | 2 +- src/api/routes/channels/#channel_id/purge.ts | 2 +- src/api/routes/channels/#channel_id/recipients.ts | 2 +- src/api/routes/channels/#channel_id/typing.ts | 2 +- src/api/routes/channels/#channel_id/webhooks.ts | 2 +- src/api/routes/discoverable-guilds.ts | 2 +- src/api/routes/discovery.ts | 2 +- src/api/routes/download.ts | 2 +- src/api/routes/experiments.ts | 2 +- src/api/routes/gateway/bot.ts | 2 +- src/api/routes/gateway/index.ts | 2 +- src/api/routes/gifs/search.ts | 2 +- src/api/routes/gifs/trending-gifs.ts | 2 +- src/api/routes/gifs/trending.ts | 2 +- src/api/routes/guild-recommendations.ts | 2 +- src/api/routes/guilds/#guild_id/audit-logs.ts | 2 +- src/api/routes/guilds/#guild_id/bans.ts | 2 +- src/api/routes/guilds/#guild_id/channels.ts | 2 +- src/api/routes/guilds/#guild_id/delete.ts | 2 +- src/api/routes/guilds/#guild_id/discovery-requirements.ts | 2 +- src/api/routes/guilds/#guild_id/emojis.ts | 2 +- src/api/routes/guilds/#guild_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/integrations.ts | 2 +- src/api/routes/guilds/#guild_id/invites.ts | 2 +- src/api/routes/guilds/#guild_id/member-verification.ts | 2 +- src/api/routes/guilds/#guild_id/members/#member_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/members/#member_id/nick.ts | 2 +- .../guilds/#guild_id/members/#member_id/roles/#role_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/members/index.ts | 2 +- src/api/routes/guilds/#guild_id/messages/search.ts | 2 +- src/api/routes/guilds/#guild_id/premium.ts | 2 +- src/api/routes/guilds/#guild_id/profile/index.ts | 2 +- src/api/routes/guilds/#guild_id/prune.ts | 2 +- src/api/routes/guilds/#guild_id/regions.ts | 2 +- src/api/routes/guilds/#guild_id/roles/#role_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/roles/index.ts | 2 +- src/api/routes/guilds/#guild_id/stickers.ts | 2 +- src/api/routes/guilds/#guild_id/templates.ts | 2 +- src/api/routes/guilds/#guild_id/vanity-url.ts | 2 +- src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/webhooks.ts | 2 +- src/api/routes/guilds/#guild_id/welcome-screen.ts | 2 +- src/api/routes/guilds/#guild_id/widget.json.ts | 2 +- src/api/routes/guilds/#guild_id/widget.png.ts | 2 +- src/api/routes/guilds/#guild_id/widget.ts | 2 +- src/api/routes/guilds/index.ts | 2 +- src/api/routes/guilds/templates/index.ts | 2 +- src/api/routes/invites/index.ts | 2 +- src/api/routes/oauth2/authorize.ts | 2 +- src/api/routes/oauth2/tokens.ts | 2 +- src/api/routes/outbound-promotions.ts | 2 +- src/api/routes/partners/#guild_id/requirements.ts | 2 +- src/api/routes/ping.ts | 2 +- src/api/routes/policies/instance/domains.ts | 2 +- src/api/routes/policies/instance/index.ts | 2 +- src/api/routes/policies/instance/limits.ts | 2 +- src/api/routes/policies/stats.ts | 2 +- src/api/routes/read-states/ack-bulk.ts | 2 +- src/api/routes/scheduled-maintenances/upcoming_json.ts | 2 +- src/api/routes/science.ts | 2 +- src/api/routes/stage-instances.ts | 2 +- src/api/routes/sticker-packs/index.ts | 2 +- src/api/routes/stickers/#sticker_id/index.ts | 2 +- src/api/routes/stop.ts | 2 +- src/api/routes/store/published-listings/applications.ts | 2 +- .../published-listings/applications/#id/subscription-plans.ts | 2 +- src/api/routes/store/published-listings/skus.ts | 2 +- .../store/published-listings/skus/#sku_id/subscription-plans.ts | 2 +- src/api/routes/teams.ts | 2 +- src/api/routes/track.ts | 2 +- src/api/routes/updates.ts | 2 +- src/api/routes/users/#id/delete.ts | 2 +- src/api/routes/users/#id/index.ts | 2 +- src/api/routes/users/#id/profile.ts | 2 +- src/api/routes/users/#id/relationships.ts | 2 +- src/api/routes/users/@me/activities/statistics/applications.ts | 2 +- src/api/routes/users/@me/affinities/guilds.ts | 2 +- src/api/routes/users/@me/affinities/users.ts | 2 +- src/api/routes/users/@me/applications/#app_id/entitlements.ts | 2 +- src/api/routes/users/@me/billing/country-code.ts | 2 +- src/api/routes/users/@me/billing/payment-sources.ts | 2 +- src/api/routes/users/@me/billing/subscriptions.ts | 2 +- src/api/routes/users/@me/channels.ts | 2 +- src/api/routes/users/@me/connections.ts | 2 +- src/api/routes/users/@me/delete.ts | 2 +- src/api/routes/users/@me/devices.ts | 2 +- src/api/routes/users/@me/disable.ts | 2 +- src/api/routes/users/@me/email-settings.ts | 2 +- src/api/routes/users/@me/entitlements.ts | 2 +- src/api/routes/users/@me/guilds.ts | 2 +- src/api/routes/users/@me/guilds/#guild_id/settings.ts | 2 +- src/api/routes/users/@me/guilds/premium/subscription-slots.ts | 2 +- src/api/routes/users/@me/index.ts | 2 +- src/api/routes/users/@me/library.ts | 2 +- src/api/routes/users/@me/mfa/codes-verification.ts | 2 +- src/api/routes/users/@me/mfa/codes.ts | 2 +- src/api/routes/users/@me/mfa/totp/disable.ts | 2 +- src/api/routes/users/@me/mfa/totp/enable.ts | 2 +- .../routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts | 2 +- src/api/routes/users/@me/mfa/webauthn/credentials/index.ts | 2 +- src/api/routes/users/@me/notes.ts | 2 +- src/api/routes/users/@me/relationships.ts | 2 +- src/api/routes/users/@me/settings.ts | 2 +- src/api/routes/voice/regions.ts | 2 +- src/api/start.ts | 2 +- src/api/util/handlers/Instance.ts | 2 +- src/api/util/handlers/Message.ts | 2 +- src/api/util/handlers/Voice.ts | 2 +- src/api/util/handlers/route.ts | 2 +- src/api/util/index.ts | 2 +- src/api/util/utility/Base64.ts | 2 +- src/api/util/utility/EmbedHandlers.ts | 2 +- src/api/util/utility/RandomInviteID.ts | 2 +- src/api/util/utility/String.ts | 2 +- src/api/util/utility/captcha.ts | 2 +- src/api/util/utility/ipAddress.ts | 2 +- src/api/util/utility/passwordStrength.ts | 2 +- src/bundle/Server.ts | 2 +- src/bundle/index.ts | 2 +- src/bundle/start.ts | 2 +- src/bundle/stats.ts | 2 +- src/cdn/Server.ts | 2 +- src/cdn/index.ts | 2 +- src/cdn/routes/attachments.ts | 2 +- src/cdn/routes/avatars.ts | 2 +- src/cdn/routes/embed.ts | 2 +- src/cdn/routes/guild-profiles.ts | 2 +- src/cdn/routes/ping.ts | 2 +- src/cdn/routes/role-icons.ts | 2 +- src/cdn/start.ts | 2 +- src/cdn/util/FileStorage.ts | 2 +- src/cdn/util/S3Storage.ts | 2 +- src/cdn/util/Storage.ts | 2 +- src/cdn/util/index.ts | 2 +- src/cdn/util/multer.ts | 2 +- src/gateway/Server.ts | 2 +- src/gateway/events/Close.ts | 2 +- src/gateway/events/Connection.ts | 2 +- src/gateway/events/Message.ts | 2 +- src/gateway/index.ts | 2 +- src/gateway/listener/listener.ts | 2 +- src/gateway/opcodes/Heartbeat.ts | 2 +- src/gateway/opcodes/Identify.ts | 2 +- src/gateway/opcodes/LazyRequest.ts | 2 +- src/gateway/opcodes/PresenceUpdate.ts | 2 +- src/gateway/opcodes/RequestGuildMembers.ts | 2 +- src/gateway/opcodes/Resume.ts | 2 +- src/gateway/opcodes/VoiceStateUpdate.ts | 2 +- src/gateway/opcodes/index.ts | 2 +- src/gateway/opcodes/instanceOf.ts | 2 +- src/gateway/start.ts | 2 +- src/gateway/util/Constants.ts | 2 +- src/gateway/util/Heartbeat.ts | 2 +- src/gateway/util/Send.ts | 2 +- src/gateway/util/SessionUtils.ts | 2 +- src/gateway/util/WebSocket.ts | 2 +- src/gateway/util/index.ts | 2 +- src/util/config/Config.ts | 2 +- src/util/config/index.ts | 2 +- src/util/config/types/ApiConfiguration.ts | 2 +- src/util/config/types/CdnConfiguration.ts | 2 +- src/util/config/types/DefaultsConfiguration.ts | 2 +- src/util/config/types/EmailConfiguration.ts | 2 +- src/util/config/types/EndpointConfiguration.ts | 2 +- src/util/config/types/ExternalTokensConfiguration.ts | 2 +- src/util/config/types/GeneralConfiguration.ts | 2 +- src/util/config/types/GifConfiguration.ts | 2 +- src/util/config/types/GuildConfiguration.ts | 2 +- src/util/config/types/KafkaConfiguration.ts | 2 +- src/util/config/types/LimitConfigurations.ts | 2 +- src/util/config/types/LoginConfiguration.ts | 2 +- src/util/config/types/MetricsConfiguration.ts | 2 +- src/util/config/types/PasswordResetConfiguration.ts | 2 +- src/util/config/types/RabbitMQConfiguration.ts | 2 +- src/util/config/types/RegionConfiguration.ts | 2 +- src/util/config/types/RegisterConfiguration.ts | 2 +- src/util/config/types/SecurityConfiguration.ts | 2 +- src/util/config/types/SentryConfiguration.ts | 2 +- src/util/config/types/TemplateConfiguration.ts | 2 +- src/util/config/types/index.ts | 2 +- .../subconfigurations/client/ClientReleaseConfiguration.ts | 2 +- src/util/config/types/subconfigurations/client/index.ts | 2 +- .../config/types/subconfigurations/defaults/GuildDefaults.ts | 2 +- .../config/types/subconfigurations/defaults/UserDefaults.ts | 2 +- src/util/config/types/subconfigurations/defaults/index.ts | 2 +- src/util/config/types/subconfigurations/email/MailGun.ts | 2 +- src/util/config/types/subconfigurations/email/MailJet.ts | 2 +- src/util/config/types/subconfigurations/email/SMTP.ts | 2 +- src/util/config/types/subconfigurations/email/SendGrid.ts | 2 +- src/util/config/types/subconfigurations/email/index.ts | 2 +- src/util/config/types/subconfigurations/guild/AutoJoin.ts | 2 +- src/util/config/types/subconfigurations/guild/Discovery.ts | 2 +- src/util/config/types/subconfigurations/guild/index.ts | 2 +- src/util/config/types/subconfigurations/index.ts | 2 +- src/util/config/types/subconfigurations/kafka/KafkaBroker.ts | 2 +- src/util/config/types/subconfigurations/kafka/index.ts | 2 +- src/util/config/types/subconfigurations/limits/ChannelLimits.ts | 2 +- .../config/types/subconfigurations/limits/GlobalRateLimits.ts | 2 +- src/util/config/types/subconfigurations/limits/GuildLimits.ts | 2 +- src/util/config/types/subconfigurations/limits/MessageLimits.ts | 2 +- src/util/config/types/subconfigurations/limits/RateLimits.ts | 2 +- src/util/config/types/subconfigurations/limits/UserLimits.ts | 2 +- src/util/config/types/subconfigurations/limits/index.ts | 2 +- .../config/types/subconfigurations/limits/ratelimits/Auth.ts | 2 +- .../subconfigurations/limits/ratelimits/RateLimitOptions.ts | 2 +- .../config/types/subconfigurations/limits/ratelimits/Route.ts | 2 +- .../config/types/subconfigurations/limits/ratelimits/index.ts | 2 +- src/util/config/types/subconfigurations/region/Region.ts | 2 +- src/util/config/types/subconfigurations/region/index.ts | 2 +- src/util/config/types/subconfigurations/register/DateOfBirth.ts | 2 +- src/util/config/types/subconfigurations/register/Email.ts | 2 +- src/util/config/types/subconfigurations/register/Password.ts | 2 +- src/util/config/types/subconfigurations/register/index.ts | 2 +- src/util/config/types/subconfigurations/security/Captcha.ts | 2 +- src/util/config/types/subconfigurations/security/TwoFactor.ts | 2 +- src/util/config/types/subconfigurations/security/index.ts | 2 +- src/util/dtos/DmChannelDTO.ts | 2 +- src/util/dtos/ReadyGuildDTO.ts | 2 +- src/util/dtos/UserDTO.ts | 2 +- src/util/dtos/index.ts | 2 +- src/util/entities/Application.ts | 2 +- src/util/entities/Attachment.ts | 2 +- src/util/entities/AuditLog.ts | 2 +- src/util/entities/BackupCodes.ts | 2 +- src/util/entities/Ban.ts | 2 +- src/util/entities/BaseClass.ts | 2 +- src/util/entities/Categories.ts | 2 +- src/util/entities/Channel.ts | 2 +- src/util/entities/ClientRelease.ts | 2 +- src/util/entities/Config.ts | 2 +- src/util/entities/ConnectedAccount.ts | 2 +- src/util/entities/EmbedCache.ts | 2 +- src/util/entities/Emoji.ts | 2 +- src/util/entities/Encryption.ts | 2 +- src/util/entities/Guild.ts | 2 +- src/util/entities/Invite.ts | 2 +- src/util/entities/Member.ts | 2 +- src/util/entities/Message.ts | 2 +- src/util/entities/Migration.ts | 2 +- src/util/entities/Note.ts | 2 +- src/util/entities/RateLimit.ts | 2 +- src/util/entities/ReadState.ts | 2 +- src/util/entities/Recipient.ts | 2 +- src/util/entities/Relationship.ts | 2 +- src/util/entities/Role.ts | 2 +- src/util/entities/SecurityKey.ts | 2 +- src/util/entities/Session.ts | 2 +- src/util/entities/Sticker.ts | 2 +- src/util/entities/StickerPack.ts | 2 +- src/util/entities/Team.ts | 2 +- src/util/entities/TeamMember.ts | 2 +- src/util/entities/Template.ts | 2 +- src/util/entities/User.ts | 2 +- src/util/entities/UserSettings.ts | 2 +- src/util/entities/ValidRegistrationTokens.ts | 2 +- src/util/entities/VoiceState.ts | 2 +- src/util/entities/Webhook.ts | 2 +- src/util/entities/index.ts | 2 +- src/util/imports/index.ts | 2 +- src/util/index.ts | 2 +- src/util/interfaces/Activity.ts | 2 +- src/util/interfaces/Event.ts | 2 +- src/util/interfaces/Interaction.ts | 2 +- src/util/interfaces/Presence.ts | 2 +- src/util/interfaces/Status.ts | 2 +- src/util/interfaces/index.ts | 2 +- .../migration/mariadb/1673609465036-templateDeleteCascade.ts | 2 +- src/util/migration/mariadb/1675045120206-webauthn.ts | 2 +- src/util/migration/mysql/1673609465036-templateDeleteCascade.ts | 2 +- src/util/migration/mysql/1675045120206-webauthn.ts | 2 +- .../migration/postgres/1673609867556-templateDeleteCascade.ts | 2 +- src/util/migration/postgres/1675044825710-webauthn.ts | 2 +- src/util/schemas/AckBulkSchema.ts | 2 +- src/util/schemas/ActivitySchema.ts | 2 +- src/util/schemas/ApplicationAuthorizeSchema.ts | 2 +- src/util/schemas/ApplicationCreateSchema.ts | 2 +- src/util/schemas/ApplicationModifySchema.ts | 2 +- src/util/schemas/BackupCodesChallengeSchema.ts | 2 +- src/util/schemas/BanCreateSchema.ts | 2 +- src/util/schemas/BanModeratorSchema.ts | 2 +- src/util/schemas/BanRegistrySchema.ts | 2 +- src/util/schemas/BotModifySchema.ts | 2 +- src/util/schemas/BulkDeleteSchema.ts | 2 +- src/util/schemas/ChannelModifySchema.ts | 2 +- src/util/schemas/ChannelPermissionOverwriteSchema.ts | 2 +- src/util/schemas/ChannelReorderSchema.ts | 2 +- src/util/schemas/CodesVerificationSchema.ts | 2 +- src/util/schemas/DmChannelCreateSchema.ts | 2 +- src/util/schemas/EmojiCreateSchema.ts | 2 +- src/util/schemas/EmojiModifySchema.ts | 2 +- src/util/schemas/ForgotPasswordSchema.ts | 2 +- src/util/schemas/GatewayBotResponse.ts | 2 +- src/util/schemas/GatewayPayloadSchema.ts | 2 +- src/util/schemas/GatewayResponse.ts | 2 +- src/util/schemas/GuildCreateSchema.ts | 2 +- src/util/schemas/GuildTemplateCreateSchema.ts | 2 +- src/util/schemas/GuildUpdateSchema.ts | 2 +- src/util/schemas/GuildUpdateWelcomeScreenSchema.ts | 2 +- src/util/schemas/IdentifySchema.ts | 2 +- src/util/schemas/InviteCreateSchema.ts | 2 +- src/util/schemas/LazyRequestSchema.ts | 2 +- src/util/schemas/LoginSchema.ts | 2 +- src/util/schemas/MemberChangeProfileSchema.ts | 2 +- src/util/schemas/MemberChangeSchema.ts | 2 +- src/util/schemas/MemberNickChangeSchema.ts | 2 +- src/util/schemas/MessageAcknowledgeSchema.ts | 2 +- src/util/schemas/MessageCreateSchema.ts | 2 +- src/util/schemas/MessageEditSchema.ts | 2 +- src/util/schemas/MfaCodesSchema.ts | 2 +- src/util/schemas/ModifyGuildStickerSchema.ts | 2 +- src/util/schemas/PasswordResetSchema.ts | 2 +- src/util/schemas/PruneSchema.ts | 2 +- src/util/schemas/PurgeSchema.ts | 2 +- src/util/schemas/RegisterSchema.ts | 2 +- src/util/schemas/RelationshipPostSchema.ts | 2 +- src/util/schemas/RelationshipPutSchema.ts | 2 +- src/util/schemas/RoleModifySchema.ts | 2 +- src/util/schemas/RolePositionUpdateSchema.ts | 2 +- src/util/schemas/SelectProtocolSchema.ts | 2 +- src/util/schemas/TemplateCreateSchema.ts | 2 +- src/util/schemas/TemplateModifySchema.ts | 2 +- src/util/schemas/TotpDisableSchema.ts | 2 +- src/util/schemas/TotpEnableSchema.ts | 2 +- src/util/schemas/TotpSchema.ts | 2 +- src/util/schemas/UserDeleteSchema.ts | 2 +- src/util/schemas/UserGuildSettingsSchema.ts | 2 +- src/util/schemas/UserModifySchema.ts | 2 +- src/util/schemas/UserProfileModifySchema.ts | 2 +- src/util/schemas/UserProfileResponse.ts | 2 +- src/util/schemas/UserRelationsResponse.ts | 2 +- src/util/schemas/UserSettingsSchema.ts | 2 +- src/util/schemas/Validator.ts | 2 +- src/util/schemas/VanityUrlSchema.ts | 2 +- src/util/schemas/VerifyEmailSchema.ts | 2 +- src/util/schemas/VoiceIdentifySchema.ts | 2 +- src/util/schemas/VoiceStateUpdateSchema.ts | 2 +- src/util/schemas/VoiceVideoSchema.ts | 2 +- src/util/schemas/WebAuthnSchema.ts | 2 +- src/util/schemas/WebhookCreateSchema.ts | 2 +- src/util/schemas/WidgetModifySchema.ts | 2 +- src/util/schemas/index.ts | 2 +- src/util/util/ApiError.ts | 2 +- src/util/util/Array.ts | 2 +- src/util/util/AutoUpdate.ts | 2 +- src/util/util/Categories.ts | 2 +- src/util/util/Config.ts | 2 +- src/util/util/Constants.ts | 2 +- src/util/util/Database.ts | 2 +- src/util/util/Event.ts | 2 +- src/util/util/FieldError.ts | 2 +- src/util/util/Intents.ts | 2 +- src/util/util/InvisibleCharacters.ts | 2 +- src/util/util/JSON.ts | 2 +- src/util/util/RabbitMQ.ts | 2 +- src/util/util/Regex.ts | 2 +- src/util/util/Rights.ts | 2 +- src/util/util/Sentry.ts | 2 +- src/util/util/String.ts | 2 +- src/util/util/Token.ts | 2 +- src/util/util/TraverseDirectory.ts | 2 +- src/util/util/WebAuthn.ts | 2 +- src/util/util/cdn.ts | 2 +- src/util/util/email/index.ts | 2 +- src/util/util/email/transports/MailGun.ts | 2 +- src/util/util/email/transports/MailJet.ts | 2 +- src/util/util/email/transports/SMTP.ts | 2 +- src/util/util/email/transports/SendGrid.ts | 2 +- src/util/util/email/transports/index.ts | 2 +- src/util/util/index.ts | 2 +- src/webrtc/Server.ts | 2 +- src/webrtc/events/Close.ts | 2 +- src/webrtc/events/Connection.ts | 2 +- src/webrtc/events/Message.ts | 2 +- src/webrtc/index.ts | 2 +- src/webrtc/opcodes/BackendVersion.ts | 2 +- src/webrtc/opcodes/Heartbeat.ts | 2 +- src/webrtc/opcodes/Identify.ts | 2 +- src/webrtc/opcodes/SelectProtocol.ts | 2 +- src/webrtc/opcodes/Speaking.ts | 2 +- src/webrtc/opcodes/Video.ts | 2 +- src/webrtc/opcodes/index.ts | 2 +- src/webrtc/start.ts | 2 +- src/webrtc/util/Constants.ts | 2 +- src/webrtc/util/MediaServer.ts | 2 +- src/webrtc/util/index.ts | 2 +- 444 files changed, 444 insertions(+), 444 deletions(-) diff --git a/scripts/benchmark/connections.js b/scripts/benchmark/connections.js index f3bafb7ff..4246c646f 100644 --- a/scripts/benchmark/connections.js +++ b/scripts/benchmark/connections.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/benchmark/index.js b/scripts/benchmark/index.js index 3164f13ac..ca799a858 100644 --- a/scripts/benchmark/index.js +++ b/scripts/benchmark/index.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/benchmark/users.js b/scripts/benchmark/users.js index 22b88dedd..20f9f7c30 100644 --- a/scripts/benchmark/users.js +++ b/scripts/benchmark/users.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/changelog.js b/scripts/changelog.js index f36992c59..221864b48 100644 --- a/scripts/changelog.js +++ b/scripts/changelog.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/openapi.js b/scripts/openapi.js index 61d4acdbe..b5001829d 100644 --- a/scripts/openapi.js +++ b/scripts/openapi.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/rights.js b/scripts/rights.js index 86f8df4ec..bf79ef79b 100644 --- a/scripts/rights.js +++ b/scripts/rights.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/schema.js b/scripts/schema.js index a6e3c7cf2..12e3cdb5e 100644 --- a/scripts/schema.js +++ b/scripts/schema.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/stagingMigration/index.js b/scripts/stagingMigration/index.js index 7e279c89d..8ba3daa0d 100644 --- a/scripts/stagingMigration/index.js +++ b/scripts/stagingMigration/index.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/stagingMigration/maria/1672833135670-staging.js b/scripts/stagingMigration/maria/1672833135670-staging.js index b1fe4719c..0da731dcc 100644 --- a/scripts/stagingMigration/maria/1672833135670-staging.js +++ b/scripts/stagingMigration/maria/1672833135670-staging.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/stagingMigration/mysql/1672833135670-staging.js b/scripts/stagingMigration/mysql/1672833135670-staging.js index b1fe4719c..0da731dcc 100644 --- a/scripts/stagingMigration/mysql/1672833135670-staging.js +++ b/scripts/stagingMigration/mysql/1672833135670-staging.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/stagingMigration/postgres/1672815835837-staging.js b/scripts/stagingMigration/postgres/1672815835837-staging.js index 1865fe2fe..8c10eedfc 100644 --- a/scripts/stagingMigration/postgres/1672815835837-staging.js +++ b/scripts/stagingMigration/postgres/1672815835837-staging.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/stresstest/index.js b/scripts/stresstest/index.js index d61199cb3..bb8c72e48 100644 --- a/scripts/stresstest/index.js +++ b/scripts/stresstest/index.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/stresstest/src/login/index.js b/scripts/stresstest/src/login/index.js index 2c9058c0e..128a477b9 100644 --- a/scripts/stresstest/src/login/index.js +++ b/scripts/stresstest/src/login/index.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/stresstest/src/message/send.js b/scripts/stresstest/src/message/send.js index 3bc5954e2..ca6af62c8 100644 --- a/scripts/stresstest/src/message/send.js +++ b/scripts/stresstest/src/message/send.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/stresstest/src/register/index.js b/scripts/stresstest/src/register/index.js index 494500ddd..f1e56813a 100644 --- a/scripts/stresstest/src/register/index.js +++ b/scripts/stresstest/src/register/index.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/syncronise.js b/scripts/syncronise.js index c13bafbdd..34cd0dddd 100644 --- a/scripts/syncronise.js +++ b/scripts/syncronise.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/util/getRouteDescriptions.js b/scripts/util/getRouteDescriptions.js index e77aeffca..fe36c238f 100644 --- a/scripts/util/getRouteDescriptions.js +++ b/scripts/util/getRouteDescriptions.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/util/licensePreamble.txt b/scripts/util/licensePreamble.txt index 999c3a8c3..2f76a3c55 100644 --- a/scripts/util/licensePreamble.txt +++ b/scripts/util/licensePreamble.txt @@ -1,5 +1,5 @@ Spacebar: A FOSS re-implementation and extension of the Discord.com backend. -Copyright (C) 2023 Fosscord and Fosscord Contributors +Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/scripts/util/walk.js b/scripts/util/walk.js index c02030f6a..be59023d9 100644 --- a/scripts/util/walk.js +++ b/scripts/util/walk.js @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/Server.ts b/src/api/Server.ts index dc84a943b..032e923e6 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/global.d.ts b/src/api/global.d.ts index da2f42720..9423b781a 100644 --- a/src/api/global.d.ts +++ b/src/api/global.d.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/index.ts b/src/api/index.ts index 185180722..fee28e707 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index 7a30312f3..400a16f45 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/middlewares/BodyParser.ts b/src/api/middlewares/BodyParser.ts index e5c037d30..ac8e04325 100644 --- a/src/api/middlewares/BodyParser.ts +++ b/src/api/middlewares/BodyParser.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/middlewares/CORS.ts b/src/api/middlewares/CORS.ts index 2197c7078..3e7452fc0 100644 --- a/src/api/middlewares/CORS.ts +++ b/src/api/middlewares/CORS.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/middlewares/ErrorHandler.ts b/src/api/middlewares/ErrorHandler.ts index 469e8ee66..439fce68d 100644 --- a/src/api/middlewares/ErrorHandler.ts +++ b/src/api/middlewares/ErrorHandler.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/middlewares/RateLimit.ts b/src/api/middlewares/RateLimit.ts index 576bbb960..f50d65685 100644 --- a/src/api/middlewares/RateLimit.ts +++ b/src/api/middlewares/RateLimit.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/middlewares/Translation.ts b/src/api/middlewares/Translation.ts index 1d651f117..60ff4ad79 100644 --- a/src/api/middlewares/Translation.ts +++ b/src/api/middlewares/Translation.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/middlewares/index.ts b/src/api/middlewares/index.ts index e4b67d813..6384e1aad 100644 --- a/src/api/middlewares/index.ts +++ b/src/api/middlewares/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/-/healthz.ts b/src/api/routes/-/healthz.ts index 2d414832f..555ccf116 100644 --- a/src/api/routes/-/healthz.ts +++ b/src/api/routes/-/healthz.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/-/readyz.ts b/src/api/routes/-/readyz.ts index 2d414832f..555ccf116 100644 --- a/src/api/routes/-/readyz.ts +++ b/src/api/routes/-/readyz.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/applications/#id/bot/index.ts b/src/api/routes/applications/#id/bot/index.ts index f0826ffb0..89e185b41 100644 --- a/src/api/routes/applications/#id/bot/index.ts +++ b/src/api/routes/applications/#id/bot/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/applications/#id/entitlements.ts b/src/api/routes/applications/#id/entitlements.ts index 7903f5140..fa8609bf9 100644 --- a/src/api/routes/applications/#id/entitlements.ts +++ b/src/api/routes/applications/#id/entitlements.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/applications/#id/index.ts b/src/api/routes/applications/#id/index.ts index 695173aec..1cd792ba7 100644 --- a/src/api/routes/applications/#id/index.ts +++ b/src/api/routes/applications/#id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/applications/#id/skus.ts b/src/api/routes/applications/#id/skus.ts index fea252429..973761c31 100644 --- a/src/api/routes/applications/#id/skus.ts +++ b/src/api/routes/applications/#id/skus.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/applications/detectable.ts b/src/api/routes/applications/detectable.ts index 0ec342ea6..2e9723356 100644 --- a/src/api/routes/applications/detectable.ts +++ b/src/api/routes/applications/detectable.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/applications/index.ts b/src/api/routes/applications/index.ts index 56605e455..c4c2c3260 100644 --- a/src/api/routes/applications/index.ts +++ b/src/api/routes/applications/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts index 31ebb16d9..3a3af3cb2 100644 --- a/src/api/routes/auth/forgot.ts +++ b/src/api/routes/auth/forgot.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/generate-registration-tokens.ts b/src/api/routes/auth/generate-registration-tokens.ts index 4458cfc81..45ebc2e8c 100644 --- a/src/api/routes/auth/generate-registration-tokens.ts +++ b/src/api/routes/auth/generate-registration-tokens.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/location-metadata.ts b/src/api/routes/auth/location-metadata.ts index f6da3bdfb..d7c7adf1e 100644 --- a/src/api/routes/auth/location-metadata.ts +++ b/src/api/routes/auth/location-metadata.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts index dab87e4e1..280d34619 100644 --- a/src/api/routes/auth/login.ts +++ b/src/api/routes/auth/login.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/logout.ts b/src/api/routes/auth/logout.ts index adb995e51..33ad144ca 100644 --- a/src/api/routes/auth/logout.ts +++ b/src/api/routes/auth/logout.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/mfa/totp.ts b/src/api/routes/auth/mfa/totp.ts index 3c2025aa0..83c4ba56a 100644 --- a/src/api/routes/auth/mfa/totp.ts +++ b/src/api/routes/auth/mfa/totp.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/mfa/webauthn.ts b/src/api/routes/auth/mfa/webauthn.ts index 63b12ca89..8ffe1ee23 100644 --- a/src/api/routes/auth/mfa/webauthn.ts +++ b/src/api/routes/auth/mfa/webauthn.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts index 51efbc998..aa09cf242 100644 --- a/src/api/routes/auth/register.ts +++ b/src/api/routes/auth/register.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts index 79ef296c7..a1fd218fb 100644 --- a/src/api/routes/auth/reset.ts +++ b/src/api/routes/auth/reset.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts index cd95d59d0..1cde3691e 100644 --- a/src/api/routes/auth/verify/index.ts +++ b/src/api/routes/auth/verify/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts index 104361632..d9751ee74 100644 --- a/src/api/routes/auth/verify/resend.ts +++ b/src/api/routes/auth/verify/resend.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/auth/verify/view-backup-codes-challenge.ts b/src/api/routes/auth/verify/view-backup-codes-challenge.ts index 31a9d1668..e02e41f75 100644 --- a/src/api/routes/auth/verify/view-backup-codes-challenge.ts +++ b/src/api/routes/auth/verify/view-backup-codes-challenge.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/followers.ts b/src/api/routes/channels/#channel_id/followers.ts index 093eb3c33..58906e73a 100644 --- a/src/api/routes/channels/#channel_id/followers.ts +++ b/src/api/routes/channels/#channel_id/followers.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts index d2228ebaf..2033e444c 100644 --- a/src/api/routes/channels/#channel_id/index.ts +++ b/src/api/routes/channels/#channel_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/invites.ts b/src/api/routes/channels/#channel_id/invites.ts index af7dff0ba..9bb540267 100644 --- a/src/api/routes/channels/#channel_id/invites.ts +++ b/src/api/routes/channels/#channel_id/invites.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts index 4800518af..42c1c3465 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts index b054d413b..d2ece163c 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts index 7152afbb1..62e18be45 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts index 94449cc8d..5f86c966d 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts index c816e04b7..d97b97e52 100644 --- a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts +++ b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index 43814846d..b68bbcd46 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/permissions.ts b/src/api/routes/channels/#channel_id/permissions.ts index 4669eb739..1794cd9a3 100644 --- a/src/api/routes/channels/#channel_id/permissions.ts +++ b/src/api/routes/channels/#channel_id/permissions.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/pins.ts b/src/api/routes/channels/#channel_id/pins.ts index cf20d077c..bd4c6ae27 100644 --- a/src/api/routes/channels/#channel_id/pins.ts +++ b/src/api/routes/channels/#channel_id/pins.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/purge.ts b/src/api/routes/channels/#channel_id/purge.ts index 1e6c2f50b..5ff53129f 100644 --- a/src/api/routes/channels/#channel_id/purge.ts +++ b/src/api/routes/channels/#channel_id/purge.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/recipients.ts b/src/api/routes/channels/#channel_id/recipients.ts index 111a24324..4cdc55ed1 100644 --- a/src/api/routes/channels/#channel_id/recipients.ts +++ b/src/api/routes/channels/#channel_id/recipients.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/typing.ts b/src/api/routes/channels/#channel_id/typing.ts index ba21283b0..e697ac96c 100644 --- a/src/api/routes/channels/#channel_id/typing.ts +++ b/src/api/routes/channels/#channel_id/typing.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts index 85530e33c..d5dd25224 100644 --- a/src/api/routes/channels/#channel_id/webhooks.ts +++ b/src/api/routes/channels/#channel_id/webhooks.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/discoverable-guilds.ts b/src/api/routes/discoverable-guilds.ts index cc3c61d80..383fa2980 100644 --- a/src/api/routes/discoverable-guilds.ts +++ b/src/api/routes/discoverable-guilds.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/discovery.ts b/src/api/routes/discovery.ts index 50d9d96e2..f9f620fb6 100644 --- a/src/api/routes/discovery.ts +++ b/src/api/routes/discovery.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/download.ts b/src/api/routes/download.ts index e32d86b80..916e9208c 100644 --- a/src/api/routes/download.ts +++ b/src/api/routes/download.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/experiments.ts b/src/api/routes/experiments.ts index 3138e58db..a29dd8947 100644 --- a/src/api/routes/experiments.ts +++ b/src/api/routes/experiments.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/gateway/bot.ts b/src/api/routes/gateway/bot.ts index 72f8d9033..1cce93b07 100644 --- a/src/api/routes/gateway/bot.ts +++ b/src/api/routes/gateway/bot.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/gateway/index.ts b/src/api/routes/gateway/index.ts index b7dd4903a..ee500e9b6 100644 --- a/src/api/routes/gateway/index.ts +++ b/src/api/routes/gateway/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/gifs/search.ts b/src/api/routes/gifs/search.ts index cbd89c382..d3e8ef1c8 100644 --- a/src/api/routes/gifs/search.ts +++ b/src/api/routes/gifs/search.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/gifs/trending-gifs.ts b/src/api/routes/gifs/trending-gifs.ts index 389f72f7b..a05bc9aa8 100644 --- a/src/api/routes/gifs/trending-gifs.ts +++ b/src/api/routes/gifs/trending-gifs.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/gifs/trending.ts b/src/api/routes/gifs/trending.ts index 2631eab4b..e7b5f2186 100644 --- a/src/api/routes/gifs/trending.ts +++ b/src/api/routes/gifs/trending.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guild-recommendations.ts b/src/api/routes/guild-recommendations.ts index e7112b930..c60873862 100644 --- a/src/api/routes/guild-recommendations.ts +++ b/src/api/routes/guild-recommendations.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/audit-logs.ts b/src/api/routes/guilds/#guild_id/audit-logs.ts index b27c23240..82c4f2549 100644 --- a/src/api/routes/guilds/#guild_id/audit-logs.ts +++ b/src/api/routes/guilds/#guild_id/audit-logs.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts index ee0e4dd4e..3ecb31c37 100644 --- a/src/api/routes/guilds/#guild_id/bans.ts +++ b/src/api/routes/guilds/#guild_id/bans.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts index 176d4f7b4..0f6225d7c 100644 --- a/src/api/routes/guilds/#guild_id/channels.ts +++ b/src/api/routes/guilds/#guild_id/channels.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/delete.ts b/src/api/routes/guilds/#guild_id/delete.ts index 236d53b20..184e17988 100644 --- a/src/api/routes/guilds/#guild_id/delete.ts +++ b/src/api/routes/guilds/#guild_id/delete.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/discovery-requirements.ts b/src/api/routes/guilds/#guild_id/discovery-requirements.ts index 8dbf68a5f..badde8781 100644 --- a/src/api/routes/guilds/#guild_id/discovery-requirements.ts +++ b/src/api/routes/guilds/#guild_id/discovery-requirements.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/emojis.ts b/src/api/routes/guilds/#guild_id/emojis.ts index e907fe913..85fcabc11 100644 --- a/src/api/routes/guilds/#guild_id/emojis.ts +++ b/src/api/routes/guilds/#guild_id/emojis.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/index.ts b/src/api/routes/guilds/#guild_id/index.ts index 01da7f09c..494933427 100644 --- a/src/api/routes/guilds/#guild_id/index.ts +++ b/src/api/routes/guilds/#guild_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/integrations.ts b/src/api/routes/guilds/#guild_id/integrations.ts index 758828847..d53183289 100644 --- a/src/api/routes/guilds/#guild_id/integrations.ts +++ b/src/api/routes/guilds/#guild_id/integrations.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/invites.ts b/src/api/routes/guilds/#guild_id/invites.ts index 7b37b4955..04a89af76 100644 --- a/src/api/routes/guilds/#guild_id/invites.ts +++ b/src/api/routes/guilds/#guild_id/invites.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/member-verification.ts b/src/api/routes/guilds/#guild_id/member-verification.ts index ab6c7281e..7bb46cbc5 100644 --- a/src/api/routes/guilds/#guild_id/member-verification.ts +++ b/src/api/routes/guilds/#guild_id/member-verification.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts index 01b91d735..e76c96072 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts index fc12ded3b..ac40f0db5 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts index b6d56d1bd..071883d67 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/members/index.ts b/src/api/routes/guilds/#guild_id/members/index.ts index f2079639f..87c2af203 100644 --- a/src/api/routes/guilds/#guild_id/members/index.ts +++ b/src/api/routes/guilds/#guild_id/members/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/messages/search.ts b/src/api/routes/guilds/#guild_id/messages/search.ts index 1ccff8033..b4869bc09 100644 --- a/src/api/routes/guilds/#guild_id/messages/search.ts +++ b/src/api/routes/guilds/#guild_id/messages/search.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/premium.ts b/src/api/routes/guilds/#guild_id/premium.ts index b975f17b4..1a3a8497b 100644 --- a/src/api/routes/guilds/#guild_id/premium.ts +++ b/src/api/routes/guilds/#guild_id/premium.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/profile/index.ts b/src/api/routes/guilds/#guild_id/profile/index.ts index fe7a58b3d..1511fab4c 100644 --- a/src/api/routes/guilds/#guild_id/profile/index.ts +++ b/src/api/routes/guilds/#guild_id/profile/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/prune.ts b/src/api/routes/guilds/#guild_id/prune.ts index 5c123b2e1..e29ef641c 100644 --- a/src/api/routes/guilds/#guild_id/prune.ts +++ b/src/api/routes/guilds/#guild_id/prune.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/regions.ts b/src/api/routes/guilds/#guild_id/regions.ts index 8441edb9a..83dc9144e 100644 --- a/src/api/routes/guilds/#guild_id/regions.ts +++ b/src/api/routes/guilds/#guild_id/regions.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts index ee91454ca..f783e27b6 100644 --- a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/roles/index.ts b/src/api/routes/guilds/#guild_id/roles/index.ts index 226feac53..6f3fab48a 100644 --- a/src/api/routes/guilds/#guild_id/roles/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/stickers.ts b/src/api/routes/guilds/#guild_id/stickers.ts index 5d691eb95..3d0c494e7 100644 --- a/src/api/routes/guilds/#guild_id/stickers.ts +++ b/src/api/routes/guilds/#guild_id/stickers.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts index 52703b4eb..8a8c53fec 100644 --- a/src/api/routes/guilds/#guild_id/templates.ts +++ b/src/api/routes/guilds/#guild_id/templates.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/vanity-url.ts b/src/api/routes/guilds/#guild_id/vanity-url.ts index 6ce4d176d..e97c92c58 100644 --- a/src/api/routes/guilds/#guild_id/vanity-url.ts +++ b/src/api/routes/guilds/#guild_id/vanity-url.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts index ae41a5964..784d7746b 100644 --- a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts +++ b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/webhooks.ts b/src/api/routes/guilds/#guild_id/webhooks.ts index aeee38ed5..caa252d2b 100644 --- a/src/api/routes/guilds/#guild_id/webhooks.ts +++ b/src/api/routes/guilds/#guild_id/webhooks.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/welcome-screen.ts b/src/api/routes/guilds/#guild_id/welcome-screen.ts index 27cab5917..938eef098 100644 --- a/src/api/routes/guilds/#guild_id/welcome-screen.ts +++ b/src/api/routes/guilds/#guild_id/welcome-screen.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/widget.json.ts b/src/api/routes/guilds/#guild_id/widget.json.ts index 5c738012d..57186e80d 100644 --- a/src/api/routes/guilds/#guild_id/widget.json.ts +++ b/src/api/routes/guilds/#guild_id/widget.json.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/widget.png.ts b/src/api/routes/guilds/#guild_id/widget.png.ts index 614f0cb25..e4a7713c8 100644 --- a/src/api/routes/guilds/#guild_id/widget.png.ts +++ b/src/api/routes/guilds/#guild_id/widget.png.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/#guild_id/widget.ts b/src/api/routes/guilds/#guild_id/widget.ts index f0b12f952..c8b47c4f1 100644 --- a/src/api/routes/guilds/#guild_id/widget.ts +++ b/src/api/routes/guilds/#guild_id/widget.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/index.ts b/src/api/routes/guilds/index.ts index 2469ee7b0..6b95bd970 100644 --- a/src/api/routes/guilds/index.ts +++ b/src/api/routes/guilds/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts index c393b27bc..df753a2ca 100644 --- a/src/api/routes/guilds/templates/index.ts +++ b/src/api/routes/guilds/templates/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/invites/index.ts b/src/api/routes/invites/index.ts index b94823a52..805e5e6e7 100644 --- a/src/api/routes/invites/index.ts +++ b/src/api/routes/invites/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts index 99865ac6d..b06be724d 100644 --- a/src/api/routes/oauth2/authorize.ts +++ b/src/api/routes/oauth2/authorize.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/oauth2/tokens.ts b/src/api/routes/oauth2/tokens.ts index 0f7fa5bba..cff331374 100644 --- a/src/api/routes/oauth2/tokens.ts +++ b/src/api/routes/oauth2/tokens.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/outbound-promotions.ts b/src/api/routes/outbound-promotions.ts index 7b8e486f3..a260bb4ca 100644 --- a/src/api/routes/outbound-promotions.ts +++ b/src/api/routes/outbound-promotions.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/partners/#guild_id/requirements.ts b/src/api/routes/partners/#guild_id/requirements.ts index 8dbf68a5f..badde8781 100644 --- a/src/api/routes/partners/#guild_id/requirements.ts +++ b/src/api/routes/partners/#guild_id/requirements.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/ping.ts b/src/api/routes/ping.ts index c567f7c97..8deefd328 100644 --- a/src/api/routes/ping.ts +++ b/src/api/routes/ping.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/policies/instance/domains.ts b/src/api/routes/policies/instance/domains.ts index 472fd6d47..d97f87110 100644 --- a/src/api/routes/policies/instance/domains.ts +++ b/src/api/routes/policies/instance/domains.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/policies/instance/index.ts b/src/api/routes/policies/instance/index.ts index a4fd70697..163c9c23f 100644 --- a/src/api/routes/policies/instance/index.ts +++ b/src/api/routes/policies/instance/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/policies/instance/limits.ts b/src/api/routes/policies/instance/limits.ts index 406d88c37..732d8a482 100644 --- a/src/api/routes/policies/instance/limits.ts +++ b/src/api/routes/policies/instance/limits.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/policies/stats.ts b/src/api/routes/policies/stats.ts index 782101b65..764a57903 100644 --- a/src/api/routes/policies/stats.ts +++ b/src/api/routes/policies/stats.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/read-states/ack-bulk.ts b/src/api/routes/read-states/ack-bulk.ts index 582cf7fe9..cab16c8c0 100644 --- a/src/api/routes/read-states/ack-bulk.ts +++ b/src/api/routes/read-states/ack-bulk.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/scheduled-maintenances/upcoming_json.ts b/src/api/routes/scheduled-maintenances/upcoming_json.ts index c117c7c74..b85d85fa8 100644 --- a/src/api/routes/scheduled-maintenances/upcoming_json.ts +++ b/src/api/routes/scheduled-maintenances/upcoming_json.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/science.ts b/src/api/routes/science.ts index fc74bca1b..52c6d903f 100644 --- a/src/api/routes/science.ts +++ b/src/api/routes/science.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/stage-instances.ts b/src/api/routes/stage-instances.ts index 7b8e486f3..a260bb4ca 100644 --- a/src/api/routes/stage-instances.ts +++ b/src/api/routes/stage-instances.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/sticker-packs/index.ts b/src/api/routes/sticker-packs/index.ts index 71104cbd8..d5c6cb11f 100644 --- a/src/api/routes/sticker-packs/index.ts +++ b/src/api/routes/sticker-packs/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/stickers/#sticker_id/index.ts b/src/api/routes/stickers/#sticker_id/index.ts index aa2990fbc..0c986320a 100644 --- a/src/api/routes/stickers/#sticker_id/index.ts +++ b/src/api/routes/stickers/#sticker_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/stop.ts b/src/api/routes/stop.ts index 1b21f68a0..a1761e671 100644 --- a/src/api/routes/stop.ts +++ b/src/api/routes/stop.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/store/published-listings/applications.ts b/src/api/routes/store/published-listings/applications.ts index 2afee7c3f..483429e5f 100644 --- a/src/api/routes/store/published-listings/applications.ts +++ b/src/api/routes/store/published-listings/applications.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts b/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts index 638dec400..5bc36b7a6 100644 --- a/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/store/published-listings/skus.ts b/src/api/routes/store/published-listings/skus.ts index 2afee7c3f..483429e5f 100644 --- a/src/api/routes/store/published-listings/skus.ts +++ b/src/api/routes/store/published-listings/skus.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts index e9f160378..4d9f7cacc 100644 --- a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/teams.ts b/src/api/routes/teams.ts index fdd0c2e12..bca5b915f 100644 --- a/src/api/routes/teams.ts +++ b/src/api/routes/teams.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/track.ts b/src/api/routes/track.ts index fc74bca1b..52c6d903f 100644 --- a/src/api/routes/track.ts +++ b/src/api/routes/track.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/updates.ts b/src/api/routes/updates.ts index be39cd3fd..2458871f9 100644 --- a/src/api/routes/updates.ts +++ b/src/api/routes/updates.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/#id/delete.ts b/src/api/routes/users/#id/delete.ts index e20817391..df9d1d6a2 100644 --- a/src/api/routes/users/#id/delete.ts +++ b/src/api/routes/users/#id/delete.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/#id/index.ts b/src/api/routes/users/#id/index.ts index 95d6a1c90..9d418bfde 100644 --- a/src/api/routes/users/#id/index.ts +++ b/src/api/routes/users/#id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#id/profile.ts index a368a135d..78e704baa 100644 --- a/src/api/routes/users/#id/profile.ts +++ b/src/api/routes/users/#id/profile.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts index edd028d06..241b097d4 100644 --- a/src/api/routes/users/#id/relationships.ts +++ b/src/api/routes/users/#id/relationships.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/activities/statistics/applications.ts b/src/api/routes/users/@me/activities/statistics/applications.ts index 44f35b67d..222261bfe 100644 --- a/src/api/routes/users/@me/activities/statistics/applications.ts +++ b/src/api/routes/users/@me/activities/statistics/applications.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/affinities/guilds.ts b/src/api/routes/users/@me/affinities/guilds.ts index 080ba0663..752ab159c 100644 --- a/src/api/routes/users/@me/affinities/guilds.ts +++ b/src/api/routes/users/@me/affinities/guilds.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/affinities/users.ts b/src/api/routes/users/@me/affinities/users.ts index 626297531..dfd847740 100644 --- a/src/api/routes/users/@me/affinities/users.ts +++ b/src/api/routes/users/@me/affinities/users.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/applications/#app_id/entitlements.ts b/src/api/routes/users/@me/applications/#app_id/entitlements.ts index 7b8e486f3..a260bb4ca 100644 --- a/src/api/routes/users/@me/applications/#app_id/entitlements.ts +++ b/src/api/routes/users/@me/applications/#app_id/entitlements.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/billing/country-code.ts b/src/api/routes/users/@me/billing/country-code.ts index 9d149fef7..ed6c19b9e 100644 --- a/src/api/routes/users/@me/billing/country-code.ts +++ b/src/api/routes/users/@me/billing/country-code.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/billing/payment-sources.ts b/src/api/routes/users/@me/billing/payment-sources.ts index 44f35b67d..222261bfe 100644 --- a/src/api/routes/users/@me/billing/payment-sources.ts +++ b/src/api/routes/users/@me/billing/payment-sources.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/billing/subscriptions.ts b/src/api/routes/users/@me/billing/subscriptions.ts index 7b8e486f3..a260bb4ca 100644 --- a/src/api/routes/users/@me/billing/subscriptions.ts +++ b/src/api/routes/users/@me/billing/subscriptions.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/channels.ts b/src/api/routes/users/@me/channels.ts index 01151f2e1..3c94826f1 100644 --- a/src/api/routes/users/@me/channels.ts +++ b/src/api/routes/users/@me/channels.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/connections.ts b/src/api/routes/users/@me/connections.ts index 7b8e486f3..a260bb4ca 100644 --- a/src/api/routes/users/@me/connections.ts +++ b/src/api/routes/users/@me/connections.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/delete.ts b/src/api/routes/users/@me/delete.ts index bd7ac8bbb..e73a7f459 100644 --- a/src/api/routes/users/@me/delete.ts +++ b/src/api/routes/users/@me/delete.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/devices.ts b/src/api/routes/users/@me/devices.ts index fc74bca1b..52c6d903f 100644 --- a/src/api/routes/users/@me/devices.ts +++ b/src/api/routes/users/@me/devices.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts index 25cfb2148..15e5d9e14 100644 --- a/src/api/routes/users/@me/disable.ts +++ b/src/api/routes/users/@me/disable.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/email-settings.ts b/src/api/routes/users/@me/email-settings.ts index 277c8dbfe..8d4e78739 100644 --- a/src/api/routes/users/@me/email-settings.ts +++ b/src/api/routes/users/@me/email-settings.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/entitlements.ts b/src/api/routes/users/@me/entitlements.ts index fac7d9e03..ff088314f 100644 --- a/src/api/routes/users/@me/entitlements.ts +++ b/src/api/routes/users/@me/entitlements.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts index 61f4ca069..0de574fcb 100644 --- a/src/api/routes/users/@me/guilds.ts +++ b/src/api/routes/users/@me/guilds.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/guilds/#guild_id/settings.ts b/src/api/routes/users/@me/guilds/#guild_id/settings.ts index 914204b28..9cdc90e69 100644 --- a/src/api/routes/users/@me/guilds/#guild_id/settings.ts +++ b/src/api/routes/users/@me/guilds/#guild_id/settings.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts index 44f35b67d..222261bfe 100644 --- a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts +++ b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index 2252e22a4..79bb85f87 100644 --- a/src/api/routes/users/@me/index.ts +++ b/src/api/routes/users/@me/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/library.ts b/src/api/routes/users/@me/library.ts index 520420b79..eacbd0397 100644 --- a/src/api/routes/users/@me/library.ts +++ b/src/api/routes/users/@me/library.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts index fc38a7616..e202dc567 100644 --- a/src/api/routes/users/@me/mfa/codes-verification.ts +++ b/src/api/routes/users/@me/mfa/codes-verification.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts index 9b977bb30..c9f73ce63 100644 --- a/src/api/routes/users/@me/mfa/codes.ts +++ b/src/api/routes/users/@me/mfa/codes.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts index 10cb83f64..f2a63aab7 100644 --- a/src/api/routes/users/@me/mfa/totp/disable.ts +++ b/src/api/routes/users/@me/mfa/totp/disable.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts index e0c351ae8..9baf7657a 100644 --- a/src/api/routes/users/@me/mfa/totp/enable.ts +++ b/src/api/routes/users/@me/mfa/totp/enable.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts index e21886188..54c3d9c79 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts index f3de9c377..8cc60d58f 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts index 7948015b6..87d452771 100644 --- a/src/api/routes/users/@me/notes.ts +++ b/src/api/routes/users/@me/notes.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index 910b55db4..268e56601 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/users/@me/settings.ts b/src/api/routes/users/@me/settings.ts index 045d4aec4..e91597e4f 100644 --- a/src/api/routes/users/@me/settings.ts +++ b/src/api/routes/users/@me/settings.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/routes/voice/regions.ts b/src/api/routes/voice/regions.ts index 45834fc2b..8ff52bcad 100644 --- a/src/api/routes/voice/regions.ts +++ b/src/api/routes/voice/regions.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/start.ts b/src/api/start.ts index 560f8584d..6d35c67b5 100644 --- a/src/api/start.ts +++ b/src/api/start.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/handlers/Instance.ts b/src/api/util/handlers/Instance.ts index 8670a880f..bd9bf3944 100644 --- a/src/api/util/handlers/Instance.ts +++ b/src/api/util/handlers/Instance.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index 65facb3a0..65dbcdfe2 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/handlers/Voice.ts b/src/api/util/handlers/Voice.ts index d49878ceb..0880ab985 100644 --- a/src/api/util/handlers/Voice.ts +++ b/src/api/util/handlers/Voice.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/handlers/route.ts b/src/api/util/handlers/route.ts index 7b56e17c4..b0bc3af79 100644 --- a/src/api/util/handlers/route.ts +++ b/src/api/util/handlers/route.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/index.ts b/src/api/util/index.ts index 4cc93afb6..cb26d4f54 100644 --- a/src/api/util/index.ts +++ b/src/api/util/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/utility/Base64.ts b/src/api/util/utility/Base64.ts index 4f7034cd6..c6d1257ce 100644 --- a/src/api/util/utility/Base64.ts +++ b/src/api/util/utility/Base64.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts index 40d7679a3..1e84e31aa 100644 --- a/src/api/util/utility/EmbedHandlers.ts +++ b/src/api/util/utility/EmbedHandlers.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/utility/RandomInviteID.ts b/src/api/util/utility/RandomInviteID.ts index 0bcca2db8..e3eda6063 100644 --- a/src/api/util/utility/RandomInviteID.ts +++ b/src/api/util/utility/RandomInviteID.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/utility/String.ts b/src/api/util/utility/String.ts index 4c6338835..7bc752f5d 100644 --- a/src/api/util/utility/String.ts +++ b/src/api/util/utility/String.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/utility/captcha.ts b/src/api/util/utility/captcha.ts index 8b11b231e..28dba44b6 100644 --- a/src/api/util/utility/captcha.ts +++ b/src/api/util/utility/captcha.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/utility/ipAddress.ts b/src/api/util/utility/ipAddress.ts index 99f58b719..4ae316fa0 100644 --- a/src/api/util/utility/ipAddress.ts +++ b/src/api/util/utility/ipAddress.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/api/util/utility/passwordStrength.ts b/src/api/util/utility/passwordStrength.ts index 638df5db5..4f3914c5d 100644 --- a/src/api/util/utility/passwordStrength.ts +++ b/src/api/util/utility/passwordStrength.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/bundle/Server.ts b/src/bundle/Server.ts index 74969dcc5..00ced932c 100644 --- a/src/bundle/Server.ts +++ b/src/bundle/Server.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/bundle/index.ts b/src/bundle/index.ts index a883cadde..899c6b1f9 100644 --- a/src/bundle/index.ts +++ b/src/bundle/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/bundle/start.ts b/src/bundle/start.ts index 604064c02..96c5ccdfa 100644 --- a/src/bundle/start.ts +++ b/src/bundle/start.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/bundle/stats.ts b/src/bundle/stats.ts index 73175c0d1..0073515eb 100644 --- a/src/bundle/stats.ts +++ b/src/bundle/stats.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts index b3bcfc5f8..543c84aea 100644 --- a/src/cdn/Server.ts +++ b/src/cdn/Server.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/index.ts b/src/cdn/index.ts index 1f8ac7201..dea9942bc 100644 --- a/src/cdn/index.ts +++ b/src/cdn/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts index d5950f129..bfbe24894 100644 --- a/src/cdn/routes/attachments.ts +++ b/src/cdn/routes/attachments.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/routes/avatars.ts b/src/cdn/routes/avatars.ts index 6493462b5..6d6f1d8e3 100644 --- a/src/cdn/routes/avatars.ts +++ b/src/cdn/routes/avatars.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/routes/embed.ts b/src/cdn/routes/embed.ts index 811ddb9b8..9d3469cd4 100644 --- a/src/cdn/routes/embed.ts +++ b/src/cdn/routes/embed.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/routes/guild-profiles.ts b/src/cdn/routes/guild-profiles.ts index f872e03fb..5fc9519cf 100644 --- a/src/cdn/routes/guild-profiles.ts +++ b/src/cdn/routes/guild-profiles.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/routes/ping.ts b/src/cdn/routes/ping.ts index 46afeca00..e68738e78 100644 --- a/src/cdn/routes/ping.ts +++ b/src/cdn/routes/ping.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/routes/role-icons.ts b/src/cdn/routes/role-icons.ts index 93702f8d2..6cc1d8ed4 100644 --- a/src/cdn/routes/role-icons.ts +++ b/src/cdn/routes/role-icons.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/start.ts b/src/cdn/start.ts index 0080691f9..d793077d2 100644 --- a/src/cdn/start.ts +++ b/src/cdn/start.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/util/FileStorage.ts b/src/cdn/util/FileStorage.ts index 956ea21e2..10b367436 100644 --- a/src/cdn/util/FileStorage.ts +++ b/src/cdn/util/FileStorage.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/util/S3Storage.ts b/src/cdn/util/S3Storage.ts index f2d8265c3..81acd945f 100644 --- a/src/cdn/util/S3Storage.ts +++ b/src/cdn/util/S3Storage.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/util/Storage.ts b/src/cdn/util/Storage.ts index 7cf4fb269..26289af6f 100644 --- a/src/cdn/util/Storage.ts +++ b/src/cdn/util/Storage.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/util/index.ts b/src/cdn/util/index.ts index c87c23c69..ba249845c 100644 --- a/src/cdn/util/index.ts +++ b/src/cdn/util/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/cdn/util/multer.ts b/src/cdn/util/multer.ts index ef0df57bd..337494e94 100644 --- a/src/cdn/util/multer.ts +++ b/src/cdn/util/multer.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/Server.ts b/src/gateway/Server.ts index 61a83201b..82fbe3b42 100644 --- a/src/gateway/Server.ts +++ b/src/gateway/Server.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/events/Close.ts b/src/gateway/events/Close.ts index 544362df1..fdb71f335 100644 --- a/src/gateway/events/Close.ts +++ b/src/gateway/events/Close.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/events/Connection.ts b/src/gateway/events/Connection.ts index b166321e1..98ee06ff1 100644 --- a/src/gateway/events/Connection.ts +++ b/src/gateway/events/Connection.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts index 53e96b30e..9dca9b33c 100644 --- a/src/gateway/events/Message.ts +++ b/src/gateway/events/Message.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/index.ts b/src/gateway/index.ts index fe4b76cdc..fefddecee 100644 --- a/src/gateway/index.ts +++ b/src/gateway/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/listener/listener.ts b/src/gateway/listener/listener.ts index 5700b4e0d..bd4c0e66d 100644 --- a/src/gateway/listener/listener.ts +++ b/src/gateway/listener/listener.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/Heartbeat.ts b/src/gateway/opcodes/Heartbeat.ts index 88968a32d..14fb03a3e 100644 --- a/src/gateway/opcodes/Heartbeat.ts +++ b/src/gateway/opcodes/Heartbeat.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts index e465516d7..16ba3f239 100644 --- a/src/gateway/opcodes/Identify.ts +++ b/src/gateway/opcodes/Identify.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts index d1806f913..241a80f2d 100644 --- a/src/gateway/opcodes/LazyRequest.ts +++ b/src/gateway/opcodes/LazyRequest.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/PresenceUpdate.ts b/src/gateway/opcodes/PresenceUpdate.ts index 7951422f1..d570a1f73 100644 --- a/src/gateway/opcodes/PresenceUpdate.ts +++ b/src/gateway/opcodes/PresenceUpdate.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts index 159bcd693..cb6bff985 100644 --- a/src/gateway/opcodes/RequestGuildMembers.ts +++ b/src/gateway/opcodes/RequestGuildMembers.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/Resume.ts b/src/gateway/opcodes/Resume.ts index b50d785f9..92e9e67c8 100644 --- a/src/gateway/opcodes/Resume.ts +++ b/src/gateway/opcodes/Resume.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/VoiceStateUpdate.ts b/src/gateway/opcodes/VoiceStateUpdate.ts index 93c227865..490831247 100644 --- a/src/gateway/opcodes/VoiceStateUpdate.ts +++ b/src/gateway/opcodes/VoiceStateUpdate.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/index.ts b/src/gateway/opcodes/index.ts index 96d609a9a..d24877f75 100644 --- a/src/gateway/opcodes/index.ts +++ b/src/gateway/opcodes/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/opcodes/instanceOf.ts b/src/gateway/opcodes/instanceOf.ts index c367e2345..4ffcaa9ce 100644 --- a/src/gateway/opcodes/instanceOf.ts +++ b/src/gateway/opcodes/instanceOf.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/start.ts b/src/gateway/start.ts index 513223214..8af96c130 100644 --- a/src/gateway/start.ts +++ b/src/gateway/start.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/util/Constants.ts b/src/gateway/util/Constants.ts index 8600340a2..5fe2f1513 100644 --- a/src/gateway/util/Constants.ts +++ b/src/gateway/util/Constants.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/util/Heartbeat.ts b/src/gateway/util/Heartbeat.ts index d2397d958..f39c4875d 100644 --- a/src/gateway/util/Heartbeat.ts +++ b/src/gateway/util/Heartbeat.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/util/Send.ts b/src/gateway/util/Send.ts index e67d30116..6f1c78e1a 100644 --- a/src/gateway/util/Send.ts +++ b/src/gateway/util/Send.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/util/SessionUtils.ts b/src/gateway/util/SessionUtils.ts index cd6cf9cd2..9238db72a 100644 --- a/src/gateway/util/SessionUtils.ts +++ b/src/gateway/util/SessionUtils.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/util/WebSocket.ts b/src/gateway/util/WebSocket.ts index 617e1d957..65c481425 100644 --- a/src/gateway/util/WebSocket.ts +++ b/src/gateway/util/WebSocket.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/gateway/util/index.ts b/src/gateway/util/index.ts index f04be4b62..627f12b22 100644 --- a/src/gateway/util/index.ts +++ b/src/gateway/util/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/Config.ts b/src/util/config/Config.ts index 280e05d45..90b98b7a2 100644 --- a/src/util/config/Config.ts +++ b/src/util/config/Config.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/index.ts b/src/util/config/index.ts index 5bfc9d909..d2cf20c6e 100644 --- a/src/util/config/index.ts +++ b/src/util/config/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/ApiConfiguration.ts b/src/util/config/types/ApiConfiguration.ts index ebfc303fe..03717dcff 100644 --- a/src/util/config/types/ApiConfiguration.ts +++ b/src/util/config/types/ApiConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/CdnConfiguration.ts b/src/util/config/types/CdnConfiguration.ts index 72898dd80..033190813 100644 --- a/src/util/config/types/CdnConfiguration.ts +++ b/src/util/config/types/CdnConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/DefaultsConfiguration.ts b/src/util/config/types/DefaultsConfiguration.ts index 60174c8f3..67d7d62bb 100644 --- a/src/util/config/types/DefaultsConfiguration.ts +++ b/src/util/config/types/DefaultsConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/EmailConfiguration.ts b/src/util/config/types/EmailConfiguration.ts index 1f288355b..ae9d53baf 100644 --- a/src/util/config/types/EmailConfiguration.ts +++ b/src/util/config/types/EmailConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/EndpointConfiguration.ts b/src/util/config/types/EndpointConfiguration.ts index cae6ca438..6319d79c7 100644 --- a/src/util/config/types/EndpointConfiguration.ts +++ b/src/util/config/types/EndpointConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/ExternalTokensConfiguration.ts b/src/util/config/types/ExternalTokensConfiguration.ts index a04c4897b..72cb0e7f1 100644 --- a/src/util/config/types/ExternalTokensConfiguration.ts +++ b/src/util/config/types/ExternalTokensConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/GeneralConfiguration.ts b/src/util/config/types/GeneralConfiguration.ts index 5a067a70c..53cfea5f8 100644 --- a/src/util/config/types/GeneralConfiguration.ts +++ b/src/util/config/types/GeneralConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/GifConfiguration.ts b/src/util/config/types/GifConfiguration.ts index bd573be9c..5f3c6589e 100644 --- a/src/util/config/types/GifConfiguration.ts +++ b/src/util/config/types/GifConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/GuildConfiguration.ts b/src/util/config/types/GuildConfiguration.ts index cad084192..221b11443 100644 --- a/src/util/config/types/GuildConfiguration.ts +++ b/src/util/config/types/GuildConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/KafkaConfiguration.ts b/src/util/config/types/KafkaConfiguration.ts index 99750823a..b1e845fc6 100644 --- a/src/util/config/types/KafkaConfiguration.ts +++ b/src/util/config/types/KafkaConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/LimitConfigurations.ts b/src/util/config/types/LimitConfigurations.ts index 6e4d8cbb3..dfcb97654 100644 --- a/src/util/config/types/LimitConfigurations.ts +++ b/src/util/config/types/LimitConfigurations.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/LoginConfiguration.ts b/src/util/config/types/LoginConfiguration.ts index a146451ca..ce9c85b7e 100644 --- a/src/util/config/types/LoginConfiguration.ts +++ b/src/util/config/types/LoginConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/MetricsConfiguration.ts b/src/util/config/types/MetricsConfiguration.ts index 36235e542..3f3c2f4fc 100644 --- a/src/util/config/types/MetricsConfiguration.ts +++ b/src/util/config/types/MetricsConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/PasswordResetConfiguration.ts b/src/util/config/types/PasswordResetConfiguration.ts index ee0e10aaf..58db7a6c4 100644 --- a/src/util/config/types/PasswordResetConfiguration.ts +++ b/src/util/config/types/PasswordResetConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/RabbitMQConfiguration.ts b/src/util/config/types/RabbitMQConfiguration.ts index a25d6acb7..d1db6fbbe 100644 --- a/src/util/config/types/RabbitMQConfiguration.ts +++ b/src/util/config/types/RabbitMQConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/RegionConfiguration.ts b/src/util/config/types/RegionConfiguration.ts index bddc98b8a..2d9ff502b 100644 --- a/src/util/config/types/RegionConfiguration.ts +++ b/src/util/config/types/RegionConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/RegisterConfiguration.ts b/src/util/config/types/RegisterConfiguration.ts index aa66ebb41..9d8e036e1 100644 --- a/src/util/config/types/RegisterConfiguration.ts +++ b/src/util/config/types/RegisterConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/SecurityConfiguration.ts b/src/util/config/types/SecurityConfiguration.ts index a7fa34d0f..5e971cfe2 100644 --- a/src/util/config/types/SecurityConfiguration.ts +++ b/src/util/config/types/SecurityConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/SentryConfiguration.ts b/src/util/config/types/SentryConfiguration.ts index 98daf09c0..3d92c62a9 100644 --- a/src/util/config/types/SentryConfiguration.ts +++ b/src/util/config/types/SentryConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/TemplateConfiguration.ts b/src/util/config/types/TemplateConfiguration.ts index 59efb91c3..dd1c3cb11 100644 --- a/src/util/config/types/TemplateConfiguration.ts +++ b/src/util/config/types/TemplateConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/index.ts b/src/util/config/types/index.ts index f435c56cc..782ebfc34 100644 --- a/src/util/config/types/index.ts +++ b/src/util/config/types/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/client/ClientReleaseConfiguration.ts b/src/util/config/types/subconfigurations/client/ClientReleaseConfiguration.ts index f6ae1fcdf..3a0c69684 100644 --- a/src/util/config/types/subconfigurations/client/ClientReleaseConfiguration.ts +++ b/src/util/config/types/subconfigurations/client/ClientReleaseConfiguration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/client/index.ts b/src/util/config/types/subconfigurations/client/index.ts index 9caf84e8d..37231b431 100644 --- a/src/util/config/types/subconfigurations/client/index.ts +++ b/src/util/config/types/subconfigurations/client/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/defaults/GuildDefaults.ts b/src/util/config/types/subconfigurations/defaults/GuildDefaults.ts index 6148c09e4..2ee67abf5 100644 --- a/src/util/config/types/subconfigurations/defaults/GuildDefaults.ts +++ b/src/util/config/types/subconfigurations/defaults/GuildDefaults.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/defaults/UserDefaults.ts b/src/util/config/types/subconfigurations/defaults/UserDefaults.ts index 38e2eccf8..86f2271de 100644 --- a/src/util/config/types/subconfigurations/defaults/UserDefaults.ts +++ b/src/util/config/types/subconfigurations/defaults/UserDefaults.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/defaults/index.ts b/src/util/config/types/subconfigurations/defaults/index.ts index 6e927d800..3c945acfa 100644 --- a/src/util/config/types/subconfigurations/defaults/index.ts +++ b/src/util/config/types/subconfigurations/defaults/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/email/MailGun.ts b/src/util/config/types/subconfigurations/email/MailGun.ts index 3fc46adc6..f743f1ad1 100644 --- a/src/util/config/types/subconfigurations/email/MailGun.ts +++ b/src/util/config/types/subconfigurations/email/MailGun.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/email/MailJet.ts b/src/util/config/types/subconfigurations/email/MailJet.ts index e9a8f9037..36b3a5645 100644 --- a/src/util/config/types/subconfigurations/email/MailJet.ts +++ b/src/util/config/types/subconfigurations/email/MailJet.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/email/SMTP.ts b/src/util/config/types/subconfigurations/email/SMTP.ts index 9f2b5fdaf..8bd57d28a 100644 --- a/src/util/config/types/subconfigurations/email/SMTP.ts +++ b/src/util/config/types/subconfigurations/email/SMTP.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/email/SendGrid.ts b/src/util/config/types/subconfigurations/email/SendGrid.ts index 1b6102390..a3a26c7ba 100644 --- a/src/util/config/types/subconfigurations/email/SendGrid.ts +++ b/src/util/config/types/subconfigurations/email/SendGrid.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/email/index.ts b/src/util/config/types/subconfigurations/email/index.ts index 2ffa3d8b9..92702bbcc 100644 --- a/src/util/config/types/subconfigurations/email/index.ts +++ b/src/util/config/types/subconfigurations/email/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/guild/AutoJoin.ts b/src/util/config/types/subconfigurations/guild/AutoJoin.ts index e4267ddf3..be1c0d0d8 100644 --- a/src/util/config/types/subconfigurations/guild/AutoJoin.ts +++ b/src/util/config/types/subconfigurations/guild/AutoJoin.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/guild/Discovery.ts b/src/util/config/types/subconfigurations/guild/Discovery.ts index 00d539555..d18fc6b38 100644 --- a/src/util/config/types/subconfigurations/guild/Discovery.ts +++ b/src/util/config/types/subconfigurations/guild/Discovery.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/guild/index.ts b/src/util/config/types/subconfigurations/guild/index.ts index b386342eb..f4da7c66f 100644 --- a/src/util/config/types/subconfigurations/guild/index.ts +++ b/src/util/config/types/subconfigurations/guild/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/index.ts b/src/util/config/types/subconfigurations/index.ts index b20cef0b9..400fb45e6 100644 --- a/src/util/config/types/subconfigurations/index.ts +++ b/src/util/config/types/subconfigurations/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/kafka/KafkaBroker.ts b/src/util/config/types/subconfigurations/kafka/KafkaBroker.ts index 3dc0a9167..4736033f1 100644 --- a/src/util/config/types/subconfigurations/kafka/KafkaBroker.ts +++ b/src/util/config/types/subconfigurations/kafka/KafkaBroker.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/kafka/index.ts b/src/util/config/types/subconfigurations/kafka/index.ts index 5cdee3911..b1971508c 100644 --- a/src/util/config/types/subconfigurations/kafka/index.ts +++ b/src/util/config/types/subconfigurations/kafka/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/ChannelLimits.ts b/src/util/config/types/subconfigurations/limits/ChannelLimits.ts index c588016ca..0c4af049c 100644 --- a/src/util/config/types/subconfigurations/limits/ChannelLimits.ts +++ b/src/util/config/types/subconfigurations/limits/ChannelLimits.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts b/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts index 1325b8b68..835d71933 100644 --- a/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts +++ b/src/util/config/types/subconfigurations/limits/GlobalRateLimits.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/GuildLimits.ts b/src/util/config/types/subconfigurations/limits/GuildLimits.ts index ac0a53b38..b64d94857 100644 --- a/src/util/config/types/subconfigurations/limits/GuildLimits.ts +++ b/src/util/config/types/subconfigurations/limits/GuildLimits.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/MessageLimits.ts b/src/util/config/types/subconfigurations/limits/MessageLimits.ts index 0f51f5c5b..e61c13e1b 100644 --- a/src/util/config/types/subconfigurations/limits/MessageLimits.ts +++ b/src/util/config/types/subconfigurations/limits/MessageLimits.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/RateLimits.ts b/src/util/config/types/subconfigurations/limits/RateLimits.ts index cd05a751c..caba740bf 100644 --- a/src/util/config/types/subconfigurations/limits/RateLimits.ts +++ b/src/util/config/types/subconfigurations/limits/RateLimits.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/UserLimits.ts b/src/util/config/types/subconfigurations/limits/UserLimits.ts index 3e7d0874f..8f9b1a97f 100644 --- a/src/util/config/types/subconfigurations/limits/UserLimits.ts +++ b/src/util/config/types/subconfigurations/limits/UserLimits.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/index.ts b/src/util/config/types/subconfigurations/limits/index.ts index 56946c06e..89435e13b 100644 --- a/src/util/config/types/subconfigurations/limits/index.ts +++ b/src/util/config/types/subconfigurations/limits/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/ratelimits/Auth.ts b/src/util/config/types/subconfigurations/limits/ratelimits/Auth.ts index b3288efb3..ce83828b7 100644 --- a/src/util/config/types/subconfigurations/limits/ratelimits/Auth.ts +++ b/src/util/config/types/subconfigurations/limits/ratelimits/Auth.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/ratelimits/RateLimitOptions.ts b/src/util/config/types/subconfigurations/limits/ratelimits/RateLimitOptions.ts index 380c98199..cdf8fac35 100644 --- a/src/util/config/types/subconfigurations/limits/ratelimits/RateLimitOptions.ts +++ b/src/util/config/types/subconfigurations/limits/ratelimits/RateLimitOptions.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/ratelimits/Route.ts b/src/util/config/types/subconfigurations/limits/ratelimits/Route.ts index 68c2afc1f..dd0757c90 100644 --- a/src/util/config/types/subconfigurations/limits/ratelimits/Route.ts +++ b/src/util/config/types/subconfigurations/limits/ratelimits/Route.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/limits/ratelimits/index.ts b/src/util/config/types/subconfigurations/limits/ratelimits/index.ts index 6a85eac14..fb376c37d 100644 --- a/src/util/config/types/subconfigurations/limits/ratelimits/index.ts +++ b/src/util/config/types/subconfigurations/limits/ratelimits/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/region/Region.ts b/src/util/config/types/subconfigurations/region/Region.ts index 9c4701cbf..1b8171ff1 100644 --- a/src/util/config/types/subconfigurations/region/Region.ts +++ b/src/util/config/types/subconfigurations/region/Region.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/region/index.ts b/src/util/config/types/subconfigurations/region/index.ts index 65ac67d54..cc5447b03 100644 --- a/src/util/config/types/subconfigurations/region/index.ts +++ b/src/util/config/types/subconfigurations/region/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/register/DateOfBirth.ts b/src/util/config/types/subconfigurations/register/DateOfBirth.ts index d0182e887..451667027 100644 --- a/src/util/config/types/subconfigurations/register/DateOfBirth.ts +++ b/src/util/config/types/subconfigurations/register/DateOfBirth.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/register/Email.ts b/src/util/config/types/subconfigurations/register/Email.ts index 01b32436c..8d3e97c14 100644 --- a/src/util/config/types/subconfigurations/register/Email.ts +++ b/src/util/config/types/subconfigurations/register/Email.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/register/Password.ts b/src/util/config/types/subconfigurations/register/Password.ts index 14fc88e17..36c3e3dc4 100644 --- a/src/util/config/types/subconfigurations/register/Password.ts +++ b/src/util/config/types/subconfigurations/register/Password.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/register/index.ts b/src/util/config/types/subconfigurations/register/index.ts index 1289664e4..9031aedae 100644 --- a/src/util/config/types/subconfigurations/register/index.ts +++ b/src/util/config/types/subconfigurations/register/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/security/Captcha.ts b/src/util/config/types/subconfigurations/security/Captcha.ts index e903dd6b4..8c7c1063e 100644 --- a/src/util/config/types/subconfigurations/security/Captcha.ts +++ b/src/util/config/types/subconfigurations/security/Captcha.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/security/TwoFactor.ts b/src/util/config/types/subconfigurations/security/TwoFactor.ts index f03902d8b..757571244 100644 --- a/src/util/config/types/subconfigurations/security/TwoFactor.ts +++ b/src/util/config/types/subconfigurations/security/TwoFactor.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/config/types/subconfigurations/security/index.ts b/src/util/config/types/subconfigurations/security/index.ts index b852315e3..09960b3e3 100644 --- a/src/util/config/types/subconfigurations/security/index.ts +++ b/src/util/config/types/subconfigurations/security/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/dtos/DmChannelDTO.ts b/src/util/dtos/DmChannelDTO.ts index fe936f5e1..8427f7f92 100644 --- a/src/util/dtos/DmChannelDTO.ts +++ b/src/util/dtos/DmChannelDTO.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/dtos/ReadyGuildDTO.ts b/src/util/dtos/ReadyGuildDTO.ts index 9f8435ec6..2a99ea466 100644 --- a/src/util/dtos/ReadyGuildDTO.ts +++ b/src/util/dtos/ReadyGuildDTO.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/dtos/UserDTO.ts b/src/util/dtos/UserDTO.ts index ce490bd2a..a24c8d960 100644 --- a/src/util/dtos/UserDTO.ts +++ b/src/util/dtos/UserDTO.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/dtos/index.ts b/src/util/dtos/index.ts index afb3fdb43..04cd7b720 100644 --- a/src/util/dtos/index.ts +++ b/src/util/dtos/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Application.ts b/src/util/entities/Application.ts index 37491a5d2..962b2a8eb 100644 --- a/src/util/entities/Application.ts +++ b/src/util/entities/Application.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Attachment.ts b/src/util/entities/Attachment.ts index d9e61a954..d60ac41cb 100644 --- a/src/util/entities/Attachment.ts +++ b/src/util/entities/Attachment.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/AuditLog.ts b/src/util/entities/AuditLog.ts index a7dfcc5b1..e47f92fbe 100644 --- a/src/util/entities/AuditLog.ts +++ b/src/util/entities/AuditLog.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/BackupCodes.ts b/src/util/entities/BackupCodes.ts index b9914a8cd..61e8f12ae 100644 --- a/src/util/entities/BackupCodes.ts +++ b/src/util/entities/BackupCodes.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Ban.ts b/src/util/entities/Ban.ts index f9f51e0cd..1693cd403 100644 --- a/src/util/entities/Ban.ts +++ b/src/util/entities/Ban.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/BaseClass.ts b/src/util/entities/BaseClass.ts index e60f40596..f4b3cf599 100644 --- a/src/util/entities/BaseClass.ts +++ b/src/util/entities/BaseClass.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Categories.ts b/src/util/entities/Categories.ts index 44971d00d..bba1bfa79 100644 --- a/src/util/entities/Categories.ts +++ b/src/util/entities/Categories.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts index 7339d70c6..9ce04848a 100644 --- a/src/util/entities/Channel.ts +++ b/src/util/entities/Channel.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/ClientRelease.ts b/src/util/entities/ClientRelease.ts index 947221b75..cfbc3a9b2 100644 --- a/src/util/entities/ClientRelease.ts +++ b/src/util/entities/ClientRelease.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Config.ts b/src/util/entities/Config.ts index 0c8b6f655..3c436ff09 100644 --- a/src/util/entities/Config.ts +++ b/src/util/entities/Config.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/ConnectedAccount.ts b/src/util/entities/ConnectedAccount.ts index 29befa091..33550197c 100644 --- a/src/util/entities/ConnectedAccount.ts +++ b/src/util/entities/ConnectedAccount.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/EmbedCache.ts b/src/util/entities/EmbedCache.ts index 41b1b6365..8ff2a4577 100644 --- a/src/util/entities/EmbedCache.ts +++ b/src/util/entities/EmbedCache.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Emoji.ts b/src/util/entities/Emoji.ts index 3458302e8..f1bf2d590 100644 --- a/src/util/entities/Emoji.ts +++ b/src/util/entities/Emoji.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Encryption.ts b/src/util/entities/Encryption.ts index ff868c400..8325bdee0 100644 --- a/src/util/entities/Encryption.ts +++ b/src/util/entities/Encryption.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Guild.ts b/src/util/entities/Guild.ts index daa265099..b1693838d 100644 --- a/src/util/entities/Guild.ts +++ b/src/util/entities/Guild.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Invite.ts b/src/util/entities/Invite.ts index f517bb446..e5f2e82ca 100644 --- a/src/util/entities/Invite.ts +++ b/src/util/entities/Invite.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Member.ts b/src/util/entities/Member.ts index e3f9a3ca6..13e74dcd5 100644 --- a/src/util/entities/Member.ts +++ b/src/util/entities/Member.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts index 42c29ce79..519c431e3 100644 --- a/src/util/entities/Message.ts +++ b/src/util/entities/Message.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Migration.ts b/src/util/entities/Migration.ts index 2ddc4df6d..5c4e951d0 100644 --- a/src/util/entities/Migration.ts +++ b/src/util/entities/Migration.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Note.ts b/src/util/entities/Note.ts index 74e2e8703..196f68614 100644 --- a/src/util/entities/Note.ts +++ b/src/util/entities/Note.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/RateLimit.ts b/src/util/entities/RateLimit.ts index ffb5a05ad..8d00f59ad 100644 --- a/src/util/entities/RateLimit.ts +++ b/src/util/entities/RateLimit.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/ReadState.ts b/src/util/entities/ReadState.ts index b40cde00c..1b280d128 100644 --- a/src/util/entities/ReadState.ts +++ b/src/util/entities/ReadState.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Recipient.ts b/src/util/entities/Recipient.ts index 115670349..797349e58 100644 --- a/src/util/entities/Recipient.ts +++ b/src/util/entities/Recipient.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Relationship.ts b/src/util/entities/Relationship.ts index 2ce16b9e2..740095c26 100644 --- a/src/util/entities/Relationship.ts +++ b/src/util/entities/Relationship.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Role.ts b/src/util/entities/Role.ts index 93a0e157b..85877c127 100644 --- a/src/util/entities/Role.ts +++ b/src/util/entities/Role.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/SecurityKey.ts b/src/util/entities/SecurityKey.ts index c9186265a..fd7a4c5e3 100644 --- a/src/util/entities/SecurityKey.ts +++ b/src/util/entities/SecurityKey.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Session.ts b/src/util/entities/Session.ts index 5a54c090b..6c6f7caa6 100644 --- a/src/util/entities/Session.ts +++ b/src/util/entities/Session.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Sticker.ts b/src/util/entities/Sticker.ts index 3af405641..cd07e65a2 100644 --- a/src/util/entities/Sticker.ts +++ b/src/util/entities/Sticker.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/StickerPack.ts b/src/util/entities/StickerPack.ts index 911ef4b5b..61ab12877 100644 --- a/src/util/entities/StickerPack.ts +++ b/src/util/entities/StickerPack.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Team.ts b/src/util/entities/Team.ts index e494762af..7bedc4af0 100644 --- a/src/util/entities/Team.ts +++ b/src/util/entities/Team.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/TeamMember.ts b/src/util/entities/TeamMember.ts index cd815e920..539da9576 100644 --- a/src/util/entities/TeamMember.ts +++ b/src/util/entities/TeamMember.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Template.ts b/src/util/entities/Template.ts index 11eb4d58e..c417f1f08 100644 --- a/src/util/entities/Template.ts +++ b/src/util/entities/Template.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index 3a77e5db3..df9af3281 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/UserSettings.ts b/src/util/entities/UserSettings.ts index 5cd63dbc2..0d5d9aad2 100644 --- a/src/util/entities/UserSettings.ts +++ b/src/util/entities/UserSettings.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/ValidRegistrationTokens.ts b/src/util/entities/ValidRegistrationTokens.ts index 94e1dacc0..94fd1542b 100644 --- a/src/util/entities/ValidRegistrationTokens.ts +++ b/src/util/entities/ValidRegistrationTokens.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/VoiceState.ts b/src/util/entities/VoiceState.ts index 37c92d6cf..b291c4d3b 100644 --- a/src/util/entities/VoiceState.ts +++ b/src/util/entities/VoiceState.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/Webhook.ts b/src/util/entities/Webhook.ts index 1a18c0a71..91498a22c 100644 --- a/src/util/entities/Webhook.ts +++ b/src/util/entities/Webhook.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/entities/index.ts b/src/util/entities/index.ts index 609b8fbaa..9b01aa77f 100644 --- a/src/util/entities/index.ts +++ b/src/util/entities/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/imports/index.ts b/src/util/imports/index.ts index dd842892b..08b870bc1 100644 --- a/src/util/imports/index.ts +++ b/src/util/imports/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/index.ts b/src/util/index.ts index 939dcbfe8..9174c3a11 100644 --- a/src/util/index.ts +++ b/src/util/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/interfaces/Activity.ts b/src/util/interfaces/Activity.ts index 65adfa2a7..7654ba901 100644 --- a/src/util/interfaces/Activity.ts +++ b/src/util/interfaces/Activity.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts index e99bd7282..6913a8152 100644 --- a/src/util/interfaces/Event.ts +++ b/src/util/interfaces/Event.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/interfaces/Interaction.ts b/src/util/interfaces/Interaction.ts index f26f85b2b..d1295cf4b 100644 --- a/src/util/interfaces/Interaction.ts +++ b/src/util/interfaces/Interaction.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/interfaces/Presence.ts b/src/util/interfaces/Presence.ts index 6821a54f1..056c19b75 100644 --- a/src/util/interfaces/Presence.ts +++ b/src/util/interfaces/Presence.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/interfaces/Status.ts b/src/util/interfaces/Status.ts index 0bcc1de3d..407a813ec 100644 --- a/src/util/interfaces/Status.ts +++ b/src/util/interfaces/Status.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/interfaces/index.ts b/src/util/interfaces/index.ts index 475892123..e37b88741 100644 --- a/src/util/interfaces/index.ts +++ b/src/util/interfaces/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/migration/mariadb/1673609465036-templateDeleteCascade.ts b/src/util/migration/mariadb/1673609465036-templateDeleteCascade.ts index 4d5aae68b..483c50702 100644 --- a/src/util/migration/mariadb/1673609465036-templateDeleteCascade.ts +++ b/src/util/migration/mariadb/1673609465036-templateDeleteCascade.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/migration/mariadb/1675045120206-webauthn.ts b/src/util/migration/mariadb/1675045120206-webauthn.ts index 03ae0226c..d58ac88d7 100644 --- a/src/util/migration/mariadb/1675045120206-webauthn.ts +++ b/src/util/migration/mariadb/1675045120206-webauthn.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/migration/mysql/1673609465036-templateDeleteCascade.ts b/src/util/migration/mysql/1673609465036-templateDeleteCascade.ts index 4d5aae68b..483c50702 100644 --- a/src/util/migration/mysql/1673609465036-templateDeleteCascade.ts +++ b/src/util/migration/mysql/1673609465036-templateDeleteCascade.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/migration/mysql/1675045120206-webauthn.ts b/src/util/migration/mysql/1675045120206-webauthn.ts index 03ae0226c..d58ac88d7 100644 --- a/src/util/migration/mysql/1675045120206-webauthn.ts +++ b/src/util/migration/mysql/1675045120206-webauthn.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/migration/postgres/1673609867556-templateDeleteCascade.ts b/src/util/migration/postgres/1673609867556-templateDeleteCascade.ts index 1a049b74f..504ed5573 100644 --- a/src/util/migration/postgres/1673609867556-templateDeleteCascade.ts +++ b/src/util/migration/postgres/1673609867556-templateDeleteCascade.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/migration/postgres/1675044825710-webauthn.ts b/src/util/migration/postgres/1675044825710-webauthn.ts index 2e76bbb32..4b32d6c73 100644 --- a/src/util/migration/postgres/1675044825710-webauthn.ts +++ b/src/util/migration/postgres/1675044825710-webauthn.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/AckBulkSchema.ts b/src/util/schemas/AckBulkSchema.ts index a08950720..cf6dc5970 100644 --- a/src/util/schemas/AckBulkSchema.ts +++ b/src/util/schemas/AckBulkSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ActivitySchema.ts b/src/util/schemas/ActivitySchema.ts index 2bafb1c55..f1a48f44e 100644 --- a/src/util/schemas/ActivitySchema.ts +++ b/src/util/schemas/ActivitySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ApplicationAuthorizeSchema.ts b/src/util/schemas/ApplicationAuthorizeSchema.ts index 1220160f2..bf7998e2a 100644 --- a/src/util/schemas/ApplicationAuthorizeSchema.ts +++ b/src/util/schemas/ApplicationAuthorizeSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ApplicationCreateSchema.ts b/src/util/schemas/ApplicationCreateSchema.ts index 214149ce6..17bbc94cb 100644 --- a/src/util/schemas/ApplicationCreateSchema.ts +++ b/src/util/schemas/ApplicationCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ApplicationModifySchema.ts b/src/util/schemas/ApplicationModifySchema.ts index 85fd36aca..f75dd5b16 100644 --- a/src/util/schemas/ApplicationModifySchema.ts +++ b/src/util/schemas/ApplicationModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/BackupCodesChallengeSchema.ts b/src/util/schemas/BackupCodesChallengeSchema.ts index 4994c9806..9ac375183 100644 --- a/src/util/schemas/BackupCodesChallengeSchema.ts +++ b/src/util/schemas/BackupCodesChallengeSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/BanCreateSchema.ts b/src/util/schemas/BanCreateSchema.ts index 2673c5917..6d30ca221 100644 --- a/src/util/schemas/BanCreateSchema.ts +++ b/src/util/schemas/BanCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/BanModeratorSchema.ts b/src/util/schemas/BanModeratorSchema.ts index d097777b8..cba1a5ed2 100644 --- a/src/util/schemas/BanModeratorSchema.ts +++ b/src/util/schemas/BanModeratorSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/BanRegistrySchema.ts b/src/util/schemas/BanRegistrySchema.ts index 956b86486..4e7687007 100644 --- a/src/util/schemas/BanRegistrySchema.ts +++ b/src/util/schemas/BanRegistrySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/BotModifySchema.ts b/src/util/schemas/BotModifySchema.ts index 511e51d10..7d94da23c 100644 --- a/src/util/schemas/BotModifySchema.ts +++ b/src/util/schemas/BotModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/BulkDeleteSchema.ts b/src/util/schemas/BulkDeleteSchema.ts index 05e7bb330..ca22f10d2 100644 --- a/src/util/schemas/BulkDeleteSchema.ts +++ b/src/util/schemas/BulkDeleteSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ChannelModifySchema.ts b/src/util/schemas/ChannelModifySchema.ts index 47f55430e..2f6eb7ae7 100644 --- a/src/util/schemas/ChannelModifySchema.ts +++ b/src/util/schemas/ChannelModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ChannelPermissionOverwriteSchema.ts b/src/util/schemas/ChannelPermissionOverwriteSchema.ts index d85dbe4e0..18602300e 100644 --- a/src/util/schemas/ChannelPermissionOverwriteSchema.ts +++ b/src/util/schemas/ChannelPermissionOverwriteSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ChannelReorderSchema.ts b/src/util/schemas/ChannelReorderSchema.ts index 6af581057..a026608ae 100644 --- a/src/util/schemas/ChannelReorderSchema.ts +++ b/src/util/schemas/ChannelReorderSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/CodesVerificationSchema.ts b/src/util/schemas/CodesVerificationSchema.ts index 1028cb26d..3c95e619f 100644 --- a/src/util/schemas/CodesVerificationSchema.ts +++ b/src/util/schemas/CodesVerificationSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/DmChannelCreateSchema.ts b/src/util/schemas/DmChannelCreateSchema.ts index afcc7fe5b..510ff9c3c 100644 --- a/src/util/schemas/DmChannelCreateSchema.ts +++ b/src/util/schemas/DmChannelCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/EmojiCreateSchema.ts b/src/util/schemas/EmojiCreateSchema.ts index 295a70ff8..5eae5a9a9 100644 --- a/src/util/schemas/EmojiCreateSchema.ts +++ b/src/util/schemas/EmojiCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/EmojiModifySchema.ts b/src/util/schemas/EmojiModifySchema.ts index 5b219b1ba..5d33bf617 100644 --- a/src/util/schemas/EmojiModifySchema.ts +++ b/src/util/schemas/EmojiModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ForgotPasswordSchema.ts b/src/util/schemas/ForgotPasswordSchema.ts index b9d745499..0f9fc92dd 100644 --- a/src/util/schemas/ForgotPasswordSchema.ts +++ b/src/util/schemas/ForgotPasswordSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/GatewayBotResponse.ts b/src/util/schemas/GatewayBotResponse.ts index 11915162e..c68ec09e5 100644 --- a/src/util/schemas/GatewayBotResponse.ts +++ b/src/util/schemas/GatewayBotResponse.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/GatewayPayloadSchema.ts b/src/util/schemas/GatewayPayloadSchema.ts index 9d7151a0d..306f2c039 100644 --- a/src/util/schemas/GatewayPayloadSchema.ts +++ b/src/util/schemas/GatewayPayloadSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/GatewayResponse.ts b/src/util/schemas/GatewayResponse.ts index 4d2d06bb2..5b771edc9 100644 --- a/src/util/schemas/GatewayResponse.ts +++ b/src/util/schemas/GatewayResponse.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/GuildCreateSchema.ts b/src/util/schemas/GuildCreateSchema.ts index 8f423cee9..f7138991a 100644 --- a/src/util/schemas/GuildCreateSchema.ts +++ b/src/util/schemas/GuildCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/GuildTemplateCreateSchema.ts b/src/util/schemas/GuildTemplateCreateSchema.ts index 94fb07166..048de6f02 100644 --- a/src/util/schemas/GuildTemplateCreateSchema.ts +++ b/src/util/schemas/GuildTemplateCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/GuildUpdateSchema.ts b/src/util/schemas/GuildUpdateSchema.ts index d857dfa41..8fb4127e9 100644 --- a/src/util/schemas/GuildUpdateSchema.ts +++ b/src/util/schemas/GuildUpdateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts b/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts index e073f6f10..8046aae65 100644 --- a/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts +++ b/src/util/schemas/GuildUpdateWelcomeScreenSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/IdentifySchema.ts b/src/util/schemas/IdentifySchema.ts index a8a541a96..d2b716eab 100644 --- a/src/util/schemas/IdentifySchema.ts +++ b/src/util/schemas/IdentifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/InviteCreateSchema.ts b/src/util/schemas/InviteCreateSchema.ts index 8d6a92c2a..6cdc02146 100644 --- a/src/util/schemas/InviteCreateSchema.ts +++ b/src/util/schemas/InviteCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/LazyRequestSchema.ts b/src/util/schemas/LazyRequestSchema.ts index f37e21943..63e67416e 100644 --- a/src/util/schemas/LazyRequestSchema.ts +++ b/src/util/schemas/LazyRequestSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/LoginSchema.ts b/src/util/schemas/LoginSchema.ts index b77268b1d..aec8272da 100644 --- a/src/util/schemas/LoginSchema.ts +++ b/src/util/schemas/LoginSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/MemberChangeProfileSchema.ts b/src/util/schemas/MemberChangeProfileSchema.ts index c652ac593..e955a0f12 100644 --- a/src/util/schemas/MemberChangeProfileSchema.ts +++ b/src/util/schemas/MemberChangeProfileSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/MemberChangeSchema.ts b/src/util/schemas/MemberChangeSchema.ts index 328eda15d..e1ee09695 100644 --- a/src/util/schemas/MemberChangeSchema.ts +++ b/src/util/schemas/MemberChangeSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/MemberNickChangeSchema.ts b/src/util/schemas/MemberNickChangeSchema.ts index d7f0b35d8..45890560b 100644 --- a/src/util/schemas/MemberNickChangeSchema.ts +++ b/src/util/schemas/MemberNickChangeSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/MessageAcknowledgeSchema.ts b/src/util/schemas/MessageAcknowledgeSchema.ts index 89701ff69..28cd9c79f 100644 --- a/src/util/schemas/MessageAcknowledgeSchema.ts +++ b/src/util/schemas/MessageAcknowledgeSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/util/schemas/MessageCreateSchema.ts index d10773e43..5b9254574 100644 --- a/src/util/schemas/MessageCreateSchema.ts +++ b/src/util/schemas/MessageCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/MessageEditSchema.ts b/src/util/schemas/MessageEditSchema.ts index 11dabdc88..002e5af9c 100644 --- a/src/util/schemas/MessageEditSchema.ts +++ b/src/util/schemas/MessageEditSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/MfaCodesSchema.ts b/src/util/schemas/MfaCodesSchema.ts index 82ba8c2ad..9104fa5c6 100644 --- a/src/util/schemas/MfaCodesSchema.ts +++ b/src/util/schemas/MfaCodesSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/ModifyGuildStickerSchema.ts b/src/util/schemas/ModifyGuildStickerSchema.ts index 1127a531f..95eb5415e 100644 --- a/src/util/schemas/ModifyGuildStickerSchema.ts +++ b/src/util/schemas/ModifyGuildStickerSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/PasswordResetSchema.ts b/src/util/schemas/PasswordResetSchema.ts index c586cbc5b..7c6b71a5e 100644 --- a/src/util/schemas/PasswordResetSchema.ts +++ b/src/util/schemas/PasswordResetSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/PruneSchema.ts b/src/util/schemas/PruneSchema.ts index 928f84ecc..88d2f6ecc 100644 --- a/src/util/schemas/PruneSchema.ts +++ b/src/util/schemas/PruneSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/PurgeSchema.ts b/src/util/schemas/PurgeSchema.ts index 1495c0d9e..2e8879984 100644 --- a/src/util/schemas/PurgeSchema.ts +++ b/src/util/schemas/PurgeSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/RegisterSchema.ts b/src/util/schemas/RegisterSchema.ts index 4e41be230..f6c99b18e 100644 --- a/src/util/schemas/RegisterSchema.ts +++ b/src/util/schemas/RegisterSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/RelationshipPostSchema.ts b/src/util/schemas/RelationshipPostSchema.ts index eb4e03623..066ecfd8e 100644 --- a/src/util/schemas/RelationshipPostSchema.ts +++ b/src/util/schemas/RelationshipPostSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/RelationshipPutSchema.ts b/src/util/schemas/RelationshipPutSchema.ts index 38a31b9e2..33f827ebf 100644 --- a/src/util/schemas/RelationshipPutSchema.ts +++ b/src/util/schemas/RelationshipPutSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/RoleModifySchema.ts b/src/util/schemas/RoleModifySchema.ts index 164a4df8c..1466953c2 100644 --- a/src/util/schemas/RoleModifySchema.ts +++ b/src/util/schemas/RoleModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/RolePositionUpdateSchema.ts b/src/util/schemas/RolePositionUpdateSchema.ts index c1f6f5f0c..6bfd7f326 100644 --- a/src/util/schemas/RolePositionUpdateSchema.ts +++ b/src/util/schemas/RolePositionUpdateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/SelectProtocolSchema.ts b/src/util/schemas/SelectProtocolSchema.ts index cba254172..09283619a 100644 --- a/src/util/schemas/SelectProtocolSchema.ts +++ b/src/util/schemas/SelectProtocolSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/TemplateCreateSchema.ts b/src/util/schemas/TemplateCreateSchema.ts index 2ed148276..9e562c9b7 100644 --- a/src/util/schemas/TemplateCreateSchema.ts +++ b/src/util/schemas/TemplateCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/TemplateModifySchema.ts b/src/util/schemas/TemplateModifySchema.ts index ec9a70ecb..49b02371b 100644 --- a/src/util/schemas/TemplateModifySchema.ts +++ b/src/util/schemas/TemplateModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/TotpDisableSchema.ts b/src/util/schemas/TotpDisableSchema.ts index db42dfcbe..0bc0b8b2d 100644 --- a/src/util/schemas/TotpDisableSchema.ts +++ b/src/util/schemas/TotpDisableSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/TotpEnableSchema.ts b/src/util/schemas/TotpEnableSchema.ts index 4af4d50ad..39c09eed5 100644 --- a/src/util/schemas/TotpEnableSchema.ts +++ b/src/util/schemas/TotpEnableSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/TotpSchema.ts b/src/util/schemas/TotpSchema.ts index 9ee268840..657b7e711 100644 --- a/src/util/schemas/TotpSchema.ts +++ b/src/util/schemas/TotpSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/UserDeleteSchema.ts b/src/util/schemas/UserDeleteSchema.ts index cf56a602c..40fb778da 100644 --- a/src/util/schemas/UserDeleteSchema.ts +++ b/src/util/schemas/UserDeleteSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/UserGuildSettingsSchema.ts b/src/util/schemas/UserGuildSettingsSchema.ts index 91b6826e4..967e29de5 100644 --- a/src/util/schemas/UserGuildSettingsSchema.ts +++ b/src/util/schemas/UserGuildSettingsSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/UserModifySchema.ts b/src/util/schemas/UserModifySchema.ts index 33be1ec78..e155b9af4 100644 --- a/src/util/schemas/UserModifySchema.ts +++ b/src/util/schemas/UserModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/UserProfileModifySchema.ts b/src/util/schemas/UserProfileModifySchema.ts index fbb4f4239..d49fe3269 100644 --- a/src/util/schemas/UserProfileModifySchema.ts +++ b/src/util/schemas/UserProfileModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/UserProfileResponse.ts b/src/util/schemas/UserProfileResponse.ts index c6f395881..699d6a29e 100644 --- a/src/util/schemas/UserProfileResponse.ts +++ b/src/util/schemas/UserProfileResponse.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/UserRelationsResponse.ts b/src/util/schemas/UserRelationsResponse.ts index e6392ee43..385074205 100644 --- a/src/util/schemas/UserRelationsResponse.ts +++ b/src/util/schemas/UserRelationsResponse.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/UserSettingsSchema.ts b/src/util/schemas/UserSettingsSchema.ts index f71cfd7ab..bad347009 100644 --- a/src/util/schemas/UserSettingsSchema.ts +++ b/src/util/schemas/UserSettingsSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/Validator.ts b/src/util/schemas/Validator.ts index a055ad824..1de511d3c 100644 --- a/src/util/schemas/Validator.ts +++ b/src/util/schemas/Validator.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/VanityUrlSchema.ts b/src/util/schemas/VanityUrlSchema.ts index 9d87cd11a..12d5abd6b 100644 --- a/src/util/schemas/VanityUrlSchema.ts +++ b/src/util/schemas/VanityUrlSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/VerifyEmailSchema.ts b/src/util/schemas/VerifyEmailSchema.ts index 84a101b56..ce297c5d3 100644 --- a/src/util/schemas/VerifyEmailSchema.ts +++ b/src/util/schemas/VerifyEmailSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/VoiceIdentifySchema.ts b/src/util/schemas/VoiceIdentifySchema.ts index 732d9ac08..618d6591c 100644 --- a/src/util/schemas/VoiceIdentifySchema.ts +++ b/src/util/schemas/VoiceIdentifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/VoiceStateUpdateSchema.ts b/src/util/schemas/VoiceStateUpdateSchema.ts index 42b668b38..a7d9f9d76 100644 --- a/src/util/schemas/VoiceStateUpdateSchema.ts +++ b/src/util/schemas/VoiceStateUpdateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/VoiceVideoSchema.ts b/src/util/schemas/VoiceVideoSchema.ts index f2839c349..0f43adc0a 100644 --- a/src/util/schemas/VoiceVideoSchema.ts +++ b/src/util/schemas/VoiceVideoSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/WebAuthnSchema.ts b/src/util/schemas/WebAuthnSchema.ts index a6395db16..652cda34c 100644 --- a/src/util/schemas/WebAuthnSchema.ts +++ b/src/util/schemas/WebAuthnSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/WebhookCreateSchema.ts b/src/util/schemas/WebhookCreateSchema.ts index 32b894e2e..f92cb63e7 100644 --- a/src/util/schemas/WebhookCreateSchema.ts +++ b/src/util/schemas/WebhookCreateSchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/WidgetModifySchema.ts b/src/util/schemas/WidgetModifySchema.ts index ad44e5b48..50794d6f4 100644 --- a/src/util/schemas/WidgetModifySchema.ts +++ b/src/util/schemas/WidgetModifySchema.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/schemas/index.ts b/src/util/schemas/index.ts index bf8fdb542..498b5ad71 100644 --- a/src/util/schemas/index.ts +++ b/src/util/schemas/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/ApiError.ts b/src/util/util/ApiError.ts index 714a50524..4c7b909f3 100644 --- a/src/util/util/ApiError.ts +++ b/src/util/util/ApiError.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Array.ts b/src/util/util/Array.ts index cb8377f9b..8a141340d 100644 --- a/src/util/util/Array.ts +++ b/src/util/util/Array.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/AutoUpdate.ts b/src/util/util/AutoUpdate.ts index a4f071de0..8365d9ae1 100644 --- a/src/util/util/AutoUpdate.ts +++ b/src/util/util/AutoUpdate.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Categories.ts b/src/util/util/Categories.ts index ebdaef563..0a9c37417 100644 --- a/src/util/util/Categories.ts +++ b/src/util/util/Categories.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Config.ts b/src/util/util/Config.ts index 7bb77901d..caf4a1e1e 100644 --- a/src/util/util/Config.ts +++ b/src/util/util/Config.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Constants.ts b/src/util/util/Constants.ts index 0ff3350a2..0d1d721e2 100644 --- a/src/util/util/Constants.ts +++ b/src/util/util/Constants.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index 67299fad4..e23bb8954 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Event.ts b/src/util/util/Event.ts index fd21eabf1..01f4911a6 100644 --- a/src/util/util/Event.ts +++ b/src/util/util/Event.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/FieldError.ts b/src/util/util/FieldError.ts index ab0fbbb7e..28e7e3784 100644 --- a/src/util/util/FieldError.ts +++ b/src/util/util/FieldError.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Intents.ts b/src/util/util/Intents.ts index f5de7df43..9c9b0f378 100644 --- a/src/util/util/Intents.ts +++ b/src/util/util/Intents.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/InvisibleCharacters.ts b/src/util/util/InvisibleCharacters.ts index dbe7e9a9d..860ab74eb 100644 --- a/src/util/util/InvisibleCharacters.ts +++ b/src/util/util/InvisibleCharacters.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/JSON.ts b/src/util/util/JSON.ts index a69bbc186..1c39b66e1 100644 --- a/src/util/util/JSON.ts +++ b/src/util/util/JSON.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/RabbitMQ.ts b/src/util/util/RabbitMQ.ts index 2db6a7363..7d9f12ce2 100644 --- a/src/util/util/RabbitMQ.ts +++ b/src/util/util/RabbitMQ.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Regex.ts b/src/util/util/Regex.ts index 3b5141828..8a961a303 100644 --- a/src/util/util/Regex.ts +++ b/src/util/util/Regex.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Rights.ts b/src/util/util/Rights.ts index 6eee4d39a..90ebe2422 100644 --- a/src/util/util/Rights.ts +++ b/src/util/util/Rights.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Sentry.ts b/src/util/util/Sentry.ts index 727aa9ab4..e302da0c2 100644 --- a/src/util/util/Sentry.ts +++ b/src/util/util/Sentry.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/String.ts b/src/util/util/String.ts index 6ffd51be1..1000ebe9b 100644 --- a/src/util/util/String.ts +++ b/src/util/util/String.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts index 14b3c863f..50e63c5fc 100644 --- a/src/util/util/Token.ts +++ b/src/util/util/Token.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/TraverseDirectory.ts b/src/util/util/TraverseDirectory.ts index e02df8220..cc4442fca 100644 --- a/src/util/util/TraverseDirectory.ts +++ b/src/util/util/TraverseDirectory.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/WebAuthn.ts b/src/util/util/WebAuthn.ts index 791893ce1..b0027b13c 100644 --- a/src/util/util/WebAuthn.ts +++ b/src/util/util/WebAuthn.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/cdn.ts b/src/util/util/cdn.ts index 45cf3fd08..f7d310a34 100644 --- a/src/util/util/cdn.ts +++ b/src/util/util/cdn.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/email/index.ts b/src/util/util/email/index.ts index 8f65f8c0f..5effdd2f5 100644 --- a/src/util/util/email/index.ts +++ b/src/util/util/email/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/email/transports/MailGun.ts b/src/util/util/email/transports/MailGun.ts index adafa4703..f65295185 100644 --- a/src/util/util/email/transports/MailGun.ts +++ b/src/util/util/email/transports/MailGun.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/email/transports/MailJet.ts b/src/util/util/email/transports/MailJet.ts index b5551d468..336fa97a6 100644 --- a/src/util/util/email/transports/MailJet.ts +++ b/src/util/util/email/transports/MailJet.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/email/transports/SMTP.ts b/src/util/util/email/transports/SMTP.ts index 7f863ec90..a6e06e529 100644 --- a/src/util/util/email/transports/SMTP.ts +++ b/src/util/util/email/transports/SMTP.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/email/transports/SendGrid.ts b/src/util/util/email/transports/SendGrid.ts index be039dddf..1d2e366ce 100644 --- a/src/util/util/email/transports/SendGrid.ts +++ b/src/util/util/email/transports/SendGrid.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/email/transports/index.ts b/src/util/util/email/transports/index.ts index 992de54bc..4d40f9ccc 100644 --- a/src/util/util/email/transports/index.ts +++ b/src/util/util/email/transports/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/util/util/index.ts b/src/util/util/index.ts index f7102ba63..838239b72 100644 --- a/src/util/util/index.ts +++ b/src/util/util/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/Server.ts b/src/webrtc/Server.ts index 423b62648..8b86236ef 100644 --- a/src/webrtc/Server.ts +++ b/src/webrtc/Server.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/events/Close.ts b/src/webrtc/events/Close.ts index 346a5d886..ba2a31422 100644 --- a/src/webrtc/events/Close.ts +++ b/src/webrtc/events/Close.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/events/Connection.ts b/src/webrtc/events/Connection.ts index fa3bc85bd..d8b4d6830 100644 --- a/src/webrtc/events/Connection.ts +++ b/src/webrtc/events/Connection.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/events/Message.ts b/src/webrtc/events/Message.ts index 98d4b6caf..dac9095e5 100644 --- a/src/webrtc/events/Message.ts +++ b/src/webrtc/events/Message.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/index.ts b/src/webrtc/index.ts index 25fddee22..cb852486f 100644 --- a/src/webrtc/index.ts +++ b/src/webrtc/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/opcodes/BackendVersion.ts b/src/webrtc/opcodes/BackendVersion.ts index 055764a90..b466c3000 100644 --- a/src/webrtc/opcodes/BackendVersion.ts +++ b/src/webrtc/opcodes/BackendVersion.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/opcodes/Heartbeat.ts b/src/webrtc/opcodes/Heartbeat.ts index 2aaa94721..95e991ad2 100644 --- a/src/webrtc/opcodes/Heartbeat.ts +++ b/src/webrtc/opcodes/Heartbeat.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/opcodes/Identify.ts b/src/webrtc/opcodes/Identify.ts index 99a30339a..9a9904df4 100644 --- a/src/webrtc/opcodes/Identify.ts +++ b/src/webrtc/opcodes/Identify.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/opcodes/SelectProtocol.ts b/src/webrtc/opcodes/SelectProtocol.ts index ea2c5f3e5..798a1046e 100644 --- a/src/webrtc/opcodes/SelectProtocol.ts +++ b/src/webrtc/opcodes/SelectProtocol.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/opcodes/Speaking.ts b/src/webrtc/opcodes/Speaking.ts index a6504c958..dbdbcdaaa 100644 --- a/src/webrtc/opcodes/Speaking.ts +++ b/src/webrtc/opcodes/Speaking.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/opcodes/Video.ts b/src/webrtc/opcodes/Video.ts index 4ab39bb8b..8fd6a9e33 100644 --- a/src/webrtc/opcodes/Video.ts +++ b/src/webrtc/opcodes/Video.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/opcodes/index.ts b/src/webrtc/opcodes/index.ts index d631499f5..f0ee23c46 100644 --- a/src/webrtc/opcodes/index.ts +++ b/src/webrtc/opcodes/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/start.ts b/src/webrtc/start.ts index cf3c8450f..1793b3916 100644 --- a/src/webrtc/start.ts +++ b/src/webrtc/start.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/util/Constants.ts b/src/webrtc/util/Constants.ts index be31a1815..bd89c9740 100644 --- a/src/webrtc/util/Constants.ts +++ b/src/webrtc/util/Constants.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/util/MediaServer.ts b/src/webrtc/util/MediaServer.ts index 309652f75..fcc1375d0 100644 --- a/src/webrtc/util/MediaServer.ts +++ b/src/webrtc/util/MediaServer.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published diff --git a/src/webrtc/util/index.ts b/src/webrtc/util/index.ts index 584b0c381..66126c1f1 100644 --- a/src/webrtc/util/index.ts +++ b/src/webrtc/util/index.ts @@ -1,6 +1,6 @@ /* Spacebar: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors + Copyright (C) 2023 Spacebar and Spacebar Contributors This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published From c8f65ca4c73d27455817be1512a2da3277c7efc0 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Thu, 30 Mar 2023 18:26:19 +0200 Subject: [PATCH 26/28] fix: disable cache if multi threaded --- src/util/cache/EntityCache.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/cache/EntityCache.ts b/src/util/cache/EntityCache.ts index 9135fef3b..ba1e5bd8e 100644 --- a/src/util/cache/EntityCache.ts +++ b/src/util/cache/EntityCache.ts @@ -24,7 +24,7 @@ import { } from "typeorm"; import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity"; import { BaseClassWithId } from "../entities/BaseClass"; -import { Config, getDatabase } from "../util"; +import { Config, getDatabase, RabbitMQ } from "../util"; import { CacheManager } from "./Cache"; function getObjectKeysAsArray(obj?: Record) { @@ -52,7 +52,9 @@ class BaseEntityCache extends BaseClassWithId { static useDataSource(dataSource: DataSource | null) { super.useDataSource(dataSource); - this.cacheEnabled = Config.get().cache.enabled ?? true; + const isMultiThreaded = + process.env.EVENT_TRANSMISSION === "process" || RabbitMQ.connection; + this.cacheEnabled = Config.get().cache.enabled ?? !isMultiThreaded; if (Config.get().cache.redis) return; // TODO: Redis cache if (!this.cacheEnabled) return; this.cache = new CacheManager(); From 698ad90d3e82a15b85ceb021ad5667109ac0bcdb Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 31 Mar 2023 15:26:15 +1100 Subject: [PATCH 27/28] Revert "Merge pull request #1008 from spacebarchat/dev/samuel" This reverts commit 69ea71aa9e0bd2e5a98904a66fba0ad3745707cb, reversing changes made to 8b2faf0b18336e5dff1eeff4e849bcfd96b09e88. --- .gitignore | 4 - package-lock.json | Bin 541638 -> 524405 bytes package.json | 22 +-- src/api/Server.ts | 4 +- src/api/middlewares/Authentication.ts | 17 +- src/api/middlewares/Translation.ts | 59 +++---- src/api/routes/guilds/#guild_id/templates.ts | 1 - src/api/routes/users/@me/notes.ts | 6 +- src/api/util/handlers/Message.ts | 2 +- src/util/cache/Cache.ts | 85 ---------- src/util/cache/EntityCache.ts | 162 ------------------- src/util/cache/LocalCache.ts | 94 ----------- src/util/cache/index.ts | 3 - src/util/config/Config.ts | 2 - src/util/config/types/CacheConfiguration.ts | 22 --- src/util/config/types/index.ts | 1 - src/util/entities/Application.ts | 4 +- src/util/entities/Attachment.ts | 4 +- src/util/entities/AuditLog.ts | 4 +- src/util/entities/BackupCodes.ts | 4 +- src/util/entities/Ban.ts | 4 +- src/util/entities/BaseClass.ts | 44 ++--- src/util/entities/Channel.ts | 4 +- src/util/entities/ClientRelease.ts | 4 +- src/util/entities/ConnectedAccount.ts | 4 +- src/util/entities/EmbedCache.ts | 4 +- src/util/entities/Emoji.ts | 4 +- src/util/entities/Encryption.ts | 4 +- src/util/entities/Guild.ts | 4 +- src/util/entities/Message.ts | 4 +- src/util/entities/Note.ts | 4 +- src/util/entities/RateLimit.ts | 4 +- src/util/entities/ReadState.ts | 4 +- src/util/entities/Recipient.ts | 4 +- src/util/entities/Relationship.ts | 4 +- src/util/entities/Role.ts | 4 +- src/util/entities/SecurityKey.ts | 4 +- src/util/entities/Session.ts | 4 +- src/util/entities/Sticker.ts | 4 +- src/util/entities/StickerPack.ts | 4 +- src/util/entities/Team.ts | 4 +- src/util/entities/TeamMember.ts | 4 +- src/util/entities/Template.ts | 4 +- src/util/entities/User.ts | 4 +- src/util/entities/VoiceState.ts | 4 +- src/util/entities/Webhook.ts | 4 +- src/util/schemas/Validator.ts | 2 +- src/util/util/Database.ts | 17 +- src/util/util/Permissions.ts | 33 ++-- src/util/util/Token.ts | 5 +- src/util/util/index.ts | 2 +- 51 files changed, 147 insertions(+), 556 deletions(-) delete mode 100644 src/util/cache/Cache.ts delete mode 100644 src/util/cache/EntityCache.ts delete mode 100644 src/util/cache/LocalCache.ts delete mode 100644 src/util/cache/index.ts delete mode 100644 src/util/config/types/CacheConfiguration.ts diff --git a/.gitignore b/.gitignore index 9ac5d9443..bc780d640 100644 --- a/.gitignore +++ b/.gitignore @@ -9,10 +9,6 @@ assets/cache .env config.json assets/cacheMisses -assets/client_test -scripts/client.js -src/api/middlewares/TestClient.ts -yarn.lock .vscode/settings.json diff --git a/package-lock.json b/package-lock.json index 3713fc53f85f20cb78b29efd2a61d1beb8c4ab64..8927001f2df6072364d354786fe4a8d69ffa7112 100644 GIT binary patch delta 58282 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 delta 65442 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%0D9#8z|DU72FEUtv<1WlI{hf{ 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 R%CSzX>tCKj<=1zd{}+1n7R>+v diff --git a/package.json b/package.json index 85edb0e5b..99a0f2d3a 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ }, "homepage": "https://fosscord.com", "devDependencies": { - "@types/amqplib": "^0.10.1", + "@types/amqplib": "^0.8.2", "@types/bcrypt": "^5.0.0", "@types/body-parser": "^1.19.2", "@types/cookie-parser": "^1.4.3", "@types/express": "^4.17.15", + "@types/i18next-node-fs-backend": "^2.1.1", "@types/json-bigint": "^1.0.1", - "@types/jsonwebtoken": "^9.0.1", + "@types/jsonwebtoken": "^8.5.9", "@types/morgan": "^1.9.3", "@types/multer": "^1.4.7", "@types/node": "^18.7.20", @@ -61,7 +62,7 @@ "husky": "^8.0.0", "prettier": "^2.7.1", "pretty-quick": "^3.1.3", - "typescript": "^5.0.2" + "typescript": "^4.9.4" }, "dependencies": { "@aws-sdk/client-s3": "^3.178.0", @@ -79,20 +80,21 @@ "exif-be-gone": "^1.3.1", "fast-zlib": "^2.0.1", "fido2-lib": "^3.3.5", - "file-type": "16.5.4", + "file-type": "16.5", "form-data": "^4.0.0", - "i18next": "^22.4.12", - "i18next-fs-backend": "^2.1.1", + "i18next": "^21.9.2", + "i18next-http-middleware": "^3.2.1", + "i18next-node-fs-backend": "^2.1.3", "image-size": "^1.0.2", "json-bigint": "^1.0.0", - "jsonwebtoken": "^9.0.0", + "jsonwebtoken": "^8.5.1", "lambert-server": "^1.2.12", "missing-native-js-functions": "^1.2.18", "module-alias": "^2.2.2", "morgan": "^1.10.0", "multer": "^1.4.5-lts.1", "node-2fa": "^2.0.3", - "node-fetch": "^2.6.9", + "node-fetch": "^2.6.7", "node-os-utils": "^1.3.7", "nodemailer": "^6.9.0", "picocolors": "^1.0.0", @@ -112,10 +114,10 @@ "@fosscord/util": "dist/util" }, "optionalDependencies": { - "better-sqlite3": "^8.2.0", "erlpack": "^0.1.4", "nodemailer-mailgun-transport": "^2.1.5", "nodemailer-mailjet-transport": "github:n0script22/nodemailer-mailjet-transport", - "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport" + "nodemailer-sendgrid-transport": "github:Maria-Golomb/nodemailer-sendgrid-transport", + "sqlite3": "^5.1.5" } } diff --git a/src/api/Server.ts b/src/api/Server.ts index f88f94c01..032e923e6 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -32,7 +32,7 @@ import "missing-native-js-functions"; import morgan from "morgan"; import path from "path"; import { red } from "picocolors"; -import { CORS, initAuthentication } from "./middlewares/"; +import { Authentication, CORS } from "./middlewares/"; import { BodyParser } from "./middlewares/BodyParser"; import { ErrorHandler } from "./middlewares/ErrorHandler"; import { initRateLimits } from "./middlewares/RateLimit"; @@ -106,7 +106,7 @@ export class FosscordServer extends Server { // @ts-ignore this.app = api; - initAuthentication(api); + api.use(Authentication); await initRateLimits(api); await initTranslation(api); diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index 0aa585e56..400a16f45 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -18,9 +18,8 @@ import { checkToken, Config, Rights } from "@fosscord/util"; import * as Sentry from "@sentry/node"; -import { NextFunction, Request, Response, Router } from "express"; +import { NextFunction, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { createSecretKey, KeyObject } from "crypto"; export const NO_AUTHORIZATION_ROUTES = [ // Authentication routes @@ -70,16 +69,6 @@ declare global { } } -let jwtPublicKey: KeyObject; - -// Initialize the jwt secret as a key object so it does not need to be regenerated for each request. -export function initAuthentication(api: Router) { - jwtPublicKey = createSecretKey( - Buffer.from(Config.get().security.jwtSecret), - ); - api.use(Authentication); -} - export async function Authentication( req: Request, res: Response, @@ -101,9 +90,11 @@ export async function Authentication( Sentry.setUser({ id: req.user_id }); try { + const { jwtSecret } = Config.get().security; + const { decoded, user } = await checkToken( req.headers.authorization, - jwtPublicKey, + jwtSecret, ); req.token = decoded; diff --git a/src/api/middlewares/Translation.ts b/src/api/middlewares/Translation.ts index 0ddc56bb3..60ff4ad79 100644 --- a/src/api/middlewares/Translation.ts +++ b/src/api/middlewares/Translation.ts @@ -18,20 +18,11 @@ import fs from "fs"; import path from "path"; -import i18next, { TFunction } from "i18next"; -import i18nextBackend from "i18next-fs-backend"; +import i18next from "i18next"; +import i18nextMiddleware from "i18next-http-middleware"; +import i18nextBackend from "i18next-node-fs-backend"; import { Router } from "express"; -declare global { - // eslint-disable-next-line @typescript-eslint/no-namespace - namespace Express { - interface Request { - t: TFunction; - language?: string; - } - } -} - const ASSET_FOLDER_PATH = path.join(__dirname, "..", "..", "..", "assets"); export async function initTranslation(router: Router) { @@ -43,33 +34,21 @@ export async function initTranslation(router: Router) { .filter((x) => x.endsWith(".json")) .map((x) => x.slice(0, x.length - 5)); - await i18next.use(i18nextBackend).init({ - preload: languages, - // debug: true, - fallbackLng: "en", - ns, - backend: { - loadPath: - path.join(ASSET_FOLDER_PATH, "locales") + - "/{{lng}}/{{ns}}.json", - }, - load: "all", - }); + await i18next + .use(i18nextBackend) + .use(i18nextMiddleware.LanguageDetector) + .init({ + preload: languages, + // debug: true, + fallbackLng: "en", + ns, + backend: { + loadPath: + path.join(ASSET_FOLDER_PATH, "locales") + + "/{{lng}}/{{ns}}.json", + }, + load: "all", + }); - router.use((req, res, next) => { - let lng = "en"; - if (req.headers["accept-language"]) { - lng = req.headers["accept-language"].split(",")[0]; - } - req.language = lng; - - // eslint-disable-next-line @typescript-eslint/no-explicit-any - req.t = (key: string | string[], options?: any) => { - return i18next.t(key, { - ...options, - lng, - }); - }; - next(); - }); + router.use(i18nextMiddleware.handle(i18next, {})); } diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts index 707675e54..8a8c53fec 100644 --- a/src/api/routes/guilds/#guild_id/templates.ts +++ b/src/api/routes/guilds/#guild_id/templates.ts @@ -39,7 +39,6 @@ const TemplateGuildProjection: (keyof Guild)[] = [ "system_channel_id", "system_channel_flags", "icon", - "id", ]; router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts index 07c07d723..87d452771 100644 --- a/src/api/routes/users/@me/notes.ts +++ b/src/api/routes/users/@me/notes.ts @@ -52,17 +52,17 @@ router.put("/:id", route({}), async (req: Request, res: Response) => { where: { owner: { id: owner.id }, target: { id: target.id } }, }) ) { - await Note.update( + Note.update( { owner: { id: owner.id }, target: { id: target.id } }, { owner, target, content: note }, ); } else { - await Note.create({ + Note.insert({ id: Snowflake.generate(), owner, target, content: note, - }).save(); + }); } } else { await Note.delete({ diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index 8818904ef..65dbcdfe2 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -274,7 +274,7 @@ export async function sendMessage(opts: MessageOptions) { const message = await handleMessage({ ...opts, timestamp: new Date() }); await Promise.all([ - message.save(), + Message.insert(message), emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, diff --git a/src/util/cache/Cache.ts b/src/util/cache/Cache.ts deleted file mode 100644 index fb66c2e31..000000000 --- a/src/util/cache/Cache.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ -/* eslint-disable @typescript-eslint/ban-ts-comment */ -/* eslint-disable @typescript-eslint/no-explicit-any */ - -import { EntityMetadata, FindOptionsWhere } from "typeorm"; -import { LocalCache } from "./LocalCache"; - -declare module "typeorm" { - interface BaseEntity { - metadata?: EntityMetadata; - cache: CacheManager; - } -} - -export type BaseEntityWithId = { id: string; [name: string]: any }; -export type Criteria = - | string - | string[] - | number - | number[] - | FindOptionsWhere; - -export interface Cache { - get(id: string): BaseEntityWithId | undefined; - set(id: string, entity: BaseEntityWithId): this; - find(options: Record): BaseEntityWithId | undefined; - filter(options: Record): BaseEntityWithId[]; - delete(id: string): boolean; -} - -export class CacheManager { - // last access time to automatically remove old entities from cache after 5 minutes of inactivity (to prevent memory leaks) - cache: Cache; - - constructor() { - this.cache = new LocalCache(); - // TODO: Config.get().cache.redis; - } - - delete(id: string) { - return this.cache.delete(id); - } - - insert(entity: BaseEntityWithId) { - if (!entity.id) return; - - return this.cache.set(entity.id, entity); - } - - find(options?: Record, select?: string[] | undefined) { - if (!options) return null; - const entity = this.cache.find(options); - if (!entity) return null; - if (!select) return entity; - - const result = {}; - for (const prop of select) { - // @ts-ignore - result[prop] = entity[prop]; - } - - // @ts-ignore - return entity.constructor.create(result); - } - - filter(options: Record) { - return this.cache.filter(options); - } -} diff --git a/src/util/cache/EntityCache.ts b/src/util/cache/EntityCache.ts deleted file mode 100644 index ba1e5bd8e..000000000 --- a/src/util/cache/EntityCache.ts +++ /dev/null @@ -1,162 +0,0 @@ -/* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ -/* eslint-disable */ -import { - DataSource, - FindOneOptions, - EntityNotFoundError, - FindOptionsWhere, -} from "typeorm"; -import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity"; -import { BaseClassWithId } from "../entities/BaseClass"; -import { Config, getDatabase, RabbitMQ } from "../util"; -import { CacheManager } from "./Cache"; - -function getObjectKeysAsArray(obj?: Record) { - if (!obj) return []; - if (Array.isArray(obj)) return obj; - return Object.keys(obj); -} - -export type ThisType = { - new (): T; -} & typeof BaseEntityCache; - -interface BaseEntityCache { - constructor: typeof BaseEntityCache; -} - -// @ts-ignore -class BaseEntityCache extends BaseClassWithId { - static cache: CacheManager; - static cacheEnabled: boolean; - - public get metadata() { - return getDatabase()?.getMetadata(this.constructor)!; - } - - static useDataSource(dataSource: DataSource | null) { - super.useDataSource(dataSource); - const isMultiThreaded = - process.env.EVENT_TRANSMISSION === "process" || RabbitMQ.connection; - this.cacheEnabled = Config.get().cache.enabled ?? !isMultiThreaded; - if (Config.get().cache.redis) return; // TODO: Redis cache - if (!this.cacheEnabled) return; - this.cache = new CacheManager(); - } - - static async findOne( - this: ThisType, - options: FindOneOptions, - ) { - // @ts-ignore - if (!this.cacheEnabled) return super.findOne(options); - let select = getObjectKeysAsArray(options.select); - - if (!select.length) { - // get all columns that are marked as select - getDatabase() - ?.getMetadata(this) - .columns.forEach((x) => { - if (!x.isSelect) return; - select.push(x.propertyName); - }); - } - if (options.relations) { - select.push(...getObjectKeysAsArray(options.relations)); - } - - const cacheResult = this.cache.find(options.where as never, select); - if (cacheResult) { - const hasAllProps = select.every((key) => { - if (key.includes(".")) return true; // @ts-ignore - return cacheResult[key] !== undefined; - }); - // console.log(`[Cache] get ${cacheResult.id} from ${cacheResult.constructor.name}`,); - if (hasAllProps) return cacheResult; - } - - // @ts-ignore - const result = await super.findOne(options); - if (!result) return null; - - this.cache.insert(result as any); - - return result; - } - - static async findOneOrFail( - this: ThisType, - options: FindOneOptions, - ) { - const result = await this.findOne(options); - if (!result) throw new EntityNotFoundError(this, options); - return result; - } - - save() { - if (this.constructor.cacheEnabled) this.constructor.cache.insert(this); - return super.save(); - } - - remove() { - if (this.constructor.cacheEnabled) - this.constructor.cache.delete(this.id); - return super.remove(); - } - - static async update( - this: ThisType, - criteria: FindOptionsWhere, - partialEntity: QueryDeepPartialEntity, - ) { - // @ts-ignore - const result = super.update(criteria, partialEntity); - if (!this.cacheEnabled) return result; - - const entities = this.cache.filter(criteria as never); - for (const entity of entities) { - // @ts-ignore - partialEntity.id = entity.id; - this.cache.insert(partialEntity as never); - } - - return result; - } - - static async delete( - this: ThisType, - criteria: FindOptionsWhere, - ) { - // @ts-ignore - const result = super.delete(criteria); - if (!this.cacheEnabled) return result; - - const entities = this.cache.filter(criteria as never); - for (const entity of entities) { - this.cache.delete(entity.id); - } - - return result; - } -} - -// needed, because typescript can't infer the type of the static methods with generics -const EntityCache = BaseEntityCache as unknown as typeof BaseClassWithId; - -export { EntityCache }; diff --git a/src/util/cache/LocalCache.ts b/src/util/cache/LocalCache.ts deleted file mode 100644 index 9c4f23b39..000000000 --- a/src/util/cache/LocalCache.ts +++ /dev/null @@ -1,94 +0,0 @@ -/* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ -/* eslint-disable @typescript-eslint/ban-ts-comment */ -import { BaseEntityWithId, Cache } from "./Cache"; - -export const cacheTimeout = 1000 * 60 * 5; - -export class LocalCache extends Map implements Cache { - last_access = new Map(); - - constructor() { - super(); - - setInterval(() => { - const now = Date.now(); - for (const [key, value] of this.last_access) { - if (now - value > cacheTimeout) { - this.delete(key); - this.last_access.delete(key); - } - } - }, cacheTimeout); - } - - set(key: string, value: BaseEntityWithId): this { - if (this.has(key)) { - this.update(key, value); - return this; - } - this.last_access.set(key, Date.now()); - return super.set(key, value as never); - } - - get(key: string) { - const value = super.get(key); - if (value) this.last_access.set(key, Date.now()); - return value; - } - - update(id: string, entity: BaseEntityWithId) { - const oldEntity = this.get(id); - if (!oldEntity) return; - for (const key in entity) { - // @ts-ignore - if (entity[key] === undefined) continue; // @ts-ignore - oldEntity[key] = entity[key]; - } - } - - find(options: Record): BaseEntityWithId | undefined { - if (options.id && Object.keys(options).length === 1) { - return this.get(options.id); - } - for (const entity of this.values()) { - if (objectFulfillsQuery(entity, options)) return entity; - } - } - - filter(options: Record): BaseEntityWithId[] { - const result = []; - for (const entity of this.values()) { - if (objectFulfillsQuery(entity, options)) { - result.push(entity); - } - } - return result; - } -} - -function objectFulfillsQuery( - entity: BaseEntityWithId, - options: Record, -) { - for (const key in options) { - // @ts-ignore - if (entity[key] !== options[key]) return false; - } - return true; -} diff --git a/src/util/cache/index.ts b/src/util/cache/index.ts deleted file mode 100644 index 43f0aa961..000000000 --- a/src/util/cache/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from "./EntityCache"; -export * from "./Cache"; -export * from "./LocalCache"; diff --git a/src/util/config/Config.ts b/src/util/config/Config.ts index 7de01b66f..90b98b7a2 100644 --- a/src/util/config/Config.ts +++ b/src/util/config/Config.ts @@ -37,7 +37,6 @@ import { SecurityConfiguration, SentryConfiguration, TemplateConfiguration, - CacheConfiguration, } from "../config"; export class ConfigValue { @@ -62,5 +61,4 @@ export class ConfigValue { email: EmailConfiguration = new EmailConfiguration(); passwordReset: PasswordResetConfiguration = new PasswordResetConfiguration(); - cache: CacheConfiguration = new CacheConfiguration(); } diff --git a/src/util/config/types/CacheConfiguration.ts b/src/util/config/types/CacheConfiguration.ts deleted file mode 100644 index 4178090e1..000000000 --- a/src/util/config/types/CacheConfiguration.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* - Fosscord: A FOSS re-implementation and extension of the Discord.com backend. - Copyright (C) 2023 Fosscord and Fosscord Contributors - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -export class CacheConfiguration { - enabled: boolean | null = true; - redis: string | null = null; -} diff --git a/src/util/config/types/index.ts b/src/util/config/types/index.ts index a52ca6277..782ebfc34 100644 --- a/src/util/config/types/index.ts +++ b/src/util/config/types/index.ts @@ -17,7 +17,6 @@ */ export * from "./ApiConfiguration"; -export * from "./CacheConfiguration"; export * from "./CdnConfiguration"; export * from "./DefaultsConfiguration"; export * from "./EmailConfiguration"; diff --git a/src/util/entities/Application.ts b/src/util/entities/Application.ts index e0cdc4812..962b2a8eb 100644 --- a/src/util/entities/Application.ts +++ b/src/util/entities/Application.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne, OneToOne } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Team } from "./Team"; import { User } from "./User"; @Entity("applications") -export class Application extends EntityCache { +export class Application extends BaseClass { @Column() name: string; diff --git a/src/util/entities/Attachment.ts b/src/util/entities/Attachment.ts index 521be5836..d60ac41cb 100644 --- a/src/util/entities/Attachment.ts +++ b/src/util/entities/Attachment.ts @@ -25,11 +25,11 @@ import { RelationId, } from "typeorm"; import { URL } from "url"; -import { EntityCache } from "../cache"; import { deleteFile } from "../util/cdn"; +import { BaseClass } from "./BaseClass"; @Entity("attachments") -export class Attachment extends EntityCache { +export class Attachment extends BaseClass { @Column() filename: string; // name of file attached diff --git a/src/util/entities/AuditLog.ts b/src/util/entities/AuditLog.ts index 9768ef041..e47f92fbe 100644 --- a/src/util/entities/AuditLog.ts +++ b/src/util/entities/AuditLog.ts @@ -17,7 +17,7 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { ChannelPermissionOverwrite } from "./Channel"; import { User } from "./User"; @@ -112,7 +112,7 @@ export enum AuditLogEvents { } @Entity("audit_logs") -export class AuditLog extends EntityCache { +export class AuditLog extends BaseClass { @JoinColumn({ name: "target_id" }) @ManyToOne(() => User) target?: User; diff --git a/src/util/entities/BackupCodes.ts b/src/util/entities/BackupCodes.ts index 3d40338ee..61e8f12ae 100644 --- a/src/util/entities/BackupCodes.ts +++ b/src/util/entities/BackupCodes.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { User } from "./User"; import crypto from "crypto"; @Entity("backup_codes") -export class BackupCode extends EntityCache { +export class BackupCode extends BaseClass { @JoinColumn({ name: "user_id" }) @ManyToOne(() => User, { onDelete: "CASCADE" }) user: User; diff --git a/src/util/entities/Ban.ts b/src/util/entities/Ban.ts index 2b3b688b4..1693cd403 100644 --- a/src/util/entities/Ban.ts +++ b/src/util/entities/Ban.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; import { User } from "./User"; @Entity("bans") -export class Ban extends EntityCache { +export class Ban extends BaseClass { @Column({ nullable: true }) @RelationId((ban: Ban) => ban.user) user_id: string; diff --git a/src/util/entities/BaseClass.ts b/src/util/entities/BaseClass.ts index d2770bfd7..f4b3cf599 100644 --- a/src/util/entities/BaseClass.ts +++ b/src/util/entities/BaseClass.ts @@ -25,12 +25,16 @@ import { PrimaryColumn, } from "typeorm"; import { Snowflake } from "../util/Snowflake"; +import { getDatabase } from "../util/Database"; import { OrmUtils } from "../imports/OrmUtils"; -import { getDatabase } from "../util"; export class BaseClassWithoutId extends BaseEntity { - public get metadata() { - return getDatabase()?.getMetadata(this.constructor); + private get construct() { + return this.constructor; + } + + private get metadata() { + return getDatabase()?.getMetadata(this.construct); } assign(props: object) { @@ -57,23 +61,8 @@ export class BaseClassWithoutId extends BaseEntity { ), ); } -} -export const PrimaryIdColumn = process.env.DATABASE?.startsWith("mongodb") - ? ObjectIdColumn - : PrimaryColumn; - -export class BaseClassWithId extends BaseClassWithoutId { - @PrimaryIdColumn() - id: string = Snowflake.generate(); - - @BeforeUpdate() - @BeforeInsert() - _do_validate() { - if (!this.id) this.id = Snowflake.generate(); - } - - static increment( + static increment( conditions: FindOptionsWhere, propertyPath: string, value: number | string, @@ -82,7 +71,7 @@ export class BaseClassWithId extends BaseClassWithoutId { return repository.increment(conditions, propertyPath, value); } - static decrement( + static decrement( conditions: FindOptionsWhere, propertyPath: string, value: number | string, @@ -91,3 +80,18 @@ export class BaseClassWithId extends BaseClassWithoutId { return repository.decrement(conditions, propertyPath, value); } } + +export const PrimaryIdColumn = process.env.DATABASE?.startsWith("mongodb") + ? ObjectIdColumn + : PrimaryColumn; + +export class BaseClass extends BaseClassWithoutId { + @PrimaryIdColumn() + id: string = Snowflake.generate(); + + @BeforeUpdate() + @BeforeInsert() + _do_validate() { + if (!this.id) this.id = Snowflake.generate(); + } +} diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts index 218907ed4..9ce04848a 100644 --- a/src/util/entities/Channel.ts +++ b/src/util/entities/Channel.ts @@ -24,7 +24,7 @@ import { OneToMany, RelationId, } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; import { PublicUserProjection, User } from "./User"; import { HTTPError } from "lambert-server"; @@ -70,7 +70,7 @@ export enum ChannelType { } @Entity("channels") -export class Channel extends EntityCache { +export class Channel extends BaseClass { @Column() created_at: Date; diff --git a/src/util/entities/ClientRelease.ts b/src/util/entities/ClientRelease.ts index a26bcd8a3..cfbc3a9b2 100644 --- a/src/util/entities/ClientRelease.ts +++ b/src/util/entities/ClientRelease.ts @@ -17,10 +17,10 @@ */ import { Column, Entity } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; @Entity("client_release") -export class Release extends EntityCache { +export class Release extends BaseClass { @Column() name: string; diff --git a/src/util/entities/ConnectedAccount.ts b/src/util/entities/ConnectedAccount.ts index 8ef03feaa..33550197c 100644 --- a/src/util/entities/ConnectedAccount.ts +++ b/src/util/entities/ConnectedAccount.ts @@ -17,7 +17,7 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { User } from "./User"; export type PublicConnectedAccount = Pick< @@ -26,7 +26,7 @@ export type PublicConnectedAccount = Pick< >; @Entity("connected_accounts") -export class ConnectedAccount extends EntityCache { +export class ConnectedAccount extends BaseClass { @Column({ nullable: true }) @RelationId((account: ConnectedAccount) => account.user) user_id: string; diff --git a/src/util/entities/EmbedCache.ts b/src/util/entities/EmbedCache.ts index 49361032e..8ff2a4577 100644 --- a/src/util/entities/EmbedCache.ts +++ b/src/util/entities/EmbedCache.ts @@ -16,12 +16,12 @@ along with this program. If not, see . */ -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Entity, Column } from "typeorm"; import { Embed } from "./Message"; @Entity("embed_cache") -export class EmbedCache extends EntityCache { +export class EmbedCache extends BaseClass { @Column() url: string; diff --git a/src/util/entities/Emoji.ts b/src/util/entities/Emoji.ts index bf15f4ec3..f1bf2d590 100644 --- a/src/util/entities/Emoji.ts +++ b/src/util/entities/Emoji.ts @@ -18,11 +18,11 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { User } from "."; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; @Entity("emojis") -export class Emoji extends EntityCache { +export class Emoji extends BaseClass { @Column() animated: boolean; diff --git a/src/util/entities/Encryption.ts b/src/util/entities/Encryption.ts index 24fbaa6c2..8325bdee0 100644 --- a/src/util/entities/Encryption.ts +++ b/src/util/entities/Encryption.ts @@ -17,10 +17,10 @@ */ import { Column, Entity } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; @Entity("security_settings") -export class SecuritySettings extends EntityCache { +export class SecuritySettings extends BaseClass { @Column({ nullable: true }) guild_id: string; diff --git a/src/util/entities/Guild.ts b/src/util/entities/Guild.ts index 7253f1186..b1693838d 100644 --- a/src/util/entities/Guild.ts +++ b/src/util/entities/Guild.ts @@ -26,7 +26,7 @@ import { } from "typeorm"; import { Config, handleFile, Snowflake } from ".."; import { Ban } from "./Ban"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Channel } from "./Channel"; import { Emoji } from "./Emoji"; import { Invite } from "./Invite"; @@ -67,7 +67,7 @@ export const PublicGuildRelations = [ ]; @Entity("guilds") -export class Guild extends EntityCache { +export class Guild extends BaseClass { @Column({ nullable: true }) @RelationId((guild: Guild) => guild.afk_channel) afk_channel_id?: string; diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts index db98a6f21..519c431e3 100644 --- a/src/util/entities/Message.ts +++ b/src/util/entities/Message.ts @@ -34,7 +34,7 @@ import { OneToMany, RelationId, } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; import { Webhook } from "./Webhook"; import { Sticker } from "./Sticker"; @@ -70,7 +70,7 @@ export enum MessageType { @Entity("messages") @Index(["channel_id", "id"], { unique: true }) -export class Message extends EntityCache { +export class Message extends BaseClass { @Column({ nullable: true }) @RelationId((message: Message) => message.channel) @Index() diff --git a/src/util/entities/Note.ts b/src/util/entities/Note.ts index 2005ab0f6..196f68614 100644 --- a/src/util/entities/Note.ts +++ b/src/util/entities/Note.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne, Unique } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { User } from "./User"; @Entity("notes") @Unique(["owner", "target"]) -export class Note extends EntityCache { +export class Note extends BaseClass { @JoinColumn({ name: "owner_id" }) @ManyToOne(() => User, { onDelete: "CASCADE" }) owner: User; diff --git a/src/util/entities/RateLimit.ts b/src/util/entities/RateLimit.ts index 5402ad063..8d00f59ad 100644 --- a/src/util/entities/RateLimit.ts +++ b/src/util/entities/RateLimit.ts @@ -17,10 +17,10 @@ */ import { Column, Entity } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; @Entity("rate_limits") -export class RateLimit extends EntityCache { +export class RateLimit extends BaseClass { @Column() // no relation as it also executor_id: string; diff --git a/src/util/entities/ReadState.ts b/src/util/entities/ReadState.ts index 56856a1e9..1b280d128 100644 --- a/src/util/entities/ReadState.ts +++ b/src/util/entities/ReadState.ts @@ -24,7 +24,7 @@ import { ManyToOne, RelationId, } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Channel } from "./Channel"; import { User } from "./User"; @@ -34,7 +34,7 @@ import { User } from "./User"; @Entity("read_states") @Index(["channel_id", "user_id"], { unique: true }) -export class ReadState extends EntityCache { +export class ReadState extends BaseClass { @Column() @RelationId((read_state: ReadState) => read_state.channel) channel_id: string; diff --git a/src/util/entities/Recipient.ts b/src/util/entities/Recipient.ts index 32ae7936e..797349e58 100644 --- a/src/util/entities/Recipient.ts +++ b/src/util/entities/Recipient.ts @@ -17,10 +17,10 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; @Entity("recipients") -export class Recipient extends EntityCache { +export class Recipient extends BaseClass { @Column() @RelationId((recipient: Recipient) => recipient.channel) channel_id: string; diff --git a/src/util/entities/Relationship.ts b/src/util/entities/Relationship.ts index e67557aaf..740095c26 100644 --- a/src/util/entities/Relationship.ts +++ b/src/util/entities/Relationship.ts @@ -24,7 +24,7 @@ import { ManyToOne, RelationId, } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { User } from "./User"; export enum RelationshipType { @@ -36,7 +36,7 @@ export enum RelationshipType { @Entity("relationships") @Index(["from_id", "to_id"], { unique: true }) -export class Relationship extends EntityCache { +export class Relationship extends BaseClass { @Column({}) @RelationId((relationship: Relationship) => relationship.from) from_id: string; diff --git a/src/util/entities/Role.ts b/src/util/entities/Role.ts index 2fb63e937..85877c127 100644 --- a/src/util/entities/Role.ts +++ b/src/util/entities/Role.ts @@ -18,11 +18,11 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; @Entity("roles") -export class Role extends EntityCache { +export class Role extends BaseClass { @Column({ nullable: true }) @RelationId((role: Role) => role.guild) guild_id: string; diff --git a/src/util/entities/SecurityKey.ts b/src/util/entities/SecurityKey.ts index cdcc814b5..fd7a4c5e3 100644 --- a/src/util/entities/SecurityKey.ts +++ b/src/util/entities/SecurityKey.ts @@ -17,11 +17,11 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { User } from "./User"; @Entity("security_keys") -export class SecurityKey extends EntityCache { +export class SecurityKey extends BaseClass { @Column({ nullable: true }) @RelationId((key: SecurityKey) => key.user) user_id: string; diff --git a/src/util/entities/Session.ts b/src/util/entities/Session.ts index a03ff1141..6c6f7caa6 100644 --- a/src/util/entities/Session.ts +++ b/src/util/entities/Session.ts @@ -17,7 +17,7 @@ */ import { User } from "./User"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { Status } from "../interfaces/Status"; import { Activity } from "../interfaces/Activity"; @@ -25,7 +25,7 @@ import { Activity } from "../interfaces/Activity"; //TODO we need to remove all sessions on server start because if the server crashes without closing websockets it won't delete them @Entity("sessions") -export class Session extends EntityCache { +export class Session extends BaseClass { @Column({ nullable: true }) @RelationId((session: Session) => session.user) user_id: string; diff --git a/src/util/entities/Sticker.ts b/src/util/entities/Sticker.ts index 9139a5b19..cd07e65a2 100644 --- a/src/util/entities/Sticker.ts +++ b/src/util/entities/Sticker.ts @@ -18,7 +18,7 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { User } from "./User"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; export enum StickerType { @@ -34,7 +34,7 @@ export enum StickerFormatType { } @Entity("stickers") -export class Sticker extends EntityCache { +export class Sticker extends BaseClass { @Column() name: string; diff --git a/src/util/entities/StickerPack.ts b/src/util/entities/StickerPack.ts index cc5c392bd..61ab12877 100644 --- a/src/util/entities/StickerPack.ts +++ b/src/util/entities/StickerPack.ts @@ -25,10 +25,10 @@ import { RelationId, } from "typeorm"; import { Sticker } from "."; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; @Entity("sticker_packs") -export class StickerPack extends EntityCache { +export class StickerPack extends BaseClass { @Column() name: string; diff --git a/src/util/entities/Team.ts b/src/util/entities/Team.ts index 04d34d30d..7bedc4af0 100644 --- a/src/util/entities/Team.ts +++ b/src/util/entities/Team.ts @@ -24,12 +24,12 @@ import { OneToMany, RelationId, } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { TeamMember } from "./TeamMember"; import { User } from "./User"; @Entity("teams") -export class Team extends EntityCache { +export class Team extends BaseClass { @Column({ nullable: true }) icon?: string; diff --git a/src/util/entities/TeamMember.ts b/src/util/entities/TeamMember.ts index d2053bb73..539da9576 100644 --- a/src/util/entities/TeamMember.ts +++ b/src/util/entities/TeamMember.ts @@ -17,7 +17,7 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { User } from "./User"; export enum TeamMemberState { @@ -26,7 +26,7 @@ export enum TeamMemberState { } @Entity("team_members") -export class TeamMember extends EntityCache { +export class TeamMember extends BaseClass { @Column({ type: "int" }) membership_state: TeamMemberState; diff --git a/src/util/entities/Template.ts b/src/util/entities/Template.ts index 101329d18..c417f1f08 100644 --- a/src/util/entities/Template.ts +++ b/src/util/entities/Template.ts @@ -17,12 +17,12 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Guild } from "./Guild"; import { User } from "./User"; @Entity("templates") -export class Template extends EntityCache { +export class Template extends BaseClass { @Column({ unique: true }) code: string; diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts index ec7a11d6a..df9af3281 100644 --- a/src/util/entities/User.ts +++ b/src/util/entities/User.ts @@ -34,7 +34,7 @@ import { trimSpecial, } from ".."; import { BitField } from "../util/BitField"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { ConnectedAccount } from "./ConnectedAccount"; import { Member } from "./Member"; import { Relationship } from "./Relationship"; @@ -94,7 +94,7 @@ export interface UserPrivate extends Pick { } @Entity("users") -export class User extends EntityCache { +export class User extends BaseClass { @Column() username: string; // username max length 32, min 2 (should be configurable) diff --git a/src/util/entities/VoiceState.ts b/src/util/entities/VoiceState.ts index 826ae0e32..b291c4d3b 100644 --- a/src/util/entities/VoiceState.ts +++ b/src/util/entities/VoiceState.ts @@ -17,7 +17,7 @@ */ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Channel } from "./Channel"; import { Guild } from "./Guild"; import { User } from "./User"; @@ -25,7 +25,7 @@ import { Member } from "./Member"; //https://gist.github.com/vassjozsef/e482c65df6ee1facaace8b3c9ff66145#file-voice_state-ex @Entity("voice_states") -export class VoiceState extends EntityCache { +export class VoiceState extends BaseClass { @Column({ nullable: true }) @RelationId((voice_state: VoiceState) => voice_state.guild) guild_id: string; diff --git a/src/util/entities/Webhook.ts b/src/util/entities/Webhook.ts index eeabfea5e..91498a22c 100644 --- a/src/util/entities/Webhook.ts +++ b/src/util/entities/Webhook.ts @@ -18,7 +18,7 @@ import { Column, Entity, JoinColumn, ManyToOne, RelationId } from "typeorm"; import { Application } from "./Application"; -import { EntityCache } from "../cache"; +import { BaseClass } from "./BaseClass"; import { Channel } from "./Channel"; import { Guild } from "./Guild"; import { User } from "./User"; @@ -30,7 +30,7 @@ export enum WebhookType { } @Entity("webhooks") -export class Webhook extends EntityCache { +export class Webhook extends BaseClass { @Column({ type: "int" }) type: WebhookType; diff --git a/src/util/schemas/Validator.ts b/src/util/schemas/Validator.ts index 84677e258..1de511d3c 100644 --- a/src/util/schemas/Validator.ts +++ b/src/util/schemas/Validator.ts @@ -43,7 +43,7 @@ export const ajv = new Ajv({ allowUnionTypes: true, }); -addFormats(ajv as never); +addFormats(ajv); export function validateSchema(schema: string, data: G): G { const valid = ajv.validate(schema, normalizeBody(data)); diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index b0d9d24ed..e23bb8954 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -38,8 +38,7 @@ const dbConnectionString = const DatabaseType = dbConnectionString.includes("://") ? dbConnectionString.split(":")[0]?.replace("+srv", "") - : "better-sqlite3"; - + : "sqlite"; const isSqlite = DatabaseType.includes("sqlite"); const DataSourceOptions = new DataSource({ @@ -51,7 +50,7 @@ const DataSourceOptions = new DataSource({ database: isSqlite ? dbConnectionString : undefined, entities: [path.join(__dirname, "..", "entities", "*.js")], synchronize: !!process.env.DB_SYNC, - logging: process.env["DB_LOGGING"] === "true", + logging: false, bigNumberStrings: false, supportBigNumbers: true, name: "default", @@ -78,13 +77,7 @@ export async function initDatabase(): Promise { } if (!process.env.DB_SYNC) { - const supported = [ - "mysql", - "mariadb", - "postgres", - "sqlite", - "better-sqlite3", - ]; + const supported = ["mysql", "mariadb", "postgres", "sqlite"]; if (!supported.includes(DatabaseType)) { console.log( "[Database]" + @@ -120,10 +113,10 @@ export async function initDatabase(): Promise { // Manually insert every current migration to prevent this: await Promise.all( dbConnection.migrations.map((migration) => - Migration.create({ + Migration.insert({ name: migration.name, timestamp: Date.now(), - }).save(), + }), ), ); } else { diff --git a/src/util/util/Permissions.ts b/src/util/util/Permissions.ts index 4aeb9268e..996c72ea5 100644 --- a/src/util/util/Permissions.ts +++ b/src/util/util/Permissions.ts @@ -257,26 +257,23 @@ export async function getPermission( } if (guild_id) { - const result = await Promise.all([ - Guild.findOneOrFail({ - where: { id: guild_id }, - select: ["id", "owner_id", ...(opts.guild_select || [])], - relations: opts.guild_relations, - }), - Member.findOneOrFail({ - where: { guild_id, id: user_id }, - relations: ["roles", ...(opts.member_relations || [])], - // select: [ - // "id", // TODO: Bug in typeorm? adding these selects breaks the query. - // "roles", - // ...(opts.member_select || []), - // ], - }), - ]); - guild = result[0]; - member = result[1]; + guild = await Guild.findOneOrFail({ + where: { id: guild_id }, + select: ["id", "owner_id", ...(opts.guild_select || [])], + relations: opts.guild_relations, + }); if (guild.owner_id === user_id) return new Permissions(Permissions.FLAGS.ADMINISTRATOR); + + member = await Member.findOneOrFail({ + where: { guild_id, id: user_id }, + relations: ["roles", ...(opts.member_relations || [])], + // select: [ + // "id", // TODO: Bug in typeorm? adding these selects breaks the query. + // "roles", + // ...(opts.member_select || []), + // ], + }); } let recipient_ids = channel?.recipients?.map((x) => x.user_id); diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts index b839a5198..50e63c5fc 100644 --- a/src/util/util/Token.ts +++ b/src/util/util/Token.ts @@ -19,7 +19,6 @@ import jwt, { VerifyOptions } from "jsonwebtoken"; import { Config } from "./Config"; import { User } from "../entities"; -import { KeyObject } from "crypto"; export const JWTOptions: VerifyOptions = { algorithms: ["HS256"] }; @@ -63,7 +62,7 @@ async function checkEmailToken( export function checkToken( token: string, - jwtSecret: string | KeyObject, + jwtSecret: string, isEmailVerification = false, ): Promise { return new Promise((res, rej) => { @@ -87,7 +86,7 @@ export function checkToken( const user = await User.findOne({ where: { id: decoded.id }, - select: ["id", "data", "bot", "disabled", "deleted", "rights"], + select: ["data", "bot", "disabled", "deleted", "rights"], }); if (!user) return rej("Invalid Token"); diff --git a/src/util/util/index.ts b/src/util/util/index.ts index 10ae7152b..838239b72 100644 --- a/src/util/util/index.ts +++ b/src/util/util/index.ts @@ -24,7 +24,7 @@ export * from "./cdn"; export * from "./Config"; export * from "./Constants"; export * from "./Database"; -export * from "./email/index"; +export * from "./email"; export * from "./Event"; export * from "./FieldError"; export * from "./Intents"; From 095cbf7b2036bc35d9c3eabbdec8a5c6dfd67242 Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Fri, 31 Mar 2023 15:52:33 +1100 Subject: [PATCH 28/28] Remove ALL fosscord mentions --- .github/FUNDING.yml | 2 +- .github/ISSUE_TEMPLATE/config.yml | 10 ++++----- .../email_templates/new_login_location.html | 4 ++-- assets/email_templates/password_changed.html | 2 +- .../password_reset_request.html | 2 +- assets/email_templates/phone_removed.html | 2 +- assets/email_templates/verify_email.html | 2 +- assets/public/fosscord-login.css | 4 ++-- assets/public/fosscord.css | 2 +- assets/public/index.html | 15 +++++++------ assets/webrtc.js | 2 +- nginx.conf | 4 ++-- package-lock.json | Bin 524405 -> 524405 bytes package.json | 20 +++++++++--------- scripts/changelog.js | 4 +++- scripts/license.js | 14 ++++++------ scripts/rights.js | 2 ++ scripts/schema.js | 2 +- scripts/stresstest/accounts.json.example | 2 +- scripts/stresstest/index.js | 4 +++- scripts/stresstest/src/register/index.js | 4 +++- scripts/syncronise.js | 2 ++ src/api/Server.ts | 13 ++++++------ src/api/middlewares/Authentication.ts | 2 +- src/api/middlewares/ErrorHandler.ts | 2 +- src/api/middlewares/RateLimit.ts | 6 +++--- src/api/routes/-/healthz.ts | 4 ++-- src/api/routes/-/readyz.ts | 4 ++-- src/api/routes/applications/#id/bot/index.ts | 4 ++-- .../routes/applications/#id/entitlements.ts | 2 +- src/api/routes/applications/#id/index.ts | 4 ++-- src/api/routes/applications/#id/skus.ts | 2 +- src/api/routes/applications/detectable.ts | 2 +- src/api/routes/applications/index.ts | 4 ++-- src/api/routes/auth/forgot.ts | 4 ++-- .../auth/generate-registration-tokens.ts | 4 ++-- src/api/routes/auth/location-metadata.ts | 4 ++-- src/api/routes/auth/login.ts | 4 ++-- src/api/routes/auth/logout.ts | 2 +- src/api/routes/auth/mfa/totp.ts | 4 ++-- src/api/routes/auth/mfa/webauthn.ts | 4 ++-- src/api/routes/auth/register.ts | 6 +++--- src/api/routes/auth/reset.ts | 4 ++-- src/api/routes/auth/verify/index.ts | 4 ++-- src/api/routes/auth/verify/resend.ts | 4 ++-- .../verify/view-backup-codes-challenge.ts | 4 ++-- src/api/routes/channels/#channel_id/index.ts | 4 ++-- .../routes/channels/#channel_id/invites.ts | 6 +++--- .../#channel_id/messages/#message_id/ack.ts | 4 ++-- .../messages/#message_id/crosspost.ts | 2 +- .../#channel_id/messages/#message_id/index.ts | 12 +++++------ .../messages/#message_id/reactions.ts | 4 ++-- .../#channel_id/messages/bulk-delete.ts | 4 ++-- .../channels/#channel_id/messages/index.ts | 6 +++--- .../channels/#channel_id/permissions.ts | 4 ++-- src/api/routes/channels/#channel_id/pins.ts | 4 ++-- src/api/routes/channels/#channel_id/purge.ts | 4 ++-- .../routes/channels/#channel_id/recipients.ts | 4 ++-- src/api/routes/channels/#channel_id/typing.ts | 4 ++-- .../routes/channels/#channel_id/webhooks.ts | 8 +++---- src/api/routes/discoverable-guilds.ts | 4 ++-- src/api/routes/discovery.ts | 4 ++-- src/api/routes/download.ts | 4 ++-- src/api/routes/experiments.ts | 2 +- src/api/routes/gateway/bot.ts | 4 ++-- src/api/routes/gateway/index.ts | 4 ++-- src/api/routes/gifs/search.ts | 2 +- src/api/routes/gifs/trending-gifs.ts | 2 +- src/api/routes/gifs/trending.ts | 4 ++-- src/api/routes/guild-recommendations.ts | 4 ++-- src/api/routes/guilds/#guild_id/audit-logs.ts | 2 +- src/api/routes/guilds/#guild_id/bans.ts | 4 ++-- src/api/routes/guilds/#guild_id/channels.ts | 4 ++-- src/api/routes/guilds/#guild_id/delete.ts | 4 ++-- .../#guild_id/discovery-requirements.ts | 2 +- src/api/routes/guilds/#guild_id/emojis.ts | 4 ++-- src/api/routes/guilds/#guild_id/index.ts | 8 +++---- .../routes/guilds/#guild_id/integrations.ts | 2 +- src/api/routes/guilds/#guild_id/invites.ts | 4 ++-- .../guilds/#guild_id/member-verification.ts | 2 +- .../#guild_id/members/#member_id/index.ts | 4 ++-- .../#guild_id/members/#member_id/nick.ts | 4 ++-- .../#member_id/roles/#role_id/index.ts | 4 ++-- .../routes/guilds/#guild_id/members/index.ts | 4 ++-- .../guilds/#guild_id/messages/search.ts | 4 ++-- src/api/routes/guilds/#guild_id/premium.ts | 2 +- .../routes/guilds/#guild_id/profile/index.ts | 4 ++-- src/api/routes/guilds/#guild_id/prune.ts | 4 ++-- src/api/routes/guilds/#guild_id/regions.ts | 4 ++-- .../guilds/#guild_id/roles/#role_id/index.ts | 4 ++-- .../routes/guilds/#guild_id/roles/index.ts | 4 ++-- src/api/routes/guilds/#guild_id/stickers.ts | 4 ++-- src/api/routes/guilds/#guild_id/templates.ts | 6 +++--- src/api/routes/guilds/#guild_id/vanity-url.ts | 4 ++-- .../#guild_id/voice-states/#user_id/index.ts | 4 ++-- src/api/routes/guilds/#guild_id/webhooks.ts | 2 +- .../routes/guilds/#guild_id/welcome-screen.ts | 4 ++-- .../routes/guilds/#guild_id/widget.json.ts | 4 ++-- src/api/routes/guilds/#guild_id/widget.png.ts | 6 +++--- src/api/routes/guilds/#guild_id/widget.ts | 4 ++-- src/api/routes/guilds/index.ts | 4 ++-- src/api/routes/guilds/templates/index.ts | 6 +++--- src/api/routes/invites/index.ts | 4 ++-- src/api/routes/oauth2/authorize.ts | 4 ++-- src/api/routes/oauth2/tokens.ts | 2 +- src/api/routes/outbound-promotions.ts | 2 +- .../routes/partners/#guild_id/requirements.ts | 2 +- src/api/routes/ping.ts | 4 ++-- src/api/routes/policies/instance/domains.ts | 4 ++-- src/api/routes/policies/instance/index.ts | 4 ++-- src/api/routes/policies/instance/limits.ts | 4 ++-- src/api/routes/policies/stats.ts | 4 ++-- src/api/routes/read-states/ack-bulk.ts | 4 ++-- .../scheduled-maintenances/upcoming_json.ts | 2 +- src/api/routes/science.ts | 2 +- src/api/routes/stage-instances.ts | 2 +- src/api/routes/sticker-packs/index.ts | 4 ++-- src/api/routes/stickers/#sticker_id/index.ts | 4 ++-- src/api/routes/stop.ts | 2 +- .../store/published-listings/applications.ts | 2 +- .../applications/#id/subscription-plans.ts | 2 +- .../routes/store/published-listings/skus.ts | 2 +- .../skus/#sku_id/subscription-plans.ts | 2 +- src/api/routes/teams.ts | 2 +- src/api/routes/template.ts.disabled | 2 +- src/api/routes/track.ts | 2 +- src/api/routes/updates.ts | 4 ++-- src/api/routes/users/#id/delete.ts | 4 ++-- src/api/routes/users/#id/index.ts | 4 ++-- src/api/routes/users/#id/profile.ts | 4 ++-- src/api/routes/users/#id/relationships.ts | 4 ++-- .../@me/activities/statistics/applications.ts | 2 +- src/api/routes/users/@me/affinities/guilds.ts | 2 +- src/api/routes/users/@me/affinities/users.ts | 2 +- .../@me/applications/#app_id/entitlements.ts | 2 +- .../routes/users/@me/billing/country-code.ts | 2 +- .../users/@me/billing/payment-sources.ts | 2 +- .../routes/users/@me/billing/subscriptions.ts | 2 +- src/api/routes/users/@me/channels.ts | 4 ++-- src/api/routes/users/@me/connections.ts | 2 +- src/api/routes/users/@me/delete.ts | 4 ++-- src/api/routes/users/@me/devices.ts | 2 +- src/api/routes/users/@me/disable.ts | 4 ++-- src/api/routes/users/@me/email-settings.ts | 2 +- src/api/routes/users/@me/entitlements.ts | 2 +- src/api/routes/users/@me/guilds.ts | 4 ++-- .../users/@me/guilds/#guild_id/settings.ts | 4 ++-- .../@me/guilds/premium/subscription-slots.ts | 2 +- src/api/routes/users/@me/index.ts | 4 ++-- src/api/routes/users/@me/library.ts | 2 +- .../users/@me/mfa/codes-verification.ts | 4 ++-- src/api/routes/users/@me/mfa/codes.ts | 4 ++-- src/api/routes/users/@me/mfa/totp/disable.ts | 4 ++-- src/api/routes/users/@me/mfa/totp/enable.ts | 4 ++-- .../mfa/webauthn/credentials/#key_id/index.ts | 4 ++-- .../@me/mfa/webauthn/credentials/index.ts | 4 ++-- src/api/routes/users/@me/notes.ts | 4 ++-- src/api/routes/users/@me/relationships.ts | 6 +++--- src/api/routes/users/@me/settings.ts | 4 ++-- src/api/routes/voice/regions.ts | 4 ++-- src/api/start.ts | 4 ++-- src/api/util/handlers/Instance.ts | 2 +- src/api/util/handlers/Message.ts | 4 ++-- src/api/util/handlers/Voice.ts | 2 +- src/api/util/handlers/route.ts | 6 +++--- src/api/util/utility/EmbedHandlers.ts | 6 +++--- src/api/util/utility/RandomInviteID.ts | 2 +- src/api/util/utility/String.ts | 2 +- src/api/util/utility/captcha.ts | 4 ++-- src/api/util/utility/ipAddress.ts | 2 +- src/api/util/utility/passwordStrength.ts | 2 +- src/bundle/Server.ts | 10 ++++----- src/bundle/index.ts | 8 +++---- src/bundle/start.ts | 14 ++++++------ src/bundle/stats.ts | 3 ++- src/cdn/Server.ts | 2 +- src/cdn/routes/attachments.ts | 2 +- src/cdn/routes/avatars.ts | 2 +- src/cdn/routes/guild-profiles.ts | 2 +- src/cdn/routes/role-icons.ts | 2 +- src/gateway/Server.ts | 2 +- src/gateway/events/Close.ts | 4 ++-- src/gateway/events/Connection.ts | 4 ++-- src/gateway/events/Message.ts | 4 ++-- src/gateway/listener/listener.ts | 6 +++--- src/gateway/opcodes/Heartbeat.ts | 2 +- src/gateway/opcodes/Identify.ts | 6 +++--- src/gateway/opcodes/LazyRequest.ts | 4 ++-- src/gateway/opcodes/PresenceUpdate.ts | 4 ++-- src/gateway/opcodes/RequestGuildMembers.ts | 2 +- src/gateway/opcodes/Resume.ts | 2 +- src/gateway/opcodes/VoiceStateUpdate.ts | 4 ++-- src/gateway/opcodes/index.ts | 2 +- src/gateway/opcodes/instanceOf.ts | 2 +- src/gateway/util/Constants.ts | 2 +- src/gateway/util/Send.ts | 4 ++-- src/gateway/util/WebSocket.ts | 4 ++-- src/util/config/types/ApiConfiguration.ts | 1 - src/util/config/types/GeneralConfiguration.ts | 6 +++--- src/util/config/types/RegionConfiguration.ts | 6 +++--- src/util/entities/AuditLog.ts | 2 +- src/util/entities/Emoji.ts | 2 +- src/util/entities/Guild.ts | 4 ++-- src/util/entities/Invite.ts | 2 +- src/util/interfaces/Event.ts | 2 +- src/util/schemas/ActivitySchema.ts | 2 +- src/util/schemas/ChannelModifySchema.ts | 2 +- .../ChannelPermissionOverwriteSchema.ts | 2 +- src/util/schemas/GuildUpdateSchema.ts | 2 +- src/util/schemas/IdentifySchema.ts | 2 +- src/util/schemas/MessageCreateSchema.ts | 2 +- src/util/schemas/RelationshipPutSchema.ts | 2 +- src/util/schemas/UserGuildSettingsSchema.ts | 2 +- src/util/schemas/UserSettingsSchema.ts | 2 +- src/util/util/AutoUpdate.ts | 4 ++-- src/util/util/Constants.ts | 10 ++++----- src/util/util/Database.ts | 2 +- src/util/util/MessageFlags.ts | 4 ++-- src/util/util/Token.ts | 2 +- src/util/util/email/transports/MailGun.ts | 2 +- src/util/util/email/transports/MailJet.ts | 2 +- src/util/util/email/transports/SMTP.ts | 2 +- src/util/util/email/transports/SendGrid.ts | 2 +- src/webrtc/Server.ts | 2 +- src/webrtc/events/Close.ts | 4 ++-- src/webrtc/events/Connection.ts | 2 +- src/webrtc/events/Message.ts | 2 +- src/webrtc/opcodes/BackendVersion.ts | 2 +- src/webrtc/opcodes/Heartbeat.ts | 2 +- src/webrtc/opcodes/Identify.ts | 6 +++--- src/webrtc/opcodes/SelectProtocol.ts | 6 +++--- src/webrtc/opcodes/Speaking.ts | 2 +- src/webrtc/opcodes/Video.ts | 6 +++--- src/webrtc/opcodes/index.ts | 2 +- src/webrtc/util/MediaServer.ts | 2 +- tsconfig.json | 8 +++---- 236 files changed, 441 insertions(+), 429 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 43f3b63b0..35c817d47 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -open_collective: fosscord +open_collective: spacebar diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 8ab6ab5a9..2af76d635 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,11 +1,11 @@ blank_issues_enabled: true contact_links: - - name: Fosscord Documentation - url: https://docs.fosscord.com/ - about: Need documentation and examples for the Fosscord? Head over to Fosscord's official documentation. + - name: Spacebar Documentation + url: https://docs.spacebar.chat/ + about: Need documentation and examples for the Spacebar? Head over to Spacebar's official documentation. - name: Discord's Developer Documentation url: https://discord.com/developers/docs/intro - about: Need help with the Discord resources? Head here instead of asking on Fosscord! - - name: Fosscord' Official Discord server + about: Need help with the Discord resources? Head here instead of asking on Spacebar! + - name: Spacebar' Official Discord server url: https://discord.com/invite/Ms5Ev7S6bF about: Need help with the server? Talk with us in our official server. diff --git a/assets/email_templates/new_login_location.html b/assets/email_templates/new_login_location.html index ff262e992..e4911c5ed 100644 --- a/assets/email_templates/new_login_location.html +++ b/assets/email_templates/new_login_location.html @@ -24,7 +24,7 @@
BrandingVerify Login
Branding Branding Branding Branding div.app-1q1i1E > div > a { /* replace me: original dimensions: 130x36 */ - background: url(https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Gradient.svg); + background: url(https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg); width: 130px; height: 23px; background-size: contain; diff --git a/assets/public/fosscord.css b/assets/public/fosscord.css index 2ee7b7940..53ffd41b3 100644 --- a/assets/public/fosscord.css +++ b/assets/public/fosscord.css @@ -27,7 +27,7 @@ > foreignObject > div > div { - background-image: url(https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Icon-Rounded-Subtract.svg); + background-image: url(https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Icon-Rounded-Subtract.svg); background-size: contain; border-radius: 50%; } diff --git a/assets/public/index.html b/assets/public/index.html index 2fa07ca9b..3723caba3 100644 --- a/assets/public/index.html +++ b/assets/public/index.html @@ -5,7 +5,7 @@ - Fosscord Server + Spacebar Server @@ -40,24 +40,25 @@ #wordmark { width: min(500px, 50%); + margin-bottom: 20px; } a, a:visited { - color: #FF6D2E; + color: #0185ff; }
- Fosscord Logo + src="https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg" />

Welcome!

-

If you're viewing this page, that means you've successfully set up your very own Fosscord instance!

-

For information on how to configure your shiny new setup, you should visit our documentation

-

For information on how to connect and use your instance, click here

+

If you're viewing this page, that means you've successfully set up your very own Spacebar instance!

+

For information on how to configure your shiny new setup, you should visit our documentation

+

For information on how to connect and use your instance, click here

diff --git a/assets/webrtc.js b/assets/webrtc.js index 40cb237a6..b56e41c4f 100644 --- a/assets/webrtc.js +++ b/assets/webrtc.js @@ -3,7 +3,7 @@ If you want to use it, throw it into the `preload-plugins` folder. TODO: Make it so this file is not required for webrtc. - Do note that webrtc, as of 17/12/2022, is not implemented yet in fosscord/fosscord-server. + Do note that webrtc, as of 17/12/2022, is not implemented yet in spacebarchat/server. */ (this.webpackChunkdiscord_app = this.webpackChunkdiscord_app || []).push([ diff --git a/nginx.conf b/nginx.conf index 141cf5cac..2a1fd4120 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,8 +1,8 @@ -# This is an example nginx config for Fosscord. +# This is an example nginx config for Spacebar. server { # Change server_name - server_name fosscord.example.com; + server_name spacebar.example.com; listen 80; location / { diff --git a/package-lock.json b/package-lock.json index 8927001f2df6072364d354786fe4a8d69ffa7112..8f9d26f613ae0bf25794ae9dfdaad607ef43b2a7 100644 GIT binary patch delta 79 zcmey`pzyUpL9UvMQzL8-VPF*!9Uu}HT#wWut$NJ)oly5mPiv56)=95AWI dj@Ayw)()oD4(8Slmevl|)(*C<9qe!a0{~<`9cusp delta 79 zcmey`pzyUpL9UvMQzK`AZ2xHvh#C`Gq8wWut$NJ)oly5mPiv56)=95AWI dj@Ayw)()oD4(8Slmevl|)(*C<9qe!a0|0M$9j^cY diff --git a/package.json b/package.json index 99a0f2d3a..3780b2bbf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "fosscord-server", + "name": "spacebar-server", "version": "1.0.0", - "description": "A Fosscord server written in Node.js", + "description": "A Spacebar server written in Node.js", "scripts": { "prepare": "husky install", "postinstall": "npx patch-package", @@ -26,17 +26,17 @@ "types": "src/bundle/index.ts", "repository": { "type": "git", - "url": "git+https://github.com/fosscord/fosscord-server.git" + "url": "git+https://github.com/spacebarchat/server.git" }, - "author": "Fosscord", + "author": "Spacebar", "license": "AGPL-3.0-only", "bugs": { - "url": "https://github.com/fosscord/fosscord-server/issues" + "url": "https://github.com/spacebarchat/server/issues" }, "imports": { "#*": "./dist/*/index.js" }, - "homepage": "https://fosscord.com", + "homepage": "https://spacebar.chat", "devDependencies": { "@types/amqplib": "^0.8.2", "@types/bcrypt": "^5.0.0", @@ -108,10 +108,10 @@ "ws": "^8.9.0" }, "_moduleAliases": { - "@fosscord/api": "dist/api", - "@fosscord/cdn": "dist/cdn", - "@fosscord/gateway": "dist/gateway", - "@fosscord/util": "dist/util" + "@spacebar/api": "dist/api", + "@spacebar/cdn": "dist/cdn", + "@spacebar/gateway": "dist/gateway", + "@spacebar/util": "dist/util" }, "optionalDependencies": { "erlpack": "^0.1.4", diff --git a/scripts/changelog.js b/scripts/changelog.js index 221864b48..f6329a46a 100644 --- a/scripts/changelog.js +++ b/scripts/changelog.js @@ -23,9 +23,11 @@ To find which file the changelog is stored in your client, simply grep for the changelog text given by the client, and update the `CHANGELOG_SCRIPT` variable to use that instead. - This grabs the new changelog from `fosscord-server/assets/changelog.txt` + This grabs the new changelog from `spacebarchat/server/assets/changelog.txt` */ +/* eslint-env node */ + const fetch = require("node-fetch"); const fs = require("fs/promises"); const path = require("path"); diff --git a/scripts/license.js b/scripts/license.js index 31321cd14..d36165bb5 100644 --- a/scripts/license.js +++ b/scripts/license.js @@ -5,13 +5,15 @@ Does not prepend is file contains @fc-license-skip */ +/* eslint-env node */ + const Path = require("path"); const fs = require("fs"); const walk = require("./util/walk"); -const FOSSCORD_SOURCE_DIR = Path.join(__dirname, "..", "src"); -const FOSSCORD_SCRIPTS_DIR = Path.join(__dirname); -const FOSSCORD_LICENSE_PREAMBLE = fs +const SPACEBAR_SOURCE_DIR = Path.join(__dirname, "..", "src"); +const SPACEBAR_SCRIPTS_DIR = Path.join(__dirname); +const SPACEBAR_LICENSE_PREAMBLE = fs .readFileSync(Path.join(__dirname, "util", "licensePreamble.txt")) .toString() .split("\r") // remove windows bs @@ -37,7 +39,7 @@ const addToDir = (dir) => { const preamble = commentStrings[0] + "\n" + - FOSSCORD_LICENSE_PREAMBLE + + SPACEBAR_LICENSE_PREAMBLE + "\n" + commentStrings[1]; @@ -56,5 +58,5 @@ const addToDir = (dir) => { } }; -addToDir(FOSSCORD_SOURCE_DIR); -addToDir(FOSSCORD_SCRIPTS_DIR); +addToDir(SPACEBAR_SOURCE_DIR); +addToDir(SPACEBAR_SCRIPTS_DIR); diff --git a/scripts/rights.js b/scripts/rights.js index bf79ef79b..148570eb0 100644 --- a/scripts/rights.js +++ b/scripts/rights.js @@ -20,6 +20,8 @@ Calculates a discord.com-like rights value. */ +/* eslint-env node */ + require("module-alias/register"); const { Rights } = require(".."); diff --git a/scripts/schema.js b/scripts/schema.js index 12e3cdb5e..2a19ea26a 100644 --- a/scripts/schema.js +++ b/scripts/schema.js @@ -17,7 +17,7 @@ */ /* - Regenerates the `fosscord-server/assets/schemas.json` file, used for API/Gateway input validation. + Regenerates the `spacebarchat/server/assets/schemas.json` file, used for API/Gateway input validation. */ /* eslint-env node */ diff --git a/scripts/stresstest/accounts.json.example b/scripts/stresstest/accounts.json.example index 61904c5e6..ec1b2a0d7 100644 --- a/scripts/stresstest/accounts.json.example +++ b/scripts/stresstest/accounts.json.example @@ -1 +1 @@ -[{"email":"org11ncxa8.wi732t9b4o@fosscord.com","password":"x.ibahfyqwle.ne4hajbzp11.gpc4lcup4"},{"email":"rek6kyprik.i5hldol255@fosscord.com","password":"1.o3w16haor2y.0e1ey2yk1x.1r0gn5o5h"},{"email":"07o37povsi.uk5q9dtxbp@fosscord.com","password":"8.6z64gcjavp1n.uar3qqymwfi.g0sfmmbd9m"},{"email":"94di5zaie4.n1vhzdfsj@fosscord.com","password":"1e.k3ijylxme1u.e9xr9yqbrk.3tir7qnvh"},{"email":"zbrqft4chj.yl73e5puq3@fosscord.com","password":"5.nkc3g8cvwl15.dmp8ywmkka.m79e9t4wij"},{"email":"br1wknv7k.6hw6yl69e@fosscord.com","password":"3.gimzx06u7mh.6rjrdflo9j1t.h3d8k2f5t"},{"email":"cdehs12h6h.iexxvg16xf@fosscord.com","password":"1i.5ab7e9rtwl1n.31qtfv7cz9.e1k313py9"},{"email":"pazx37jpra.mgsb8k50ip@fosscord.com","password":"d.eg5dwqvd981e.5qobehiyffe.6k5pb4fqm"},{"email":"vs6k62ak2o.xo1v4w0rj@fosscord.com","password":"c.hrkcrnlxlg1d.w18ztd39d1p.eycgehb49"},{"email":"u5d27rbewm.3p0wa7s899@fosscord.com","password":"s.1r7o1ur8o9k.puzbm1uuta9.an5m8bhh0a"},{"email":"vyp6x66fr.yv74eftomo@fosscord.com","password":"m.w0c7h21asf.pq2lj3uot6a.xnhv9ftqii"},{"email":"da0k6sra2n.qts4gs9ufg@fosscord.com","password":"h.8e42ud5f6r5.896sp1t8y6e.shwe0d8no9"},{"email":"l093koc05n.81vt1v8tsx@fosscord.com","password":"11.zhkv1jbhdf.0ub2po3mnu.no4lq8l4"},{"email":"115tfo7ct.muvy04u0tf@fosscord.com","password":"1c.4bpk2a17z1p.gw2h6qmvhez.57drs0quz"},{"email":"dq6bk1hjch.huw092gkhr@fosscord.com","password":"1l.kp28mclrtee.5i4dmacbpc1j.hcqgemsni"},{"email":"8g8q9v3wmk.l2frwpuds8@fosscord.com","password":"1n.i0wwg0njmv.teaiqjqalt1g.ib6551nh4"},{"email":"5b3y3neqxa.mmi0ex2hxd@fosscord.com","password":"8.tvz7q9uw0hm.6ufz6fu65c1a.88vp9di6e"},{"email":"mg28g3krsp.35h1akxrqj@fosscord.com","password":"s.y8j2n19iffr.qyecyrgo6ig.6hgrc5vy9"},{"email":"ehtumcok2j.2oozlhiq97@fosscord.com","password":"11.uq0up8g8h1q.ofvjsx29yd.pfwen3kr38"},{"email":"le98rah1uc.au4ug9tpnt@fosscord.com","password":"t.q15zsc0q2mt.2nj3jsdxhfc.leb9ba1xku"},{"email":"hrroex9f5n.6cl98h3jsi@fosscord.com","password":"17.qnqqhg2us4.kh92v74atg19.49ufgil7g"},{"email":"w95wrrn48.6gfnue7dcq@fosscord.com","password":"b.jnqgbi89oj1k.8rn0llovbll.kcblui80th"},{"email":"rqo4n0il5w.4gl1u8hlyc@fosscord.com","password":"17.41d1lpjmi0.d8ijhslby11w.sjn7sqhi9"},{"email":"6dv3yp4kon.pk7ye6q1r6@fosscord.com","password":"0.j70py6yysjz.sf56ebpp2gp.z68yo9hiim"},{"email":"knmi9qkige.5v1bg6h09w@fosscord.com","password":"1d.7n58xntwg1s.umnglex7h13.c5xrsfkosm"},{"email":"cefymgc7te.dd81jabws4@fosscord.com","password":"1u.73ea7dde1o.0i1fhyaird.sjk30nky1e"},{"email":"33xcwiqf73.r6khs46a7j@fosscord.com","password":"b.5p5gdmh1891f.11g4590n5a.vfoek6qjb9"},{"email":"9zcgmr84s6.utnlygoubi@fosscord.com","password":"8.g4v53t7kcl16.wgaiufzgg1u.pusdfdneb"},{"email":"26vpzekrdw.3bwq27wla@fosscord.com","password":"11.yxey8293lj1d.nxhkju2eke.hl86mcvswd"},{"email":"vvq6w36r84.lr1auhpfc@fosscord.com","password":"y.7vlqbpftom.6xfrtozd11k.ycf9ifi7o"},{"email":"6ejeiq64yo.zorve5saw4@fosscord.com","password":"o.eue50qp1frq.qi0rwphg3dv.psph7va2fb"},{"email":"6s0hu88ro8.hsckrmud1i@fosscord.com","password":"16.fc836nhb91a.ul37503ppg.l62wgser4i"},{"email":"h8qwchz2x9.5br1kcw1iv@fosscord.com","password":"l.iw1041wgy.6azyc9h6vb.br9cr0dmn8"},{"email":"yx13rst2hu.ybisfdwgv@fosscord.com","password":"8.5yasf5ba619.ir0toxu251p.tbgwjd18f"},{"email":"1j7vrr1trh.wqj0ozl357@fosscord.com","password":"1m.iucscoe7b0.6ca1jfaag361.c2trc36mnvk"},{"email":"9w2w572pzr.fv1rk360pp@fosscord.com","password":"t.labzw6qw8t3.33k42uvhgd1s.e1gj71h14"},{"email":"yf5e43ol4.6509owbcxa@fosscord.com","password":"12.jewy0uvx1m1m.ce28kht6dk.v2p0bzlvz"},{"email":"gzny2o1re.1xrl0ua7yd@fosscord.com","password":"h.3valf7r8jh.6bzfr4ions.r4b2mt0l0g"},{"email":"bc77a5kw9v.hu5barps6q@fosscord.com","password":"1a.jt11azsa81j.4v70jvm9d1o.hflrb1tigk"},{"email":"ltoezpefev.hrvnxmq9ee@fosscord.com","password":"b.v4f5lqrlc912.dx4dd4xq91v.zj345to03"},{"email":"svcpsuoenk.b8mfqxpbzg@fosscord.com","password":"1a.7aobev8b4r.xqqfybkcs1t.cjuswku0a"},{"email":"n0mroewqq.svq5iq57pe@fosscord.com","password":"1l.zxm1xhlavp.65rp7bz57x.01vjajdsc"},{"email":"trly6yupd.dt37kh07dn@fosscord.com","password":"1i.o2ieg72fz1j.er031tzerx.2ngg4dcvlh"},{"email":"ickkf14cqv.9pu2pnmx7n@fosscord.com","password":"18.pyhd9ruatl1k.erfchcjc95.wfd67r5e8x"},{"email":"5o4ornfwy9.yabymb8e2k@fosscord.com","password":"1g.117kmei8df10.cedozr4vee.08te5d44nb"},{"email":"p0ulegfi3.dgmar6qc2v@fosscord.com","password":"1h.tle7s3ed82.un20o5nv3dk.wnz4w802h8"},{"email":"58gejpvr6v.jolxrsl83p@fosscord.com","password":"e.ksw14117hbo.f0pgufr3na.ssrjys23al"},{"email":"vf349zeoja.r8bjel59kd@fosscord.com","password":"1o.79kh6e6glm9.d76d86g1jp16.u37p4jhf7"},{"email":"uc786nn0go.n9ygun6owj@fosscord.com","password":"m.xo4bwhct5be.lpokbj59w8p.z4l52dzv1r"},{"email":"5jgx24s87u.odlx0bfo0r@fosscord.com","password":"1k.ni9jyfol7h1g.vczzsa8dbg.r4bhoh5op"},{"email":"2v44408x8l.unfspunnnm@fosscord.com","password":"16.63njhji5b4.r4xkcf672f1a.x389dr603g"},{"email":"ityj8kcvrm.9djzannsll@fosscord.com","password":"1p.6jdbhaxiqc.nfnpw7e09g8.967dtt2dy3"},{"email":"8csbvl9qot.28etdf4pf@fosscord.com","password":"1b.52rdo5qmj3.ta9jw1wm3k9.m96fe27tp"},{"email":"dqndi38hsq.yv77wk3mov@fosscord.com","password":"k.zpjwpwxmlr1f.tbj03rxayn17.9x451qclu"},{"email":"ohwmvag9j.w6t8ngs4t@fosscord.com","password":"b.h1ta0mly991q.wzu1ssffyk1h.kc10wt8i2"},{"email":"2mmors2h0w.jwukibc7oi@fosscord.com","password":"y.xo4kgepqa1t.b77zwt1in5.3um79fx22r"},{"email":"ux0q6gvwnr.gnywxxrsn@fosscord.com","password":"g.52userbsonu.ny8omqaduf.rvhtwq4jer"},{"email":"0q12b4zet.y87zc04r8r@fosscord.com","password":"1t.79mg1a9q85.k66wagu67j14.ad0gw3caw"},{"email":"gatbconrvq.dsopxa8fkk@fosscord.com","password":"1n.fycl7y9roh1p.4yg37pst4k16.votnvabrf"},{"email":"mmp9g1b1v.xz1w4qzxee@fosscord.com","password":"1k.cjmz3huosl.jh502yz5jf1e.hyce7qc67"},{"email":"5s90s1hbns.b027pfiv3s@fosscord.com","password":"1l.86ipkmi6fg.scabtvproj4.yw4nb9qui9"},{"email":"l4zrvtrbpb.1r627sllk@fosscord.com","password":"1l.zzm1dunzzek.10sr7mp01ly.yyrjj1hsli"},{"email":"xih9rwk90i.rmdifv40g@fosscord.com","password":"15.db9k0pxci1v.hs6l033urm.5a1zv42fhl"},{"email":"55mq93jdq.2dhr1ps4f5@fosscord.com","password":"i.v5hpg2qez1u.xhs32cwes1h.n10pexmfff"},{"email":"5c0vb38rul.5su27w4pn8@fosscord.com","password":"12.y87q6jxq41m.qgiji2j0hm.gmy2wuavc"},{"email":"qjk2eoqeqq.ljq4dig10o@fosscord.com","password":"0.lpu8eio3hra12.mq8qcehpe1e.77p7zilh4"},{"email":"b45ltbf5d.o4oouuik1e@fosscord.com","password":"1u.wb7hn2b1x1k.jys5p3ri4j.9ew9jab3ll"},{"email":"1mw205tjri.gpi2h76eps@fosscord.com","password":"1g.kyh53pnamd13.5yufexmyv1h.r56pmhm7i"},{"email":"8y0psdjq2s.ifqyimhnkj@fosscord.com","password":"1d.fi03hlwk41u.b89w0vrd712.ljudzvdo6"},{"email":"ls73glp0q9.3rtqyb262@fosscord.com","password":"1.z70c4ef5hfi.fes9zmue2it.5cobkz3ah"},{"email":"ipe2um46bi.in93oau1l@fosscord.com","password":"5.a5he7keuru1n.l05ivx4n24.piohqdy51w"},{"email":"mt16ta8diq.krypy2t9cv@fosscord.com","password":"n.zk4goctn5p3.r1fhllqy1m1p.ni2q3y68w"},{"email":"qehwflm0ja.x5uvmxgfle@fosscord.com","password":"1e.r2sj0uimq1f.nmtozr8qd1s.xgvz4d62b"},{"email":"0ppn1iwd6.ivrqbvn17i@fosscord.com","password":"1n.fr6x1pbzjl.c8xwipgo6c.m1me2h2g58"},{"email":"xiiq47ofev.u9z0gndxs6@fosscord.com","password":"1t.7tfe0181ij.jbznx5eebs.ytm50kp5qf"},{"email":"kqhk3lt2mo.o4y7u23zbu@fosscord.com","password":"1b.bkoqmxjcf1l.c5q9oneuz1u.00x93z7l4"},{"email":"ri64c5o5zn.o429slph64@fosscord.com","password":"1r.mre2hu1gpu.401xyxa6eu.j98cetaplg"},{"email":"j5jpukoktw.q5bseyjfu@fosscord.com","password":"h.k1ar11fpx1m.n50t8tz4k4.9oj17rtdjw"},{"email":"cg8gyuhu16.jezv2bo8n@fosscord.com","password":"1c.vyfo117pd1b.hxlc7e9zve.j6ej7ho2rk"},{"email":"7ngysyss7w.yjy0whd5fh@fosscord.com","password":"12.pl4jjp66wi1r.xx7s13gsgy.v2slv2vyx"},{"email":"7uhylwdaiq.w557htx0x@fosscord.com","password":"1j.icm6w8m4mh.4qyoql77m8.ar8kliax0s"},{"email":"y6yn1ckm1e.7xxizerecm@fosscord.com","password":"1e.om7n18zisn1w.usblhxf4p1m.r9ke41xox"},{"email":"uwdsktqhuw.4vmh5gmg7d@fosscord.com","password":"6.cdte4bk24b16.cf1sbtxlx1o.n62w4weh9"},{"email":"8v1nt755y.w0y1jgfcgm@fosscord.com","password":"f.ozxpvznxj41o.bs5s5dhua1l.ffayy0gsy"},{"email":"rmy9b61cij.qir0bjorcm@fosscord.com","password":"1h.bxjxpx0u6f13.e97yh8g761c.j8zog74iql"},{"email":"93ir0yiyi9.1f7bfzt3fb@fosscord.com","password":"18.vky28kwlw14.w1wsoyu6c15.yhxbr725xe"},{"email":"g0kqw9plr.v2zcovhyg6@fosscord.com","password":"1r.3txq1jt4zl1d.ha0ejtekjh.xhjl9e6vqg"},{"email":"xmk2q5zxa.v1ka9gm3a8@fosscord.com","password":"1l.ryvykh3ihm16.rxea04ifq0.h14sz83yisv"},{"email":"mqt2bmltj9.53o16bc6xn@fosscord.com","password":"i.vt66ajtme1f.lllyzaprk16.yb0yh0o1z"},{"email":"4kvjyddsv.7u7lmex2df@fosscord.com","password":"1i.axaegtd0qz.2yvfr5n261g.8s8fprsd8"},{"email":"yigntcopcc.8bchnlmclm@fosscord.com","password":"n.b5yn5xried1d.siep9e4fb1t.h6s6erw5t"},{"email":"meubr1b03t.t97015wih6@fosscord.com","password":"5.wu3izi2gyqi.iurx5qpp7l.znq1htzuel"},{"email":"xz3gta0hi.1x5o83xyee@fosscord.com","password":"14.uafjiryde3.oin9k24w3510.vkjmjleb4i"},{"email":"9jkrkk9r6o.6ossrgj919@fosscord.com","password":"v.u9531wtw2o11.151eg145bf.bk57nd0s6u"},{"email":"kf9fdmnacv.67shfcubvn@fosscord.com","password":"1i.7f1olv2hkt.v2cso7zxlfw.8ylhl33g1"},{"email":"k8zuiett0r.0w299k0t9j@fosscord.com","password":"t.1mrpwsil15.999lbrfvz1h.7od0kjlxo"},{"email":"8m9rt3vgg.vkpf6apx9@fosscord.com","password":"1n.2ohz11tk412.5ezp8ujcwn8.rvqqrozh9s"},{"email":"rfavhpnhc.6xwy7o3ulm@fosscord.com","password":"11.ikd54271zj.vq3brjark7.h1ryvz7ap8"},{"email":"6zmju5azrd.4bes4a3cq@fosscord.com","password":"5.litb6taajto.ownyp3uhjkh.f543o47uc9"},{"email":"ml5pst7t3g.kbvn8b1vg@fosscord.com","password":"1q.co2aumj6fw.fa18frro5e.vnpotfg209"},{"email":"kaa1r6srjs.wjriguic5e@fosscord.com","password":"y.y635jqxai9.s4hcd1weni5.51i7z3c26r"},{"email":"n09uhfkuc5.9aqau9qyk@fosscord.com","password":"1f.wtjqoqzdwg6.mfvvtcwtx91t.8ujt3pwx4"},{"email":"6y5y3px9oa.4183pg5aq6@fosscord.com","password":"11.8a00uh75g1i.d462wzpqv1t.dnd8sdvr"},{"email":"aqdzadem03.f8uv1m4zv4@fosscord.com","password":"4.4ndx89thn53.afcjfzjqe51o.ivaemdp5hf"},{"email":"oqv3944yav.31ccatif3r@fosscord.com","password":"1w.9cstqu9o21f.p40uqca3vl19.iqnn79lqde"},{"email":"akzyzmigv.9c6w5aj4o@fosscord.com","password":"m.m382wa8nznr.szvso4c03ke.ttw2jhnwh8"},{"email":"13dqfm57jo.e05e711ggt@fosscord.com","password":"1b.t1b51jt7lf.rhi4j32rw91u.0foqthilf"},{"email":"3derfs5v66.s2kbedbm3o@fosscord.com","password":"t.e153si8xso1m.9rv9il857fd.e3i0di3ope"},{"email":"92k9vmws7.dt9mvv6ijh@fosscord.com","password":"1r.r8oy0su9c1e.irtwz9gdna.3fddwt8k4n"},{"email":"w1huzvblr.q9qp44japt@fosscord.com","password":"1v.dfdr92srfs.3x2wd25frh15.z73xb3vol"},{"email":"vne3an2fif.32eq9woyl@fosscord.com","password":"7.lurd6n689ek.sf3gedrf711.5xclyfsn3"},{"email":"298zj4dvxf.5sfh7f2e2m@fosscord.com","password":"n.1rbv0z54wr1n.nt2041ujks.0gwbe80zyl"},{"email":"ywp1ssr2zh.gl97epixxu@fosscord.com","password":"1w.gfpvze8vq1p.is7b2795819.4hilzah3"},{"email":"kqzujy4m5j.ocydwl4yyh@fosscord.com","password":"1c.sqxzxuareez.fgczf2qh3en.yi5vo23phn"},{"email":"ck8n5p7d6d.2vu4cdm6iw@fosscord.com","password":"1o.g3lq6grnm1t.otf44zgiw1c.jfdgqubfjl"},{"email":"s3vqe9bzj.muec34461t@fosscord.com","password":"1u.i4u3eidof19.tl8hf5fpdv.mvbij0fdgc"},{"email":"7hedrsktw.oqe4hym4us@fosscord.com","password":"1j.orlptqc2h.hs6661zehh1r.ngepsoldvf"},{"email":"44tm2rsu6j.oxrw5ib1np@fosscord.com","password":"1o.n71dxtllrf9.htwjv6fsi81l.5w9pyr8eee"},{"email":"o28saa2e4t.m49530ir45@fosscord.com","password":"16.z31xrcp6li12.uaklzxvskl.nqyq23zqb"},{"email":"aaz3kkwx2q.u42rdyacy6@fosscord.com","password":"1k.aohk44bxqkq.6lec7k6yfa14.geiq4ok3b"},{"email":"ntw1oc87mh.js3q1iqxrh@fosscord.com","password":"15.li45vduoy15.h90fv4ytl1t.3v78qdvcq"},{"email":"cpkgoh313.lkdhhl039a@fosscord.com","password":"3.fdw00uv0dn1v.qz6frlgeh0.3g0c7xnn9le"},{"email":"wznnajnyww.3f5s5cf0lt@fosscord.com","password":"4.3d2ro1uvag2.9yum8m4gd5t.yd1zriwovn"},{"email":"odwdxlk49g.m113aywba@fosscord.com","password":"y.24hnap1ckh.n0q1dtobf717.0tzaopasse"},{"email":"0xt66uuwbs.24qfa4w82q@fosscord.com","password":"e.3cfcd0usw57.oydvjpl5wm1b.sxnf38ihh"},{"email":"4pxgasro0t.xifcrlp26f@fosscord.com","password":"1d.oxpqgh8jbgb.6epjawtwga1u.o5d33jm"},{"email":"l202g9q8xo.t4ck4xu44v@fosscord.com","password":"d.gyul2yhu7h1g.163rzn4kqik.e5qlstdwp"},{"email":"8mwzma33ko.b9on13ypjl@fosscord.com","password":"b.0sdy90whqr1o.rruwt57r8l14.hjejwclmr"},{"email":"h8dm19fu77.hzpnw8famh@fosscord.com","password":"s.q49kg1uq8gc.046rudurb1o.2lqegjfds"},{"email":"exkp3ve6z7.mdydbk9jy@fosscord.com","password":"16.bq8o0d13sd8.tri7wtdjpro.2ebtbyqgtt"},{"email":"n8fe02yphv.huwi91ywha@fosscord.com","password":"1d.8qp5wkq541k.ulwk4bzjsm19.q3qbxorto"},{"email":"lsslgvrdyb.u86qng3p7o@fosscord.com","password":"11.9q1m8gwavd.9z3kflcg5k1e.lrux8aqm8"},{"email":"0jur86ya2p.gb26btuz7@fosscord.com","password":"n.fflp1f1yksg.10rh6etc61.yld8y7u9hi"},{"email":"raseda2c45.vl9resp89r@fosscord.com","password":"b.6gd8az3ljg.es1yjenqskk.i4i8m466p"},{"email":"jmam7ha069.b96jzg1bkl@fosscord.com","password":"1f.2z41vc92bo.84f3d3j3gra.5yev9enzv"},{"email":"pp2rki7hjd.a037bg6u6@fosscord.com","password":"3.nktq53a97c19.khsapwl0wd.ej16kksime"},{"email":"c35l8m3ikr.e7vx8nmbil@fosscord.com","password":"2.oryjofui8mu.7jes36sirs1u.oclq1geaf"},{"email":"ufhsl7tn5u.j4ey0abswv@fosscord.com","password":"14.uctn73o6h1n.t75arwloxgf.nvgdr4l41o"},{"email":"8ru4fr2ed.kf8ffg9ko8@fosscord.com","password":"n.hqxwr2ypwd1l.vu23byfp3c.nzgszptoqk"},{"email":"6gmjeij67o.ep5256bmf@fosscord.com","password":"1i.237gs5pk5j1w.yvuhvp9ho15.l4qibsw5i"},{"email":"4wrhgqel0w.e0sz7l0zki@fosscord.com","password":"w.g09qtor0p1g.a5uzjl6u3g17.v3z6rhb9h"},{"email":"3860ixs8g.6pha1slnur@fosscord.com","password":"m.o7o62cqw3g.wkkaak7zz8.h82m4nenbf"},{"email":"wnnpg8stto.zwsxqfp38i@fosscord.com","password":"c.k2b6jn1b3r14.ojpvlbxil1r.rpkncuyqp"},{"email":"t04ss33dlw.98dpq7j8rg@fosscord.com","password":"5.7zgfmumai7.iphztcsjfw1h.sq2kp3j9j"},{"email":"hy53et7kw6.vsku4tebj9@fosscord.com","password":"3.ayjddj0roe1m.ngz1qajzlgu.xue35w1d1d"},{"email":"252ueajele.j4euv8la1d@fosscord.com","password":"h.tw1utyw7mh9.ydii1rkvp4.8xafwfxrqd"},{"email":"ye2mi1d86.uqa7ig7qxb@fosscord.com","password":"j.pn3eoar1ft1e.k8febwch91o.fzau5lnbx"},{"email":"4cq5y22mm8.q33hk612wu@fosscord.com","password":"1l.7tx03ihc9e1a.3i2l76ur5.28yffumat8"},{"email":"d9op87vvj7.vbu23p4mnq@fosscord.com","password":"10.z7pgyokesip.0i0axexmwpa.0p5xrlag9k"},{"email":"tnhgsqizxh.14ulf4jinl@fosscord.com","password":"j.8p0jucy5xk10.creosnkf2o.vzznt05x"},{"email":"8h2h3w3ex5.8ogl7f027n@fosscord.com","password":"1b.08wkhdm03g3.8hdklh1zj41t.fq57w9raf"},{"email":"ommn4ocwtn.1fkdjbz2v8@fosscord.com","password":"1e.i8k15b9uk1p.70n34lxbzf.4inv63cwt8"},{"email":"fnxg92zeqn.ljg5uumt3e@fosscord.com","password":"w.ltho2dsgveu.d1ome2w0x8j.7wr2hq1wk8"},{"email":"lzi8aurosp.mck9i974of@fosscord.com","password":"u.zezf4qdz2p0.l2g634tak98.ql0n1tg6sq"},{"email":"fdhv4fccm5.o9x209i94g@fosscord.com","password":"5.2o84u6v43619.4c0c71a9gk7.n9cmjegefv"},{"email":"tuedrm1ajt.bxjgzsyj4s@fosscord.com","password":"1m.ng2h807gvu.rhd056e6bbb.lkvewwp2tg"},{"email":"488bryb32a.x928qzsf8g@fosscord.com","password":"y.n2c3x3irffa.fz9xwiimno8.nnpvm280oc"},{"email":"n928oorjaa.kj35rf9p35@fosscord.com","password":"1l.flvmvopcj16.pmx6n9hi7hi.v9odjzq3at"},{"email":"emzd8qz0f8.b972dvhf0m@fosscord.com","password":"3.7umgbd5apm18.0n6yi8ol9g.m4607npuc"},{"email":"g7jzdulwv5.0a2wzws2ua@fosscord.com","password":"10.1u1sac19wkf.lvi2qwfhtq16.8wbdddpms"},{"email":"giuivahumo.7iqapfnbfr@fosscord.com","password":"q.pzck5qtbype.llhl9ypv6b1e.3dz8gsv0pg"},{"email":"0t84mm2pj9.kycgvqkuag@fosscord.com","password":"1t.kpvjmvipo14.kwv0np3ordv.ustw31ifu"},{"email":"vx5t6yurg7.pocn2c069m@fosscord.com","password":"f.gdwgrk0wia1u.7m1ozam0b0.d5y62kwyih5"},{"email":"p7arvq1hha.7wryrvhvl@fosscord.com","password":"1v.eb62r3rx71h.d3fhbfdxa1l.4gzcu184s"},{"email":"adp64dkhdd.q2nc2qvy3@fosscord.com","password":"q.96rt5rc517h.3f0foodom4.h1wee4z428"},{"email":"pfhrq2kv8.92dq9bxy8a@fosscord.com","password":"1g.nfaha2xx7hi.vtng22emxs1l.fpbra2wo6h"},{"email":"jjnysdssoc.eqr6v2pqeo@fosscord.com","password":"1.112arb9m3cb.w3yfq6ekz1d.keb15ptd5"},{"email":"m5rab6dhrc.p1tnxv9feg@fosscord.com","password":"1.3guc8m7j0uj4.xphgg3121714.7ii7ah6g7f"},{"email":"zgq1iount.blsiqtyvc6@fosscord.com","password":"16.dzt6188au1w.ilwc3p3ds17.7j7lcsqur"},{"email":"ix7nx1ce4a.3wj4gs8b7p@fosscord.com","password":"13.p2v1p2nwa1t.2yarcqsmzk.ay7w9u0p1r"},{"email":"5jh7wm63ug.feyytgy11g@fosscord.com","password":"10.otpp2mz0smb.uv94hcp26c8.a3nlz16n14"},{"email":"9cd7yy1ps4.jet2fn1fdb@fosscord.com","password":"9.bjtfocm7zk12.sushyeb1yg.lhtmj6a70t"},{"email":"20u20f6dlk.l8n5tvh2re@fosscord.com","password":"19.qfrr25rarj.4tzf063a9n4.3i5s3vm30b"},{"email":"b1hnmmwcb.q21mrflg1h@fosscord.com","password":"3.ysh10ultyjz.nz8azt84216.lxn1kgvly"},{"email":"j7nhj8s2d.aqaeidbi8m@fosscord.com","password":"g.nlnw7ejuqbz.41exhwj2wiv.1yr0njmd"}] \ No newline at end of file +[{"email":"org11ncxa8.wi732t9b4o@spacebar.chat","password":"x.ibahfyqwle.ne4hajbzp11.gpc4lcup4"},{"email":"rek6kyprik.i5hldol255@spacebar.chat","password":"1.o3w16haor2y.0e1ey2yk1x.1r0gn5o5h"},{"email":"07o37povsi.uk5q9dtxbp@spacebar.chat","password":"8.6z64gcjavp1n.uar3qqymwfi.g0sfmmbd9m"},{"email":"94di5zaie4.n1vhzdfsj@spacebar.chat","password":"1e.k3ijylxme1u.e9xr9yqbrk.3tir7qnvh"},{"email":"zbrqft4chj.yl73e5puq3@spacebar.chat","password":"5.nkc3g8cvwl15.dmp8ywmkka.m79e9t4wij"},{"email":"br1wknv7k.6hw6yl69e@spacebar.chat","password":"3.gimzx06u7mh.6rjrdflo9j1t.h3d8k2f5t"},{"email":"cdehs12h6h.iexxvg16xf@spacebar.chat","password":"1i.5ab7e9rtwl1n.31qtfv7cz9.e1k313py9"},{"email":"pazx37jpra.mgsb8k50ip@spacebar.chat","password":"d.eg5dwqvd981e.5qobehiyffe.6k5pb4fqm"},{"email":"vs6k62ak2o.xo1v4w0rj@spacebar.chat","password":"c.hrkcrnlxlg1d.w18ztd39d1p.eycgehb49"},{"email":"u5d27rbewm.3p0wa7s899@spacebar.chat","password":"s.1r7o1ur8o9k.puzbm1uuta9.an5m8bhh0a"},{"email":"vyp6x66fr.yv74eftomo@spacebar.chat","password":"m.w0c7h21asf.pq2lj3uot6a.xnhv9ftqii"},{"email":"da0k6sra2n.qts4gs9ufg@spacebar.chat","password":"h.8e42ud5f6r5.896sp1t8y6e.shwe0d8no9"},{"email":"l093koc05n.81vt1v8tsx@spacebar.chat","password":"11.zhkv1jbhdf.0ub2po3mnu.no4lq8l4"},{"email":"115tfo7ct.muvy04u0tf@spacebar.chat","password":"1c.4bpk2a17z1p.gw2h6qmvhez.57drs0quz"},{"email":"dq6bk1hjch.huw092gkhr@spacebar.chat","password":"1l.kp28mclrtee.5i4dmacbpc1j.hcqgemsni"},{"email":"8g8q9v3wmk.l2frwpuds8@spacebar.chat","password":"1n.i0wwg0njmv.teaiqjqalt1g.ib6551nh4"},{"email":"5b3y3neqxa.mmi0ex2hxd@spacebar.chat","password":"8.tvz7q9uw0hm.6ufz6fu65c1a.88vp9di6e"},{"email":"mg28g3krsp.35h1akxrqj@spacebar.chat","password":"s.y8j2n19iffr.qyecyrgo6ig.6hgrc5vy9"},{"email":"ehtumcok2j.2oozlhiq97@spacebar.chat","password":"11.uq0up8g8h1q.ofvjsx29yd.pfwen3kr38"},{"email":"le98rah1uc.au4ug9tpnt@spacebar.chat","password":"t.q15zsc0q2mt.2nj3jsdxhfc.leb9ba1xku"},{"email":"hrroex9f5n.6cl98h3jsi@spacebar.chat","password":"17.qnqqhg2us4.kh92v74atg19.49ufgil7g"},{"email":"w95wrrn48.6gfnue7dcq@spacebar.chat","password":"b.jnqgbi89oj1k.8rn0llovbll.kcblui80th"},{"email":"rqo4n0il5w.4gl1u8hlyc@spacebar.chat","password":"17.41d1lpjmi0.d8ijhslby11w.sjn7sqhi9"},{"email":"6dv3yp4kon.pk7ye6q1r6@spacebar.chat","password":"0.j70py6yysjz.sf56ebpp2gp.z68yo9hiim"},{"email":"knmi9qkige.5v1bg6h09w@spacebar.chat","password":"1d.7n58xntwg1s.umnglex7h13.c5xrsfkosm"},{"email":"cefymgc7te.dd81jabws4@spacebar.chat","password":"1u.73ea7dde1o.0i1fhyaird.sjk30nky1e"},{"email":"33xcwiqf73.r6khs46a7j@spacebar.chat","password":"b.5p5gdmh1891f.11g4590n5a.vfoek6qjb9"},{"email":"9zcgmr84s6.utnlygoubi@spacebar.chat","password":"8.g4v53t7kcl16.wgaiufzgg1u.pusdfdneb"},{"email":"26vpzekrdw.3bwq27wla@spacebar.chat","password":"11.yxey8293lj1d.nxhkju2eke.hl86mcvswd"},{"email":"vvq6w36r84.lr1auhpfc@spacebar.chat","password":"y.7vlqbpftom.6xfrtozd11k.ycf9ifi7o"},{"email":"6ejeiq64yo.zorve5saw4@spacebar.chat","password":"o.eue50qp1frq.qi0rwphg3dv.psph7va2fb"},{"email":"6s0hu88ro8.hsckrmud1i@spacebar.chat","password":"16.fc836nhb91a.ul37503ppg.l62wgser4i"},{"email":"h8qwchz2x9.5br1kcw1iv@spacebar.chat","password":"l.iw1041wgy.6azyc9h6vb.br9cr0dmn8"},{"email":"yx13rst2hu.ybisfdwgv@spacebar.chat","password":"8.5yasf5ba619.ir0toxu251p.tbgwjd18f"},{"email":"1j7vrr1trh.wqj0ozl357@spacebar.chat","password":"1m.iucscoe7b0.6ca1jfaag361.c2trc36mnvk"},{"email":"9w2w572pzr.fv1rk360pp@spacebar.chat","password":"t.labzw6qw8t3.33k42uvhgd1s.e1gj71h14"},{"email":"yf5e43ol4.6509owbcxa@spacebar.chat","password":"12.jewy0uvx1m1m.ce28kht6dk.v2p0bzlvz"},{"email":"gzny2o1re.1xrl0ua7yd@spacebar.chat","password":"h.3valf7r8jh.6bzfr4ions.r4b2mt0l0g"},{"email":"bc77a5kw9v.hu5barps6q@spacebar.chat","password":"1a.jt11azsa81j.4v70jvm9d1o.hflrb1tigk"},{"email":"ltoezpefev.hrvnxmq9ee@spacebar.chat","password":"b.v4f5lqrlc912.dx4dd4xq91v.zj345to03"},{"email":"svcpsuoenk.b8mfqxpbzg@spacebar.chat","password":"1a.7aobev8b4r.xqqfybkcs1t.cjuswku0a"},{"email":"n0mroewqq.svq5iq57pe@spacebar.chat","password":"1l.zxm1xhlavp.65rp7bz57x.01vjajdsc"},{"email":"trly6yupd.dt37kh07dn@spacebar.chat","password":"1i.o2ieg72fz1j.er031tzerx.2ngg4dcvlh"},{"email":"ickkf14cqv.9pu2pnmx7n@spacebar.chat","password":"18.pyhd9ruatl1k.erfchcjc95.wfd67r5e8x"},{"email":"5o4ornfwy9.yabymb8e2k@spacebar.chat","password":"1g.117kmei8df10.cedozr4vee.08te5d44nb"},{"email":"p0ulegfi3.dgmar6qc2v@spacebar.chat","password":"1h.tle7s3ed82.un20o5nv3dk.wnz4w802h8"},{"email":"58gejpvr6v.jolxrsl83p@spacebar.chat","password":"e.ksw14117hbo.f0pgufr3na.ssrjys23al"},{"email":"vf349zeoja.r8bjel59kd@spacebar.chat","password":"1o.79kh6e6glm9.d76d86g1jp16.u37p4jhf7"},{"email":"uc786nn0go.n9ygun6owj@spacebar.chat","password":"m.xo4bwhct5be.lpokbj59w8p.z4l52dzv1r"},{"email":"5jgx24s87u.odlx0bfo0r@spacebar.chat","password":"1k.ni9jyfol7h1g.vczzsa8dbg.r4bhoh5op"},{"email":"2v44408x8l.unfspunnnm@spacebar.chat","password":"16.63njhji5b4.r4xkcf672f1a.x389dr603g"},{"email":"ityj8kcvrm.9djzannsll@spacebar.chat","password":"1p.6jdbhaxiqc.nfnpw7e09g8.967dtt2dy3"},{"email":"8csbvl9qot.28etdf4pf@spacebar.chat","password":"1b.52rdo5qmj3.ta9jw1wm3k9.m96fe27tp"},{"email":"dqndi38hsq.yv77wk3mov@spacebar.chat","password":"k.zpjwpwxmlr1f.tbj03rxayn17.9x451qclu"},{"email":"ohwmvag9j.w6t8ngs4t@spacebar.chat","password":"b.h1ta0mly991q.wzu1ssffyk1h.kc10wt8i2"},{"email":"2mmors2h0w.jwukibc7oi@spacebar.chat","password":"y.xo4kgepqa1t.b77zwt1in5.3um79fx22r"},{"email":"ux0q6gvwnr.gnywxxrsn@spacebar.chat","password":"g.52userbsonu.ny8omqaduf.rvhtwq4jer"},{"email":"0q12b4zet.y87zc04r8r@spacebar.chat","password":"1t.79mg1a9q85.k66wagu67j14.ad0gw3caw"},{"email":"gatbconrvq.dsopxa8fkk@spacebar.chat","password":"1n.fycl7y9roh1p.4yg37pst4k16.votnvabrf"},{"email":"mmp9g1b1v.xz1w4qzxee@spacebar.chat","password":"1k.cjmz3huosl.jh502yz5jf1e.hyce7qc67"},{"email":"5s90s1hbns.b027pfiv3s@spacebar.chat","password":"1l.86ipkmi6fg.scabtvproj4.yw4nb9qui9"},{"email":"l4zrvtrbpb.1r627sllk@spacebar.chat","password":"1l.zzm1dunzzek.10sr7mp01ly.yyrjj1hsli"},{"email":"xih9rwk90i.rmdifv40g@spacebar.chat","password":"15.db9k0pxci1v.hs6l033urm.5a1zv42fhl"},{"email":"55mq93jdq.2dhr1ps4f5@spacebar.chat","password":"i.v5hpg2qez1u.xhs32cwes1h.n10pexmfff"},{"email":"5c0vb38rul.5su27w4pn8@spacebar.chat","password":"12.y87q6jxq41m.qgiji2j0hm.gmy2wuavc"},{"email":"qjk2eoqeqq.ljq4dig10o@spacebar.chat","password":"0.lpu8eio3hra12.mq8qcehpe1e.77p7zilh4"},{"email":"b45ltbf5d.o4oouuik1e@spacebar.chat","password":"1u.wb7hn2b1x1k.jys5p3ri4j.9ew9jab3ll"},{"email":"1mw205tjri.gpi2h76eps@spacebar.chat","password":"1g.kyh53pnamd13.5yufexmyv1h.r56pmhm7i"},{"email":"8y0psdjq2s.ifqyimhnkj@spacebar.chat","password":"1d.fi03hlwk41u.b89w0vrd712.ljudzvdo6"},{"email":"ls73glp0q9.3rtqyb262@spacebar.chat","password":"1.z70c4ef5hfi.fes9zmue2it.5cobkz3ah"},{"email":"ipe2um46bi.in93oau1l@spacebar.chat","password":"5.a5he7keuru1n.l05ivx4n24.piohqdy51w"},{"email":"mt16ta8diq.krypy2t9cv@spacebar.chat","password":"n.zk4goctn5p3.r1fhllqy1m1p.ni2q3y68w"},{"email":"qehwflm0ja.x5uvmxgfle@spacebar.chat","password":"1e.r2sj0uimq1f.nmtozr8qd1s.xgvz4d62b"},{"email":"0ppn1iwd6.ivrqbvn17i@spacebar.chat","password":"1n.fr6x1pbzjl.c8xwipgo6c.m1me2h2g58"},{"email":"xiiq47ofev.u9z0gndxs6@spacebar.chat","password":"1t.7tfe0181ij.jbznx5eebs.ytm50kp5qf"},{"email":"kqhk3lt2mo.o4y7u23zbu@spacebar.chat","password":"1b.bkoqmxjcf1l.c5q9oneuz1u.00x93z7l4"},{"email":"ri64c5o5zn.o429slph64@spacebar.chat","password":"1r.mre2hu1gpu.401xyxa6eu.j98cetaplg"},{"email":"j5jpukoktw.q5bseyjfu@spacebar.chat","password":"h.k1ar11fpx1m.n50t8tz4k4.9oj17rtdjw"},{"email":"cg8gyuhu16.jezv2bo8n@spacebar.chat","password":"1c.vyfo117pd1b.hxlc7e9zve.j6ej7ho2rk"},{"email":"7ngysyss7w.yjy0whd5fh@spacebar.chat","password":"12.pl4jjp66wi1r.xx7s13gsgy.v2slv2vyx"},{"email":"7uhylwdaiq.w557htx0x@spacebar.chat","password":"1j.icm6w8m4mh.4qyoql77m8.ar8kliax0s"},{"email":"y6yn1ckm1e.7xxizerecm@spacebar.chat","password":"1e.om7n18zisn1w.usblhxf4p1m.r9ke41xox"},{"email":"uwdsktqhuw.4vmh5gmg7d@spacebar.chat","password":"6.cdte4bk24b16.cf1sbtxlx1o.n62w4weh9"},{"email":"8v1nt755y.w0y1jgfcgm@spacebar.chat","password":"f.ozxpvznxj41o.bs5s5dhua1l.ffayy0gsy"},{"email":"rmy9b61cij.qir0bjorcm@spacebar.chat","password":"1h.bxjxpx0u6f13.e97yh8g761c.j8zog74iql"},{"email":"93ir0yiyi9.1f7bfzt3fb@spacebar.chat","password":"18.vky28kwlw14.w1wsoyu6c15.yhxbr725xe"},{"email":"g0kqw9plr.v2zcovhyg6@spacebar.chat","password":"1r.3txq1jt4zl1d.ha0ejtekjh.xhjl9e6vqg"},{"email":"xmk2q5zxa.v1ka9gm3a8@spacebar.chat","password":"1l.ryvykh3ihm16.rxea04ifq0.h14sz83yisv"},{"email":"mqt2bmltj9.53o16bc6xn@spacebar.chat","password":"i.vt66ajtme1f.lllyzaprk16.yb0yh0o1z"},{"email":"4kvjyddsv.7u7lmex2df@spacebar.chat","password":"1i.axaegtd0qz.2yvfr5n261g.8s8fprsd8"},{"email":"yigntcopcc.8bchnlmclm@spacebar.chat","password":"n.b5yn5xried1d.siep9e4fb1t.h6s6erw5t"},{"email":"meubr1b03t.t97015wih6@spacebar.chat","password":"5.wu3izi2gyqi.iurx5qpp7l.znq1htzuel"},{"email":"xz3gta0hi.1x5o83xyee@spacebar.chat","password":"14.uafjiryde3.oin9k24w3510.vkjmjleb4i"},{"email":"9jkrkk9r6o.6ossrgj919@spacebar.chat","password":"v.u9531wtw2o11.151eg145bf.bk57nd0s6u"},{"email":"kf9fdmnacv.67shfcubvn@spacebar.chat","password":"1i.7f1olv2hkt.v2cso7zxlfw.8ylhl33g1"},{"email":"k8zuiett0r.0w299k0t9j@spacebar.chat","password":"t.1mrpwsil15.999lbrfvz1h.7od0kjlxo"},{"email":"8m9rt3vgg.vkpf6apx9@spacebar.chat","password":"1n.2ohz11tk412.5ezp8ujcwn8.rvqqrozh9s"},{"email":"rfavhpnhc.6xwy7o3ulm@spacebar.chat","password":"11.ikd54271zj.vq3brjark7.h1ryvz7ap8"},{"email":"6zmju5azrd.4bes4a3cq@spacebar.chat","password":"5.litb6taajto.ownyp3uhjkh.f543o47uc9"},{"email":"ml5pst7t3g.kbvn8b1vg@spacebar.chat","password":"1q.co2aumj6fw.fa18frro5e.vnpotfg209"},{"email":"kaa1r6srjs.wjriguic5e@spacebar.chat","password":"y.y635jqxai9.s4hcd1weni5.51i7z3c26r"},{"email":"n09uhfkuc5.9aqau9qyk@spacebar.chat","password":"1f.wtjqoqzdwg6.mfvvtcwtx91t.8ujt3pwx4"},{"email":"6y5y3px9oa.4183pg5aq6@spacebar.chat","password":"11.8a00uh75g1i.d462wzpqv1t.dnd8sdvr"},{"email":"aqdzadem03.f8uv1m4zv4@spacebar.chat","password":"4.4ndx89thn53.afcjfzjqe51o.ivaemdp5hf"},{"email":"oqv3944yav.31ccatif3r@spacebar.chat","password":"1w.9cstqu9o21f.p40uqca3vl19.iqnn79lqde"},{"email":"akzyzmigv.9c6w5aj4o@spacebar.chat","password":"m.m382wa8nznr.szvso4c03ke.ttw2jhnwh8"},{"email":"13dqfm57jo.e05e711ggt@spacebar.chat","password":"1b.t1b51jt7lf.rhi4j32rw91u.0foqthilf"},{"email":"3derfs5v66.s2kbedbm3o@spacebar.chat","password":"t.e153si8xso1m.9rv9il857fd.e3i0di3ope"},{"email":"92k9vmws7.dt9mvv6ijh@spacebar.chat","password":"1r.r8oy0su9c1e.irtwz9gdna.3fddwt8k4n"},{"email":"w1huzvblr.q9qp44japt@spacebar.chat","password":"1v.dfdr92srfs.3x2wd25frh15.z73xb3vol"},{"email":"vne3an2fif.32eq9woyl@spacebar.chat","password":"7.lurd6n689ek.sf3gedrf711.5xclyfsn3"},{"email":"298zj4dvxf.5sfh7f2e2m@spacebar.chat","password":"n.1rbv0z54wr1n.nt2041ujks.0gwbe80zyl"},{"email":"ywp1ssr2zh.gl97epixxu@spacebar.chat","password":"1w.gfpvze8vq1p.is7b2795819.4hilzah3"},{"email":"kqzujy4m5j.ocydwl4yyh@spacebar.chat","password":"1c.sqxzxuareez.fgczf2qh3en.yi5vo23phn"},{"email":"ck8n5p7d6d.2vu4cdm6iw@spacebar.chat","password":"1o.g3lq6grnm1t.otf44zgiw1c.jfdgqubfjl"},{"email":"s3vqe9bzj.muec34461t@spacebar.chat","password":"1u.i4u3eidof19.tl8hf5fpdv.mvbij0fdgc"},{"email":"7hedrsktw.oqe4hym4us@spacebar.chat","password":"1j.orlptqc2h.hs6661zehh1r.ngepsoldvf"},{"email":"44tm2rsu6j.oxrw5ib1np@spacebar.chat","password":"1o.n71dxtllrf9.htwjv6fsi81l.5w9pyr8eee"},{"email":"o28saa2e4t.m49530ir45@spacebar.chat","password":"16.z31xrcp6li12.uaklzxvskl.nqyq23zqb"},{"email":"aaz3kkwx2q.u42rdyacy6@spacebar.chat","password":"1k.aohk44bxqkq.6lec7k6yfa14.geiq4ok3b"},{"email":"ntw1oc87mh.js3q1iqxrh@spacebar.chat","password":"15.li45vduoy15.h90fv4ytl1t.3v78qdvcq"},{"email":"cpkgoh313.lkdhhl039a@spacebar.chat","password":"3.fdw00uv0dn1v.qz6frlgeh0.3g0c7xnn9le"},{"email":"wznnajnyww.3f5s5cf0lt@spacebar.chat","password":"4.3d2ro1uvag2.9yum8m4gd5t.yd1zriwovn"},{"email":"odwdxlk49g.m113aywba@spacebar.chat","password":"y.24hnap1ckh.n0q1dtobf717.0tzaopasse"},{"email":"0xt66uuwbs.24qfa4w82q@spacebar.chat","password":"e.3cfcd0usw57.oydvjpl5wm1b.sxnf38ihh"},{"email":"4pxgasro0t.xifcrlp26f@spacebar.chat","password":"1d.oxpqgh8jbgb.6epjawtwga1u.o5d33jm"},{"email":"l202g9q8xo.t4ck4xu44v@spacebar.chat","password":"d.gyul2yhu7h1g.163rzn4kqik.e5qlstdwp"},{"email":"8mwzma33ko.b9on13ypjl@spacebar.chat","password":"b.0sdy90whqr1o.rruwt57r8l14.hjejwclmr"},{"email":"h8dm19fu77.hzpnw8famh@spacebar.chat","password":"s.q49kg1uq8gc.046rudurb1o.2lqegjfds"},{"email":"exkp3ve6z7.mdydbk9jy@spacebar.chat","password":"16.bq8o0d13sd8.tri7wtdjpro.2ebtbyqgtt"},{"email":"n8fe02yphv.huwi91ywha@spacebar.chat","password":"1d.8qp5wkq541k.ulwk4bzjsm19.q3qbxorto"},{"email":"lsslgvrdyb.u86qng3p7o@spacebar.chat","password":"11.9q1m8gwavd.9z3kflcg5k1e.lrux8aqm8"},{"email":"0jur86ya2p.gb26btuz7@spacebar.chat","password":"n.fflp1f1yksg.10rh6etc61.yld8y7u9hi"},{"email":"raseda2c45.vl9resp89r@spacebar.chat","password":"b.6gd8az3ljg.es1yjenqskk.i4i8m466p"},{"email":"jmam7ha069.b96jzg1bkl@spacebar.chat","password":"1f.2z41vc92bo.84f3d3j3gra.5yev9enzv"},{"email":"pp2rki7hjd.a037bg6u6@spacebar.chat","password":"3.nktq53a97c19.khsapwl0wd.ej16kksime"},{"email":"c35l8m3ikr.e7vx8nmbil@spacebar.chat","password":"2.oryjofui8mu.7jes36sirs1u.oclq1geaf"},{"email":"ufhsl7tn5u.j4ey0abswv@spacebar.chat","password":"14.uctn73o6h1n.t75arwloxgf.nvgdr4l41o"},{"email":"8ru4fr2ed.kf8ffg9ko8@spacebar.chat","password":"n.hqxwr2ypwd1l.vu23byfp3c.nzgszptoqk"},{"email":"6gmjeij67o.ep5256bmf@spacebar.chat","password":"1i.237gs5pk5j1w.yvuhvp9ho15.l4qibsw5i"},{"email":"4wrhgqel0w.e0sz7l0zki@spacebar.chat","password":"w.g09qtor0p1g.a5uzjl6u3g17.v3z6rhb9h"},{"email":"3860ixs8g.6pha1slnur@spacebar.chat","password":"m.o7o62cqw3g.wkkaak7zz8.h82m4nenbf"},{"email":"wnnpg8stto.zwsxqfp38i@spacebar.chat","password":"c.k2b6jn1b3r14.ojpvlbxil1r.rpkncuyqp"},{"email":"t04ss33dlw.98dpq7j8rg@spacebar.chat","password":"5.7zgfmumai7.iphztcsjfw1h.sq2kp3j9j"},{"email":"hy53et7kw6.vsku4tebj9@spacebar.chat","password":"3.ayjddj0roe1m.ngz1qajzlgu.xue35w1d1d"},{"email":"252ueajele.j4euv8la1d@spacebar.chat","password":"h.tw1utyw7mh9.ydii1rkvp4.8xafwfxrqd"},{"email":"ye2mi1d86.uqa7ig7qxb@spacebar.chat","password":"j.pn3eoar1ft1e.k8febwch91o.fzau5lnbx"},{"email":"4cq5y22mm8.q33hk612wu@spacebar.chat","password":"1l.7tx03ihc9e1a.3i2l76ur5.28yffumat8"},{"email":"d9op87vvj7.vbu23p4mnq@spacebar.chat","password":"10.z7pgyokesip.0i0axexmwpa.0p5xrlag9k"},{"email":"tnhgsqizxh.14ulf4jinl@spacebar.chat","password":"j.8p0jucy5xk10.creosnkf2o.vzznt05x"},{"email":"8h2h3w3ex5.8ogl7f027n@spacebar.chat","password":"1b.08wkhdm03g3.8hdklh1zj41t.fq57w9raf"},{"email":"ommn4ocwtn.1fkdjbz2v8@spacebar.chat","password":"1e.i8k15b9uk1p.70n34lxbzf.4inv63cwt8"},{"email":"fnxg92zeqn.ljg5uumt3e@spacebar.chat","password":"w.ltho2dsgveu.d1ome2w0x8j.7wr2hq1wk8"},{"email":"lzi8aurosp.mck9i974of@spacebar.chat","password":"u.zezf4qdz2p0.l2g634tak98.ql0n1tg6sq"},{"email":"fdhv4fccm5.o9x209i94g@spacebar.chat","password":"5.2o84u6v43619.4c0c71a9gk7.n9cmjegefv"},{"email":"tuedrm1ajt.bxjgzsyj4s@spacebar.chat","password":"1m.ng2h807gvu.rhd056e6bbb.lkvewwp2tg"},{"email":"488bryb32a.x928qzsf8g@spacebar.chat","password":"y.n2c3x3irffa.fz9xwiimno8.nnpvm280oc"},{"email":"n928oorjaa.kj35rf9p35@spacebar.chat","password":"1l.flvmvopcj16.pmx6n9hi7hi.v9odjzq3at"},{"email":"emzd8qz0f8.b972dvhf0m@spacebar.chat","password":"3.7umgbd5apm18.0n6yi8ol9g.m4607npuc"},{"email":"g7jzdulwv5.0a2wzws2ua@spacebar.chat","password":"10.1u1sac19wkf.lvi2qwfhtq16.8wbdddpms"},{"email":"giuivahumo.7iqapfnbfr@spacebar.chat","password":"q.pzck5qtbype.llhl9ypv6b1e.3dz8gsv0pg"},{"email":"0t84mm2pj9.kycgvqkuag@spacebar.chat","password":"1t.kpvjmvipo14.kwv0np3ordv.ustw31ifu"},{"email":"vx5t6yurg7.pocn2c069m@spacebar.chat","password":"f.gdwgrk0wia1u.7m1ozam0b0.d5y62kwyih5"},{"email":"p7arvq1hha.7wryrvhvl@spacebar.chat","password":"1v.eb62r3rx71h.d3fhbfdxa1l.4gzcu184s"},{"email":"adp64dkhdd.q2nc2qvy3@spacebar.chat","password":"q.96rt5rc517h.3f0foodom4.h1wee4z428"},{"email":"pfhrq2kv8.92dq9bxy8a@spacebar.chat","password":"1g.nfaha2xx7hi.vtng22emxs1l.fpbra2wo6h"},{"email":"jjnysdssoc.eqr6v2pqeo@spacebar.chat","password":"1.112arb9m3cb.w3yfq6ekz1d.keb15ptd5"},{"email":"m5rab6dhrc.p1tnxv9feg@spacebar.chat","password":"1.3guc8m7j0uj4.xphgg3121714.7ii7ah6g7f"},{"email":"zgq1iount.blsiqtyvc6@spacebar.chat","password":"16.dzt6188au1w.ilwc3p3ds17.7j7lcsqur"},{"email":"ix7nx1ce4a.3wj4gs8b7p@spacebar.chat","password":"13.p2v1p2nwa1t.2yarcqsmzk.ay7w9u0p1r"},{"email":"5jh7wm63ug.feyytgy11g@spacebar.chat","password":"10.otpp2mz0smb.uv94hcp26c8.a3nlz16n14"},{"email":"9cd7yy1ps4.jet2fn1fdb@spacebar.chat","password":"9.bjtfocm7zk12.sushyeb1yg.lhtmj6a70t"},{"email":"20u20f6dlk.l8n5tvh2re@spacebar.chat","password":"19.qfrr25rarj.4tzf063a9n4.3i5s3vm30b"},{"email":"b1hnmmwcb.q21mrflg1h@spacebar.chat","password":"3.ysh10ultyjz.nz8azt84216.lxn1kgvly"},{"email":"j7nhj8s2d.aqaeidbi8m@spacebar.chat","password":"g.nlnw7ejuqbz.41exhwj2wiv.1yr0njmd"}] \ No newline at end of file diff --git a/scripts/stresstest/index.js b/scripts/stresstest/index.js index bb8c72e48..d3f2d2ba5 100644 --- a/scripts/stresstest/index.js +++ b/scripts/stresstest/index.js @@ -16,13 +16,15 @@ along with this program. If not, see . */ +/* eslint-env node */ + const register = require("./src/register"); const login = require("./src/login/index"); const config = require("./config.json"); const figlet = require("figlet"); const sendMessage = require("./src/message/send"); const fs = require("fs"); -figlet("Fosscord Stress Test :)", function (err, data) { +figlet("Spacebar Stress Test :)", function (err, data) { if (err) { console.log("Something went wrong..."); console.dir(err); diff --git a/scripts/stresstest/src/register/index.js b/scripts/stresstest/src/register/index.js index f1e56813a..f085386f9 100644 --- a/scripts/stresstest/src/register/index.js +++ b/scripts/stresstest/src/register/index.js @@ -16,6 +16,8 @@ along with this program. If not, see . */ +/* eslint-env node */ + const fetch = require("node-fetch"); const fs = require("fs"); var config = require("../../config.json"); @@ -36,7 +38,7 @@ async function generate() { var body = { fingerprint: "805826570869932034.wR8vi8lGlFBJerErO9LG5NViJFw", email: mail, - username: "Fosscord Stress Test", + username: "Spacebar Stress Test", password: password, invite: config.invite, consent: true, diff --git a/scripts/syncronise.js b/scripts/syncronise.js index 34cd0dddd..5f6987c37 100644 --- a/scripts/syncronise.js +++ b/scripts/syncronise.js @@ -25,6 +25,8 @@ it doesn't break the below, thus we're left with this :sob: */ +/* eslint-env node */ + require("module-alias/register"); require("dotenv").config(); const { initDatabase } = require(".."); diff --git a/src/api/Server.ts b/src/api/Server.ts index 032e923e6..447a48022 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -25,7 +25,7 @@ import { registerRoutes, Sentry, WebAuthn, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; import { Server, ServerOptions } from "lambert-server"; import "missing-native-js-functions"; @@ -38,7 +38,6 @@ import { ErrorHandler } from "./middlewares/ErrorHandler"; import { initRateLimits } from "./middlewares/RateLimit"; import { initTranslation } from "./middlewares/Translation"; import { initInstance } from "./util/handlers/Instance"; -import express from "express"; const PUBLIC_ASSETS_FOLDER = path.join( __dirname, @@ -48,21 +47,21 @@ const PUBLIC_ASSETS_FOLDER = path.join( "public", ); -export type FosscordServerOptions = ServerOptions; +export type SpacebarServerOptions = ServerOptions; declare global { // eslint-disable-next-line @typescript-eslint/no-namespace namespace Express { interface Request { - server: FosscordServer; + server: SpacebarServer; } } } -export class FosscordServer extends Server { - public declare options: FosscordServerOptions; +export class SpacebarServer extends Server { + public declare options: SpacebarServerOptions; - constructor(opts?: Partial) { + constructor(opts?: Partial) { // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore super({ ...opts, errorHandler: false, jsonBody: false }); diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index 400a16f45..09644eeee 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { checkToken, Config, Rights } from "@fosscord/util"; +import { checkToken, Config, Rights } from "@spacebar/util"; import * as Sentry from "@sentry/node"; import { NextFunction, Request, Response } from "express"; import { HTTPError } from "lambert-server"; diff --git a/src/api/middlewares/ErrorHandler.ts b/src/api/middlewares/ErrorHandler.ts index 439fce68d..b8a732989 100644 --- a/src/api/middlewares/ErrorHandler.ts +++ b/src/api/middlewares/ErrorHandler.ts @@ -18,7 +18,7 @@ import { NextFunction, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { ApiError, FieldError } from "@fosscord/util"; +import { ApiError, FieldError } from "@spacebar/util"; const EntityNotFoundErrorRegex = /"(\w+)"/; export function ErrorHandler( diff --git a/src/api/middlewares/RateLimit.ts b/src/api/middlewares/RateLimit.ts index f50d65685..0da292e91 100644 --- a/src/api/middlewares/RateLimit.ts +++ b/src/api/middlewares/RateLimit.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { getIpAdress } from "@fosscord/api"; -import { Config, getRights, listenEvent } from "@fosscord/util"; +import { getIpAdress } from "@spacebar/api"; +import { Config, getRights, listenEvent } from "@spacebar/util"; import { NextFunction, Request, Response, Router } from "express"; import { API_PREFIX_TRAILING_SLASH } from "./Authentication"; @@ -27,7 +27,7 @@ import { API_PREFIX_TRAILING_SLASH } from "./Authentication"; /* ? bucket limit? Max actions/sec per bucket? -(ANSWER: a small fosscord instance might not need a complex rate limiting system) +(ANSWER: a small spacebar instance might not need a complex rate limiting system) TODO: delay database requests to include multiple queries TODO: different for methods (GET/POST) > IP addresses that make too many invalid HTTP requests are automatically and temporarily restricted from accessing the Discord API. Currently, this limit is 10,000 per 10 minutes. An invalid request is one that results in 401, 403, or 429 statuses. diff --git a/src/api/routes/-/healthz.ts b/src/api/routes/-/healthz.ts index 555ccf116..6a2f65de3 100644 --- a/src/api/routes/-/healthz.ts +++ b/src/api/routes/-/healthz.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { getDatabase } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { getDatabase } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/-/readyz.ts b/src/api/routes/-/readyz.ts index 555ccf116..6a2f65de3 100644 --- a/src/api/routes/-/readyz.ts +++ b/src/api/routes/-/readyz.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { getDatabase } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { getDatabase } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/applications/#id/bot/index.ts b/src/api/routes/applications/#id/bot/index.ts index 89e185b41..e3f1832cc 100644 --- a/src/api/routes/applications/#id/bot/index.ts +++ b/src/api/routes/applications/#id/bot/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Application, generateToken, @@ -25,7 +25,7 @@ import { BotModifySchema, handleFile, DiscordApiErrors, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { verifyToken } from "node-2fa"; diff --git a/src/api/routes/applications/#id/entitlements.ts b/src/api/routes/applications/#id/entitlements.ts index fa8609bf9..e88fb7f72 100644 --- a/src/api/routes/applications/#id/entitlements.ts +++ b/src/api/routes/applications/#id/entitlements.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/applications/#id/index.ts b/src/api/routes/applications/#id/index.ts index 1cd792ba7..067f5dad4 100644 --- a/src/api/routes/applications/#id/index.ts +++ b/src/api/routes/applications/#id/index.ts @@ -17,12 +17,12 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Application, DiscordApiErrors, ApplicationModifySchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { verifyToken } from "node-2fa"; import { HTTPError } from "lambert-server"; diff --git a/src/api/routes/applications/#id/skus.ts b/src/api/routes/applications/#id/skus.ts index 973761c31..fcb754237 100644 --- a/src/api/routes/applications/#id/skus.ts +++ b/src/api/routes/applications/#id/skus.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/applications/detectable.ts b/src/api/routes/applications/detectable.ts index 2e9723356..a8e308944 100644 --- a/src/api/routes/applications/detectable.ts +++ b/src/api/routes/applications/detectable.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/applications/index.ts b/src/api/routes/applications/index.ts index c4c2c3260..80a19aa82 100644 --- a/src/api/routes/applications/index.ts +++ b/src/api/routes/applications/index.ts @@ -17,13 +17,13 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Application, ApplicationCreateSchema, trimSpecial, User, -} from "@fosscord/util"; +} from "@spacebar/util"; const router: Router = Router(); diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts index 3a3af3cb2..e240dff2d 100644 --- a/src/api/routes/auth/forgot.ts +++ b/src/api/routes/auth/forgot.ts @@ -16,14 +16,14 @@ along with this program. If not, see . */ -import { getIpAdress, route, verifyCaptcha } from "@fosscord/api"; +import { getIpAdress, route, verifyCaptcha } from "@spacebar/api"; import { Config, Email, FieldErrors, ForgotPasswordSchema, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/auth/generate-registration-tokens.ts b/src/api/routes/auth/generate-registration-tokens.ts index 45ebc2e8c..723875f86 100644 --- a/src/api/routes/auth/generate-registration-tokens.ts +++ b/src/api/routes/auth/generate-registration-tokens.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { route, random } from "@fosscord/api"; -import { Config, ValidRegistrationToken } from "@fosscord/util"; +import { route, random } from "@spacebar/api"; +import { Config, ValidRegistrationToken } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router: Router = Router(); diff --git a/src/api/routes/auth/location-metadata.ts b/src/api/routes/auth/location-metadata.ts index d7c7adf1e..52a45c678 100644 --- a/src/api/routes/auth/location-metadata.ts +++ b/src/api/routes/auth/location-metadata.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { getIpAdress, IPAnalysis } from "@fosscord/api"; +import { route } from "@spacebar/api"; +import { getIpAdress, IPAnalysis } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts index 280d34619..fe0b4f998 100644 --- a/src/api/routes/auth/login.ts +++ b/src/api/routes/auth/login.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { getIpAdress, route, verifyCaptcha } from "@fosscord/api"; +import { getIpAdress, route, verifyCaptcha } from "@spacebar/api"; import { adjustEmail, Config, @@ -26,7 +26,7 @@ import { LoginSchema, User, WebAuthn, -} from "@fosscord/util"; +} from "@spacebar/util"; import bcrypt from "bcrypt"; import crypto from "crypto"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/auth/logout.ts b/src/api/routes/auth/logout.ts index 33ad144ca..51909afac 100644 --- a/src/api/routes/auth/logout.ts +++ b/src/api/routes/auth/logout.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router: Router = Router(); diff --git a/src/api/routes/auth/mfa/totp.ts b/src/api/routes/auth/mfa/totp.ts index 83c4ba56a..2396443d4 100644 --- a/src/api/routes/auth/mfa/totp.ts +++ b/src/api/routes/auth/mfa/totp.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { BackupCode, generateToken, User, TotpSchema } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { BackupCode, generateToken, User, TotpSchema } from "@spacebar/util"; import { verifyToken } from "node-2fa"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/auth/mfa/webauthn.ts b/src/api/routes/auth/mfa/webauthn.ts index 8ffe1ee23..1b3874110 100644 --- a/src/api/routes/auth/mfa/webauthn.ts +++ b/src/api/routes/auth/mfa/webauthn.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { generateToken, SecurityKey, @@ -24,7 +24,7 @@ import { verifyWebAuthnToken, WebAuthn, WebAuthnTotpSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; import { ExpectedAssertionResult } from "fido2-lib"; import { HTTPError } from "lambert-server"; diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts index aa09cf242..430c95326 100644 --- a/src/api/routes/auth/register.ts +++ b/src/api/routes/auth/register.ts @@ -26,14 +26,14 @@ import { adjustEmail, RegisterSchema, ValidRegistrationToken, -} from "@fosscord/util"; +} from "@spacebar/util"; import { route, getIpAdress, IPAnalysis, isProxy, verifyCaptcha, -} from "@fosscord/api"; +} from "@spacebar/api"; import bcrypt from "bcrypt"; import { HTTPError } from "lambert-server"; import { MoreThan } from "typeorm"; @@ -52,7 +52,7 @@ router.post( // They're a one time use token that bypasses registration limits ( rates, disabled reg, etc ) let regTokenUsed = false; if (req.get("Referrer") && req.get("Referrer")?.includes("token=")) { - // eg theyre on https://staging.fosscord.com/register?token=whatever + // eg theyre on https://staging.spacebar.chat/register?token=whatever const token = req.get("Referrer")?.split("token=")[1].split("&")[0]; if (token) { const regToken = await ValidRegistrationToken.findOneOrFail({ diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts index a1fd218fb..852a43c71 100644 --- a/src/api/routes/auth/reset.ts +++ b/src/api/routes/auth/reset.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { checkToken, Config, @@ -25,7 +25,7 @@ import { generateToken, PasswordResetSchema, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts index 1cde3691e..c1afcde9a 100644 --- a/src/api/routes/auth/verify/index.ts +++ b/src/api/routes/auth/verify/index.ts @@ -16,14 +16,14 @@ along with this program. If not, see . */ -import { getIpAdress, route, verifyCaptcha } from "@fosscord/api"; +import { getIpAdress, route, verifyCaptcha } from "@spacebar/api"; import { checkToken, Config, FieldErrors, generateToken, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts index d9751ee74..f2727abd6 100644 --- a/src/api/routes/auth/verify/resend.ts +++ b/src/api/routes/auth/verify/resend.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; -import { Email, User } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Email, User } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/auth/verify/view-backup-codes-challenge.ts b/src/api/routes/auth/verify/view-backup-codes-challenge.ts index e02e41f75..b12719ffd 100644 --- a/src/api/routes/auth/verify/view-backup-codes-challenge.ts +++ b/src/api/routes/auth/verify/view-backup-codes-challenge.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { FieldErrors, User, BackupCodesChallengeSchema } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { FieldErrors, User, BackupCodesChallengeSchema } from "@spacebar/util"; import bcrypt from "bcrypt"; const router = Router(); diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts index 2033e444c..db0d42421 100644 --- a/src/api/routes/channels/#channel_id/index.ts +++ b/src/api/routes/channels/#channel_id/index.ts @@ -25,9 +25,9 @@ import { Recipient, handleFile, ChannelModifySchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); // TODO: delete channel diff --git a/src/api/routes/channels/#channel_id/invites.ts b/src/api/routes/channels/#channel_id/invites.ts index 9bb540267..9f247fe89 100644 --- a/src/api/routes/channels/#channel_id/invites.ts +++ b/src/api/routes/channels/#channel_id/invites.ts @@ -18,8 +18,8 @@ import { Router, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; -import { random } from "@fosscord/api"; +import { route } from "@spacebar/api"; +import { random } from "@spacebar/api"; import { Channel, Invite, @@ -28,7 +28,7 @@ import { User, Guild, PublicInviteRelation, -} from "@fosscord/util"; +} from "@spacebar/util"; import { isTextChannel } from "./messages"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts index 42c1c3465..f098fa8e4 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts @@ -21,9 +21,9 @@ import { getPermission, MessageAckEvent, ReadState, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts index d2ece163c..909a459e7 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts index 62e18be45..cd4b243ee 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts @@ -20,7 +20,7 @@ import { Attachment, Channel, emitEvent, - FosscordApiErrors, + SpacebarApiErrors, getPermission, getRights, Message, @@ -31,11 +31,11 @@ import { uploadFile, MessageCreateSchema, MessageEditSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Response, Request } from "express"; import multer from "multer"; -import { route } from "@fosscord/api"; -import { handleMessage, postHandleMessage } from "@fosscord/api"; +import { route } from "@spacebar/api"; +import { handleMessage, postHandleMessage } from "@spacebar/api"; import { HTTPError } from "lambert-server"; const router = Router(); @@ -163,14 +163,14 @@ router.put( const snowflake = Snowflake.deconstruct(message_id); if (Date.now() < snowflake.timestamp) { // message is in the future - throw FosscordApiErrors.CANNOT_BACKFILL_TO_THE_FUTURE; + throw SpacebarApiErrors.CANNOT_BACKFILL_TO_THE_FUTURE; } const exists = await Message.findOne({ where: { id: message_id, channel_id: channel_id }, }); if (exists) { - throw FosscordApiErrors.CANNOT_REPLACE_BY_BACKFILL; + throw SpacebarApiErrors.CANNOT_REPLACE_BY_BACKFILL; } if (req.file) { diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts index 5f86c966d..eafa70c8f 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts @@ -30,8 +30,8 @@ import { PartialEmoji, PublicUserProjection, User, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Router, Response, Request } from "express"; import { HTTPError } from "lambert-server"; import { In } from "typeorm"; diff --git a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts index d97b97e52..18476d5cf 100644 --- a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts +++ b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts @@ -25,9 +25,9 @@ import { getRights, MessageDeleteBulkEvent, Message, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index b68bbcd46..c871087ac 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -36,9 +36,9 @@ import { Rights, Reaction, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { handleMessage, postHandleMessage, route } from "@fosscord/api"; +import { handleMessage, postHandleMessage, route } from "@spacebar/api"; import multer from "multer"; import { FindManyOptions, FindOperator, LessThan, MoreThan } from "typeorm"; import { URL } from "url"; @@ -146,7 +146,7 @@ router.get("/", async (req: Request, res: Response) => { x.author = User.create({ id: "4", discriminator: "0000", - username: "Fosscord Ghost", + username: "Spacebar Ghost", public_flags: 0, }); x.attachments?.forEach((y: Attachment) => { diff --git a/src/api/routes/channels/#channel_id/permissions.ts b/src/api/routes/channels/#channel_id/permissions.ts index 1794cd9a3..68dbc2f2e 100644 --- a/src/api/routes/channels/#channel_id/permissions.ts +++ b/src/api/routes/channels/#channel_id/permissions.ts @@ -24,11 +24,11 @@ import { Member, Role, ChannelPermissionOverwriteSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Response, Request } from "express"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); // TODO: Only permissions your bot has in the guild or channel can be allowed/denied (unless your bot has a MANAGE_ROLES overwrite in the channel) diff --git a/src/api/routes/channels/#channel_id/pins.ts b/src/api/routes/channels/#channel_id/pins.ts index bd4c6ae27..328209163 100644 --- a/src/api/routes/channels/#channel_id/pins.ts +++ b/src/api/routes/channels/#channel_id/pins.ts @@ -24,9 +24,9 @@ import { Message, MessageUpdateEvent, DiscordApiErrors, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/purge.ts b/src/api/routes/channels/#channel_id/purge.ts index 5ff53129f..c8da67603 100644 --- a/src/api/routes/channels/#channel_id/purge.ts +++ b/src/api/routes/channels/#channel_id/purge.ts @@ -17,7 +17,7 @@ */ import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { isTextChannel } from "./messages"; import { FindManyOptions, Between, Not, FindOperator } from "typeorm"; import { @@ -28,7 +28,7 @@ import { Message, MessageDeleteBulkEvent, PurgeSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Response, Request } from "express"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/recipients.ts b/src/api/routes/channels/#channel_id/recipients.ts index 4cdc55ed1..f1fb48afb 100644 --- a/src/api/routes/channels/#channel_id/recipients.ts +++ b/src/api/routes/channels/#channel_id/recipients.ts @@ -27,8 +27,8 @@ import { PublicUserProjection, Recipient, User, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/typing.ts b/src/api/routes/channels/#channel_id/typing.ts index e697ac96c..6a2fef398 100644 --- a/src/api/routes/channels/#channel_id/typing.ts +++ b/src/api/routes/channels/#channel_id/typing.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { Channel, emitEvent, Member, TypingStartEvent } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Channel, emitEvent, Member, TypingStartEvent } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Router, Request, Response } from "express"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts index d5dd25224..14791a1cb 100644 --- a/src/api/routes/channels/#channel_id/webhooks.ts +++ b/src/api/routes/channels/#channel_id/webhooks.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Channel, Config, @@ -27,10 +27,10 @@ import { Webhook, WebhookCreateSchema, WebhookType, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { isTextChannel } from "./messages/index"; -import { DiscordApiErrors } from "@fosscord/util"; +import { DiscordApiErrors } from "@spacebar/util"; import crypto from "crypto"; const router: Router = Router(); @@ -63,7 +63,7 @@ router.post( // TODO: move this if (name === "clyde") throw new HTTPError("Invalid name", 400); - if (name === "Fosscord Ghost") throw new HTTPError("Invalid name", 400); + if (name === "Spacebar Ghost") throw new HTTPError("Invalid name", 400); if (avatar) avatar = await handleFile(`/avatars/${channel_id}`, avatar); diff --git a/src/api/routes/discoverable-guilds.ts b/src/api/routes/discoverable-guilds.ts index 383fa2980..75eb60887 100644 --- a/src/api/routes/discoverable-guilds.ts +++ b/src/api/routes/discoverable-guilds.ts @@ -16,10 +16,10 @@ along with this program. If not, see . */ -import { Guild, Config } from "@fosscord/util"; +import { Guild, Config } from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Like } from "typeorm"; const router = Router(); diff --git a/src/api/routes/discovery.ts b/src/api/routes/discovery.ts index f9f620fb6..0c8089e47 100644 --- a/src/api/routes/discovery.ts +++ b/src/api/routes/discovery.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Categories } from "@fosscord/util"; +import { Categories } from "@spacebar/util"; import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/download.ts b/src/api/routes/download.ts index 916e9208c..c4eea8e80 100644 --- a/src/api/routes/download.ts +++ b/src/api/routes/download.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { FieldErrors, Release } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { FieldErrors, Release } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/experiments.ts b/src/api/routes/experiments.ts index a29dd8947..cd206d79f 100644 --- a/src/api/routes/experiments.ts +++ b/src/api/routes/experiments.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/gateway/bot.ts b/src/api/routes/gateway/bot.ts index 1cce93b07..243159ec4 100644 --- a/src/api/routes/gateway/bot.ts +++ b/src/api/routes/gateway/bot.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import { Router, Response, Request } from "express"; -import { route, RouteOptions } from "@fosscord/api"; +import { route, RouteOptions } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/gateway/index.ts b/src/api/routes/gateway/index.ts index ee500e9b6..12e969195 100644 --- a/src/api/routes/gateway/index.ts +++ b/src/api/routes/gateway/index.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import { Router, Response, Request } from "express"; -import { route, RouteOptions } from "@fosscord/api"; +import { route, RouteOptions } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/gifs/search.ts b/src/api/routes/gifs/search.ts index d3e8ef1c8..fb99374bc 100644 --- a/src/api/routes/gifs/search.ts +++ b/src/api/routes/gifs/search.ts @@ -19,7 +19,7 @@ import { Router, Response, Request } from "express"; import fetch from "node-fetch"; import ProxyAgent from "proxy-agent"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { getGifApiKey, parseGifResult } from "./trending"; const router = Router(); diff --git a/src/api/routes/gifs/trending-gifs.ts b/src/api/routes/gifs/trending-gifs.ts index a05bc9aa8..238a2abd2 100644 --- a/src/api/routes/gifs/trending-gifs.ts +++ b/src/api/routes/gifs/trending-gifs.ts @@ -19,7 +19,7 @@ import { Router, Response, Request } from "express"; import fetch from "node-fetch"; import ProxyAgent from "proxy-agent"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { getGifApiKey, parseGifResult } from "./trending"; const router = Router(); diff --git a/src/api/routes/gifs/trending.ts b/src/api/routes/gifs/trending.ts index e7b5f2186..5cccdb2d2 100644 --- a/src/api/routes/gifs/trending.ts +++ b/src/api/routes/gifs/trending.ts @@ -19,8 +19,8 @@ import { Router, Response, Request } from "express"; import fetch from "node-fetch"; import ProxyAgent from "proxy-agent"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/guild-recommendations.ts b/src/api/routes/guild-recommendations.ts index c60873862..67f43c140 100644 --- a/src/api/routes/guild-recommendations.ts +++ b/src/api/routes/guild-recommendations.ts @@ -16,10 +16,10 @@ along with this program. If not, see . */ -import { Guild, Config } from "@fosscord/util"; +import { Guild, Config } from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Like } from "typeorm"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/audit-logs.ts b/src/api/routes/guilds/#guild_id/audit-logs.ts index 82c4f2549..5dbb0e3fe 100644 --- a/src/api/routes/guilds/#guild_id/audit-logs.ts +++ b/src/api/routes/guilds/#guild_id/audit-logs.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); //TODO: implement audit logs diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts index 3ecb31c37..31aed6b9f 100644 --- a/src/api/routes/guilds/#guild_id/bans.ts +++ b/src/api/routes/guilds/#guild_id/bans.ts @@ -27,9 +27,9 @@ import { Member, BanRegistrySchema, BanModeratorSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { getIpAdress, route } from "@fosscord/api"; +import { getIpAdress, route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts index 0f6225d7c..d74d9f840 100644 --- a/src/api/routes/guilds/#guild_id/channels.ts +++ b/src/api/routes/guilds/#guild_id/channels.ts @@ -23,9 +23,9 @@ import { emitEvent, ChannelModifySchema, ChannelReorderSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/guilds/#guild_id/delete.ts b/src/api/routes/guilds/#guild_id/delete.ts index 184e17988..ec72a4aed 100644 --- a/src/api/routes/guilds/#guild_id/delete.ts +++ b/src/api/routes/guilds/#guild_id/delete.ts @@ -16,10 +16,10 @@ along with this program. If not, see . */ -import { emitEvent, GuildDeleteEvent, Guild } from "@fosscord/util"; +import { emitEvent, GuildDeleteEvent, Guild } from "@spacebar/util"; import { Router, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/discovery-requirements.ts b/src/api/routes/guilds/#guild_id/discovery-requirements.ts index badde8781..5e15676ae 100644 --- a/src/api/routes/guilds/#guild_id/discovery-requirements.ts +++ b/src/api/routes/guilds/#guild_id/discovery-requirements.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/emojis.ts b/src/api/routes/guilds/#guild_id/emojis.ts index 85fcabc11..c661202ee 100644 --- a/src/api/routes/guilds/#guild_id/emojis.ts +++ b/src/api/routes/guilds/#guild_id/emojis.ts @@ -29,8 +29,8 @@ import { User, EmojiCreateSchema, EmojiModifySchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/index.ts b/src/api/routes/guilds/#guild_id/index.ts index 494933427..672bc92e7 100644 --- a/src/api/routes/guilds/#guild_id/index.ts +++ b/src/api/routes/guilds/#guild_id/index.ts @@ -27,10 +27,10 @@ import { handleFile, Member, GuildUpdateSchema, - FosscordApiErrors, -} from "@fosscord/util"; + SpacebarApiErrors, +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); @@ -113,7 +113,7 @@ router.patch( for (const feature of diff) { if (MUTABLE_FEATURES.includes(feature)) continue; - throw FosscordApiErrors.FEATURE_IS_IMMUTABLE.withParams( + throw SpacebarApiErrors.FEATURE_IS_IMMUTABLE.withParams( feature, ); } diff --git a/src/api/routes/guilds/#guild_id/integrations.ts b/src/api/routes/guilds/#guild_id/integrations.ts index d53183289..3d963af13 100644 --- a/src/api/routes/guilds/#guild_id/integrations.ts +++ b/src/api/routes/guilds/#guild_id/integrations.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); //TODO: implement integrations list diff --git a/src/api/routes/guilds/#guild_id/invites.ts b/src/api/routes/guilds/#guild_id/invites.ts index 04a89af76..9c4469282 100644 --- a/src/api/routes/guilds/#guild_id/invites.ts +++ b/src/api/routes/guilds/#guild_id/invites.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { Invite, PublicInviteRelation } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Invite, PublicInviteRelation } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/member-verification.ts b/src/api/routes/guilds/#guild_id/member-verification.ts index 7bb46cbc5..242f3684c 100644 --- a/src/api/routes/guilds/#guild_id/member-verification.ts +++ b/src/api/routes/guilds/#guild_id/member-verification.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts index e76c96072..a14691f2b 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts @@ -29,8 +29,8 @@ import { Guild, handleFile, MemberChangeSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts index ac40f0db5..14e7467f4 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { getPermission, Member, PermissionResolvable } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { getPermission, Member, PermissionResolvable } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts index 071883d67..698df88fa 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { Member } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Member } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/members/index.ts b/src/api/routes/guilds/#guild_id/members/index.ts index 87c2af203..f7a55cf14 100644 --- a/src/api/routes/guilds/#guild_id/members/index.ts +++ b/src/api/routes/guilds/#guild_id/members/index.ts @@ -17,8 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { Member, PublicMemberProjection } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Member, PublicMemberProjection } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { MoreThan } from "typeorm"; import { HTTPError } from "lambert-server"; diff --git a/src/api/routes/guilds/#guild_id/messages/search.ts b/src/api/routes/guilds/#guild_id/messages/search.ts index b4869bc09..bc5f1b6e9 100644 --- a/src/api/routes/guilds/#guild_id/messages/search.ts +++ b/src/api/routes/guilds/#guild_id/messages/search.ts @@ -19,8 +19,8 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; -import { getPermission, FieldErrors, Message, Channel } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { getPermission, FieldErrors, Message, Channel } from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { FindManyOptions, In, Like } from "typeorm"; diff --git a/src/api/routes/guilds/#guild_id/premium.ts b/src/api/routes/guilds/#guild_id/premium.ts index 1a3a8497b..7b343daf4 100644 --- a/src/api/routes/guilds/#guild_id/premium.ts +++ b/src/api/routes/guilds/#guild_id/premium.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/subscriptions", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/guilds/#guild_id/profile/index.ts b/src/api/routes/guilds/#guild_id/profile/index.ts index 1511fab4c..8ec22ea41 100644 --- a/src/api/routes/guilds/#guild_id/profile/index.ts +++ b/src/api/routes/guilds/#guild_id/profile/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { emitEvent, GuildMemberUpdateEvent, @@ -24,7 +24,7 @@ import { Member, MemberChangeProfileSchema, OrmUtils, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/prune.ts b/src/api/routes/guilds/#guild_id/prune.ts index e29ef641c..dbed546bc 100644 --- a/src/api/routes/guilds/#guild_id/prune.ts +++ b/src/api/routes/guilds/#guild_id/prune.ts @@ -17,9 +17,9 @@ */ import { Router, Request, Response } from "express"; -import { Guild, Member, Snowflake } from "@fosscord/util"; +import { Guild, Member, Snowflake } from "@spacebar/util"; import { LessThan, IsNull } from "typeorm"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); //Returns all inactive members, respecting role hierarchy diff --git a/src/api/routes/guilds/#guild_id/regions.ts b/src/api/routes/guilds/#guild_id/regions.ts index 83dc9144e..de1e87696 100644 --- a/src/api/routes/guilds/#guild_id/regions.ts +++ b/src/api/routes/guilds/#guild_id/regions.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Guild } from "@fosscord/util"; +import { Guild } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { getVoiceRegions, route, getIpAdress } from "@fosscord/api"; +import { getVoiceRegions, route, getIpAdress } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts index f783e27b6..de3fc35b6 100644 --- a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts @@ -25,8 +25,8 @@ import { emitEvent, handleFile, RoleModifySchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/roles/index.ts b/src/api/routes/guilds/#guild_id/roles/index.ts index 6f3fab48a..f93e93857 100644 --- a/src/api/routes/guilds/#guild_id/roles/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/index.ts @@ -29,8 +29,8 @@ import { RoleModifySchema, RolePositionUpdateSchema, Snowflake, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Not } from "typeorm"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/stickers.ts b/src/api/routes/guilds/#guild_id/stickers.ts index 3d0c494e7..84a236701 100644 --- a/src/api/routes/guilds/#guild_id/stickers.ts +++ b/src/api/routes/guilds/#guild_id/stickers.ts @@ -26,9 +26,9 @@ import { StickerType, uploadFile, ModifyGuildStickerSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import multer from "multer"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts index 8a8c53fec..3bd28e05e 100644 --- a/src/api/routes/guilds/#guild_id/templates.ts +++ b/src/api/routes/guilds/#guild_id/templates.ts @@ -17,10 +17,10 @@ */ import { Request, Response, Router } from "express"; -import { Guild, Template } from "@fosscord/util"; +import { Guild, Template } from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; -import { generateCode } from "@fosscord/api"; +import { route } from "@spacebar/api"; +import { generateCode } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/vanity-url.ts b/src/api/routes/guilds/#guild_id/vanity-url.ts index e97c92c58..c85c943f3 100644 --- a/src/api/routes/guilds/#guild_id/vanity-url.ts +++ b/src/api/routes/guilds/#guild_id/vanity-url.ts @@ -22,9 +22,9 @@ import { Guild, Invite, VanityUrlSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts index 784d7746b..791ac1021 100644 --- a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts +++ b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts @@ -25,8 +25,8 @@ import { VoiceState, VoiceStateUpdateEvent, VoiceStateUpdateSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/webhooks.ts b/src/api/routes/guilds/#guild_id/webhooks.ts index caa252d2b..d58659a41 100644 --- a/src/api/routes/guilds/#guild_id/webhooks.ts +++ b/src/api/routes/guilds/#guild_id/webhooks.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); //TODO: implement webhooks diff --git a/src/api/routes/guilds/#guild_id/welcome-screen.ts b/src/api/routes/guilds/#guild_id/welcome-screen.ts index 938eef098..696e20dbd 100644 --- a/src/api/routes/guilds/#guild_id/welcome-screen.ts +++ b/src/api/routes/guilds/#guild_id/welcome-screen.ts @@ -17,9 +17,9 @@ */ import { Request, Response, Router } from "express"; -import { Guild, Member, GuildUpdateWelcomeScreenSchema } from "@fosscord/util"; +import { Guild, Member, GuildUpdateWelcomeScreenSchema } from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/widget.json.ts b/src/api/routes/guilds/#guild_id/widget.json.ts index 57186e80d..1799f0beb 100644 --- a/src/api/routes/guilds/#guild_id/widget.json.ts +++ b/src/api/routes/guilds/#guild_id/widget.json.ts @@ -17,9 +17,9 @@ */ import { Request, Response, Router } from "express"; -import { Permissions, Guild, Invite, Channel, Member } from "@fosscord/util"; +import { Permissions, Guild, Invite, Channel, Member } from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { random, route } from "@fosscord/api"; +import { random, route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/widget.png.ts b/src/api/routes/guilds/#guild_id/widget.png.ts index e4a7713c8..4e9756030 100644 --- a/src/api/routes/guilds/#guild_id/widget.png.ts +++ b/src/api/routes/guilds/#guild_id/widget.png.ts @@ -19,9 +19,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Request, Response, Router } from "express"; -import { Guild } from "@fosscord/util"; +import { Guild } from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import fs from "fs"; import path from "path"; @@ -58,7 +58,7 @@ router.get("/", route({}), async (req: Request, res: Response) => { const { loadImage } = require("canvas"); const sizeOf = require("image-size"); - // TODO: Widget style templates need Fosscord branding + // TODO: Widget style templates need Spacebar branding const source = path.join( __dirname, "..", diff --git a/src/api/routes/guilds/#guild_id/widget.ts b/src/api/routes/guilds/#guild_id/widget.ts index c8b47c4f1..77af25dcf 100644 --- a/src/api/routes/guilds/#guild_id/widget.ts +++ b/src/api/routes/guilds/#guild_id/widget.ts @@ -17,8 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { Guild, WidgetModifySchema } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Guild, WidgetModifySchema } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/index.ts b/src/api/routes/guilds/index.ts index 6b95bd970..c793d185c 100644 --- a/src/api/routes/guilds/index.ts +++ b/src/api/routes/guilds/index.ts @@ -24,8 +24,8 @@ import { Member, DiscordApiErrors, GuildCreateSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts index df753a2ca..bfbb7d3bf 100644 --- a/src/api/routes/guilds/templates/index.ts +++ b/src/api/routes/guilds/templates/index.ts @@ -25,9 +25,9 @@ import { Config, Member, GuildTemplateCreateSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; -import { DiscordApiErrors } from "@fosscord/util"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; +import { DiscordApiErrors } from "@spacebar/util"; import fetch from "node-fetch"; const router: Router = Router(); diff --git a/src/api/routes/invites/index.ts b/src/api/routes/invites/index.ts index 805e5e6e7..6680e3755 100644 --- a/src/api/routes/invites/index.ts +++ b/src/api/routes/invites/index.ts @@ -25,8 +25,8 @@ import { InviteDeleteEvent, User, PublicInviteRelation, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { HTTPError } from "lambert-server"; const router: Router = Router(); diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts index b06be724d..c041f6711 100644 --- a/src/api/routes/oauth2/authorize.ts +++ b/src/api/routes/oauth2/authorize.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { ApiError, Application, @@ -27,7 +27,7 @@ import { Member, Permissions, User, -} from "@fosscord/util"; +} from "@spacebar/util"; const router = Router(); // TODO: scopes, other oauth types diff --git a/src/api/routes/oauth2/tokens.ts b/src/api/routes/oauth2/tokens.ts index cff331374..86290721e 100644 --- a/src/api/routes/oauth2/tokens.ts +++ b/src/api/routes/oauth2/tokens.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/outbound-promotions.ts b/src/api/routes/outbound-promotions.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/outbound-promotions.ts +++ b/src/api/routes/outbound-promotions.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/partners/#guild_id/requirements.ts b/src/api/routes/partners/#guild_id/requirements.ts index badde8781..5e15676ae 100644 --- a/src/api/routes/partners/#guild_id/requirements.ts +++ b/src/api/routes/partners/#guild_id/requirements.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/ping.ts b/src/api/routes/ping.ts index 8deefd328..0fb6d9d0f 100644 --- a/src/api/routes/ping.ts +++ b/src/api/routes/ping.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/policies/instance/domains.ts b/src/api/routes/policies/instance/domains.ts index d97f87110..fe032b50b 100644 --- a/src/api/routes/policies/instance/domains.ts +++ b/src/api/routes/policies/instance/domains.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/policies/instance/index.ts b/src/api/routes/policies/instance/index.ts index 163c9c23f..68ce3b429 100644 --- a/src/api/routes/policies/instance/index.ts +++ b/src/api/routes/policies/instance/index.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/policies/instance/limits.ts b/src/api/routes/policies/instance/limits.ts index 732d8a482..a6f131702 100644 --- a/src/api/routes/policies/instance/limits.ts +++ b/src/api/routes/policies/instance/limits.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/policies/stats.ts b/src/api/routes/policies/stats.ts index 764a57903..3939e1e82 100644 --- a/src/api/routes/policies/stats.ts +++ b/src/api/routes/policies/stats.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Config, getRights, @@ -24,7 +24,7 @@ import { Member, Message, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/read-states/ack-bulk.ts b/src/api/routes/read-states/ack-bulk.ts index cab16c8c0..2c51893b7 100644 --- a/src/api/routes/read-states/ack-bulk.ts +++ b/src/api/routes/read-states/ack-bulk.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { AckBulkSchema, ReadState } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { AckBulkSchema, ReadState } from "@spacebar/util"; const router = Router(); router.post( diff --git a/src/api/routes/scheduled-maintenances/upcoming_json.ts b/src/api/routes/scheduled-maintenances/upcoming_json.ts index b85d85fa8..c1fc0ff39 100644 --- a/src/api/routes/scheduled-maintenances/upcoming_json.ts +++ b/src/api/routes/scheduled-maintenances/upcoming_json.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get( diff --git a/src/api/routes/science.ts b/src/api/routes/science.ts index 52c6d903f..099da18bc 100644 --- a/src/api/routes/science.ts +++ b/src/api/routes/science.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/stage-instances.ts b/src/api/routes/stage-instances.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/stage-instances.ts +++ b/src/api/routes/stage-instances.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/sticker-packs/index.ts b/src/api/routes/sticker-packs/index.ts index d5c6cb11f..234e03c68 100644 --- a/src/api/routes/sticker-packs/index.ts +++ b/src/api/routes/sticker-packs/index.ts @@ -17,8 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; -import { StickerPack } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { StickerPack } from "@spacebar/util"; const router: Router = Router(); diff --git a/src/api/routes/stickers/#sticker_id/index.ts b/src/api/routes/stickers/#sticker_id/index.ts index 0c986320a..360149b59 100644 --- a/src/api/routes/stickers/#sticker_id/index.ts +++ b/src/api/routes/stickers/#sticker_id/index.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Sticker } from "@fosscord/util"; +import { Sticker } from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/stop.ts b/src/api/routes/stop.ts index a1761e671..6a6e6277c 100644 --- a/src/api/routes/stop.ts +++ b/src/api/routes/stop.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/store/published-listings/applications.ts b/src/api/routes/store/published-listings/applications.ts index 483429e5f..5ee63e532 100644 --- a/src/api/routes/store/published-listings/applications.ts +++ b/src/api/routes/store/published-listings/applications.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts b/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts index 5bc36b7a6..a15e0bf71 100644 --- a/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/store/published-listings/skus.ts b/src/api/routes/store/published-listings/skus.ts index 483429e5f..5ee63e532 100644 --- a/src/api/routes/store/published-listings/skus.ts +++ b/src/api/routes/store/published-listings/skus.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts index 4d9f7cacc..4ea35c18a 100644 --- a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/teams.ts b/src/api/routes/teams.ts index bca5b915f..26570165a 100644 --- a/src/api/routes/teams.ts +++ b/src/api/routes/teams.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/template.ts.disabled b/src/api/routes/template.ts.disabled index fcc59ef4d..c9d78a034 100644 --- a/src/api/routes/template.ts.disabled +++ b/src/api/routes/template.ts.disabled @@ -1,7 +1,7 @@ //TODO: this is a template for a generic route import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/",route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/track.ts b/src/api/routes/track.ts index 52c6d903f..099da18bc 100644 --- a/src/api/routes/track.ts +++ b/src/api/routes/track.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/updates.ts b/src/api/routes/updates.ts index 2458871f9..f74038999 100644 --- a/src/api/routes/updates.ts +++ b/src/api/routes/updates.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { FieldErrors, Release } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { FieldErrors, Release } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/users/#id/delete.ts b/src/api/routes/users/#id/delete.ts index df9d1d6a2..e36a35e66 100644 --- a/src/api/routes/users/#id/delete.ts +++ b/src/api/routes/users/#id/delete.ts @@ -16,14 +16,14 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { emitEvent, Member, PrivateUserProjection, User, UserDeleteEvent, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/users/#id/index.ts b/src/api/routes/users/#id/index.ts index 9d418bfde..0c7cfe375 100644 --- a/src/api/routes/users/#id/index.ts +++ b/src/api/routes/users/#id/index.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { User } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { User } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#id/profile.ts index 78e704baa..4727e2151 100644 --- a/src/api/routes/users/#id/profile.ts +++ b/src/api/routes/users/#id/profile.ts @@ -25,8 +25,8 @@ import { PrivateUserProjection, emitEvent, UserUpdateEvent, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts index 241b097d4..dfe52a5ef 100644 --- a/src/api/routes/users/#id/relationships.ts +++ b/src/api/routes/users/#id/relationships.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { User } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { User } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/activities/statistics/applications.ts b/src/api/routes/users/@me/activities/statistics/applications.ts index 222261bfe..5e797ce87 100644 --- a/src/api/routes/users/@me/activities/statistics/applications.ts +++ b/src/api/routes/users/@me/activities/statistics/applications.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/affinities/guilds.ts b/src/api/routes/users/@me/affinities/guilds.ts index 752ab159c..e49661483 100644 --- a/src/api/routes/users/@me/affinities/guilds.ts +++ b/src/api/routes/users/@me/affinities/guilds.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/affinities/users.ts b/src/api/routes/users/@me/affinities/users.ts index dfd847740..76fb8aa64 100644 --- a/src/api/routes/users/@me/affinities/users.ts +++ b/src/api/routes/users/@me/affinities/users.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/applications/#app_id/entitlements.ts b/src/api/routes/users/@me/applications/#app_id/entitlements.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/users/@me/applications/#app_id/entitlements.ts +++ b/src/api/routes/users/@me/applications/#app_id/entitlements.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/billing/country-code.ts b/src/api/routes/users/@me/billing/country-code.ts index ed6c19b9e..2a43a3962 100644 --- a/src/api/routes/users/@me/billing/country-code.ts +++ b/src/api/routes/users/@me/billing/country-code.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/billing/payment-sources.ts b/src/api/routes/users/@me/billing/payment-sources.ts index 222261bfe..5e797ce87 100644 --- a/src/api/routes/users/@me/billing/payment-sources.ts +++ b/src/api/routes/users/@me/billing/payment-sources.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/billing/subscriptions.ts b/src/api/routes/users/@me/billing/subscriptions.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/users/@me/billing/subscriptions.ts +++ b/src/api/routes/users/@me/billing/subscriptions.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/channels.ts b/src/api/routes/users/@me/channels.ts index 3c94826f1..04db4fe9d 100644 --- a/src/api/routes/users/@me/channels.ts +++ b/src/api/routes/users/@me/channels.ts @@ -22,8 +22,8 @@ import { DmChannelDTO, Channel, DmChannelCreateSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/connections.ts b/src/api/routes/users/@me/connections.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/users/@me/connections.ts +++ b/src/api/routes/users/@me/connections.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/delete.ts b/src/api/routes/users/@me/delete.ts index e73a7f459..dce737fc7 100644 --- a/src/api/routes/users/@me/delete.ts +++ b/src/api/routes/users/@me/delete.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { Member, User } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Member, User } from "@spacebar/util"; +import { route } from "@spacebar/api"; import bcrypt from "bcrypt"; import { HTTPError } from "lambert-server"; diff --git a/src/api/routes/users/@me/devices.ts b/src/api/routes/users/@me/devices.ts index 52c6d903f..099da18bc 100644 --- a/src/api/routes/users/@me/devices.ts +++ b/src/api/routes/users/@me/devices.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts index 15e5d9e14..d123a6a18 100644 --- a/src/api/routes/users/@me/disable.ts +++ b/src/api/routes/users/@me/disable.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { User } from "@fosscord/util"; +import { User } from "@spacebar/util"; import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import bcrypt from "bcrypt"; const router = Router(); diff --git a/src/api/routes/users/@me/email-settings.ts b/src/api/routes/users/@me/email-settings.ts index 8d4e78739..4c9e16b14 100644 --- a/src/api/routes/users/@me/email-settings.ts +++ b/src/api/routes/users/@me/email-settings.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/entitlements.ts b/src/api/routes/users/@me/entitlements.ts index ff088314f..7f5526226 100644 --- a/src/api/routes/users/@me/entitlements.ts +++ b/src/api/routes/users/@me/entitlements.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts index 0de574fcb..b16b909dc 100644 --- a/src/api/routes/users/@me/guilds.ts +++ b/src/api/routes/users/@me/guilds.ts @@ -25,9 +25,9 @@ import { GuildMemberRemoveEvent, emitEvent, Config, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/guilds/#guild_id/settings.ts b/src/api/routes/users/@me/guilds/#guild_id/settings.ts index 9cdc90e69..7e9f2a08a 100644 --- a/src/api/routes/users/@me/guilds/#guild_id/settings.ts +++ b/src/api/routes/users/@me/guilds/#guild_id/settings.ts @@ -22,8 +22,8 @@ import { Member, OrmUtils, UserGuildSettingsSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts index 222261bfe..5e797ce87 100644 --- a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts +++ b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index 79bb85f87..b3eeb964f 100644 --- a/src/api/routes/users/@me/index.ts +++ b/src/api/routes/users/@me/index.ts @@ -28,8 +28,8 @@ import { Config, UserModifySchema, generateToken, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import bcrypt from "bcrypt"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/library.ts b/src/api/routes/users/@me/library.ts index eacbd0397..54d9b04fd 100644 --- a/src/api/routes/users/@me/library.ts +++ b/src/api/routes/users/@me/library.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts index e202dc567..69d45e91e 100644 --- a/src/api/routes/users/@me/mfa/codes-verification.ts +++ b/src/api/routes/users/@me/mfa/codes-verification.ts @@ -17,14 +17,14 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { BackupCode, generateMfaBackupCodes, User, CodesVerificationSchema, DiscordApiErrors, -} from "@fosscord/util"; +} from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts index c9f73ce63..4ddbf78eb 100644 --- a/src/api/routes/users/@me/mfa/codes.ts +++ b/src/api/routes/users/@me/mfa/codes.ts @@ -17,14 +17,14 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { BackupCode, FieldErrors, generateMfaBackupCodes, User, MfaCodesSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import bcrypt from "bcrypt"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts index f2a63aab7..9f4064238 100644 --- a/src/api/routes/users/@me/mfa/totp/disable.ts +++ b/src/api/routes/users/@me/mfa/totp/disable.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { verifyToken } from "node-2fa"; import { HTTPError } from "lambert-server"; import { @@ -25,7 +25,7 @@ import { generateToken, BackupCode, TotpDisableSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts index 9baf7657a..4d6b27634 100644 --- a/src/api/routes/users/@me/mfa/totp/enable.ts +++ b/src/api/routes/users/@me/mfa/totp/enable.ts @@ -22,8 +22,8 @@ import { generateToken, generateMfaBackupCodes, TotpEnableSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import bcrypt from "bcrypt"; import { HTTPError } from "lambert-server"; import { verifyToken } from "node-2fa"; diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts index 54c3d9c79..04aca7e48 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; -import { SecurityKey, User } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { SecurityKey, User } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts index 8cc60d58f..29dbb7cf2 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { CreateWebAuthnCredentialSchema, DiscordApiErrors, @@ -28,7 +28,7 @@ import { verifyWebAuthnToken, WebAuthn, WebAuthnPostSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { ExpectedAttestationResult } from "fido2-lib"; diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts index 87d452771..d05c799cd 100644 --- a/src/api/routes/users/@me/notes.ts +++ b/src/api/routes/users/@me/notes.ts @@ -17,8 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; -import { User, Note, emitEvent, Snowflake } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { User, Note, emitEvent, Snowflake } from "@spacebar/util"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index 268e56601..e9ea47e63 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -25,11 +25,11 @@ import { emitEvent, Relationship, Config, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Response, Request } from "express"; import { HTTPError } from "lambert-server"; -import { DiscordApiErrors } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { DiscordApiErrors } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/settings.ts b/src/api/routes/users/@me/settings.ts index e91597e4f..62cfe904f 100644 --- a/src/api/routes/users/@me/settings.ts +++ b/src/api/routes/users/@me/settings.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { User, UserSettingsSchema } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { User, UserSettingsSchema } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/voice/regions.ts b/src/api/routes/voice/regions.ts index 8ff52bcad..59bac07fc 100644 --- a/src/api/routes/voice/regions.ts +++ b/src/api/routes/voice/regions.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { getIpAdress, route } from "@fosscord/api"; -import { getVoiceRegions } from "@fosscord/api"; +import { getIpAdress, route } from "@spacebar/api"; +import { getVoiceRegions } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/start.ts b/src/api/start.ts index 6d35c67b5..088c6f8de 100644 --- a/src/api/start.ts +++ b/src/api/start.ts @@ -23,7 +23,7 @@ process.on("unhandledRejection", console.error); import "missing-native-js-functions"; import { config } from "dotenv"; config(); -import { FosscordServer } from "./Server"; +import { SpacebarServer } from "./Server"; import cluster from "cluster"; import os from "os"; let cores = 1; @@ -48,7 +48,7 @@ if (cluster.isPrimary && process.env.NODE_ENV == "production") { } else { const port = Number(process.env.PORT) || 3001; - const server = new FosscordServer({ port }); + const server = new SpacebarServer({ port }); server.start().catch(console.error); // eslint-disable-next-line @typescript-eslint/ban-ts-comment diff --git a/src/api/util/handlers/Instance.ts b/src/api/util/handlers/Instance.ts index bd9bf3944..ccd56d928 100644 --- a/src/api/util/handlers/Instance.ts +++ b/src/api/util/handlers/Instance.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Session } from "@fosscord/util"; +import { Session } from "@spacebar/util"; export async function initInstance() { // TODO: clean up database and delete tombstone data diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index 65dbcdfe2..6172a3d0c 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -41,10 +41,10 @@ import { Sticker, MessageCreateSchema, EmbedCache, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { In } from "typeorm"; -import { EmbedHandlers } from "@fosscord/api"; +import { EmbedHandlers } from "@spacebar/api"; import * as Sentry from "@sentry/node"; const allow_empty = false; // TODO: check webhook, application, system author, stickers diff --git a/src/api/util/handlers/Voice.ts b/src/api/util/handlers/Voice.ts index 0880ab985..db06bd33c 100644 --- a/src/api/util/handlers/Voice.ts +++ b/src/api/util/handlers/Voice.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import { distanceBetweenLocations, IPAnalysis } from "../utility/ipAddress"; export async function getVoiceRegions(ipAddress: string, vip: boolean) { diff --git a/src/api/util/handlers/route.ts b/src/api/util/handlers/route.ts index b0bc3af79..604df4e99 100644 --- a/src/api/util/handlers/route.ts +++ b/src/api/util/handlers/route.ts @@ -21,7 +21,7 @@ import { DiscordApiErrors, EVENT, FieldErrors, - FosscordApiErrors, + SpacebarApiErrors, getPermission, getRights, normalizeBody, @@ -29,7 +29,7 @@ import { Permissions, RightResolvable, Rights, -} from "@fosscord/util"; +} from "@spacebar/util"; import { NextFunction, Request, Response } from "express"; import { AnyValidateFunction } from "ajv/dist/core"; @@ -91,7 +91,7 @@ export function route(opts: RouteOptions) { req.rights = await getRights(req.user_id); if (!req.rights || !req.rights.has(required)) { - throw FosscordApiErrors.MISSING_RIGHTS.withParams( + throw SpacebarApiErrors.MISSING_RIGHTS.withParams( opts.right as string, ); } diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts index 1e84e31aa..15e3f67f3 100644 --- a/src/api/util/utility/EmbedHandlers.ts +++ b/src/api/util/utility/EmbedHandlers.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config, Embed, EmbedType } from "@fosscord/util"; +import { Config, Embed, EmbedType } from "@spacebar/util"; import fetch, { RequestInit } from "node-fetch"; import * as cheerio from "cheerio"; import probe from "probe-image-size"; @@ -28,7 +28,7 @@ export const DEFAULT_FETCH_OPTIONS: RequestInit = { follow: 1, headers: { "user-agent": - "Mozilla/5.0 (compatible; Fosscord/1.0; +https://github.com/fosscord/fosscord)", + "Mozilla/5.0 (compatible; Spacebar/1.0; +https://github.com/spacebarchat/server)", }, // size: 1024 * 1024 * 5, // grabbed from config later compress: true, @@ -67,7 +67,7 @@ export const getProxyUrl = ( console.log( "[Embeds]", yellow( - "Imagor has not been set up correctly. https://docs.fosscord.com/setup/server/configuration/imagor/", + "Imagor has not been set up correctly. https://docs.spacebar.chat/setup/server/configuration/imagor/", ), ); } diff --git a/src/api/util/utility/RandomInviteID.ts b/src/api/util/utility/RandomInviteID.ts index e3eda6063..926750d35 100644 --- a/src/api/util/utility/RandomInviteID.ts +++ b/src/api/util/utility/RandomInviteID.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Snowflake } from "@fosscord/util"; +import { Snowflake } from "@spacebar/util"; import crypto from "crypto"; // TODO: 'random'? seriously? who named this? diff --git a/src/api/util/utility/String.ts b/src/api/util/utility/String.ts index 7bc752f5d..eef69e39b 100644 --- a/src/api/util/utility/String.ts +++ b/src/api/util/utility/String.ts @@ -18,7 +18,7 @@ import { Request } from "express"; import { ntob } from "./Base64"; -import { FieldErrors } from "@fosscord/util"; +import { FieldErrors } from "@spacebar/util"; export function checkLength( str: string, diff --git a/src/api/util/utility/captcha.ts b/src/api/util/utility/captcha.ts index 28dba44b6..db1b7957a 100644 --- a/src/api/util/utility/captcha.ts +++ b/src/api/util/utility/captcha.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import fetch from "node-fetch"; export interface hcaptchaResponse { @@ -49,7 +49,7 @@ export async function verifyCaptcha(response: string, ip?: string) { if (!service || !secret || !sitekey) throw new Error( - "CAPTCHA is not configured correctly. https://docs.fosscord.com/setup/server/security/captcha/", + "CAPTCHA is not configured correctly. https://docs.spacebar.chat/setup/server/security/captcha/", ); const res = await fetch(verifyEndpoints[service], { diff --git a/src/api/util/utility/ipAddress.ts b/src/api/util/utility/ipAddress.ts index 4ae316fa0..172e9604d 100644 --- a/src/api/util/utility/ipAddress.ts +++ b/src/api/util/utility/ipAddress.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import { Request } from "express"; // use ipdata package instead of simple fetch because of integrated caching import fetch from "node-fetch"; diff --git a/src/api/util/utility/passwordStrength.ts b/src/api/util/utility/passwordStrength.ts index 4f3914c5d..fd627fbf7 100644 --- a/src/api/util/utility/passwordStrength.ts +++ b/src/api/util/utility/passwordStrength.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import "missing-native-js-functions"; const reNUMBER = /[0-9]/g; diff --git a/src/bundle/Server.ts b/src/bundle/Server.ts index 00ced932c..6ba74be62 100644 --- a/src/bundle/Server.ts +++ b/src/bundle/Server.ts @@ -20,12 +20,12 @@ process.on("unhandledRejection", console.error); process.on("uncaughtException", console.error); import http from "http"; -import * as Api from "@fosscord/api"; -import * as Gateway from "@fosscord/gateway"; -import { CDNServer } from "@fosscord/cdn"; +import * as Api from "@spacebar/api"; +import * as Gateway from "@spacebar/gateway"; +import { CDNServer } from "@spacebar/cdn"; import express from "express"; import { green, bold } from "picocolors"; -import { Config, initDatabase, Sentry } from "@fosscord/util"; +import { Config, initDatabase, Sentry } from "@spacebar/util"; const app = express(); const server = http.createServer(); @@ -33,7 +33,7 @@ const port = Number(process.env.PORT) || 3001; const production = process.env.NODE_ENV == "development" ? false : true; server.on("request", app); -const api = new Api.FosscordServer({ server, port, production, app }); +const api = new Api.SpacebarServer({ server, port, production, app }); const cdn = new CDNServer({ server, port, production, app }); const gateway = new Gateway.Server({ server, port, production }); diff --git a/src/bundle/index.ts b/src/bundle/index.ts index 899c6b1f9..c6af4f005 100644 --- a/src/bundle/index.ts +++ b/src/bundle/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -export * from "@fosscord/api"; -export * from "@fosscord/util"; -export * from "@fosscord/gateway"; -export * from "@fosscord/cdn"; +export * from "@spacebar/api"; +export * from "@spacebar/util"; +export * from "@spacebar/gateway"; +export * from "@spacebar/cdn"; diff --git a/src/bundle/start.ts b/src/bundle/start.ts index 96c5ccdfa..df50fd4ca 100644 --- a/src/bundle/start.ts +++ b/src/bundle/start.ts @@ -42,14 +42,14 @@ if (cluster.isPrimary) { console.log( bold(` -███████╗ ██████╗ ███████╗███████╗ ██████╗ ██████╗ ██████╗ ██████╗ -██╔════╝██╔═══██╗██╔════╝██╔════╝██╔════╝██╔═══██╗██╔══██╗██╔══██╗ -█████╗ ██║ ██║███████╗███████╗██║ ██║ ██║██████╔╝██║ ██║ -██╔══╝ ██║ ██║╚════██║╚════██║██║ ██║ ██║██╔══██╗██║ ██║ -██║ ╚██████╔╝███████║███████║╚██████╗╚██████╔╝██║ ██║██████╔╝ -╚═╝ ╚═════╝ ╚══════╝╚══════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚═════╝ +███████╗██████╗ █████╗ ██████╗███████╗██████╗ █████╗ ██████╗ +██╔════╝██╔══██╗██╔══██╗██╔════╝██╔════╝██╔══██╗██╔══██╗██╔══██╗ +███████╗██████╔╝███████║██║ █████╗ ██████╔╝███████║██████╔╝ +╚════██║██╔═══╝ ██╔══██║██║ ██╔══╝ ██╔══██╗██╔══██║██╔══██╗ +███████║██║ ██║ ██║╚██████╗███████╗██████╔╝██║ ██║██║ ██║ +╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ - fosscord-server | ${yellow( + spacebar-server | ${yellow( `Pre-release (${ commit !== null ? commit.slice(0, 7) diff --git a/src/bundle/stats.ts b/src/bundle/stats.ts index 0073515eb..b690eb752 100644 --- a/src/bundle/stats.ts +++ b/src/bundle/stats.ts @@ -33,7 +33,8 @@ export function initStats() { if (process.getuid && process.getuid() === 0) { console.warn( red( - `[Process] Warning fosscord is running as root, this highly discouraged and might expose your system vulnerable to attackers. Please run fosscord as a user without root privileges.`, + `[Process] Warning Spacebar is running as root, this highly discouraged and might expose your system vulnerable to attackers.` + + `Please run Spacebar as a user without root privileges.`, ), ); } diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts index 543c84aea..255452a0b 100644 --- a/src/cdn/Server.ts +++ b/src/cdn/Server.ts @@ -17,7 +17,7 @@ */ import { Server, ServerOptions } from "lambert-server"; -import { Config, initDatabase, registerRoutes, Sentry } from "@fosscord/util"; +import { Config, initDatabase, registerRoutes, Sentry } from "@spacebar/util"; import path from "path"; import avatarsRoute from "./routes/avatars"; import guildProfilesRoute from "./routes/guild-profiles"; diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts index bfbe24894..19bb0b908 100644 --- a/src/cdn/routes/attachments.ts +++ b/src/cdn/routes/attachments.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { Config, Snowflake } from "@fosscord/util"; +import { Config, Snowflake } from "@spacebar/util"; import { storage } from "../util/Storage"; import FileType from "file-type"; import { HTTPError } from "lambert-server"; diff --git a/src/cdn/routes/avatars.ts b/src/cdn/routes/avatars.ts index 6d6f1d8e3..6af3243fa 100644 --- a/src/cdn/routes/avatars.ts +++ b/src/cdn/routes/avatars.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { Config, Snowflake } from "@fosscord/util"; +import { Config, Snowflake } from "@spacebar/util"; import { storage } from "../util/Storage"; import FileType from "file-type"; import { HTTPError } from "lambert-server"; diff --git a/src/cdn/routes/guild-profiles.ts b/src/cdn/routes/guild-profiles.ts index 5fc9519cf..1ee5eecae 100644 --- a/src/cdn/routes/guild-profiles.ts +++ b/src/cdn/routes/guild-profiles.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config, Snowflake } from "@fosscord/util"; +import { Config, Snowflake } from "@spacebar/util"; import crypto from "crypto"; import { Request, Response, Router } from "express"; import FileType from "file-type"; diff --git a/src/cdn/routes/role-icons.ts b/src/cdn/routes/role-icons.ts index 6cc1d8ed4..c7fb6e1a6 100644 --- a/src/cdn/routes/role-icons.ts +++ b/src/cdn/routes/role-icons.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { Config, Snowflake } from "@fosscord/util"; +import { Config, Snowflake } from "@spacebar/util"; import { storage } from "../util/Storage"; import FileType from "file-type"; import { HTTPError } from "lambert-server"; diff --git a/src/gateway/Server.ts b/src/gateway/Server.ts index 82fbe3b42..9fba2d4c5 100644 --- a/src/gateway/Server.ts +++ b/src/gateway/Server.ts @@ -25,7 +25,7 @@ import { initDatabase, initEvent, Sentry, -} from "@fosscord/util"; +} from "@spacebar/util"; import ws from "ws"; import { Connection } from "./events/Connection"; import http from "http"; diff --git a/src/gateway/events/Close.ts b/src/gateway/events/Close.ts index fdb71f335..572037afa 100644 --- a/src/gateway/events/Close.ts +++ b/src/gateway/events/Close.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import { emitEvent, PresenceUpdateEvent, @@ -24,7 +24,7 @@ import { Session, SessionsReplace, User, -} from "@fosscord/util"; +} from "@spacebar/util"; export async function Close(this: WebSocket, code: number, reason: Buffer) { console.log("[WebSocket] closed", code, reason.toString()); diff --git a/src/gateway/events/Connection.ts b/src/gateway/events/Connection.ts index 98ee06ff1..68273ace6 100644 --- a/src/gateway/events/Connection.ts +++ b/src/gateway/events/Connection.ts @@ -18,7 +18,7 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ import WS from "ws"; -import { genSessionId, WebSocket } from "@fosscord/gateway"; +import { genSessionId, WebSocket } from "@spacebar/gateway"; import { Send } from "../util/Send"; import { CLOSECODES, OPCODES } from "../util/Constants"; import { setHeartbeat } from "../util/Heartbeat"; @@ -27,7 +27,7 @@ import { Close } from "./Close"; import { Message } from "./Message"; import { Deflate, Inflate } from "fast-zlib"; import { URL } from "url"; -import { Config, ErlpackType } from "@fosscord/util"; +import { Config, ErlpackType } from "@spacebar/util"; let erlpack: ErlpackType | null = null; try { diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts index 9dca9b33c..457901464 100644 --- a/src/gateway/events/Message.ts +++ b/src/gateway/events/Message.ts @@ -16,11 +16,11 @@ along with this program. If not, see . */ -import { WebSocket, Payload, CLOSECODES, OPCODES } from "@fosscord/gateway"; +import { WebSocket, Payload, CLOSECODES, OPCODES } from "@spacebar/gateway"; import OPCodeHandlers from "../opcodes"; import { check } from "../opcodes/instanceOf"; import WS from "ws"; -import { PayloadSchema, ErlpackType } from "@fosscord/util"; +import { PayloadSchema, ErlpackType } from "@spacebar/util"; import * as Sentry from "@sentry/node"; import BigIntJson from "json-bigint"; import path from "path"; diff --git a/src/gateway/listener/listener.ts b/src/gateway/listener/listener.ts index bd4c0e66d..b624b8e03 100644 --- a/src/gateway/listener/listener.ts +++ b/src/gateway/listener/listener.ts @@ -27,13 +27,13 @@ import { EVENTEnum, Relationship, RelationshipType, -} from "@fosscord/util"; +} from "@spacebar/util"; import { OPCODES } from "../util/Constants"; import { Send } from "../util/Send"; -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import "missing-native-js-functions"; import { Channel as AMQChannel } from "amqplib"; -import { Recipient } from "@fosscord/util"; +import { Recipient } from "@spacebar/util"; // TODO: close connection on Invalidated Token // TODO: check intent diff --git a/src/gateway/opcodes/Heartbeat.ts b/src/gateway/opcodes/Heartbeat.ts index 14fb03a3e..7866c3e91 100644 --- a/src/gateway/opcodes/Heartbeat.ts +++ b/src/gateway/opcodes/Heartbeat.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import { setHeartbeat } from "../util/Heartbeat"; import { Send } from "../util/Send"; diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts index 16ba3f239..d3b55f0a7 100644 --- a/src/gateway/opcodes/Identify.ts +++ b/src/gateway/opcodes/Identify.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket, Payload } from "@fosscord/gateway"; +import { WebSocket, Payload } from "@spacebar/gateway"; import { checkToken, Intents, @@ -43,14 +43,14 @@ import { ReadyGuildDTO, Guild, UserTokenData, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Send } from "../util/Send"; import { CLOSECODES, OPCODES } from "../util/Constants"; import { setupListener } from "../listener/listener"; // import experiments from "./experiments.json"; const experiments: unknown[] = []; import { check } from "./instanceOf"; -import { Recipient } from "@fosscord/util"; +import { Recipient } from "@spacebar/util"; // TODO: user sharding // TODO: check privileged intents, if defined in the config diff --git a/src/gateway/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts index 241a80f2d..3cc2b655d 100644 --- a/src/gateway/opcodes/LazyRequest.ts +++ b/src/gateway/opcodes/LazyRequest.ts @@ -26,14 +26,14 @@ import { LazyRequestSchema, User, Presence, -} from "@fosscord/util"; +} from "@spacebar/util"; import { WebSocket, Payload, handlePresenceUpdate, OPCODES, Send, -} from "@fosscord/gateway"; +} from "@spacebar/gateway"; import { check } from "./instanceOf"; // TODO: only show roles/members that have access to this channel diff --git a/src/gateway/opcodes/PresenceUpdate.ts b/src/gateway/opcodes/PresenceUpdate.ts index d570a1f73..03736263c 100644 --- a/src/gateway/opcodes/PresenceUpdate.ts +++ b/src/gateway/opcodes/PresenceUpdate.ts @@ -16,14 +16,14 @@ along with this program. If not, see . */ -import { WebSocket, Payload } from "@fosscord/gateway"; +import { WebSocket, Payload } from "@spacebar/gateway"; import { emitEvent, PresenceUpdateEvent, Session, User, ActivitySchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { check } from "./instanceOf"; export async function onPresenceUpdate(this: WebSocket, { d }: Payload) { diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts index cb6bff985..304d4b390 100644 --- a/src/gateway/opcodes/RequestGuildMembers.ts +++ b/src/gateway/opcodes/RequestGuildMembers.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; export function onRequestGuildMembers(this: WebSocket) { // return this.close(CLOSECODES.Unknown_error); diff --git a/src/gateway/opcodes/Resume.ts b/src/gateway/opcodes/Resume.ts index 92e9e67c8..3e43d648a 100644 --- a/src/gateway/opcodes/Resume.ts +++ b/src/gateway/opcodes/Resume.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import { Send } from "../util/Send"; export async function onResume(this: WebSocket) { diff --git a/src/gateway/opcodes/VoiceStateUpdate.ts b/src/gateway/opcodes/VoiceStateUpdate.ts index 490831247..ffc143eda 100644 --- a/src/gateway/opcodes/VoiceStateUpdate.ts +++ b/src/gateway/opcodes/VoiceStateUpdate.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Payload, WebSocket } from "@fosscord/gateway"; +import { Payload, WebSocket } from "@spacebar/gateway"; import { genVoiceToken } from "../util/SessionUtils"; import { check } from "./instanceOf"; import { @@ -29,7 +29,7 @@ import { VoiceStateUpdateEvent, VoiceStateUpdateSchema, Region, -} from "@fosscord/util"; +} from "@spacebar/util"; // TODO: check if a voice server is setup // Notice: Bot users respect the voice channel's user limit, if set. diff --git a/src/gateway/opcodes/index.ts b/src/gateway/opcodes/index.ts index d24877f75..cf2338e64 100644 --- a/src/gateway/opcodes/index.ts +++ b/src/gateway/opcodes/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket, Payload } from "@fosscord/gateway"; +import { WebSocket, Payload } from "@spacebar/gateway"; import { onHeartbeat } from "./Heartbeat"; import { onIdentify } from "./Identify"; import { onLazyRequest } from "./LazyRequest"; diff --git a/src/gateway/opcodes/instanceOf.ts b/src/gateway/opcodes/instanceOf.ts index 4ffcaa9ce..39bece16c 100644 --- a/src/gateway/opcodes/instanceOf.ts +++ b/src/gateway/opcodes/instanceOf.ts @@ -17,7 +17,7 @@ */ import { instanceOf } from "lambert-server"; -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import { CLOSECODES } from "../util/Constants"; export function check(this: WebSocket, schema: unknown, data: unknown) { diff --git a/src/gateway/util/Constants.ts b/src/gateway/util/Constants.ts index 5fe2f1513..5c0f134a6 100644 --- a/src/gateway/util/Constants.ts +++ b/src/gateway/util/Constants.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -// import { VoiceOPCodes } from "@fosscord/webrtc"; +// import { VoiceOPCodes } from "@spacebar/webrtc"; export enum OPCODES { Dispatch = 0, diff --git a/src/gateway/util/Send.ts b/src/gateway/util/Send.ts index 6f1c78e1a..57f87d8b2 100644 --- a/src/gateway/util/Send.ts +++ b/src/gateway/util/Send.ts @@ -16,11 +16,11 @@ along with this program. If not, see . */ -import { Payload, WebSocket } from "@fosscord/gateway"; +import { Payload, WebSocket } from "@spacebar/gateway"; import fs from "fs/promises"; import path from "path"; -import { ErlpackType, JSONReplacer } from "@fosscord/util"; +import { ErlpackType, JSONReplacer } from "@spacebar/util"; let erlpack: ErlpackType | null = null; try { erlpack = require("erlpack") as ErlpackType; diff --git a/src/gateway/util/WebSocket.ts b/src/gateway/util/WebSocket.ts index 65c481425..972129c7c 100644 --- a/src/gateway/util/WebSocket.ts +++ b/src/gateway/util/WebSocket.ts @@ -16,10 +16,10 @@ along with this program. If not, see . */ -import { Intents, ListenEventOpts, Permissions } from "@fosscord/util"; +import { Intents, ListenEventOpts, Permissions } from "@spacebar/util"; import WS from "ws"; import { Deflate, Inflate } from "fast-zlib"; -// import { Client } from "@fosscord/webrtc"; +// import { Client } from "@spacebar/webrtc"; export interface WebSocket extends WS { version: number; diff --git a/src/util/config/types/ApiConfiguration.ts b/src/util/config/types/ApiConfiguration.ts index 03717dcff..4d61521af 100644 --- a/src/util/config/types/ApiConfiguration.ts +++ b/src/util/config/types/ApiConfiguration.ts @@ -19,6 +19,5 @@ export class ApiConfiguration { defaultVersion: string = "9"; activeVersions: string[] = ["6", "7", "8", "9"]; - useFosscordEnhancements: boolean = true; endpointPublic: string = "/api"; } diff --git a/src/util/config/types/GeneralConfiguration.ts b/src/util/config/types/GeneralConfiguration.ts index 53cfea5f8..c20fe9a7b 100644 --- a/src/util/config/types/GeneralConfiguration.ts +++ b/src/util/config/types/GeneralConfiguration.ts @@ -16,12 +16,12 @@ along with this program. If not, see . */ -import { Snowflake } from "@fosscord/util"; +import { Snowflake } from "@spacebar/util"; export class GeneralConfiguration { - instanceName: string = "Fosscord Instance"; + instanceName: string = "Spacebar Instance"; instanceDescription: string | null = - "This is a Fosscord instance made in the pre-release days"; + "This is a Spacebar instance made in the pre-release days"; frontPage: string | null = null; tosPage: string | null = null; correspondenceEmail: string | null = null; diff --git a/src/util/config/types/RegionConfiguration.ts b/src/util/config/types/RegionConfiguration.ts index 2d9ff502b..8cd11fc04 100644 --- a/src/util/config/types/RegionConfiguration.ts +++ b/src/util/config/types/RegionConfiguration.ts @@ -19,12 +19,12 @@ import { Region } from "."; export class RegionConfiguration { - default: string = "fosscord"; + default: string = "spacebar"; useDefaultAsOptimal: boolean = true; available: Region[] = [ { - id: "fosscord", - name: "Fosscord", + id: "spacebar", + name: "spacebar", endpoint: "127.0.0.1:3004", vip: false, custom: false, diff --git a/src/util/entities/AuditLog.ts b/src/util/entities/AuditLog.ts index e47f92fbe..b375f771b 100644 --- a/src/util/entities/AuditLog.ts +++ b/src/util/entities/AuditLog.ts @@ -100,7 +100,7 @@ export enum AuditLogEvents { POLICY_CREATE = 140, POLICY_UPDATE = 141, POLICY_DELETE = 142, - MESSAGE_BLOCKED_BY_POLICIES = 143, // in fosscord, blocked messages are stealth-dropped + MESSAGE_BLOCKED_BY_POLICIES = 143, // in spacebar, blocked messages are stealth-dropped // instance policies affecting the guild GUILD_AFFECTED_BY_POLICIES = 216, // message moves diff --git a/src/util/entities/Emoji.ts b/src/util/entities/Emoji.ts index f1bf2d590..0bc2f4231 100644 --- a/src/util/entities/Emoji.ts +++ b/src/util/entities/Emoji.ts @@ -59,5 +59,5 @@ export class Emoji extends BaseClass { roles: string[]; // roles this emoji is whitelisted to (new discord feature?) @Column({ type: "simple-array", nullable: true }) - groups: string[]; // user groups this emoji is whitelisted to (Fosscord extension) + groups: string[]; // user groups this emoji is whitelisted to (Spacebar extension) } diff --git a/src/util/entities/Guild.ts b/src/util/entities/Guild.ts index b1693838d..e84549865 100644 --- a/src/util/entities/Guild.ts +++ b/src/util/entities/Guild.ts @@ -319,7 +319,7 @@ export class Guild extends BaseClass { const guild = await Guild.create({ id: guild_id, - name: body.name || "Fosscord", + name: body.name || "Spacebar", icon: await handleFile(`/icons/${guild_id}`, body.icon as string), owner_id: body.owner_id, // TODO: need to figure out a way for ownerless guilds and multiply-owned guilds presence_count: 0, @@ -346,7 +346,7 @@ export class Guild extends BaseClass { color: 0, hoist: false, managed: false, - // NB: in Fosscord, every role will be non-managed, as we use user-groups instead of roles for managed groups + // NB: in Spacebar, every role will be non-managed, as we use user-groups instead of roles for managed groups mentionable: false, name: "@everyone", permissions: String("2251804225"), diff --git a/src/util/entities/Invite.ts b/src/util/entities/Invite.ts index e5f2e82ca..3019709f3 100644 --- a/src/util/entities/Invite.ts +++ b/src/util/entities/Invite.ts @@ -86,7 +86,7 @@ export class Invite extends BaseClassWithoutId { @ManyToOne(() => User, { onDelete: "CASCADE", }) - target_user?: string; // could be used for "User specific invites" https://github.com/fosscord/fosscord/issues/62 + target_user?: string; // could be used for "User specific invites" https://github.com/spacebarchat/server/issues/326 @Column({ nullable: true }) target_user_type?: number; diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts index 6913a8152..3a0eadc5a 100644 --- a/src/util/interfaces/Event.ts +++ b/src/util/interfaces/Event.ts @@ -40,7 +40,7 @@ import { UserSettings, IReadyGuildDTO, ReadState, -} from "@fosscord/util"; +} from "@spacebar/util"; export interface Event { guild_id?: string; diff --git a/src/util/schemas/ActivitySchema.ts b/src/util/schemas/ActivitySchema.ts index f1a48f44e..f168f9671 100644 --- a/src/util/schemas/ActivitySchema.ts +++ b/src/util/schemas/ActivitySchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Activity, Status } from "@fosscord/util"; +import { Activity, Status } from "@spacebar/util"; export const ActivitySchema = { $afk: Boolean, diff --git a/src/util/schemas/ChannelModifySchema.ts b/src/util/schemas/ChannelModifySchema.ts index 2f6eb7ae7..088ac4597 100644 --- a/src/util/schemas/ChannelModifySchema.ts +++ b/src/util/schemas/ChannelModifySchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { ChannelPermissionOverwriteType, ChannelType } from "@fosscord/util"; +import { ChannelPermissionOverwriteType, ChannelType } from "@spacebar/util"; export interface ChannelModifySchema { /** diff --git a/src/util/schemas/ChannelPermissionOverwriteSchema.ts b/src/util/schemas/ChannelPermissionOverwriteSchema.ts index 18602300e..6e8b3402a 100644 --- a/src/util/schemas/ChannelPermissionOverwriteSchema.ts +++ b/src/util/schemas/ChannelPermissionOverwriteSchema.ts @@ -16,6 +16,6 @@ along with this program. If not, see . */ -import { ChannelPermissionOverwrite } from "@fosscord/util"; +import { ChannelPermissionOverwrite } from "@spacebar/util"; export type ChannelPermissionOverwriteSchema = ChannelPermissionOverwrite; diff --git a/src/util/schemas/GuildUpdateSchema.ts b/src/util/schemas/GuildUpdateSchema.ts index 8fb4127e9..19316380d 100644 --- a/src/util/schemas/GuildUpdateSchema.ts +++ b/src/util/schemas/GuildUpdateSchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { GuildCreateSchema } from "@fosscord/util"; +import { GuildCreateSchema } from "@spacebar/util"; export interface GuildUpdateSchema extends Omit { diff --git a/src/util/schemas/IdentifySchema.ts b/src/util/schemas/IdentifySchema.ts index d2b716eab..fb48c2a47 100644 --- a/src/util/schemas/IdentifySchema.ts +++ b/src/util/schemas/IdentifySchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { ActivitySchema } from "@fosscord/util"; +import { ActivitySchema } from "@spacebar/util"; // TODO: Need a way to allow camalCase and pascal_case without just duplicating the schema diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/util/schemas/MessageCreateSchema.ts index 5b9254574..45cd735e3 100644 --- a/src/util/schemas/MessageCreateSchema.ts +++ b/src/util/schemas/MessageCreateSchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Embed } from "@fosscord/util"; +import { Embed } from "@spacebar/util"; type Attachment = { id: string; diff --git a/src/util/schemas/RelationshipPutSchema.ts b/src/util/schemas/RelationshipPutSchema.ts index 33f827ebf..36d9877d0 100644 --- a/src/util/schemas/RelationshipPutSchema.ts +++ b/src/util/schemas/RelationshipPutSchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { RelationshipType } from "@fosscord/util"; +import { RelationshipType } from "@spacebar/util"; export interface RelationshipPutSchema { type?: RelationshipType; diff --git a/src/util/schemas/UserGuildSettingsSchema.ts b/src/util/schemas/UserGuildSettingsSchema.ts index 967e29de5..c295f7677 100644 --- a/src/util/schemas/UserGuildSettingsSchema.ts +++ b/src/util/schemas/UserGuildSettingsSchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { UserGuildSettings, ChannelOverride } from "@fosscord/util"; +import { UserGuildSettings, ChannelOverride } from "@spacebar/util"; // This sucks. I would use a DeepPartial, my own or typeorms, but they both generate inncorect schema export interface UserGuildSettingsSchema diff --git a/src/util/schemas/UserSettingsSchema.ts b/src/util/schemas/UserSettingsSchema.ts index bad347009..0d23e757f 100644 --- a/src/util/schemas/UserSettingsSchema.ts +++ b/src/util/schemas/UserSettingsSchema.ts @@ -16,6 +16,6 @@ along with this program. If not, see . */ -import { UserSettings } from "@fosscord/util"; +import { UserSettings } from "@spacebar/util"; export type UserSettingsSchema = Omit, "index">; diff --git a/src/util/util/AutoUpdate.ts b/src/util/util/AutoUpdate.ts index 8365d9ae1..1f90a41e5 100644 --- a/src/util/util/AutoUpdate.ts +++ b/src/util/util/AutoUpdate.ts @@ -78,8 +78,8 @@ async function download(url: string, dir: string) { const agent = new ProxyAgent(); const response = await fetch(url, { agent }); const buffer = await response.buffer(); - const tempDir = await fs.mkdtemp("fosscord"); - await fs.writeFile(path.join(tempDir, "Fosscord.zip"), buffer); + const tempDir = await fs.mkdtemp("spacebar"); + await fs.writeFile(path.join(tempDir, "Spacebar.zip"), buffer); } catch (error) { console.error(`[Auto Update] download failed`, error); } diff --git a/src/util/util/Constants.ts b/src/util/util/Constants.ts index 0d1d721e2..d4adb54ec 100644 --- a/src/util/util/Constants.ts +++ b/src/util/util/Constants.ts @@ -1001,9 +1001,9 @@ export const DiscordApiErrors = { }; /** - * An error encountered while performing an API request (Fosscord only). Here are the potential errors: + * An error encountered while performing an API request (Spacebar only). Here are the potential errors: */ -export const FosscordApiErrors = { +export const SpacebarApiErrors = { MANUALLY_TRIGGERED_ERROR: new ApiError( "This is an artificial error", 1, @@ -1101,7 +1101,7 @@ export const FosscordApiErrors = { * The value set for a guild's default message notifications, e.g. `ALL`. Here are the available types: * * ALL * * MENTIONS - * * MUTED (Fosscord extension) + * * MUTED (Spacebar extension) * @typedef {string} DefaultMessageNotifications */ export const DefaultMessageNotifications = ["ALL", "MENTIONS", "MUTED"]; @@ -1110,7 +1110,7 @@ export const DefaultMessageNotifications = ["ALL", "MENTIONS", "MUTED"]; * The value set for a team members's membership state: * * INVITED * * ACCEPTED - * * INSERTED (Fosscord extension) + * * INSERTED (Spacebar extension) * @typedef {string} MembershipStates */ export const MembershipStates = ["INSERTED", "INVITED", "ACCEPTED"]; @@ -1119,7 +1119,7 @@ export const MembershipStates = ["INSERTED", "INVITED", "ACCEPTED"]; * The value set for a webhook's type: * * Incoming * * Channel Follower - * * Custom (Fosscord extension) + * * Custom (Spacebar extension) * @typedef {string} WebhookTypes */ export const WebhookTypes = ["Custom", "Incoming", "Channel Follower"]; diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index e23bb8954..a6b24b3e3 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -83,7 +83,7 @@ export async function initDatabase(): Promise { "[Database]" + red( ` We don't have migrations for DB type '${DatabaseType}'` + - ` To ignore, set DB_SYNC=true in your env. https://docs.fosscord.com/setup/server/configuration/env/`, + ` To ignore, set DB_SYNC=true in your env. https://docs.spacebar.chat/setup/server/configuration/env/`, ), ); process.exit(); diff --git a/src/util/util/MessageFlags.ts b/src/util/util/MessageFlags.ts index 35ba9e2ac..b2ea41d0d 100644 --- a/src/util/util/MessageFlags.ts +++ b/src/util/util/MessageFlags.ts @@ -9,9 +9,9 @@ export class MessageFlags extends BitField { CROSSPOSTED: BigInt(1) << BigInt(0), IS_CROSSPOST: BigInt(1) << BigInt(1), SUPPRESS_EMBEDS: BigInt(1) << BigInt(2), - // SOURCE_MESSAGE_DELETED: BigInt(1) << BigInt(3), // fosscord will delete them from destination too, making this redundant + // SOURCE_MESSAGE_DELETED: BigInt(1) << BigInt(3), // spacebar will delete them from destination too, making this redundant URGENT: BigInt(1) << BigInt(4), - // HAS_THREAD: BigInt(1) << BigInt(5) // does not apply to fosscord due to infrastructural differences + // HAS_THREAD: BigInt(1) << BigInt(5) // does not apply to spacebar due to infrastructural differences PRIVATE_ROUTE: BigInt(1) << BigInt(6), // it that has been routed to only some of the users that can see the channel INTERACTION_WAIT: BigInt(1) << BigInt(7), // discord.com calls this LOADING // FAILED_TO_MENTION_SOME_ROLES_IN_THREAD: BigInt(1) << BigInt(8) diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts index 50e63c5fc..903101764 100644 --- a/src/util/util/Token.ts +++ b/src/util/util/Token.ts @@ -69,7 +69,7 @@ export function checkToken( token = token.replace("Bot ", ""); token = token.replace("Bearer ", ""); /** - in fosscord, even with instances that have bot distinction; we won't enforce "Bot" prefix, + in spacebar, even with instances that have bot distinction; we won't enforce "Bot" prefix, as we don't really have separate pathways for bots **/ diff --git a/src/util/util/email/transports/MailGun.ts b/src/util/util/email/transports/MailGun.ts index f65295185..badc98801 100644 --- a/src/util/util/email/transports/MailGun.ts +++ b/src/util/util/email/transports/MailGun.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import nodemailer from "nodemailer"; export default async function () { diff --git a/src/util/util/email/transports/MailJet.ts b/src/util/util/email/transports/MailJet.ts index 336fa97a6..69be7acfe 100644 --- a/src/util/util/email/transports/MailJet.ts +++ b/src/util/util/email/transports/MailJet.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import nodemailer from "nodemailer"; export default async function () { diff --git a/src/util/util/email/transports/SMTP.ts b/src/util/util/email/transports/SMTP.ts index a6e06e529..5b43a8705 100644 --- a/src/util/util/email/transports/SMTP.ts +++ b/src/util/util/email/transports/SMTP.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import nodemailer from "nodemailer"; export default async function () { diff --git a/src/util/util/email/transports/SendGrid.ts b/src/util/util/email/transports/SendGrid.ts index 1d2e366ce..a863d3ec7 100644 --- a/src/util/util/email/transports/SendGrid.ts +++ b/src/util/util/email/transports/SendGrid.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import nodemailer from "nodemailer"; export default async function () { diff --git a/src/webrtc/Server.ts b/src/webrtc/Server.ts index 8b86236ef..0ba2e41b2 100644 --- a/src/webrtc/Server.ts +++ b/src/webrtc/Server.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { closeDatabase, Config, initDatabase, initEvent } from "@fosscord/util"; +import { closeDatabase, Config, initDatabase, initEvent } from "@spacebar/util"; import dotenv from "dotenv"; import http from "http"; import ws from "ws"; diff --git a/src/webrtc/events/Close.ts b/src/webrtc/events/Close.ts index ba2a31422..7b71e9ce5 100644 --- a/src/webrtc/events/Close.ts +++ b/src/webrtc/events/Close.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; -import { Session } from "@fosscord/util"; +import { WebSocket } from "@spacebar/gateway"; +import { Session } from "@spacebar/util"; export async function onClose(this: WebSocket, code: number, reason: string) { console.log("[WebRTC] closed", code, reason.toString()); diff --git a/src/webrtc/events/Connection.ts b/src/webrtc/events/Connection.ts index d8b4d6830..6c5bab030 100644 --- a/src/webrtc/events/Connection.ts +++ b/src/webrtc/events/Connection.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { CLOSECODES, Send, setHeartbeat, WebSocket } from "@fosscord/gateway"; +import { CLOSECODES, Send, setHeartbeat, WebSocket } from "@spacebar/gateway"; import { IncomingMessage } from "http"; import { URL } from "url"; import WS from "ws"; diff --git a/src/webrtc/events/Message.ts b/src/webrtc/events/Message.ts index dac9095e5..22189e95b 100644 --- a/src/webrtc/events/Message.ts +++ b/src/webrtc/events/Message.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { CLOSECODES, Payload, WebSocket } from "@fosscord/gateway"; +import { CLOSECODES, Payload, WebSocket } from "@spacebar/gateway"; import { Tuple } from "lambert-server"; import OPCodeHandlers from "../opcodes"; import { VoiceOPCodes } from "../util"; diff --git a/src/webrtc/opcodes/BackendVersion.ts b/src/webrtc/opcodes/BackendVersion.ts index b466c3000..60de3e58d 100644 --- a/src/webrtc/opcodes/BackendVersion.ts +++ b/src/webrtc/opcodes/BackendVersion.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Payload, Send, WebSocket } from "@fosscord/gateway"; +import { Payload, Send, WebSocket } from "@spacebar/gateway"; import { VoiceOPCodes } from "../util"; export async function onBackendVersion(this: WebSocket, data: Payload) { diff --git a/src/webrtc/opcodes/Heartbeat.ts b/src/webrtc/opcodes/Heartbeat.ts index 95e991ad2..3d8e187b4 100644 --- a/src/webrtc/opcodes/Heartbeat.ts +++ b/src/webrtc/opcodes/Heartbeat.ts @@ -22,7 +22,7 @@ import { Send, setHeartbeat, WebSocket, -} from "@fosscord/gateway"; +} from "@spacebar/gateway"; import { VoiceOPCodes } from "../util"; export async function onHeartbeat(this: WebSocket, data: Payload) { diff --git a/src/webrtc/opcodes/Identify.ts b/src/webrtc/opcodes/Identify.ts index 9a9904df4..3f65127e1 100644 --- a/src/webrtc/opcodes/Identify.ts +++ b/src/webrtc/opcodes/Identify.ts @@ -16,13 +16,13 @@ along with this program. If not, see . */ -import { CLOSECODES, Payload, Send, WebSocket } from "@fosscord/gateway"; +import { CLOSECODES, Payload, Send, WebSocket } from "@spacebar/gateway"; import { validateSchema, VoiceIdentifySchema, VoiceState, -} from "@fosscord/util"; -import { endpoint, getClients, VoiceOPCodes, PublicIP } from "@fosscord/webrtc"; +} from "@spacebar/util"; +import { endpoint, getClients, VoiceOPCodes, PublicIP } from "@spacebar/webrtc"; import SemanticSDP from "semantic-sdp"; const defaultSDP = require("./sdp.json"); diff --git a/src/webrtc/opcodes/SelectProtocol.ts b/src/webrtc/opcodes/SelectProtocol.ts index 798a1046e..6618d83b4 100644 --- a/src/webrtc/opcodes/SelectProtocol.ts +++ b/src/webrtc/opcodes/SelectProtocol.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Payload, Send, WebSocket } from "@fosscord/gateway"; -import { SelectProtocolSchema, validateSchema } from "@fosscord/util"; -import { endpoint, PublicIP, VoiceOPCodes } from "@fosscord/webrtc"; +import { Payload, Send, WebSocket } from "@spacebar/gateway"; +import { SelectProtocolSchema, validateSchema } from "@spacebar/util"; +import { endpoint, PublicIP, VoiceOPCodes } from "@spacebar/webrtc"; import SemanticSDP, { MediaInfo, SDPInfo } from "semantic-sdp"; export async function onSelectProtocol(this: WebSocket, payload: Payload) { diff --git a/src/webrtc/opcodes/Speaking.ts b/src/webrtc/opcodes/Speaking.ts index dbdbcdaaa..97055e0a2 100644 --- a/src/webrtc/opcodes/Speaking.ts +++ b/src/webrtc/opcodes/Speaking.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Payload, Send, WebSocket } from "@fosscord/gateway"; +import { Payload, Send, WebSocket } from "@spacebar/gateway"; import { getClients, VoiceOPCodes } from "../util"; // {"speaking":1,"delay":5,"ssrc":2805246727} diff --git a/src/webrtc/opcodes/Video.ts b/src/webrtc/opcodes/Video.ts index 8fd6a9e33..3228d4eed 100644 --- a/src/webrtc/opcodes/Video.ts +++ b/src/webrtc/opcodes/Video.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Payload, Send, WebSocket } from "@fosscord/gateway"; -import { validateSchema, VoiceVideoSchema } from "@fosscord/util"; -import { channels, getClients, VoiceOPCodes } from "@fosscord/webrtc"; +import { Payload, Send, WebSocket } from "@spacebar/gateway"; +import { validateSchema, VoiceVideoSchema } from "@spacebar/util"; +import { channels, getClients, VoiceOPCodes } from "@spacebar/webrtc"; import { IncomingStreamTrack, SSRCs } from "medooze-media-server"; import SemanticSDP from "semantic-sdp"; diff --git a/src/webrtc/opcodes/index.ts b/src/webrtc/opcodes/index.ts index f0ee23c46..346810556 100644 --- a/src/webrtc/opcodes/index.ts +++ b/src/webrtc/opcodes/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Payload, WebSocket } from "@fosscord/gateway"; +import { Payload, WebSocket } from "@spacebar/gateway"; import { VoiceOPCodes } from "../util"; import { onBackendVersion } from "./BackendVersion"; import { onHeartbeat } from "./Heartbeat"; diff --git a/src/webrtc/util/MediaServer.ts b/src/webrtc/util/MediaServer.ts index fcc1375d0..0c12876c6 100644 --- a/src/webrtc/util/MediaServer.ts +++ b/src/webrtc/util/MediaServer.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import MediaServer, { IncomingStream, OutgoingStream, diff --git a/tsconfig.json b/tsconfig.json index cecccc55f..63b5e96cb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -34,10 +34,10 @@ "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */, "baseUrl": "./src/", "paths": { - "@fosscord/api*": ["./api"], - "@fosscord/gateway*": ["./gateway"], - "@fosscord/cdn*": ["./cdn"], - "@fosscord/util*": ["./util"] + "@spacebar/api*": ["./api"], + "@spacebar/gateway*": ["./gateway"], + "@spacebar/cdn*": ["./cdn"], + "@spacebar/util*": ["./util"] } /* Specify a set of entries that re-map imports to additional lookup locations. */, // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */