From cf0073907411c93a5ca52a57527bb343ed8cb669 Mon Sep 17 00:00:00 2001
From: rxdn <29165304+rxdn@users.noreply.github.com>
Date: Sat, 13 Feb 2021 14:33:31 +0000
Subject: [PATCH] Fix various issues

---
 app/http/endpoints/api/guilds.go       | 10 +++++++---
 go.mod                                 |  2 +-
 public/static/css/style.css            |  3 +--
 public/static/js/utils.js              |  2 +-
 public/templates/includes/head.tmpl    |  1 -
 public/templates/includes/sidebar.tmpl |  6 +++---
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/http/endpoints/api/guilds.go b/app/http/endpoints/api/guilds.go
index 49759b9..4240067 100644
--- a/app/http/endpoints/api/guilds.go
+++ b/app/http/endpoints/api/guilds.go
@@ -8,6 +8,7 @@ import (
 	"github.com/TicketsBot/common/permission"
 	syncutils "github.com/TicketsBot/common/utils"
 	"github.com/gin-gonic/gin"
+	"github.com/jackc/pgx/v4"
 	"github.com/rxdn/gdl/objects/guild"
 	"github.com/rxdn/gdl/rest/request"
 	"golang.org/x/sync/errgroup"
@@ -44,9 +45,12 @@ func GetGuilds(ctx *gin.Context) {
 			defer wg.Done()
 
 			// verify bot is in guild
-			_, ok := cache.Instance.GetGuild(g.GuildId, false)
-			if !ok {
-				return nil
+			if err := cache.Instance.QueryRow(context.Background(), `SELECT 1 from guilds WHERE "guild_id" = $1`, g.GuildId).Scan(nil); err != nil {
+				if err == pgx.ErrNoRows {
+					return nil
+				} else {
+					return err
+				}
 			}
 
 			fakeGuild := guild.Guild{
diff --git a/go.mod b/go.mod
index c4bd849..f63e4bf 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/jackc/pgx/v4 v4.7.1
 	github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c
 	github.com/pkg/errors v0.9.1
-	github.com/rxdn/gdl v0.0.0-20210209203918-0eb7209c47db
+	github.com/rxdn/gdl v0.0.0-20210213141842-c1449108cf9b
 	github.com/sirupsen/logrus v1.5.0
 	github.com/ulule/limiter/v3 v3.5.0
 	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
diff --git a/public/static/css/style.css b/public/static/css/style.css
index 3b4d9d8..424c522 100644
--- a/public/static/css/style.css
+++ b/public/static/css/style.css
@@ -40,7 +40,6 @@ html > ::-webkit-scrollbar {
 .sidebar-element {
     display: flex;
     align-items: center;
-    flex-basis: 100%;
     width: 100%;
     cursor: pointer;
     padding: 5px 0 5px 0;
@@ -62,7 +61,7 @@ html > ::-webkit-scrollbar {
     width: 100%;
     color: white !important;
     font-size: 18px;
-    margin-left: 2%;
+    margin-left: 4%;
 }
 
 .sidebar-text {
diff --git a/public/static/js/utils.js b/public/static/js/utils.js
index 200baf3..5b93045 100644
--- a/public/static/js/utils.js
+++ b/public/static/js/utils.js
@@ -28,7 +28,7 @@ function appendTd(tr, content) {
 
 function appendButton(tr, content, onclick) {
     const tdRemove = document.createElement('td');
-    const removeButton = document.createElement('button');
+    const removeButton = document.createElement('a');
     removeButton.type = 'submit';
     removeButton.classList.add('btn', 'btn-primary', 'btn-fill', 'mx-auto');
     removeButton.appendChild(document.createTextNode(content));
diff --git a/public/templates/includes/head.tmpl b/public/templates/includes/head.tmpl
index f800003..f73c949 100644
--- a/public/templates/includes/head.tmpl
+++ b/public/templates/includes/head.tmpl
@@ -21,7 +21,6 @@
           display: block;
           background-size: cover;
           border-radius: 50%;
-          float: right;
       }
   </style>
 
diff --git a/public/templates/includes/sidebar.tmpl b/public/templates/includes/sidebar.tmpl
index f71eaee..31ead53 100644
--- a/public/templates/includes/sidebar.tmpl
+++ b/public/templates/includes/sidebar.tmpl
@@ -3,13 +3,13 @@
     <div class="sidebar-container" id="sidebar-nav">
       <div class="sidebar-element">
         <a href="/">
-          <i class="fas fa-server"></i>
+          <i class="fas fa-server sidebar-icon"></i>
           <span class="sidebar-text">Servers</span>
         </a>
       </div>
       <div class="sidebar-element">
         <a href="/whitelabel">
-          <i class="fas fa-robot"></i>
+          <i class="fas fa-edit sidebar-icon"></i>
           <span class="sidebar-text">Whitelabel</span>
         </a>
       </div>
@@ -25,7 +25,7 @@
     <div class="sidebar-container" style="margin-bottom: 2%">
       <div class="sidebar-element">
         <a href="/logout" onclick="clearLocalStorage();">
-          <i class="sidebar-icon fas fa-sign-out-alt"></i>
+          <i class="sidebar-icon fas fa-sign-out-alt sidebar-icon"></i>
           <span class="sidebar-text">Logout</span>
         </a>
       </div>