add new abc for sockets

[erebus.git] / modules / admin_channel.py

diff --git a/modules/admin_channel.py b/modules/admin_channel.py
index 6d9eba88255bcfdf7d70b8b4582fbd4f0ec041fa..88a6c5af6efc8e59da8303f35f2606d015f14772 100644 (file)
--- a/modules/admin_channel.py
+++ b/modules/admin_channel.py
@@ -1,6 +1,6 @@
 # Erebus IRC bot - Author: Erebus Team
 # vim: fileencoding=utf-8
-# simple module example
+# Channel list management (add, remove channels)
 # This file is released into the public domain; see http://unlicense.org/
 
 # module info
@@ -55,13 +55,14 @@ def join(bot, user, chan, realtarget, *args):
        bot.chans.append(chan)
        bot.join(chan)
 
-       chan.setlevel(target.auth, lib.COWNER)
-       user.msg('Added channel')
+       if chan.setlevel(target.auth, lib.COWNER):
+               return 'Added channel'
+       else:
+               return "An error occurred!"
 
 
 def _part(user, chan):
-       chan.bot.chans.remove(chan)
-       del lib.parent.chans[chan.name.lower()]
+       chan.deleting = True
        lib.parent.query("DELETE FROM chusers WHERE chan = %s", (chan,))
        lib.parent.query("DELETE FROM chans WHERE chname = %s", (chan,))
        chan.bot.part(chan)