has_guilds key

app/http/endpoints/root/callback.go

@@ -80,17 +80,15 @@ func CallbackHandler(ctx *gin.Context) {
 		log.Error(err.Error())
 	}
 
-	handleRedirect(ctx)
-
-	// Cache guilds because Discord takes like 2 whole seconds to return then
-	go func() {
 	var guilds []guild.Guild
 	err, _ = userEndpoint.CurrentUserGuilds.Request(store, nil, nil, &guilds)
 	if err != nil {
-			log.Error(err.Error())
+		handleRedirect(ctx)
 		return
 	}
 
+	store.Set("has_guilds", true)
+
 	var wrappedGuilds []database.UserGuild
 
 	// endpoint's partial guild doesn't include ownerid
@@ -112,7 +110,8 @@ func CallbackHandler(ctx *gin.Context) {
 	if err := dbclient.Client.UserGuilds.Set(currentUser.Id, wrappedGuilds); err != nil {
 		log.Error(err.Error())
 	}
-	}()
+
+	handleRedirect(ctx)
 }
 
 func handleRedirect(ctx *gin.Context) {

app/http/endpoints/root/index.go

@@ -1,14 +1,22 @@
 package root
 
 import (
+	"fmt"
 	"github.com/TicketsBot/GoPanel/config"
 	"github.com/gin-gonic/contrib/sessions"
 	"github.com/gin-gonic/gin"
+	"net/url"
 )
 
 func IndexHandler(ctx *gin.Context) {
 	store := sessions.Default(ctx)
 
+	if _, hasGuilds := store.Get("has_guilds").(bool); !hasGuilds {
+		redirect := url.QueryEscape(config.Conf.Oauth.RedirectUri)
+		ctx.Redirect(302, fmt.Sprintf("https://discordapp.com/oauth2/authorize?response_type=code&redirect_uri=%s&scope=identify+guilds&client_id=%d&state=%s", redirect, config.Conf.Oauth.Id, ctx.Query("state")))
+		return
+	}
+
 	ctx.HTML(200, "main/index", gin.H{
 		"name":    store.Get("name").(string),
 		"baseurl": config.Conf.Server.BaseUrl,