fix perm issue

app/http/endpoints/manage/blacklist.go

@@ -33,7 +33,7 @@ func BlacklistHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/blacklistremove.go

@@ -34,7 +34,7 @@ func BlacklistRemoveHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/logs.go

@@ -42,7 +42,7 @@ func LogsHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/panelcreate.go

@@ -37,7 +37,7 @@ func PanelCreateHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/paneldelete.go

@@ -40,7 +40,7 @@ func PanelDeleteHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/panels.go

@@ -41,7 +41,7 @@ func PanelHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/sendmessage.go

@@ -36,7 +36,7 @@ func SendMessage(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/settings.go

@@ -42,7 +42,7 @@ func SettingsHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/ticketclose.go

@@ -35,7 +35,7 @@ func TicketCloseHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/ticketlist.go

@@ -34,7 +34,7 @@ func TicketListHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/ticketview.go

@@ -40,7 +40,7 @@ func TicketViewHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/updatesettings.go

@@ -35,7 +35,7 @@ func UpdateSettingsHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/viewlog.go

@@ -37,7 +37,7 @@ func LogViewHandler(ctx *gin.Context) {
 
 		// Verify the user has permissions to be here
 		isAdmin := make(chan bool)
-		go utils.IsAdmin(guild, guildId, userId, isAdmin)
+		go utils.IsAdmin(guild, userId, isAdmin)
 		if !<-isAdmin {
 			ctx.Redirect(302, config.Conf.Server.BaseUrl) // TODO: 403 Page
 			return

app/http/endpoints/manage/webchatws.go

@@ -126,7 +126,7 @@ func WebChatWs(ctx *gin.Context) {
 
 				// Verify the user has permissions to be here
 				isAdmin := make(chan bool)
-				go utils.IsAdmin(guild, guildIdParsed, userId, isAdmin)
+				go utils.IsAdmin(guild, userId, isAdmin)
 				if !<-isAdmin {
 					fmt.Println(err.Error())
 					conn.Close()

app/http/endpoints/root/index.go

@@ -30,12 +30,13 @@ func IndexHandler(ctx *gin.Context) {
 			}
 
 			fakeGuild := guild.Guild{
-				Owner:       g.Owner,
+				Id:          guildId,
+				OwnerId:     g.OwnerId,
 				Permissions: g.Permissions,
 			}
 
 			isAdmin := make(chan bool)
-			go utils.IsAdmin(fakeGuild, guildId, userId, isAdmin)
+			go utils.IsAdmin(fakeGuild, userId, isAdmin)
 			if <-isAdmin {
 				adminGuilds = append(adminGuilds, g)
 			}

utils/discord/objects/guild.go

@@ -5,5 +5,6 @@ type Guild struct {
 	Name        string
 	Icon        string
 	Owner       bool
+	OwnerId     uint64 `json:"id,string"`
 	Permissions int
 }

utils/permissionutils.go

@@ -10,16 +10,16 @@ import (
 	"strconv"
 )
 
-func IsAdmin(g guild.Guild, guildId, userId uint64, res chan bool) {
+func IsAdmin(g guild.Guild, userId uint64, res chan bool) {
 	if Contains(config.Conf.Admins, strconv.Itoa(int(userId))) {
 		res <- true
 	}
 
-	if g.Owner {
+	if g.OwnerId == userId {
 		res <- true
 	}
 
-	if table.IsAdmin(guildId, userId) {
+	if table.IsAdmin(g.Id, userId) {
 		res <- true
 	}
 
@@ -28,10 +28,10 @@ func IsAdmin(g guild.Guild, guildId, userId uint64, res chan bool) {
 	}
 
 	adminRolesChan := make(chan []uint64)
-	go table.GetAdminRoles(guildId, adminRolesChan)
+	go table.GetAdminRoles(g.Id, adminRolesChan)
 	adminRoles := <- adminRolesChan
 
-	userRoles, found := getRoles(guildId, userId)
+	userRoles, found := getRoles(g.Id, userId)
 
 	hasAdminRole := false
 	if found {