mr_tesla/discover-desktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Normalise some subscriptions

Browse source
This commit is contained in:
trigg 2020-09-23 16:57:26 +01:00
parent 57386da828
commit 9e7e4d705d
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
discover.py
View file

@ -151,6 +151,7 @@ def on_message(ws, message):
sub_all_voice_guild(ws,j["nonce"]) sub_all_voice_guild(ws,j["nonce"])
return return
elif j["cmd"] == "SUBSCRIBE": elif j["cmd"] == "SUBSCRIBE":
return return
elif j["cmd"] == "GET_CHANNEL": elif j["cmd"] == "GET_CHANNEL":
if j["evt"] == "ERROR": if j["evt"] == "ERROR":
@ -163,6 +164,8 @@ def on_message(ws, message):
set_in_room(voice["user"]["id"], True) set_in_room(voice["user"]["id"], True)
if voice["user"]["id"] == user["id"]: if voice["user"]["id"] == user["id"]:
current_channel = j["data"]["id"] current_channel = j["data"]["id"]
return
print(j)
def check_guilds(): def check_guilds():
global guilds global guilds
@ -174,7 +177,7 @@ def check_guilds():
on_connected() on_connected()
def on_connected(): def on_connected():
global guilds global guilds, ws
for guild in guilds.values(): for guild in guilds.values():
channels = "" channels = ""
for channel in guild["channels"]: for channel in guild["channels"]:
@ -207,12 +210,15 @@ def find_user(ws):
for channel in channels: for channel in channels:
req_channel_details(ws, channel) req_channel_details(ws, channel)
def sub_raw(ws, cmd, channel, nonce):
ws.send("{\"cmd\":\"SUBSCRIBE\",\"args\":{\"channel_id\":\"%s\"},\"evt\":\"%s\",\"nonce\":\"%s\"}" % (channel, cmd, nonce))
def sub_voice_channel(ws, channel): def sub_voice_channel(ws, channel):
ws.send("{\"cmd\":\"SUBSCRIBE\",\"args\":{\"channel_id\":\"%s\"},\"evt\":\"VOICE_STATE_CREATE\",\"nonce\":\"deadbeef\"}" % (channel)) sub_raw(ws,"VOICE_STATE_CREATE", channel, channel)
ws.send("{\"cmd\":\"SUBSCRIBE\",\"args\":{\"channel_id\":\"%s\"},\"evt\":\"VOICE_STATE_UPDATE\",\"nonce\":\"deadbeef\"}" % (channel)) sub_raw(ws,"VOICE_STATE_UPDATE", channel, channel)
ws.send("{\"cmd\":\"SUBSCRIBE\",\"args\":{\"channel_id\":\"%s\"},\"evt\":\"VOICE_STATE_DELETE\",\"nonce\":\"deadbeef\"}" % (channel)) sub_raw(ws,"VOICE_STATE_DELETE", channel, channel)
ws.send("{\"cmd\":\"SUBSCRIBE\",\"args\":{\"channel_id\":\"%s\"},\"evt\":\"SPEAKING_START\",\"nonce\":\"deadbeef\"}" % (channel)) sub_raw(ws,"SPEAKING_START", channel, channel)
ws.send("{\"cmd\":\"SUBSCRIBE\",\"args\":{\"channel_id\":\"%s\"},\"evt\":\"SPEAKING_STOP\",\"nonce\":\"deadbeef\"}" % (channel)) sub_raw(ws,"SPEAKING_STOP", channel, channel)
def sub_all_voice_guild(ws, gid): def sub_all_voice_guild(ws, gid):
global guilds global guilds
@ -913,7 +919,11 @@ def main():
GLib.timeout_add((1000/60), do_read) GLib.timeout_add((1000/60), do_read)
Gtk.main() try:
Gtk.main()
except:
pass
if __name__ == "__main__": if __name__ == "__main__":
ws=None ws=None