From d82de6605fff81cdfbb61dac52d5dd8f18d00c89 Mon Sep 17 00:00:00 2001
From: Choco <94597336+ChocoMeow@users.noreply.github.com>
Date: Wed, 22 Mar 2023 19:33:48 +0800
Subject: [PATCH] Add error message in dashboard

---
 web/ipc/methods.py       |  12 +++++++++---
 web/static/img/error.png | Bin 0 -> 1445 bytes
 web/static/img/info.png  | Bin 0 -> 1670 bytes
 web/static/js/objects.js |  12 +++++++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 web/static/img/error.png
 create mode 100644 web/static/img/info.png

diff --git a/web/ipc/methods.py b/web/ipc/methods.py
index 2d762ea..2f61f2a 100644
--- a/web/ipc/methods.py
+++ b/web/ipc/methods.py
@@ -5,7 +5,7 @@ from discord import Member
 from discord.ext import commands
 
 def missingPermission(user_id:int):
-    payload = {"op": "missingPermission", "msg": "Only the DJ or admins may use this funciton!"}
+    payload = {"op": "errorMsg", "level": "info", "msg": "Only the DJ or admins may use this funciton!"}
     payload["user_id"] = user_id
     return payload
 
@@ -176,5 +176,11 @@ async def process_methods(websocket, bot: commands.Bot, data: dict) -> None:
         resp: dict = await method(player, member, data)
         if resp:
             await websocket.send(json.dumps(resp))
-    except:
-        return
\ No newline at end of file
+    except Exception as e:
+        payload = {
+            "op": "errorMsg",
+            "level": "info",
+            "msg": e,
+            "user_id": member.id
+        }
+        await websocket.send(json.dumps(payload))
\ No newline at end of file
diff --git a/web/static/img/error.png b/web/static/img/error.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cb4e9e9f881a41897c6982d34d06ed54e15340f
GIT binary patch
literal 1445
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yaTa()7Bet#3xhBt!>l<HKtaah
zAa^H*b?0PW0y!+{j=qiz3>*8o|0J?9FtA#Ax;TbZFuuL(*d>!Has1(|6$b@Q8to{5
z=(MLvX;NyKn^WHcg-5)5nxxkYG@X=Wd9Sc;GjAlPqQb0eW}j6j`+eWPde{DSzp`Fc
znmMmuCVfvn*f{v>-t_+b`%$F_!osZ*)EgZX1UOij1}`P~;?~^Vcek#8S62M_p!xl?
zpKATz-tD`0tuSVP@%yW<pZCj^6mRHz{P+C+ny*!Q?{~Al|MTIayM5W4t&+#D`rEw?
zTOIoSyZrug-P=9MKxt8?mx;!Gi@qk_?pZA0S<iGcIb6nd_2F&WeNHNWIaF?lyI;Ju
z;cfR~fs=JiHy7s1xN0B1W)75_>99>g%H8nm2HswvTprWSf()6XA&1K{WLiD837=p+
zek`!ZHU~&{JjrFU4A<^UT9de1)Ln6sIp>nq^6rJN5?9LtdDq3{Ppo{T;b)q&ybEZK
zcQ@aYD}^Fk+us67rN|$5_q@ORXM^<Vuj}83?wnn=#-d9*{q(+v)feagJ3qhv)xTeF
zujlC;cQY!JIWKSbVxH}u`?@zD&1awKt@3C_8~d_d-;@Q9m#`GAyXtYoP`5GWLKIMZ
zo`cyIp-zii3KMjf^|{ErEyy^`_u3=x&-bsd(&I~#BiuKAJ9l>Wql^<bAK%^{CTo57
z$G6`Xl_Y0dd@JtUdi=)p=wv~6d#0BUH@PbH{bRXwIknS8<}gP}!%lalzK1ME7h-^R
zCbASY>;%dm=6vE%43s}EctS9$A4m(Im>AXTB2&t-r0JTHpt~*8$|X}hjs#A3(3)i>
zRCq;w!l`9lE;7p%CkR(;th(5n+x31Y3)9M+H|=w~qMqk{RBH?|2?d7mD`5}S;NyWE
zOY|B;E_i_i1c3$vW64vN$<k>xFzhVnIq+Sn0?PC$PhdWy3XHLK;S&zUpomOlF**?Q
zSi{9=jziU~YM_!fK@a}vASHh}Q~FPf0i&gkMaZY{)UP>ZYI=>A@0QOfVm&Cb{FHtD
zmj#b=>zZ;5zt;8b%)P(&49lj4Q=ghDWi~tLW#n$2?6FLJLh;&lw!$a3uw2@@UpPSJ
za%7D{apVlmNtrrU6L#iK7CrexO!ma9mzVQ&ww_xnWjzTLpC=-|EU*7|`fuPr$FSc4
z+czo|O3c0Q=qGn_W!sx86FVNO)*pT4Cw_8e`<oCT&$MyQYT1(!&SBO<g?l^|#IJOv
zyir^&+G%l5Z2~VaEnJ--E8S@UOoL+WZbn}x$VzoulnI~Ub5_nwJ<;Z-)aRq%c;6#R
zdegp%9m)2MZ#L>r3Tw}aS9$cpUBUKE*OIS_w}EE;687+)J@HKH2{T}98t~;xB*>op
zA9i<5TaN6>UkV-d^K1l<JHW~fy^Vvs%xHA@pns&?%+W@*#~N6wGI+ZBxvX<aXaWFS
C(=jRl

literal 0
HcmV?d00001

diff --git a/web/static/img/info.png b/web/static/img/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..a914ef4290f3b75a5e7e6d40b0d7c4d8f5fbbbc3
GIT binary patch
literal 1670
zcmcJQdpy%?9LHxSx#ij{ib+ndoZ}!(mysc?+{ZCe$7K~x86j$N_F6-sY~@b5j+fjr
zmq=5jZCzZVBo+&qDVNOL#yG#}@AGGWJiq7re4pq0{k@;h^L>85BsUiaC3!7*5D27n
z5`6*#^sgjs`!?WN?Ol@(baLTnpGXi$L0!_MK)Lr}fKw_G<6r}->E1mB3?M<)&ek9h
zouaTFAOiwz(>{5^+ViT^%y19oEDqK-KRNQG<HAt6OtGPAUN>059jQJ2c7%dxWc&G3
z>|#1~+mfAC>F`@JYJ23M4g6vcEBmw@<g(7P6C$I0e<-0KCW6xw#Q7Q(`8={aw)<Lv
z*^$_FH_f*5O42KSU{X8^uBU?D4pIB1rm6fXrOajaj~^cNsJS%LGe=<yCd1y8*UDkc
zb8$xHh%Kaa{&@4$d?V~L;fSHI=u*MeV}a`qZXE_*MHBkQS<GJT?o`W`&DFwGRK*{2
zDWjGSB}2iBIfI*xR^@usy&ck(y>G%Nx(gFgHL{0~l08+o?}K1yNaC^F!D!9OWWYOa
zMb?sRGdaq4=Fix&JSF2vyb1W>Slwg`9MFK~wu}{*x=soz(g9JZc0tu1r{D=KT?Hlg
zZ^oBGz;YywZ;y$}&^(l3=)faoi+xoFTTui4Qp19bOzpcULqzk-h`gpuN%$!v*8CB2
zx*EC&&)C&p=8HGLs!52-FU}8$uagIS@c!V34WV(h{H@IY92BuRj8aG)|1;0%XWkU?
z*a)v$Vgsjh!0V`p{i=W<;fLn<GA1CHswg4lX8gofxS1%3E=M~(s@<xi_EBB(o~j5T
z<*wBt1XCUHKAi)s2lzcJcZ<grF)nbXp~EI@)x#A|RYBAHdadj?($&$35+XELf*x2}
zLS%ILy1-L9Lq{UE6#Hvdd)Yk9l7zB>8{IZ4)676=@#XUqV5{#Fx3rpohN*)?3eQQ1
zoF%*=g@MAJ54&h`qz1Qn`$tXjc`5)^ABxG>)h7<ApcQsz+2R+>CACK*)dbEpo1xXg
zK5q6K4L@D?Bv6O+s8EX!zTV)F_8Wu%IT~q-_i%OA@V?Ap%LN}dSGZB<zweOTDkj6}
z84($53%@gcU3}W9=fUlZ{h?LtmA6>3Ii&C164LeMN?KMivPlP9$t53O6)k=uESDpk
zZOQd)<ttKWGR*)qKptRoR0-w(m`U!n`?tMa!(Cl2F=fo46?asz!ny6YCgL<V=v>Ux
z%Yqj=R6nabvma!8S5^4=wYoI==$o^qgfHHTa|9tq1zX6yzzNG98s@r~fkT3)+BI?4
z76+T5;%Lrs4L}lUu@7$b?m%Gp_tET|Q!K*t^{CE4npBD~@abiXCEn+;PnNuCZ?Wkb
z&chMTj2`y}ZqY~G$V15A-5ucxnX^bQHMX5N=bZ41qxBw=#$anh?r?R5`RO=Tsh1u}
zV;ADqc=5(83<1FuZl)Y(Oa?d9Me*r_fk8wQBKUwwv$!ZYG-^)0eO->$HtQi^ZIk82
zXy-UWF#g8St_}_bvap{DCTAc^8r!=*!goS20mjfy?EIKM)<sfB39X-=j^^nZ0O>iG
zHj{Yx@uBB`Gl_CE)N_T}#wp&E{{}F%Hp2-HC5Xh5fxlop>G5~!pa>^O>9N5ADK_eR
zxQ%O`3t!pGOFUMa5(;kj8@C3r*1J@YU6zPS7V5`FKdaEKG09=}`V?lVqKh7+g|UR4
zlkVpQ?_*6j`UXqxp^`(1D`#H&t>AH%EL{%X*BRb_L1C#nCbfIfsjn-w@ygf%*B))4
z1nYGLOVhG(UD8|;=ZPO<Z)&1q>cy&ph`RMQ1#FW+lQJ&Oh{a{--DW}R97Jv+XBWp9
zi```39eyxn;iJ)ham#rEuRc2;x!M!CBVbyFgnFU%D?g+!xtq33N27zS-+<o+=%k&?
Ki5eUK8~*|7z1Q;q

literal 0
HcmV?d00001

diff --git a/web/static/js/objects.js b/web/static/js/objects.js
index 24f6bda..28b687c 100644
--- a/web/static/js/objects.js
+++ b/web/static/js/objects.js
@@ -169,6 +169,10 @@ const actions = {
     repeatTrack: function (player, data) {
         player.repeat = data["repeatMode"];
     },
+
+    errorMsg: function (player, data) {
+        var level = data["level"];
+        player.showToast(level, data["msg"]);
     }
 
 }
@@ -323,7 +327,13 @@ class Player {
     }
 
     showToast(userId, msg) {
-        var user = this.users[userId];
+        if (userId == "info") {
+            var user = { avatar_url: "/static/img/info.png", name: "Info" }
+        } else if (userId == "error") {
+            var user = { avatar_url: "/static/img/error.png", name: "Error" }
+        } else {
+            var user = this.users[userId];
+        }
         if (user != null) {
             var $element = $(`<div class="toast"><img src=${user['avatar_url']} alt="user-icon"/><div class="content"><p class="username">${user['name']}</p><p class="message">${msg}</p></div></div>`)
             $(".toastContrainer").append($element)