US!|Lp!lLCJTVIC9OiM!f(3(VaO)kMM2ev{S5qBU#Rzv>qbem0Stcu>-nP|m
zvdAA&8ajT_IwF2YVQt)^mNz}1@KMN=2{Yl9BOw&#S5ktJ1@JQYBpkYP+qTe~w#o9;b-sg+OO&E{V(7V^=ZBw^z
z1_ic87xelrhDIMt*Rup(-ON|WGJR}u^B6KqYSx>Y@*f~Ih5g#QJsfVIyf6^iYf7X@
z;Y;qh-l7x|4M;o9dm{VrUpp{ryXVq-re^dy`p0bGf-x_VA*Psu!LTat^(RBe!BbZu
z9rOk>It9b)nt|mWQ`G&kmqZ9RCXh0w-e0i|)A%_P0BQ6ml%^Wg?BxAzw6u;1~(e)2GeohQEK;2{S=+vfgEC-0x_5$$h;
zGi2{N^n~E4P|^v#DEOAwH8O43x7)&>e~p7p;}i`PXDqyLA`>Wc(i7MM>nlAWwzk+{|tr?CymlV6Kl
zR%Nz;9ELhPt=a~%7d>oKK|fwav~Q?z$O&&f|6Pb<=d18;arpp<0w15;>s
zwrC!@Qwh)Eci5<65%027zIzP<-jo?&()sk?+eMM%D%a_HqwDDkx7oVn0GgMK
zdv%2Aea=Ey!&F=65kjmij{zH%4xr@np3d$0iWC));y5^(blfW^B4<~
z(l6*LT%fk?$zD)k@61Zxkf>_qeUw#qRbvgi$O?$N_zM)ppqF#<1CSjOdqYFMia*7`
z{zf;8hv#Q{J)OYrRtG!}_60<)lD`cmBpQ3aW#Xch8J@ulne*tbPBv~{02bG7R1ny$6L&R>pA
zE9!Xpfu)#WCREE4NqGMbHq+4JB0&0j
zZGJ=+WX!f7Wu|a{&PFb=u{+=P-w*&To}Y3lWhYaPL-x^Mvr~~%!8g_ki>MQ^01_5#
z1qtV^wmUdb2S$Yr%+u8kQ0#qq^6VaDH%P=%A*BHT8Fraq}4DQI$
zgVFEjt9I6DFkirJT<5SaS`uXnk^^pkX)e0)ne+hpi^8^JfDR83?5HDTfu0J$d(82O
zH7&;T8&KL++Y>o)CkOH9XV4HK-{Lg=7EJZB01{tp48v%ZI;#M1p=GBc5%0feo339^xWR&6Ys1~9@@^3);kZ`o1
z+Z!^CMi``Zgb~W2jh!
z&8wAzUL5%y6AGgVS+F@uilO^|+u72lPu(Ura^^FJANT$c|8<3SaTObV)t^feumLmg
zm+4EuSnZxQ6T~*Km~4BAH92oRgI$t#zkF(wOj19|uHcguSau50p{2t2>~hGT9soV(
zEbSxD0@mM-Kt~=KD=YfPYtX4h?xP(4wg+Jwj+;Giyng1?B+{h2AeR7t@q^fxd2RRN
zR0E9{9bD1E=kVs?;|pcGUHSm_bk+t%#{DTgz{#pwUcr1;v8tdS_|Zp%Jl7CUFsCLd
zf;`~qMabLPp{5-NJCgTU*XnlCK4)%Z`PkUg1Mrq1msb@KCHW+HqY5gN#5Y-1n&j6H
zLS!FdqvG8SjmZYZ&bL=6uWnby4KxowpOwz>u_pzJB*tjg$i-uyFS@a&aVJDFdlBA6
zkZf%W?f<^A#fbsjxphrP5)-ENCuM|s<+pS&>cv(@0GV$pHFoNY3|)>NGEvCL?xSY_
z?+1m!Ec!wx?KC^1fO}f4R{$6VsEEZa;hPa}WveGCg8)@Yo<_^jdQ)G3PH=~X$PmC*
zjOQbV>_zxqsjwH~iB!JJmJmtEHucP29d%q?2YCVJfZ(?iilN*{-DYtpQ14YusE{S%p&
z@?;TK`cAq@q0c32dKHtm5MTZ{%xoST1+dxqLGOvtqs&r)vcc7O4P$DWG^Wht3Gg1<
z&vw4~!~waw*M`;cw({D$8FMJ%mXj+X_xF(VoLlWv_PBPxWV?w#yzjAS4`yrli`aOD
znmg5jiBT)UvQQjMZlEV6dfGeTrCXb}cVOxjK1sD?M3r;;jya^^H$_%2BBH_efNfwr
zIpo8xFaFv>Naawzl*iS4a3Q*?fd6o(?U8D;&54V?4+A*|!Zl
zmQ;_?iQ>wkX{}Igr>|5heTpU*cdR1EeQJOHpfJl_TR;FvORTtmX0O}$uUQASFWBQ&
zE`Rq9w`FV5)%V+;jV^1
ziAh&!-TV0sYH
z971(?;nafYK68XpCA+9MSO{(1F<4+*^{CPH03I?e?WM9lUAKxcIZC?&EXDe3H(TX*
zFn$td4#ERUfLoV*?sOuKGHpA>cfl2=5UP$iG=ZzPY%7%3JJ;q`3qb8wPGw9kRFY2<
z5l<75h34NEGaz@u%+$svv9kKrEy${NW~+sD%U(|;l2M40O(ag!@C|nbEAm}g!sUr_
zq0u%{`NhMV&xeNAW|rqI9a>G_O>oX2q4)02uxVGjF>KiGQA8WsQwAxyQjI*A$9$p`L{MmHx
z8-m4WxkEQmoR>)G7}HN)hCI3I$p@Nwt7>pR)G^@EN8`c5q|ueZ74)-Rc-ws)vwJ_k
z(y$x|uT`3+N=T%^B3_}&D#>D2ntf7AiiU#_RLHr((8irm@9m|WEvd}wzurT;
z-b(hF2UOO{>_Qo%k-*RN$934|@wmpAloZTqULfL^CpfQrYR_-Eaq-bGIjf%$6?t2L
zl83IRn!0&5GY3ks;S#q1tY_E=yCDLb9Y0S&Q05|UAwTejikgA%e@t`Kr$+L1KeK$~
zoO}U;kl>z&73kdh^fFvnXty@9D2he<;eJ9W&PVvP)al3j=4I=8aT_pnx*+LWf=u0f
zU?K&Tn);du3vGu~P;{38@`=Tc>2;#RFr{~gq>$G(RZYv}N3X$6TsVCasbU_n>484`
z0ukTVErs~|!L@Kz$vB6Ksk_rcdd^%1Xk~O?5
zGqnP~Ix>Kr?KcH{(QnCMd}7)m6{r-pM75X~Q=&#)^+ji9XI>$&iurwWhQSlpOa4gJ
z1AV9`ImTAf{0A=y;zs6s17?47aki#6pfGFYztGobm>i~B-FS*>H`v2+j7m`{(Q^Cr
z`r3w2EpD~NiNeW)k<-sH#ws87`n(x1xPMw7NoQu)=MKf#C9=r~&KhgZ2k+SniqOP0
z^3$}gg${!7;T`37V~5T`u>-V8qL}XtqH=WNN)Ct{EAFnAW6qnewH%mo*PX(fWGUpi>VT0}b#Q|INc5Jv
zEmb+T9q=#5510L2ynJ9v<(KhB>;=&|ftKnj>2aV6yusgS8)kZ-<)s=!%Gi10*|iw6
zaVGuW9WdXf5qjbMvSS3#%~AxJ{pw_N==L?Z&o{^bLPm=HT6`Y;f^OU?}x!
zR%7I)20D|enz&_R)X*4gxUgMan~2dAV{)98Qc86G)Ygf!iS6=PZl7QO{Z+_zGagiD
zs^1qMUPn(Me)^P3vVqd~B}JRUP&#B2`9$E}37Nf=^SiqYs&TB+Z`v--4oJs%S`({0
zq7LqUgfQbmrq4#OBB%P|<}TCad3$aV!e(~TTSv7*tj1~Yrou~Z
z#7cPM*eBK{$FdxMm8vf;YI$vaN?Fp0JFky(X_-I-vJdw_VmAt2bKad-rx84n@4yh^
zbLS$V#P8;Z*7sHjl$ccGPDhh~ix}knI5b4ycr``(L!pHaVb*f)^Y_Vf%(){xdO5j;
z#%U8yQ!TW-o9NF0HTUUd?FyYO%lb#lN?}uM5jvTQHCCw^IuI!AH%#rl;hu|EtpOE0
zs(5_7j5p|MK@EqvxS_>|x-s0(`)xkTDl%{)92Lq`lJyscinE=;*X#ZDZLGK@>w;5D
zn?**QI^@f7m$)o+z4thuN7B0e%h>#jlv;x3tW3v>+@)GVguhW;&AW{4LX)&?!)Ves
zO`AXHGd!op3{5a_zwV=pa|5gzb@C>QK#t98FxRwHX+OBox}*+X*_s&EzHmHrkb5jn
zmOtu=pHk=`$2tX?I!NVJu)B@`N89BT)Pe7#?M<+-tnJT8kyCGy96Ji0(0(;0TyL+l
z+qP-Y&5iZ`Cg|GExtSaO*u~O&+aJbqeu7<23_ByY;1)feaMKZz_}MFU0rTUx1pdTP
zo-;**g|$CjtT(caR#Sr
z>A$sX1PT+a7%!8w`@5vr&0J2G?%p+6=7{fh0S-&p++XL2PPPT%N=BAqss}X@l~)17
z-3MnBbsp8bak)80DrI8*%`m1yWdyHL+BbUHW|o{REt%Tc+^HBo^4VqJ>0$913v+^u
zWSXN0kvCf-QIAhQj)yr|h_7cjVSa-t`qW@8t{3
ztT!;RF#Nvr6gzeQ0>;DBqaYfN{Wc+(oWgP<9v>o|5xYH?&z1pfp~Y(^Z1o1)uL0Te
zrRC}Lu0ZWpDWeA)@}Sy*c`|Uo^z{as}xguQ^+7M*BV?hLoHw}BxB+IClj5)
z?F$J1=Sw0gr)`uYUn24rOIzE1S^J4wT9zUA-*!bc%5CY?$^dHuyf+`K2!xlhP96F6
z*l1b1JwL^o#k{G=;&1%6MoHWZ>WIesfESC7z=1$MPcW`swsds!S`#`OnkP|hpV2v@
z2i9xe_}p|%P~kz(%5c3qzO`8y?ox=54~{o8QOW5PH}a&zCY?`gJUg%gb;+{+N{Jvb
zDUsG&Zkn9_fuVn_SxSQkQmJX3zNuP{>NjMCjI8fq*im$hwn5W=4g9F98u9h8-)aA@
zx>PA>Si$z7Xl@8Cv&K?RY?^(q9Sp&)4|r!LJ=*7BC6bn+JN_M}D^)Kp1n5gJ>`b=3
znXGu!iB+~F}MBu!=@Y@xHr}|sF%LXD2S&yua4Z|9{tJU*xHsxry5su
z$P()&!J=r0Ad_v|gWe@$3FPaPVVBYZdfnU2l-zl-f2GW>o*qJ3Fk`2;G>fkFfj_488$r)79!YB@pNLm_)W
zR`F&{W>oD(J7y;g6bzkZ+&-i5ZViU+mNaKvXN+#NyBS~u!~R?eoWCofseH9~sLP6!
zk+%f-4xNi&qk&ZOBEKa@S?=ijHlY%^ZzDDn8)p5TS$w+6^{>KrRs9c_!8WE}^GN-v
zaI_rz=6JT`3yWSE4=-@SR;5VJYq0$?tZY-`ztn*_r0Lkb$~^XMYvODF=gr1elp7~{
z&8$DAvRXkj;S_`8%U#!ZZ{*c!QG!q&V*>O1)J0J~T7$PERj
zz9G)8_EMbXA$HdPd34-ifVeweKUe5QisS64faAMl>en%+l0YO8Wq=>NrEuOrw~;Pl
zA0wh4L~-qs)kJm$A9VAG`Y2Z@HE?gAQn<^>+U}~*rez6y?n=CGNpY(%ugW56k}c6f
zQb$;l*;eh{cG<{0Ic60feE+=z`{^Z+sPK+f5Cz=6dL>}IdE1%Fcrt((mxyh^pS_Md
z(DyTAOm&?V^p#~jt^C|&RU@^l>lSvf&vS%9#6=;!kP6vwj+NqUNVrp%IaM+qH2;~D
zhOF22`Yy>+@a?QGa`VW2q{Q*6&~6|-!Mu1wVwZ7nX9O}9sJTMP9h6!sT$z24Hv-uC
zrM5WW`lBnmrNn*%C8~<>6!7@OjC-7&sJow<_7Y;ax7w<7!j(2zdZGVm@NlF^-|KfI
zBIa8TIgN1#dB2Xu@$KY81)>(zDv!RgNanSu$Xj(0Q7M_{_rj=h20v-TYpL_y^)$pe
z(?{oKs>VxxDiBacMC`{GUWUFNh1ZeK7egp60{{WP5~0)L@t)0u{-1A`WGL&Q(aqr*
z@AvO_P|+&X1I{RljO)w&Ia&tmJt?+sE+b*H=svW7c~O2fgcb>hh|UeKuD};JyPN|y
zX;xQMnOOc~4DkyQsFn`}c4(!plHm4v*&&3vyIhTm&iif{M*c+I6Mg9sjJ;I9U37fw
z)}8i$?+7T|4()DUc~~OB4_t<*?k%;_nK)}k9DxAy>a$Tb*JfdM4Fen(%}P75|95OA
z@HMg*QDlL8O_5kLdVI!SR^IYPZrGV@{-EQc_|*>~m?ag&&2*7M1XXNr5BsK@kL#@|
zBx`w-q@H9CzDCb6DW-lBEbomoQjmF=jMRhFGDPmm3>yJj
zS&x%rmC9tI*>yB}x?oHhup)Cs$sp7mJp=mA_i4YbjLJhVny^Yu}na_?CIw&0p%~EMIWCmDi=|GVNPtj<|8C2l8>pPP4)fcN~OtSrN6z
z4cO6^Bu%X_NEVY;t#o~rZB1!XB(L7U9jO5uw|CBMsZ5^aC{F*}f?b@|Xl%^V4UH>|
zSaUecPJ2mWo!e^qV=6Loy_mJ&I=3v+i0#)NW6QCBguwZ^gwC-$m->`>z9_Bky`B!!
zTmFX)P!(XM`Kw9<7=regEelIgor-|H4ZmccK6Q(u#fbxkcNNK9Dj<&eAV~wv#9O$K|8AQxSet&DX1bse|28+7
zG5byQt8CdN1y6*K^vJnGdWr|Pi+%JFE8_xg4eKKivB8y**o^op%Iqz)dLgtwwp+ID
zNhOHmijS)>uf1*h#G-Fht!G*%E?PPNhEUCzRyd0@Kj(gn3*uF?#ijEp&)QWQLv4fB
zsDO-jbmaQ$x-{H6QJYlIDO-Av4rTRhcBibp#l=V5`I8P>24kk4>DGuWcaCsRPRC!T
z%i*z*^Fiass_a_29bNY9G%a35uU4-Q>*}aI9snVjmvPq;VoiX9+jKH|akWy{9LC6y
z0&&`NPcH)slaF|_E{e={NZ^Sx65QOd?(gDx#4l083*b2f+QYurtJi#_^J`}p>!Ni|
zuMao{%st2pD_cW2sdJQmPZ!m{qE_^E54GZEIe5`Dg!1;^3M?!)^Dq%aC3XzvVFgBw
zeAeritEbsrTzxYJ65tHeJNG9OVJc^rl^2xfFAe3m;u%P66+X8V%tH7Ssl4>Edj
zAWd_{-KFdhqH6|#X5M0*sy^McZMj+@0wg=Jcmf6aD5p
zcNt6A%AQ%7v$W%7ReXN+Xg_XMCmPh@M3h6kEU5mzjzv^Bn{%TpjbYUL?P+JD!B}T(
z#?Ax5DH62rB`Cn61{JOFxtuVEpp6hh5!y=OO??F_1@+Ka7_#Bzd=HQoOVXG|jV;;}
zFxivu%RXaSFqc*Pz1IfQLN&wwd#%)l`UP=PLG7PHXYkznT6m>yRF4k~(W#!pxvnxS
z_#aQzTRlvKik^ru)-seWmJFJ(GRk%}o%}
zU#!dw^wEFNM{SMiaX-wX{LL-wbgF%QRy86^OvyyJqOYA|L0-n*{?cSW^e-{0u*I5d
z7Wnu2@R<=-^^c2KM1hl$2NH^?*b45Q
z$vBM!aDzT8^3~lY%FdTyo^Asq=%CGbXC|;caw+KAO+o2xm}K
z-|tk_Ef?~YmTX;YB-b)g?^#wj31+U({<48+hgK#-yEiE-*p3ggdaGbJEZC(EO4N{f
zlg)OqBEN#yW=W^C?(JCEI%6jLx^<8f+ljLJtKrFDVXpWLuzALm?i`|ezhe&eg6A7<
zBx3Y;RlfCHsi43a2<1f3?wu3wMxdQ=?O*D-&!%rlNhudc&01X0KydXg4q^O*!I##H
z?V1k@e>P>jA}igJOJpxr(?ETp)B!eM%_K$3S9U5?n7!J9b`?iOm~=5*n4+l5M1d19
zFtLU)|5^nn^+iWR{JJEj7w}%Ce{t*r%l-m}!u=>O`%a};bdh@{{qJwyTfoJYP&g=y
zdegyMnJtZ{p*U~(dpCY3NOl)^ivR!opIP7&51y0RXW@CrtZ*ps)}vdRsyZ*qmCb_x
E2c$r^5C8xG
literal 0
HcmV?d00001
diff --git a/dashboard/src/main.ts b/dashboard/src/main.ts
index fd08c979..e3431bca 100644
--- a/dashboard/src/main.ts
+++ b/dashboard/src/main.ts
@@ -1,3 +1,5 @@
+import "./style/base.scss";
+
import Vue from "vue";
import { RootStore } from "./store";
import { router } from "./routes";
diff --git a/dashboard/src/routes.ts b/dashboard/src/routes.ts
index e203ed57..7157c49d 100644
--- a/dashboard/src/routes.ts
+++ b/dashboard/src/routes.ts
@@ -1,30 +1,37 @@
import Vue from "vue";
import VueRouter, { RouteConfig } from "vue-router";
-import Index from "./components/Index.vue";
+import Splash from "./components/Splash.vue";
import Login from "./components/Login.vue";
import LoginCallback from "./components/LoginCallback.vue";
-import GuildConfigEditor from "./components/GuildConfigEditor.vue";
+import DashboardGuildList from "./components/DashboardGuildList.vue";
+import DashboardGuildConfigEditor from "./components/DashboardGuildConfigEditor.vue";
import Dashboard from "./components/Dashboard.vue";
-import { authGuard, loginCallbackGuard } from "./auth";
+import { authGuard, authRedirectGuard, loginCallbackGuard } from "./auth";
Vue.use(VueRouter);
-const publicRoutes: RouteConfig[] = [
- { path: "/", component: Index },
- { path: "/login", component: Login },
- { path: "/login-callback", beforeEnter: loginCallbackGuard },
-];
-
-const authenticatedRoutes: RouteConfig[] = [
- { path: "/dashboard", component: Dashboard },
- { path: "/dashboard/guilds/:guildId/config", component: GuildConfigEditor },
-];
-
-authenticatedRoutes.forEach(route => {
- route.beforeEnter = authGuard;
-});
-
export const router = new VueRouter({
mode: "history",
- routes: [...publicRoutes, ...authenticatedRoutes],
+ routes: [
+ { path: "/", component: Splash },
+ { path: "/login", beforeEnter: authRedirectGuard },
+ { path: "/login-callback", beforeEnter: loginCallbackGuard },
+
+ // Dashboard
+ {
+ path: "/dashboard",
+ component: Dashboard,
+ beforeEnter: authGuard,
+ children: [
+ {
+ path: "",
+ component: DashboardGuildList,
+ },
+ {
+ path: "guilds/:guildId/config",
+ component: DashboardGuildConfigEditor,
+ },
+ ],
+ },
+ ],
});
diff --git a/dashboard/src/style/base.scss b/dashboard/src/style/base.scss
new file mode 100644
index 00000000..c40f12c3
--- /dev/null
+++ b/dashboard/src/style/base.scss
@@ -0,0 +1,6 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600&display=swap');
+@import "~bulma/sass/base/minireset";
+
+body {
+ font: normal 16px/1.4 'Open Sans', sans-serif;
+}
diff --git a/dashboard/src/style/dark-bulma-variables.scss b/dashboard/src/style/dark-bulma-variables.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/dashboard/src/style/dashboard.scss b/dashboard/src/style/dashboard.scss
new file mode 100644
index 00000000..30219c94
--- /dev/null
+++ b/dashboard/src/style/dashboard.scss
@@ -0,0 +1,5 @@
+$family-primary: 'Open Sans', sans-serif;
+
+@import "~bulmaswatch/superhero/_variables";
+@import "~bulma/bulma";
+@import "~bulmaswatch/superhero/_overrides";
diff --git a/dashboard/src/style/splash.scss b/dashboard/src/style/splash.scss
new file mode 100644
index 00000000..0d5cc145
--- /dev/null
+++ b/dashboard/src/style/splash.scss
@@ -0,0 +1,72 @@
+.splash {
+ width: 100vw;
+ height: 100vh;
+
+ background-color: #7289da;
+ background-image: linear-gradient(225deg, #7289da 0%, #5d70b4 100%);
+ color: #fff;
+
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ a {
+ color: #fff;
+ }
+
+ .wrapper {
+ display: grid;
+ grid-template-columns: auto 400px;
+ grid-template-rows: auto repeat(4, 1fr);
+ align-items: start;
+
+ .logo {
+ grid-column: 1;
+ grid-row: 1/-1; // Span all
+
+ width: 300px;
+ height: 300px;
+ margin-right: 64px;
+ }
+
+ h1 {
+ grid-column: 2;
+
+ font-size: 80px;
+ font-weight: 300;
+ margin-top: 40px
+ }
+
+ .description {
+ grid-column: 2;
+
+ color: #f1f5ff;
+ }
+
+ .actions {
+ grid-column: 2;
+
+ display: flex;
+
+ .btn {
+ margin: 12px;
+ text-decoration: none;
+ padding: 8px 24px;
+ border: 1px solid #fff;
+ border-radius: 4px;
+ transition: all 120ms ease-in-out;
+ background-color: hsla(0, 0%, 100%, 0.05);
+
+ &:not(.disabled):hover {
+ background-color: hsla(0, 0%, 100%, 0.25);
+ box-shadow: 0 3px 12px -2px hsla(0, 0%, 0%, 0.2);
+ }
+
+ &.disabled {
+ cursor: default;
+ opacity: 0.75;
+ }
+ }
+ }
+ }
+}
diff --git a/src/api/archives.ts b/src/api/archives.ts
new file mode 100644
index 00000000..0193ca9a
--- /dev/null
+++ b/src/api/archives.ts
@@ -0,0 +1,34 @@
+import express, { Request, Response } from "express";
+import { GuildArchives } from "../data/GuildArchives";
+import { notFound } from "./responses";
+import moment from "moment-timezone";
+
+export function initArchives(app: express.Express) {
+ const archives = new GuildArchives(null);
+
+ // Legacy redirect
+ app.get("/spam-logs/:id", (req: Request, res: Response) => {
+ res.redirect("/archives/" + req.params.id);
+ });
+
+ app.get("/archives/:id", async (req: Request, res: Response) => {
+ const archive = await archives.find(req.params.id);
+ if (!archive) return notFound(res);
+
+ let body = archive.body;
+
+ // Add some metadata at the end of the log file (but only if it doesn't already have it directly in the body)
+ if (archive.body.indexOf("Log file generated on") === -1) {
+ const createdAt = moment(archive.created_at).format("YYYY-MM-DD [at] HH:mm:ss [(+00:00)]");
+ body += `\n\nLog file generated on ${createdAt}`;
+
+ if (archive.expires_at !== null) {
+ const expiresAt = moment(archive.expires_at).format("YYYY-MM-DD [at] HH:mm:ss [(+00:00)]");
+ body += `\nExpires at ${expiresAt}`;
+ }
+ }
+
+ res.setHeader("Content-Type", "text/plain; charset=UTF-8");
+ res.end(body);
+ });
+}
diff --git a/src/api/auth.ts b/src/api/auth.ts
index e960998d..b4231462 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -2,9 +2,11 @@ import express, { Request, Response } from "express";
import passport from "passport";
import OAuth2Strategy from "passport-oauth2";
import CustomStrategy from "passport-custom";
-import { DashboardLogins, DashboardLoginUserData } from "../data/DashboardLogins";
+import { ApiLogins } from "../data/ApiLogins";
import pick from "lodash.pick";
import https from "https";
+import { ApiUserInfo } from "../data/ApiUserInfo";
+import { ApiUserInfoData } from "../data/entities/ApiUserInfo";
const DISCORD_API_URL = "https://discordapp.com/api";
@@ -53,7 +55,8 @@ export function initAuth(app: express.Express) {
passport.serializeUser((user, done) => done(null, user));
passport.deserializeUser((user, done) => done(null, user));
- const dashboardLogins = new DashboardLogins();
+ const apiLogins = new ApiLogins();
+ const apiUserInfo = new ApiUserInfo();
// Initialize API tokens
passport.use(
@@ -62,7 +65,7 @@ export function initAuth(app: express.Express) {
const apiKey = req.header("X-Api-Key");
if (!apiKey) return cb();
- const userId = await dashboardLogins.getUserIdByApiKey(apiKey);
+ const userId = await apiLogins.getUserIdByApiKey(apiKey);
if (userId) {
return cb(null, { userId });
}
@@ -72,6 +75,7 @@ export function initAuth(app: express.Express) {
);
// Initialize OAuth2 for Discord login
+ // When the user logs in through OAuth2, we create them a "login" (= api token) and update their user info in the DB
passport.use(
new OAuth2Strategy(
{
@@ -84,10 +88,10 @@ export function initAuth(app: express.Express) {
},
async (accessToken, refreshToken, profile, cb) => {
const user = await simpleDiscordAPIRequest(accessToken, "users/@me");
- const userData = pick(user, ["username", "discriminator", "avatar"]) as DashboardLoginUserData;
- const apiKey = await dashboardLogins.addLogin(user.id, userData);
+ const apiKey = await apiLogins.addLogin(user.id);
+ const userData = pick(user, ["username", "discriminator", "avatar"]) as ApiUserInfoData;
+ await apiUserInfo.update(user.id, userData);
// TODO: Revoke access token, we don't need it anymore
- console.log("done, calling cb with", apiKey);
cb(null, { apiKey });
},
),
@@ -108,7 +112,7 @@ export function initAuth(app: express.Express) {
return res.status(400).json({ error: "No key supplied" });
}
- const userId = await dashboardLogins.getUserIdByApiKey(key);
+ const userId = await apiLogins.getUserIdByApiKey(key);
if (!userId) {
return res.json({ valid: false });
}
diff --git a/src/api/guilds.ts b/src/api/guilds.ts
index f51d6094..72edcb7e 100644
--- a/src/api/guilds.ts
+++ b/src/api/guilds.ts
@@ -2,35 +2,35 @@ import express from "express";
import passport from "passport";
import { AllowedGuilds } from "../data/AllowedGuilds";
import { requireAPIToken } from "./auth";
-import { DashboardUsers } from "../data/DashboardUsers";
+import { ApiPermissions } from "../data/ApiPermissions";
import { clientError, ok, unauthorized } from "./responses";
import { Configs } from "../data/Configs";
-import { DashboardRoles } from "../data/DashboardRoles";
+import { ApiRoles } from "../data/ApiRoles";
export function initGuildsAPI(app: express.Express) {
const guildAPIRouter = express.Router();
requireAPIToken(guildAPIRouter);
const allowedGuilds = new AllowedGuilds();
- const dashboardUsers = new DashboardUsers();
+ const apiPermissions = new ApiPermissions();
const configs = new Configs();
guildAPIRouter.get("/guilds/available", async (req, res) => {
- const guilds = await allowedGuilds.getForDashboardUser(req.user.userId);
+ const guilds = await allowedGuilds.getForApiUser(req.user.userId);
res.json(guilds);
});
guildAPIRouter.get("/guilds/:guildId/config", async (req, res) => {
- const dbUser = await dashboardUsers.getByGuildAndUserId(req.params.guildId, req.user.userId);
- if (!dbUser) return unauthorized(res);
+ const permissions = await apiPermissions.getByGuildAndUserId(req.params.guildId, req.user.userId);
+ if (!permissions) return unauthorized(res);
const config = await configs.getActiveByKey(`guild-${req.params.guildId}`);
res.json({ config: config ? config.config : "" });
});
guildAPIRouter.post("/guilds/:guildId/config", async (req, res) => {
- const dbUser = await dashboardUsers.getByGuildAndUserId(req.params.guildId, req.user.userId);
- if (!dbUser || DashboardRoles[dbUser.role] < DashboardRoles.Editor) return unauthorized(res);
+ const permissions = await apiPermissions.getByGuildAndUserId(req.params.guildId, req.user.userId);
+ if (!permissions || ApiRoles[permissions.role] < ApiRoles.Editor) return unauthorized(res);
const config = req.body.config;
if (config == null) return clientError(res, "No config supplied");
diff --git a/src/api/index.ts b/src/api/index.ts
index eaac13c9..c2de62b3 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1,9 +1,12 @@
+import { error, notFound } from "./responses";
+
require("dotenv").config();
import express from "express";
import cors from "cors";
import { initAuth } from "./auth";
import { initGuildsAPI } from "./guilds";
+import { initArchives } from "./archives";
import { connect } from "../data/db";
console.log("Connecting to database...");
@@ -19,16 +22,23 @@ connect().then(() => {
initAuth(app);
initGuildsAPI(app);
+ initArchives(app);
- app.use((err, req, res, next) => {
- res.status(err.status || 500);
- res.json({ error: err.message });
- });
-
+ // Default route
app.get("/", (req, res) => {
res.end({ status: "cookies" });
});
+ // Error response
+ app.use((err, req, res, next) => {
+ error(res, err.message, err.status || 500);
+ });
+
+ // 404 response
+ app.use((req, res, next) => {
+ return notFound(res);
+ });
+
const port = process.env.PORT || 3000;
app.listen(port, () => console.log(`API server listening on port ${port}`));
});
diff --git a/src/api/responses.ts b/src/api/responses.ts
index 976f3a15..2a8b0a89 100644
--- a/src/api/responses.ts
+++ b/src/api/responses.ts
@@ -4,8 +4,20 @@ export function unauthorized(res: Response) {
res.status(403).json({ error: "Unauthorized" });
}
+export function error(res: Response, message: string, statusCode: number = 500) {
+ res.status(statusCode).json({ error: message });
+}
+
+export function serverError(res: Response, message: string) {
+ error(res, message, 500);
+}
+
export function clientError(res: Response, message: string) {
- res.status(400).json({ error: message });
+ error(res, message, 400);
+}
+
+export function notFound(res: Response) {
+ res.status(404).json({ error: "Not found" });
}
export function ok(res: Response) {
diff --git a/src/data/AllowedGuilds.ts b/src/data/AllowedGuilds.ts
index 248c0132..78a701f6 100644
--- a/src/data/AllowedGuilds.ts
+++ b/src/data/AllowedGuilds.ts
@@ -21,21 +21,25 @@ export class AllowedGuilds extends BaseRepository {
async isAllowed(guildId) {
const count = await this.allowedGuilds.count({
where: {
- guild_id: guildId,
+ id: guildId,
},
});
return count !== 0;
}
- getForDashboardUser(userId) {
+ getForApiUser(userId) {
return this.allowedGuilds
.createQueryBuilder("allowed_guilds")
.innerJoin(
- "dashboard_users",
- "dashboard_users",
- "dashboard_users.guild_id = allowed_guilds.guild_id AND dashboard_users.user_id = :userId",
+ "api_permissions",
+ "api_permissions",
+ "api_permissions.guild_id = allowed_guilds.id AND api_permissions.user_id = :userId",
{ userId },
)
.getMany();
}
+
+ updateInfo(id, name, icon) {
+ return this.allowedGuilds.update({ id }, { name, icon });
+ }
}
diff --git a/src/data/DashboardLogins.ts b/src/data/ApiLogins.ts
similarity index 73%
rename from src/data/DashboardLogins.ts
rename to src/data/ApiLogins.ts
index ff7597e5..f9c2edfa 100644
--- a/src/data/DashboardLogins.ts
+++ b/src/data/ApiLogins.ts
@@ -1,5 +1,5 @@
import { getRepository, Repository } from "typeorm";
-import { DashboardLogin } from "./entities/DashboardLogin";
+import { ApiLogin } from "./entities/ApiLogin";
import { BaseRepository } from "./BaseRepository";
import crypto from "crypto";
import moment from "moment-timezone";
@@ -9,18 +9,12 @@ import uuidv4 from "uuid/v4";
import { DBDateFormat } from "../utils";
import { log } from "util";
-export interface DashboardLoginUserData {
- username: string;
- discriminator: string;
- avatar: string;
-}
-
-export class DashboardLogins extends BaseRepository {
- private dashboardLogins: Repository;
+export class ApiLogins extends BaseRepository {
+ private apiLogins: Repository;
constructor() {
super();
- this.dashboardLogins = getRepository(DashboardLogin);
+ this.apiLogins = getRepository(ApiLogin);
}
async getUserIdByApiKey(apiKey: string): Promise {
@@ -29,7 +23,7 @@ export class DashboardLogins extends BaseRepository {
return null;
}
- const login = await this.dashboardLogins
+ const login = await this.apiLogins
.createQueryBuilder()
.where("id = :id", { id: loginId })
.andWhere("expires_at > NOW()")
@@ -49,12 +43,12 @@ export class DashboardLogins extends BaseRepository {
return login.user_id;
}
- async addLogin(userId: string, userData: DashboardLoginUserData): Promise {
+ async addLogin(userId: string): Promise {
// Generate random login id
let loginId;
while (true) {
loginId = uuidv4();
- const existing = await this.dashboardLogins.findOne({
+ const existing = await this.apiLogins.findOne({
where: {
id: loginId,
},
@@ -69,11 +63,10 @@ export class DashboardLogins extends BaseRepository {
const hashedToken = hash.digest("hex");
// Save this to the DB
- await this.dashboardLogins.insert({
+ await this.apiLogins.insert({
id: loginId,
token: hashedToken,
user_id: userId,
- user_data: userData,
logged_in_at: moment().format(DBDateFormat),
expires_at: moment()
.add(1, "day")
diff --git a/src/data/DashboardUsers.ts b/src/data/ApiPermissions.ts
similarity index 51%
rename from src/data/DashboardUsers.ts
rename to src/data/ApiPermissions.ts
index e0ce8489..f956ab77 100644
--- a/src/data/DashboardUsers.ts
+++ b/src/data/ApiPermissions.ts
@@ -1,17 +1,17 @@
import { getRepository, Repository } from "typeorm";
-import { DashboardUser } from "./entities/DashboardUser";
+import { ApiPermission } from "./entities/ApiPermission";
import { BaseRepository } from "./BaseRepository";
-export class DashboardUsers extends BaseRepository {
- private dashboardUsers: Repository;
+export class ApiPermissions extends BaseRepository {
+ private apiPermissions: Repository;
constructor() {
super();
- this.dashboardUsers = getRepository(DashboardUser);
+ this.apiPermissions = getRepository(ApiPermission);
}
getByGuildAndUserId(guildId, userId) {
- return this.dashboardUsers.findOne({
+ return this.apiPermissions.findOne({
where: {
guild_id: guildId,
user_id: userId,
diff --git a/src/data/DashboardRoles.ts b/src/data/ApiRoles.ts
similarity index 64%
rename from src/data/DashboardRoles.ts
rename to src/data/ApiRoles.ts
index 91a68d7c..663982b1 100644
--- a/src/data/DashboardRoles.ts
+++ b/src/data/ApiRoles.ts
@@ -1,4 +1,4 @@
-export enum DashboardRoles {
+export enum ApiRoles {
Viewer = 1,
Editor,
Manager,
diff --git a/src/data/ApiUserInfo.ts b/src/data/ApiUserInfo.ts
new file mode 100644
index 00000000..c7ef64d2
--- /dev/null
+++ b/src/data/ApiUserInfo.ts
@@ -0,0 +1,38 @@
+import { getRepository, Repository } from "typeorm";
+import { ApiUserInfo as ApiUserInfoEntity, ApiUserInfoData } from "./entities/ApiUserInfo";
+import { BaseRepository } from "./BaseRepository";
+import { connection } from "./db";
+import moment from "moment-timezone";
+import { DBDateFormat } from "../utils";
+
+export class ApiUserInfo extends BaseRepository {
+ private apiUserInfo: Repository;
+
+ constructor() {
+ super();
+ this.apiUserInfo = getRepository(ApiUserInfoEntity);
+ }
+
+ get(id) {
+ return this.apiUserInfo.findOne({
+ where: {
+ id,
+ },
+ });
+ }
+
+ update(id, data: ApiUserInfoData) {
+ return connection.transaction(async entityManager => {
+ const repo = entityManager.getRepository(ApiUserInfoEntity);
+
+ const existingInfo = await repo.findOne({ where: { id } });
+ const updatedAt = moment().format(DBDateFormat);
+
+ if (existingInfo) {
+ await repo.update({ id }, { data, updated_at: updatedAt });
+ } else {
+ await repo.insert({ id, data, updated_at: updatedAt });
+ }
+ });
+ }
+}
diff --git a/src/data/Configs.ts b/src/data/Configs.ts
index 431314b7..5cb0a700 100644
--- a/src/data/Configs.ts
+++ b/src/data/Configs.ts
@@ -32,6 +32,18 @@ export class Configs extends BaseRepository {
return (await this.getActiveByKey(key)) != null;
}
+ getRevisions(key, num = 10) {
+ return this.configs.find({
+ relations: this.getRelations(),
+ where: { key },
+ select: ["id", "key", "is_active", "edited_by", "edited_at"],
+ order: {
+ edited_at: "DESC",
+ },
+ take: num,
+ });
+ }
+
async saveNewRevision(key, config, editedBy) {
return connection.transaction(async entityManager => {
const repo = entityManager.getRepository(Config);
diff --git a/src/data/entities/AllowedGuild.ts b/src/data/entities/AllowedGuild.ts
index 23240880..3c3e983f 100644
--- a/src/data/entities/AllowedGuild.ts
+++ b/src/data/entities/AllowedGuild.ts
@@ -4,7 +4,7 @@ import { Entity, Column, PrimaryColumn, CreateDateColumn } from "typeorm";
export class AllowedGuild {
@Column()
@PrimaryColumn()
- guild_id: string;
+ id: string;
@Column()
name: string;
diff --git a/src/data/entities/ApiLogin.ts b/src/data/entities/ApiLogin.ts
new file mode 100644
index 00000000..76204224
--- /dev/null
+++ b/src/data/entities/ApiLogin.ts
@@ -0,0 +1,25 @@
+import { Entity, Column, PrimaryColumn, OneToOne, ManyToOne, JoinColumn } from "typeorm";
+import { ApiUserInfo } from "./ApiUserInfo";
+
+@Entity("api_logins")
+export class ApiLogin {
+ @Column()
+ @PrimaryColumn()
+ id: string;
+
+ @Column()
+ token: string;
+
+ @Column()
+ user_id: string;
+
+ @Column()
+ logged_in_at: string;
+
+ @Column()
+ expires_at: string;
+
+ @ManyToOne(type => ApiUserInfo, userInfo => userInfo.logins)
+ @JoinColumn({ name: "user_id" })
+ userInfo: ApiUserInfo;
+}
diff --git a/src/data/entities/ApiPermission.ts b/src/data/entities/ApiPermission.ts
new file mode 100644
index 00000000..b648eb27
--- /dev/null
+++ b/src/data/entities/ApiPermission.ts
@@ -0,0 +1,20 @@
+import { Entity, Column, PrimaryColumn, ManyToOne, JoinColumn } from "typeorm";
+import { ApiUserInfo } from "./ApiUserInfo";
+
+@Entity("api_permissions")
+export class ApiPermission {
+ @Column()
+ @PrimaryColumn()
+ guild_id: string;
+
+ @Column()
+ @PrimaryColumn()
+ user_id: string;
+
+ @Column()
+ role: string;
+
+ @ManyToOne(type => ApiUserInfo, userInfo => userInfo.permissions)
+ @JoinColumn({ name: "user_id" })
+ userInfo: ApiUserInfo;
+}
diff --git a/src/data/entities/ApiUserInfo.ts b/src/data/entities/ApiUserInfo.ts
new file mode 100644
index 00000000..f39addf2
--- /dev/null
+++ b/src/data/entities/ApiUserInfo.ts
@@ -0,0 +1,28 @@
+import { Entity, Column, PrimaryColumn, OneToMany } from "typeorm";
+import { ApiLogin } from "./ApiLogin";
+import { ApiPermission } from "./ApiPermission";
+
+export interface ApiUserInfoData {
+ username: string;
+ discriminator: string;
+ avatar: string;
+}
+
+@Entity("api_user_info")
+export class ApiUserInfo {
+ @Column()
+ @PrimaryColumn()
+ id: string;
+
+ @Column("simple-json")
+ data: ApiUserInfoData;
+
+ @Column()
+ updated_at: string;
+
+ @OneToMany(type => ApiLogin, login => login.userInfo)
+ logins: ApiLogin[];
+
+ @OneToMany(type => ApiPermission, perm => perm.userInfo)
+ permissions: ApiPermission[];
+}
diff --git a/src/data/entities/Config.ts b/src/data/entities/Config.ts
index 08ec19a3..36bcef95 100644
--- a/src/data/entities/Config.ts
+++ b/src/data/entities/Config.ts
@@ -1,4 +1,5 @@
-import { Entity, Column, PrimaryColumn, CreateDateColumn } from "typeorm";
+import { Entity, Column, PrimaryColumn, CreateDateColumn, ManyToOne, JoinColumn } from "typeorm";
+import { ApiUserInfo } from "./ApiUserInfo";
@Entity("configs")
export class Config {
@@ -20,4 +21,8 @@ export class Config {
@Column()
edited_at: string;
+
+ @ManyToOne(type => ApiUserInfo)
+ @JoinColumn({ name: "edited_by" })
+ userInfo: ApiUserInfo;
}
diff --git a/src/data/entities/DashboardLogin.ts b/src/data/entities/DashboardLogin.ts
deleted file mode 100644
index 31943284..00000000
--- a/src/data/entities/DashboardLogin.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Entity, Column, PrimaryColumn } from "typeorm";
-import { DashboardLoginUserData } from "../DashboardLogins";
-
-@Entity("dashboard_logins")
-export class DashboardLogin {
- @Column()
- @PrimaryColumn()
- id: string;
-
- @Column()
- token: string;
-
- @Column()
- user_id: string;
-
- @Column("simple-json")
- user_data: DashboardLoginUserData;
-
- @Column()
- logged_in_at: string;
-
- @Column()
- expires_at: string;
-}
diff --git a/src/data/entities/DashboardUser.ts b/src/data/entities/DashboardUser.ts
deleted file mode 100644
index bc29d5f1..00000000
--- a/src/data/entities/DashboardUser.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Entity, Column, PrimaryColumn } from "typeorm";
-
-@Entity("dashboard_users")
-export class DashboardUser {
- @Column()
- @PrimaryColumn()
- guild_id: string;
-
- @Column()
- @PrimaryColumn()
- user_id: string;
-
- @Column()
- username: string;
-
- @Column()
- role: string;
-}
diff --git a/src/migrations/1561282151982-RenameBackendDashboardStuffToAPI.ts b/src/migrations/1561282151982-RenameBackendDashboardStuffToAPI.ts
new file mode 100644
index 00000000..856d851a
--- /dev/null
+++ b/src/migrations/1561282151982-RenameBackendDashboardStuffToAPI.ts
@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RenameBackendDashboardStuffToAPI1561282151982 implements MigrationInterface {
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE dashboard_users RENAME api_users`);
+ await queryRunner.query(`ALTER TABLE dashboard_logins RENAME api_logins`);
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE api_users RENAME dashboard_users`);
+ await queryRunner.query(`ALTER TABLE api_logins RENAME dashboard_logins`);
+ }
+}
diff --git a/src/migrations/1561282552734-RenameAllowedGuildGuildIdToId.ts b/src/migrations/1561282552734-RenameAllowedGuildGuildIdToId.ts
new file mode 100644
index 00000000..3a934c54
--- /dev/null
+++ b/src/migrations/1561282552734-RenameAllowedGuildGuildIdToId.ts
@@ -0,0 +1,11 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RenameAllowedGuildGuildIdToId1561282552734 implements MigrationInterface {
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query("ALTER TABLE `allowed_guilds` CHANGE COLUMN `guild_id` `id` BIGINT(20) NOT NULL FIRST;");
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query("ALTER TABLE `allowed_guilds` CHANGE COLUMN `id` `guild_id` BIGINT(20) NOT NULL FIRST;");
+ }
+}
diff --git a/src/migrations/1561282950483-CreateApiUserInfoTable.ts b/src/migrations/1561282950483-CreateApiUserInfoTable.ts
new file mode 100644
index 00000000..de8a4ad6
--- /dev/null
+++ b/src/migrations/1561282950483-CreateApiUserInfoTable.ts
@@ -0,0 +1,31 @@
+import { MigrationInterface, QueryRunner, Table } from "typeorm";
+
+export class CreateApiUserInfoTable1561282950483 implements MigrationInterface {
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.createTable(
+ new Table({
+ name: "api_user_info",
+ columns: [
+ {
+ name: "id",
+ type: "bigint",
+ isPrimary: true,
+ },
+ {
+ name: "data",
+ type: "text",
+ },
+ {
+ name: "updated_at",
+ type: "datetime",
+ default: "now()",
+ },
+ ],
+ }),
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.dropTable("api_user_info", true);
+ }
+}
diff --git a/src/migrations/1561283165823-RenameApiUsersToApiPermissions.ts b/src/migrations/1561283165823-RenameApiUsersToApiPermissions.ts
new file mode 100644
index 00000000..2da93b77
--- /dev/null
+++ b/src/migrations/1561283165823-RenameApiUsersToApiPermissions.ts
@@ -0,0 +1,11 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class RenameApiUsersToApiPermissions1561283165823 implements MigrationInterface {
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE api_users RENAME api_permissions`);
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(`ALTER TABLE api_permissions RENAME api_users`);
+ }
+}
diff --git a/src/migrations/1561283405201-DropUserDataFromLoginsAndPermissions.ts b/src/migrations/1561283405201-DropUserDataFromLoginsAndPermissions.ts
new file mode 100644
index 00000000..d47c8d2d
--- /dev/null
+++ b/src/migrations/1561283405201-DropUserDataFromLoginsAndPermissions.ts
@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class DropUserDataFromLoginsAndPermissions1561283405201 implements MigrationInterface {
+ public async up(queryRunner: QueryRunner): Promise {
+ await queryRunner.query("ALTER TABLE `api_logins` DROP COLUMN `user_data`");
+ await queryRunner.query("ALTER TABLE `api_permissions` DROP COLUMN `username`");
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ await queryRunner.query(
+ "ALTER TABLE `api_logins` ADD COLUMN `user_data` TEXT NOT NULL COLLATE 'utf8mb4_swedish_ci' AFTER `user_id`",
+ );
+ await queryRunner.query(
+ "ALTER TABLE `api_permissions` ADD COLUMN `username` VARCHAR(255) NOT NULL COLLATE 'utf8mb4_swedish_ci' AFTER `user_id`",
+ );
+ }
+}
diff --git a/src/plugins/GuildInfoSaver.ts b/src/plugins/GuildInfoSaver.ts
new file mode 100644
index 00000000..b89dc508
--- /dev/null
+++ b/src/plugins/GuildInfoSaver.ts
@@ -0,0 +1,24 @@
+import { ZeppelinPlugin } from "./ZeppelinPlugin";
+import { AllowedGuilds } from "../data/AllowedGuilds";
+import { MINUTES } from "../utils";
+
+export class GuildInfoSaverPlugin extends ZeppelinPlugin {
+ public static pluginName = "guild_info_saver";
+ protected allowedGuilds: AllowedGuilds;
+ private updateInterval;
+
+ onLoad() {
+ this.allowedGuilds = new AllowedGuilds();
+
+ this.updateGuildInfo();
+ this.updateInterval = setInterval(() => this.updateGuildInfo(), 60 * MINUTES);
+ }
+
+ onUnload() {
+ clearInterval(this.updateInterval);
+ }
+
+ protected updateGuildInfo() {
+ this.allowedGuilds.updateInfo(this.guildId, this.guild.name, this.guild.iconURL);
+ }
+}
diff --git a/src/plugins/LogServer.ts b/src/plugins/LogServer.ts
deleted file mode 100644
index 9a94b638..00000000
--- a/src/plugins/LogServer.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import http, { ServerResponse } from "http";
-import { GlobalPlugin, IPluginOptions, logger } from "knub";
-import { GuildArchives } from "../data/GuildArchives";
-import { sleep } from "../utils";
-import moment from "moment-timezone";
-
-const DEFAULT_PORT = 9920;
-const archivesRegex = /^\/(spam-logs|archives)\/([a-z0-9\-]+)\/?$/i;
-
-function notFound(res: ServerResponse) {
- res.statusCode = 404;
- res.end("Not Found");
-}
-
-interface ILogServerPluginConfig {
- port: number;
-}
-
-export class LogServerPlugin extends GlobalPlugin {
- public static pluginName = "log_server";
-
- protected archives: GuildArchives;
- protected server: http.Server;
-
- protected getDefaultOptions(): IPluginOptions {
- return {
- config: {
- port: DEFAULT_PORT,
- },
- };
- }
-
- async onLoad() {
- this.archives = new GuildArchives(null);
-
- this.server = http.createServer(async (req, res) => {
- const pathMatch = req.url.match(archivesRegex);
- if (!pathMatch) return notFound(res);
-
- const logId = pathMatch[2];
-
- if (pathMatch[1] === "spam-logs") {
- res.statusCode = 301;
- res.setHeader("Location", `/archives/${logId}`);
- return;
- }
-
- if (pathMatch) {
- const log = await this.archives.find(logId);
- if (!log) return notFound(res);
-
- let body = log.body;
-
- // Add some metadata at the end of the log file (but only if it doesn't already have it directly in the body)
- if (log.body.indexOf("Log file generated on") === -1) {
- const createdAt = moment(log.created_at).format("YYYY-MM-DD [at] HH:mm:ss [(+00:00)]");
- body += `\n\nLog file generated on ${createdAt}`;
-
- if (log.expires_at !== null) {
- const expiresAt = moment(log.expires_at).format("YYYY-MM-DD [at] HH:mm:ss [(+00:00)]");
- body += `\nExpires at ${expiresAt}`;
- }
- }
-
- res.setHeader("Content-Type", "text/plain; charset=UTF-8");
- res.end(body);
- }
- });
-
- const port = this.getConfig().port;
- let retried = false;
-
- this.server.on("error", async (err: any) => {
- if (err.code === "EADDRINUSE" && !retried) {
- logger.info("Got EADDRINUSE, retrying in 2 sec...");
- retried = true;
- await sleep(2000);
- this.server.listen(port);
- } else {
- throw err;
- }
- });
-
- this.server.listen(port);
- }
-
- async onUnload() {
- return new Promise(resolve => {
- this.server.close(() => resolve());
- });
- }
-}
diff --git a/src/plugins/availablePlugins.ts b/src/plugins/availablePlugins.ts
index 856b3519..82974437 100644
--- a/src/plugins/availablePlugins.ts
+++ b/src/plugins/availablePlugins.ts
@@ -19,9 +19,9 @@ import { SelfGrantableRolesPlugin } from "./SelfGrantableRolesPlugin";
import { RemindersPlugin } from "./Reminders";
import { WelcomeMessagePlugin } from "./WelcomeMessage";
import { BotControlPlugin } from "./BotControl";
-import { LogServerPlugin } from "./LogServer";
import { UsernameSaver } from "./UsernameSaver";
import { CustomEventsPlugin } from "./CustomEvents";
+import { GuildInfoSaverPlugin } from "./GuildInfoSaver";
/**
* Plugins available to be loaded for individual guilds
@@ -48,12 +48,14 @@ export const availablePlugins = [
RemindersPlugin,
WelcomeMessagePlugin,
CustomEventsPlugin,
+ GuildInfoSaverPlugin,
];
/**
* Plugins that are always loaded (subset of the names of the plugins in availablePlugins)
*/
export const basePlugins = [
+ GuildInfoSaverPlugin.pluginName,
MessageSaverPlugin.pluginName,
NameHistoryPlugin.pluginName,
CasesPlugin.pluginName,
@@ -63,4 +65,4 @@ export const basePlugins = [
/**
* Available global plugins (can't be loaded per-guild, only globally)
*/
-export const availableGlobalPlugins = [BotControlPlugin, LogServerPlugin, UsernameSaver];
+export const availableGlobalPlugins = [BotControlPlugin, UsernameSaver];
+