Merge pull request #76 from Mineinjava/mineinjavaDev

fix #74

Author: Mineinjava

.github/todo.py

@@ -19,7 +19,7 @@
 for todo in x:
     new_x = todo.replace("TODO:", "")
     new_x_t = new_x.replace("|", "\n")
-    a,b = new_x_t.split('-', 1)
+    a, b = new_x_t.split('-', 1)
     todos[a] = b
 
 for todo_post in todos:

.gitignore

@@ -50,6 +50,8 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 
+
+
 # Translations
 *.mo
 *.pot

discordSplash/__init__.py

@@ -1,5 +1,7 @@
 from .main import *
+import os
+import sys
 PACKAGE_PARENT = '.'
 SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
 sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

discordSplash/cfg.py

@@ -0,0 +1,7 @@
+"""
+really doesn't do anything
+used for keeping track of tokens and stuff
+"""
+
+AUTH_HEADER = None
+TOKEN = None

discordSplash/channel.py

@@ -1,5 +1,5 @@
 
-class Channel():
+class Channel:
     """
     Represents a Discord Channel Object.
     """
@@ -16,4 +16,4 @@ def id(self):
         try:
             return self.json['x']
         except KeyError:
-            return None
+            return None

discordSplash/main.py

@@ -1,24 +1,18 @@
-import os.path
-import sys
-
-
-
 import asyncio
 import websockets
 import json
 import aiohttp
+import cfg
 from enum import Enum
+
 try:
-    import member
     import opcodes as op
 except ModuleNotFoundError:
     from discordSplash import opcodes as op
 import traceback
 
 commands = {}
 
-TOKEN = None
-AUTH_HEADER = None
 API_URL = 'https://discord.com/api/v8'
 
 
@@ -132,6 +126,7 @@ def json(self):
         """
         return self.jsonContent
 
+
 class ReactionData:
     """
     reaction data passed in to the handler
@@ -191,6 +186,7 @@ def member(self):
         :return: a discordSplash.member.Member** object.
         :rtype: discordSplash.member.Member
         """
+        import member
         return member.Member(self.jsonData['member'])
 
     @property
@@ -242,7 +238,8 @@ async def respond(self, data: ReactionResponse):
             async with session.post(
                     f'https://discord.com/api/v8/interactions/{self.jsonData["id"]}/{self.jsonData["token"]}/callback',
                     json=data.json) as resp:
-                        pass
+                pass
+
 
 
 class Run:
@@ -274,10 +271,10 @@ def __init__(self, token: str, presence: Presence = None):
         self.session_id = None
 
         self.TOKEN = token
-        global TOKEN, AUTH_HEADER
-        TOKEN = token
-        AUTH_HEADER = {"Authorization": f"Bot {token}"}
-
+        cfg.TOKEN = token
+        cfg.AUTH_HEADER = {"Authorization": f"Bot {token}"}
+        TOKEN = self.TOKEN
+        print('header 1', cfg.AUTH_HEADER)
 
         self.auth = {
             "token": self.TOKEN,
@@ -318,6 +315,7 @@ def __init__(self, token: str, presence: Presence = None):
         # asyncio.get_event_loop().run_until_complete(self.hello())
         # print(self.opcode(1, self.sequence))
 
+
     async def main(self, resume=False):
         async with websockets.connect(
                 'wss://gateway.discord.gg/?v=6&encoding=json') \
@@ -330,7 +328,9 @@ async def main(self, resume=False):
                 await asyncio.gather(self.heartbeat(), self.receive())
             if resume is True:
                 await self.resume()
-                print('RESUMING------------------------------------------------------------------------------------------------------------------------------------------------')
+                print \
+                        (
+                        'RESUMING------------------------------------------------------------------------------------------------------------------------------------------------')
                 await asyncio.gather(self.heartbeat(), self.receive())
 
             # while self.interval is not None:
@@ -401,14 +401,13 @@ async def resume(self):
 
     async def create_resume_packet(self):
         resume_blk = {
-                "token": self.TOKEN,
-                "session_id": self.session_id,
-                "seq": self.sequence
-            }
+            "token": self.TOKEN,
+            "session_id": self.session_id,
+            "seq": self.sequence
+        }
         return resume_blk
 
 
-
 def command(name: str):
     """A decorator that is used to register a command.
 

discordSplash/member.py

@@ -5,13 +5,9 @@
 SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
 sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
 
+from cfg import AUTH_HEADER as HEADER
+from main import API_URL as URL
 
-try:
-    from main import AUTH_HEADER as HEADER
-    from main import API_URL as URL
-except Exception:
-    from discordSplash import API_URL as URL
-    from discordSplash import AUTH_HEADER as HEADER
 
 
 class User:
@@ -220,7 +216,7 @@ def permissions(self):
         except KeyError:
             return None
 
-    async def update(self, nick: str = None, roles: list = None, mute: bool = None, deaf: bool = None,
+    async def update(self, guild_id, nick: str = None, roles: list = None, mute: bool = None, deaf: bool = None,
                      channel_id: int = None):
         """
         modifies the guild member object
@@ -246,9 +242,11 @@ async def update(self, nick: str = None, roles: list = None, mute: bool = None,
         :rtype: discordSplash.member.Member
         """
         json = {"nick": nick, "roles": roles, "mute": mute, "deaf": deaf, "channel_id": channel_id}
-        g_id = self.json['guild_id']
-        id_ = self.json['id']
+        g_id = guild_id
+        id_ = self.json['user']['id']
         async with aiohttp.ClientSession() as cs:
             async with cs.patch(f'{URL}/guilds/{g_id}/members/{id_}', json=json, headers=HEADER) as r:
                 member_ = Member(r.json)
+                print(HEADER)
+                print(r)
                 return member_

examples/main.py

@@ -6,6 +6,6 @@
 @discordSplash.command(name='say')
 async def say(data):
     arg1 = data.options[0]['value']  # set arg1 to the value of the first argument
-    await data.respond(arg1) # respond to the command
+    await data.respond(arg1)  # respond to the command
 
 Run('TOKEN', x)