Skip to content

Commit b0c7198

Browse files
authored
Merge pull request #76 from Mineinjava/mineinjavaDev
fix #74
2 parents a6cfd48 + 0438eb8 commit b0c7198

File tree

8 files changed

+41
-33
lines changed

8 files changed

+41
-33
lines changed

.github/todo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
for todo in x:
2020
new_x = todo.replace("TODO:", "")
2121
new_x_t = new_x.replace("|", "\n")
22-
a,b = new_x_t.split('-', 1)
22+
a, b = new_x_t.split('-', 1)
2323
todos[a] = b
2424

2525
for todo_post in todos:

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ coverage.xml
5050
.hypothesis/
5151
.pytest_cache/
5252

53+
54+
5355
# Translations
5456
*.mo
5557
*.pot

discordSplash/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from .main import *
2+
import os
3+
import sys
24
PACKAGE_PARENT = '.'
35
SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
46
sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
5-
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
7+
__path__ = __import__('pkgutil').extend_path(__path__, __name__)

discordSplash/cfg.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"""
2+
really doesn't do anything
3+
used for keeping track of tokens and stuff
4+
"""
5+
6+
AUTH_HEADER = None
7+
TOKEN = None

discordSplash/channel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
class Channel():
2+
class Channel:
33
"""
44
Represents a Discord Channel Object.
55
"""
@@ -16,4 +16,4 @@ def id(self):
1616
try:
1717
return self.json['x']
1818
except KeyError:
19-
return None
19+
return None

discordSplash/main.py

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
1-
import os.path
2-
import sys
3-
4-
5-
61
import asyncio
72
import websockets
83
import json
94
import aiohttp
5+
import cfg
106
from enum import Enum
7+
118
try:
12-
import member
139
import opcodes as op
1410
except ModuleNotFoundError:
1511
from discordSplash import opcodes as op
1612
import traceback
1713

1814
commands = {}
1915

20-
TOKEN = None
21-
AUTH_HEADER = None
2216
API_URL = 'https://discord.com/api/v8'
2317

2418

@@ -132,6 +126,7 @@ def json(self):
132126
"""
133127
return self.jsonContent
134128

129+
135130
class ReactionData:
136131
"""
137132
reaction data passed in to the handler
@@ -191,6 +186,7 @@ def member(self):
191186
:return: a discordSplash.member.Member** object.
192187
:rtype: discordSplash.member.Member
193188
"""
189+
import member
194190
return member.Member(self.jsonData['member'])
195191

196192
@property
@@ -242,7 +238,8 @@ async def respond(self, data: ReactionResponse):
242238
async with session.post(
243239
f'https://discord.com/api/v8/interactions/{self.jsonData["id"]}/{self.jsonData["token"]}/callback',
244240
json=data.json) as resp:
245-
pass
241+
pass
242+
246243

247244

248245
class Run:
@@ -274,10 +271,10 @@ def __init__(self, token: str, presence: Presence = None):
274271
self.session_id = None
275272

276273
self.TOKEN = token
277-
global TOKEN, AUTH_HEADER
278-
TOKEN = token
279-
AUTH_HEADER = {"Authorization": f"Bot {token}"}
280-
274+
cfg.TOKEN = token
275+
cfg.AUTH_HEADER = {"Authorization": f"Bot {token}"}
276+
TOKEN = self.TOKEN
277+
print('header 1', cfg.AUTH_HEADER)
281278

282279
self.auth = {
283280
"token": self.TOKEN,
@@ -318,6 +315,7 @@ def __init__(self, token: str, presence: Presence = None):
318315
# asyncio.get_event_loop().run_until_complete(self.hello())
319316
# print(self.opcode(1, self.sequence))
320317

318+
321319
async def main(self, resume=False):
322320
async with websockets.connect(
323321
'wss://gateway.discord.gg/?v=6&encoding=json') \
@@ -330,7 +328,9 @@ async def main(self, resume=False):
330328
await asyncio.gather(self.heartbeat(), self.receive())
331329
if resume is True:
332330
await self.resume()
333-
print('RESUMING------------------------------------------------------------------------------------------------------------------------------------------------')
331+
print \
332+
(
333+
'RESUMING------------------------------------------------------------------------------------------------------------------------------------------------')
334334
await asyncio.gather(self.heartbeat(), self.receive())
335335

336336
# while self.interval is not None:
@@ -401,14 +401,13 @@ async def resume(self):
401401

402402
async def create_resume_packet(self):
403403
resume_blk = {
404-
"token": self.TOKEN,
405-
"session_id": self.session_id,
406-
"seq": self.sequence
407-
}
404+
"token": self.TOKEN,
405+
"session_id": self.session_id,
406+
"seq": self.sequence
407+
}
408408
return resume_blk
409409

410410

411-
412411
def command(name: str):
413412
"""A decorator that is used to register a command.
414413

discordSplash/member.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55
SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
66
sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
77

8+
from cfg import AUTH_HEADER as HEADER
9+
from main import API_URL as URL
810

9-
try:
10-
from main import AUTH_HEADER as HEADER
11-
from main import API_URL as URL
12-
except Exception:
13-
from discordSplash import API_URL as URL
14-
from discordSplash import AUTH_HEADER as HEADER
1511

1612

1713
class User:
@@ -220,7 +216,7 @@ def permissions(self):
220216
except KeyError:
221217
return None
222218

223-
async def update(self, nick: str = None, roles: list = None, mute: bool = None, deaf: bool = None,
219+
async def update(self, guild_id, nick: str = None, roles: list = None, mute: bool = None, deaf: bool = None,
224220
channel_id: int = None):
225221
"""
226222
modifies the guild member object
@@ -246,9 +242,11 @@ async def update(self, nick: str = None, roles: list = None, mute: bool = None,
246242
:rtype: discordSplash.member.Member
247243
"""
248244
json = {"nick": nick, "roles": roles, "mute": mute, "deaf": deaf, "channel_id": channel_id}
249-
g_id = self.json['guild_id']
250-
id_ = self.json['id']
245+
g_id = guild_id
246+
id_ = self.json['user']['id']
251247
async with aiohttp.ClientSession() as cs:
252248
async with cs.patch(f'{URL}/guilds/{g_id}/members/{id_}', json=json, headers=HEADER) as r:
253249
member_ = Member(r.json)
250+
print(HEADER)
251+
print(r)
254252
return member_

examples/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
@discordSplash.command(name='say')
77
async def say(data):
88
arg1 = data.options[0]['value'] # set arg1 to the value of the first argument
9-
await data.respond(arg1) # respond to the command
9+
await data.respond(arg1) # respond to the command
1010

1111
Run('TOKEN', x)

0 commit comments

Comments
 (0)