From 7ad24b07c00b755034777123d2362b6129d4a094 Mon Sep 17 00:00:00 2001
From: Androz2091 <androz2091@gmail.com>
Date: Wed, 17 Feb 2021 18:59:04 +0100
Subject: [PATCH] :bug: Remove guild ID validation

---
 src/App.vue            |  2 +-
 src/api.js             | 17 -----------------
 src/util/helpers.js    |  1 -
 src/views/Settings.vue | 23 ++++++++---------------
 4 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e6067ac..1b74317 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,7 +17,7 @@
             v-else-if="missingScope && $route.name !== 'Settings'"
             class="text-center mt-28"
         >
-            You selected a guild (<code>{{ $store.state.selectedGuildID }}</code>) on which your bot can't create Slash Commands. You can authorize it by clicking <a
+            You selected a guild (<code>{{ $store.state.selectedGuildID }}</code>) on which your bot can't create Slash Commands OR the guild doesn't exist. You can authorize it by clicking <a
                 :href="`https://discord.com/api/oauth2/authorize?client_id=${$store.state.clientID}&scope=applications.commands&guild_id=${$store.state.selectedGuildID}&disable_guild_select=true`"
                 class="link"
                 target="_blank"
diff --git a/src/api.js b/src/api.js
index c3cf7f0..94b6493 100644
--- a/src/api.js
+++ b/src/api.js
@@ -48,23 +48,6 @@ export function getToken (clientID, clientSecret, proxyURL) {
     });
 }
 
-/**
- * Check if the bot has access to this guild
- * @param {string} clientID
- * @param {string} token 
- * @param {string} proxyURL 
- * @param {string} guildID 
- */
-export function checkGuild (clientID, token, proxyURL, guildID) {
-    return new Promise((resolve, reject) => {
-        const url = getURL(clientID, guildID);
-        request(token, proxyURL, url, 'GET').then((value) => {
-            if (value) resolve();
-            else reject();
-        });
-    });
-}
-
 export function fetchCommands (clientID, token, proxyURL, guildID) {
     const url = getURL(clientID, guildID);
     return request(token, proxyURL, url, 'GET');
diff --git a/src/util/helpers.js b/src/util/helpers.js
index 2700515..7b97fa8 100644
--- a/src/util/helpers.js
+++ b/src/util/helpers.js
@@ -1,3 +1,2 @@
-export const fakePromise = () => new Promise((resolve) => resolve());
 export const cloneObject = (object) => Object.assign({}, object);
 export const formatString = (string) => string.charAt(0).toUpperCase() + string.substr(1, string.length).toLowerCase();
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 9b52baf..22e0fda 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -112,8 +112,7 @@
 </template>
 
 <script>
-import { fakePromise } from '../util/helpers';
-import { getToken, checkGuild, fetchApplication } from '../api';
+import { getToken, fetchApplication } from '../api';
 import LoadingAnimation from '../components/LoadingAnimation.vue';
 
 export default {
@@ -186,21 +185,15 @@ export default {
                         expiresAt: Date.now() + (tokenData.expires_in * 1000),
                         value: tokenData.access_token
                     });
-                    const fetchGuildPromise = this.guildID ? checkGuild(this.$store.state.clientID, this.$store.state.token.value, this.proxyURL, this.guildID) : fakePromise();
-                    fetchGuildPromise.then(() => {
-                        fetchApplication(this.$store.state.clientID).then((application) => {
-                            this.$toast.success(`Successfully logged in as ${application.username}!`, {
-                                duration: 10000,
-                                pauseOnHover: true
-                            });
-                            this.$router.push('/');
+                    fetchApplication(this.$store.state.clientID).then((application) => {
+                        this.$toast.success(`Successfully logged in as ${application.username}!`, {
+                            duration: 10000,
+                            pauseOnHover: true
                         });
-                        this.loading = false;
-                        this.$root.loadCommands();
-                    }).catch(() => {
-                        this.loading = false;
-                        this.invalidGuildIDs.add(this.guildID);
+                        this.$router.push('/');
                     });
+                    this.loading = false;
+                    this.$root.loadCommands();
                 }
             }).catch(() => {
                 this.loading = false;