FIX: Issue with discord webhooks because of empty response

d-Rickyy-b · Oct 6, 2019 · 7d9ee0d · Zeroji · Oct 9, 2019 · d-Rickyy-b
1 parent 1786bf4
commit 7d9ee0d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pastepwn/actions/discordaction.py b/pastepwn/actions/discordaction.py
@@ -114,9 +114,14 @@ def perform(self, paste, analyzer_name=None):
             url = 'https://discordapp.com/api/channels/{0}/messages'.format(self.channel_id)
             r.headers = {'Authorization': 'Bot {}'.format(self.token)}
 
-        res = json.loads(r.post(url, {"content": text}))
+        res = r.post(url, {"content": text})
+        if res == "":
+            # If the response is empty, skip further execution
+            return
 
-        if res.get('code') == 40001 and self.webhook is None and not self.identified:
+        res = json.loads(res)
+
+        if res.get('code') == 40001 and self.bot_available and self.webhook is None and not self.identified:
             # Unauthorized access, bot token hasn't been identified to Discord Gateway
             self.logger.info('Accessing Discord Gateway to initialize token')
             self.initialize_gateway()