mirror of
https://github.com/TitanEmbeds/Titan.git
synced 2024-12-25 14:37:02 +01:00
Return after disconnect
This commit is contained in:
parent
ca834b758f
commit
e35e33abf7
@ -8,6 +8,7 @@ import json
|
|||||||
|
|
||||||
class Gateway(Namespace):
|
class Gateway(Namespace):
|
||||||
def teardown_db_session(self):
|
def teardown_db_session(self):
|
||||||
|
time.sleep(0)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
db.session.remove()
|
db.session.remove()
|
||||||
|
|
||||||
@ -15,9 +16,11 @@ class Gateway(Namespace):
|
|||||||
emit('hello')
|
emit('hello')
|
||||||
|
|
||||||
def on_identify(self, data):
|
def on_identify(self, data):
|
||||||
|
time.sleep(0)
|
||||||
guild_id = data["guild_id"]
|
guild_id = data["guild_id"]
|
||||||
if not guild_accepts_visitors(guild_id) and not check_user_in_guild(guild_id):
|
if not guild_accepts_visitors(guild_id) and not check_user_in_guild(guild_id):
|
||||||
disconnect()
|
disconnect()
|
||||||
|
self.teardown_db_session()
|
||||||
return
|
return
|
||||||
session["socket_guild_id"] = guild_id
|
session["socket_guild_id"] = guild_id
|
||||||
channels = []
|
channels = []
|
||||||
@ -46,10 +49,13 @@ class Gateway(Namespace):
|
|||||||
self.teardown_db_session()
|
self.teardown_db_session()
|
||||||
|
|
||||||
def on_disconnect(self):
|
def on_disconnect(self):
|
||||||
|
time.sleep(0)
|
||||||
if "user_keys" not in session:
|
if "user_keys" not in session:
|
||||||
disconnect()
|
self.teardown_db_session()
|
||||||
|
return
|
||||||
if "socket_guild_id" not in session:
|
if "socket_guild_id" not in session:
|
||||||
disconnect()
|
self.teardown_db_session()
|
||||||
|
return
|
||||||
else:
|
else:
|
||||||
guild_id = session["socket_guild_id"]
|
guild_id = session["socket_guild_id"]
|
||||||
msg = {}
|
msg = {}
|
||||||
@ -75,8 +81,10 @@ class Gateway(Namespace):
|
|||||||
self.teardown_db_session()
|
self.teardown_db_session()
|
||||||
|
|
||||||
def on_heartbeat(self, data):
|
def on_heartbeat(self, data):
|
||||||
|
time.sleep(0)
|
||||||
if "socket_guild_id" not in session:
|
if "socket_guild_id" not in session:
|
||||||
disconnect()
|
disconnect()
|
||||||
|
return
|
||||||
guild_id = data["guild_id"]
|
guild_id = data["guild_id"]
|
||||||
visitor_mode = data["visitor_mode"]
|
visitor_mode = data["visitor_mode"]
|
||||||
if not visitor_mode:
|
if not visitor_mode:
|
||||||
@ -84,25 +92,31 @@ class Gateway(Namespace):
|
|||||||
if "unauthenticated" not in session:
|
if "unauthenticated" not in session:
|
||||||
self.teardown_db_session()
|
self.teardown_db_session()
|
||||||
disconnect()
|
disconnect()
|
||||||
|
return
|
||||||
if session["unauthenticated"]:
|
if session["unauthenticated"]:
|
||||||
key = session["user_keys"][guild_id]
|
key = session["user_keys"][guild_id]
|
||||||
|
time.sleep(0)
|
||||||
status = update_user_status(guild_id, session["username"], key)
|
status = update_user_status(guild_id, session["username"], key)
|
||||||
if status["revoked"] or status["banned"]:
|
if status["revoked"] or status["banned"]:
|
||||||
emit("revoke")
|
emit("revoke")
|
||||||
self.teardown_db_session()
|
self.teardown_db_session()
|
||||||
time.sleep(1)
|
time.sleep(1)
|
||||||
disconnect()
|
disconnect()
|
||||||
|
return
|
||||||
else:
|
else:
|
||||||
emit("ack")
|
emit("ack")
|
||||||
else:
|
else:
|
||||||
if not guild_accepts_visitors(guild_id):
|
if not guild_accepts_visitors(guild_id):
|
||||||
self.teardown_db_session()
|
self.teardown_db_session()
|
||||||
disconnect()
|
disconnect()
|
||||||
|
return
|
||||||
self.teardown_db_session()
|
self.teardown_db_session()
|
||||||
|
|
||||||
def on_channel_list(self, data):
|
def on_channel_list(self, data):
|
||||||
|
time.sleep(0)
|
||||||
if "socket_guild_id" not in session:
|
if "socket_guild_id" not in session:
|
||||||
disconnect()
|
disconnect()
|
||||||
|
return
|
||||||
guild_id = data["guild_id"]
|
guild_id = data["guild_id"]
|
||||||
visitor_mode = data["visitor_mode"]
|
visitor_mode = data["visitor_mode"]
|
||||||
channels = None
|
channels = None
|
||||||
@ -120,8 +134,10 @@ class Gateway(Namespace):
|
|||||||
self.teardown_db_session()
|
self.teardown_db_session()
|
||||||
|
|
||||||
def on_current_user_info(self, data):
|
def on_current_user_info(self, data):
|
||||||
|
time.sleep(0)
|
||||||
if "socket_guild_id" not in session:
|
if "socket_guild_id" not in session:
|
||||||
disconnect()
|
disconnect()
|
||||||
|
return
|
||||||
guild_id = data["guild_id"]
|
guild_id = data["guild_id"]
|
||||||
if "user_keys" in session and not session["unauthenticated"]:
|
if "user_keys" in session and not session["unauthenticated"]:
|
||||||
dbMember = get_guild_member(guild_id, session["user_id"])
|
dbMember = get_guild_member(guild_id, session["user_id"])
|
||||||
@ -164,8 +180,10 @@ class Gateway(Namespace):
|
|||||||
return color
|
return color
|
||||||
|
|
||||||
def on_lookup_user_info(self, data):
|
def on_lookup_user_info(self, data):
|
||||||
|
time.sleep(0)
|
||||||
if "socket_guild_id" not in session:
|
if "socket_guild_id" not in session:
|
||||||
disconnect()
|
disconnect()
|
||||||
|
return
|
||||||
guild_id = data["guild_id"]
|
guild_id = data["guild_id"]
|
||||||
name = data["name"]
|
name = data["name"]
|
||||||
discriminator = data["discriminator"]
|
discriminator = data["discriminator"]
|
||||||
@ -180,6 +198,7 @@ class Gateway(Namespace):
|
|||||||
"avatar_url": None,
|
"avatar_url": None,
|
||||||
"discordbotsorgvoted": False,
|
"discordbotsorgvoted": False,
|
||||||
}
|
}
|
||||||
|
time.sleep(0)
|
||||||
member = redisqueue.get_guild_member_named(guild_id, "{}#{}".format(name, discriminator))
|
member = redisqueue.get_guild_member_named(guild_id, "{}#{}".format(name, discriminator))
|
||||||
if member:
|
if member:
|
||||||
usr["id"] = str(member["id"])
|
usr["id"] = str(member["id"])
|
||||||
|
Loading…
Reference in New Issue
Block a user