From 1ecd23045dcf7797b1cebea729e83306bc068a20 Mon Sep 17 00:00:00 2001 From: luni3359 Date: Wed, 21 Oct 2020 08:39:31 -0500 Subject: [PATCH] Undo changes --- discover_overlay/discord_connector.py | 8 ++++---- discover_overlay/text_settings.py | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/discover_overlay/discord_connector.py b/discover_overlay/discord_connector.py index 4c86966..1ec6822 100644 --- a/discover_overlay/discord_connector.py +++ b/discover_overlay/discord_connector.py @@ -338,9 +338,9 @@ class DiscordConnector: for channel in j["data"]["channels"]: channel['guild_id'] = j['nonce'] channel['guild_name'] = self.guilds[j['nonce']]["name"] - # self.channels[channel["id"]] = channel - if channel["type"] in [0, 2]: - self.req_channel_details(channel["id"], guild_id=j["nonce"]) + self.channels[channel["id"]] = channel + if channel["type"] == 2: + self.req_channel_details(channel["id"]) self.check_guilds() return elif j["cmd"] == "SUBSCRIBE": @@ -466,7 +466,7 @@ class DiscordConnector: "args": { "channel_id": channel }, - "nonce": guild_id and guild_id or channel + "nonce": channel } self.websocket.send(json.dumps(cmd)) diff --git a/discover_overlay/text_settings.py b/discover_overlay/text_settings.py index aa32df8..00890e2 100644 --- a/discover_overlay/text_settings.py +++ b/discover_overlay/text_settings.py @@ -173,10 +173,6 @@ class TextSettingsWindow(SettingsWindow): """ Set the contents of list_channels """ - if in_list != {}: - print(in_list) - in_list = {k: v for k, v in sorted(in_list.items(), key=lambda i: i[1]["position"])} - self.list_channels = in_list self.list_channels_keys = [] for (key, _value) in enumerate(in_list):