1 files changed, 2 insertions, 17 deletions
diff --git a/modules/channel_save.py b/modules/channel_save.py
index d32fb26c..b3133843 100644
--- a/modules/channel_save.py
+++ b/modules/channel_save.py
@@ -4,23 +4,8 @@ class Module(ModuleManager.BaseModule):
     @utils.hook("received.001")
     def on_connect(self, event):
         channels = event["server"].get_setting("autojoin", [])
-        if not channels:
-            return
-
-        chan_keys = event["server"].get_setting("channel_keys", {})
-        channels_sorted = sorted(channels,
-            key=lambda x: 0 if x in chan_keys else 1)
-
-        keys_sorted = list(map(lambda x: x[1],
-            sorted(chan_keys.items(),
-            key=lambda x: channels_sorted.index(x[0]))))
-
-        for i in range(len(channels_sorted)):
-            channel = channels_sorted[i]
-            key = None if len(keys_sorted) <= i else keys_sorted[i]
-            event["server"].attempted_join[channel] = key
-
-        event["server"].send_joins(channels_sorted, keys_sorted)
+        if channels:
+                event["server"].send_joins(channels)
 
     @utils.hook("self.join")
     def on_join(self, event):