From bc63d5b93886a2908cf1332b726a109a1646c085 Mon Sep 17 00:00:00 2001 From: rxdn <29165304+rxdn@users.noreply.github.com> Date: Tue, 18 Jun 2024 23:29:26 +0100 Subject: [PATCH] Notify error --- app/http/endpoints/api/guilds.go | 8 ++++++-- frontend/src/views/Index.svelte | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/http/endpoints/api/guilds.go b/app/http/endpoints/api/guilds.go index d32e11d..cfac950 100644 --- a/app/http/endpoints/api/guilds.go +++ b/app/http/endpoints/api/guilds.go @@ -64,14 +64,18 @@ func GetGuilds(ctx *gin.Context) { if g.Owner { permLevel = permission.Admin } else { - permLevel, err = utils.GetPermissionLevel(context.Background(), g.GuildId, userId) + tmp, err := utils.GetPermissionLevel(context.Background(), g.GuildId, userId) if err != nil { // If a Discord error occurs, just skip the server var restError request.RestError - if !errors.As(err, &restError) { + if errors.As(err, &restError) { + return nil + } else { return err } } + + permLevel = tmp } if permLevel >= permission.Support { diff --git a/frontend/src/views/Index.svelte b/frontend/src/views/Index.svelte index 36a50c9..0f1de37 100644 --- a/frontend/src/views/Index.svelte +++ b/frontend/src/views/Index.svelte @@ -42,6 +42,11 @@ async function loadData() { const res = await axios.get(`${API_URL}/user/guilds`); + if (res.status !== 200) { + notifyError(res.data.error); + return; + } + guilds = res.data; permissionLevelCache.update(cache => {