From d8a77ec380e66529f856c83b7df420dc53c9ae38 Mon Sep 17 00:00:00 2001
From: rxdn <29165304+rxdn@users.noreply.github.com>
Date: Wed, 22 Jun 2022 21:17:05 +0100
Subject: [PATCH] Cleanup legacy code

---
 app/http/middleware/authenticateguild.go | 43 +++++-------------------
 utils/errorpage.go                       | 10 ------
 2 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 utils/errorpage.go

diff --git a/app/http/middleware/authenticateguild.go b/app/http/middleware/authenticateguild.go
index 03add3b..278f366 100644
--- a/app/http/middleware/authenticateguild.go
+++ b/app/http/middleware/authenticateguild.go
@@ -1,8 +1,6 @@
 package middleware
 
 import (
-	"fmt"
-	"github.com/TicketsBot/GoPanel/config"
 	"github.com/TicketsBot/GoPanel/rpc/cache"
 	"github.com/TicketsBot/GoPanel/utils"
 	"github.com/TicketsBot/common/permission"
@@ -11,20 +9,12 @@ import (
 )
 
 // requires AuthenticateCookie middleware to be run before
-func AuthenticateGuild(isApiMethod bool, requiredPermissionLevel permission.PermissionLevel) gin.HandlerFunc {
+func AuthenticateGuild(requiredPermissionLevel permission.PermissionLevel) gin.HandlerFunc {
 	return func(ctx *gin.Context) {
 		if guildId, ok := ctx.Params.Get("id"); ok {
 			parsed, err := strconv.ParseUint(guildId, 10, 64)
 			if err != nil {
-				if isApiMethod {
-					ctx.JSON(400, gin.H{
-						"success": false,
-						"error": "Invalid guild ID",
-					})
-				} else {
-					utils.ErrorPage(ctx, 400, "Invalid server ID")
-					ctx.Abort()
-				}
+				ctx.JSON(400, utils.ErrorStr("Invalid guild ID"))
 				ctx.Abort()
 				return
 			}
@@ -34,11 +24,7 @@ func AuthenticateGuild(isApiMethod bool, requiredPermissionLevel permission.Perm
 			// TODO: Do we need this? Only really serves as a check whether the bot is in the server
 			guild, found := cache.Instance.GetGuild(parsed, false)
 			if !found {
-				if isApiMethod {
-					ctx.Redirect(302, fmt.Sprintf("https://invite.ticketsbot.net/?guild_id=%d&disable_guild_select=true&response_type=code&scope=bot%%20identify&redirect_uri=%s", parsed, config.Conf.Server.BaseUrl))
-				} else {
-					utils.ErrorPage(ctx, 404, "Couldn't find server with the provided ID")
-				}
+				ctx.JSON(404, utils.ErrorStr("Guild not found"))
 				ctx.Abort()
 				return
 			}
@@ -48,30 +34,17 @@ func AuthenticateGuild(isApiMethod bool, requiredPermissionLevel permission.Perm
 
 			permLevel, err := utils.GetPermissionLevel(guild.Id, userId)
 			if err != nil {
-				ctx.AbortWithStatusJSON(500, utils.ErrorJson(err))
+				ctx.JSON(500, utils.ErrorJson(err))
+				ctx.Abort()
 				return
 			}
 
 			if permLevel < requiredPermissionLevel {
-				if isApiMethod {
-					ctx.AbortWithStatusJSON(403, gin.H{
-						"success": false,
-						"error": "Unauthorized",
-					})
-				} else {
-					utils.ErrorPage(ctx, 403, "You don't have permission to be here - make sure the server owner has added you as an admin with t!addadmin")
-					ctx.Abort()
-				}
+				ctx.JSON(403, utils.ErrorStr("Unauthorized"))
+				ctx.Abort()
 			}
 		} else {
-			if isApiMethod {
-				ctx.JSON(400, gin.H{
-					"success": false,
-					"error": "Invalid guild ID",
-				})
-			} else {
-				utils.ErrorPage(ctx, 400, "Invalid server ID")
-			}
+			ctx.JSON(400, utils.ErrorStr("Invalid guild ID"))
 			ctx.Abort()
 		}
 	}
diff --git a/utils/errorpage.go b/utils/errorpage.go
deleted file mode 100644
index 77b50b6..0000000
--- a/utils/errorpage.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package utils
-
-import "github.com/gin-gonic/gin"
-
-func ErrorPage(ctx *gin.Context, statusCode int, error string) {
-	ctx.HTML(statusCode, "error", gin.H{
-		"status": statusCode,
-		"error": error,
-	})
-}