From a0043529331a3645673531c3864c3829e356fa53 Mon Sep 17 00:00:00 2001 From: Dot-Rar Date: Tue, 14 Apr 2020 17:11:21 +0100 Subject: [PATCH] fix panic --- app/http/endpoints/manage/blacklist.go | 6 +----- app/http/endpoints/manage/blacklistremove.go | 6 +----- app/http/endpoints/manage/logs.go | 6 +----- app/http/endpoints/manage/panelcreate.go | 6 +----- app/http/endpoints/manage/paneldelete.go | 6 +----- app/http/endpoints/manage/panels.go | 6 +----- app/http/endpoints/manage/sendmessage.go | 6 +----- app/http/endpoints/manage/settings.go | 6 +----- app/http/endpoints/manage/ticketclose.go | 6 +----- app/http/endpoints/manage/ticketlist.go | 6 +----- app/http/endpoints/manage/ticketview.go | 6 +----- app/http/endpoints/manage/updatesettings.go | 6 +----- app/http/endpoints/manage/viewlog.go | 6 +----- app/http/endpoints/root/index.go | 6 +----- utils/sessionutils.go | 5 ++--- 15 files changed, 16 insertions(+), 73 deletions(-) diff --git a/app/http/endpoints/manage/blacklist.go b/app/http/endpoints/manage/blacklist.go index 1516863..cbcdf2e 100644 --- a/app/http/endpoints/manage/blacklist.go +++ b/app/http/endpoints/manage/blacklist.go @@ -18,11 +18,7 @@ func BlacklistHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/blacklistremove.go b/app/http/endpoints/manage/blacklistremove.go index 90cd2e6..7a2e4df 100644 --- a/app/http/endpoints/manage/blacklistremove.go +++ b/app/http/endpoints/manage/blacklistremove.go @@ -19,11 +19,7 @@ func BlacklistRemoveHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/logs.go b/app/http/endpoints/manage/logs.go index 2ca9ebc..5d97230 100644 --- a/app/http/endpoints/manage/logs.go +++ b/app/http/endpoints/manage/logs.go @@ -18,11 +18,7 @@ func LogsHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/panelcreate.go b/app/http/endpoints/manage/panelcreate.go index 48411ba..3d5b39e 100644 --- a/app/http/endpoints/manage/panelcreate.go +++ b/app/http/endpoints/manage/panelcreate.go @@ -22,11 +22,7 @@ func PanelCreateHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/paneldelete.go b/app/http/endpoints/manage/paneldelete.go index 403d752..134ba65 100644 --- a/app/http/endpoints/manage/paneldelete.go +++ b/app/http/endpoints/manage/paneldelete.go @@ -19,11 +19,7 @@ func PanelDeleteHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/panels.go b/app/http/endpoints/manage/panels.go index e3d5f69..5c4694b 100644 --- a/app/http/endpoints/manage/panels.go +++ b/app/http/endpoints/manage/panels.go @@ -26,11 +26,7 @@ func PanelHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/sendmessage.go b/app/http/endpoints/manage/sendmessage.go index ad24c41..7ec2d60 100644 --- a/app/http/endpoints/manage/sendmessage.go +++ b/app/http/endpoints/manage/sendmessage.go @@ -21,11 +21,7 @@ func SendMessage(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/settings.go b/app/http/endpoints/manage/settings.go index 25a0766..04c4980 100644 --- a/app/http/endpoints/manage/settings.go +++ b/app/http/endpoints/manage/settings.go @@ -20,11 +20,7 @@ func SettingsHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/ticketclose.go b/app/http/endpoints/manage/ticketclose.go index 3aede35..c773df9 100644 --- a/app/http/endpoints/manage/ticketclose.go +++ b/app/http/endpoints/manage/ticketclose.go @@ -20,11 +20,7 @@ func TicketCloseHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/ticketlist.go b/app/http/endpoints/manage/ticketlist.go index 06b033b..951fcb6 100644 --- a/app/http/endpoints/manage/ticketlist.go +++ b/app/http/endpoints/manage/ticketlist.go @@ -19,11 +19,7 @@ func TicketListHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/ticketview.go b/app/http/endpoints/manage/ticketview.go index efa7f23..89658a4 100644 --- a/app/http/endpoints/manage/ticketview.go +++ b/app/http/endpoints/manage/ticketview.go @@ -25,11 +25,7 @@ func TicketViewHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/updatesettings.go b/app/http/endpoints/manage/updatesettings.go index 88c39ce..99a5037 100644 --- a/app/http/endpoints/manage/updatesettings.go +++ b/app/http/endpoints/manage/updatesettings.go @@ -20,11 +20,7 @@ func UpdateSettingsHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/manage/viewlog.go b/app/http/endpoints/manage/viewlog.go index ecdb8be..e58986e 100644 --- a/app/http/endpoints/manage/viewlog.go +++ b/app/http/endpoints/manage/viewlog.go @@ -22,11 +22,7 @@ func LogViewHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) // Verify the guild exists guildIdStr := ctx.Param("id") diff --git a/app/http/endpoints/root/index.go b/app/http/endpoints/root/index.go index 1153e45..89e7d15 100644 --- a/app/http/endpoints/root/index.go +++ b/app/http/endpoints/root/index.go @@ -19,11 +19,7 @@ func IndexHandler(ctx *gin.Context) { defer store.Save() if utils.IsLoggedIn(store) { - userId, err := utils.GetUserId(store) - if err != nil { - ctx.String(500, err.Error()) - return - } + userId := utils.GetUserId(store) userGuilds := table.GetGuilds(userId) adminGuilds := make([]objects.Guild, 0) diff --git a/utils/sessionutils.go b/utils/sessionutils.go index d49bfe2..a3ebf44 100644 --- a/utils/sessionutils.go +++ b/utils/sessionutils.go @@ -2,7 +2,6 @@ package utils import ( "github.com/gin-gonic/contrib/sessions" - "strconv" ) func IsLoggedIn(store sessions.Session) bool { @@ -15,6 +14,6 @@ func IsLoggedIn(store sessions.Session) bool { store.Get("csrf") != nil } -func GetUserId(store sessions.Session) (uint64, error) { - return strconv.ParseUint(store.Get("userid").(string), 10, 64) +func GetUserId(store sessions.Session) uint64 { + return store.Get("userid").(uint64) }