Merge remote-tracking branch 'origin/refresh' into refresh

disabled_stuff/religion.py

@@ -1,38 +0,0 @@
-from util import hook, http
-
-
-@hook.command('god')
-@hook.command
-def bible(inp):
-    """.bible <passage> -- gets <passage> from the Bible (ESV)"""
-
-    base_url = ('http://www.esvapi.org/v2/rest/passageQuery?key=IP&'
-                'output-format=plain-text&include-heading-horizontal-lines&'
-                'include-headings=false&include-passage-horizontal-lines=false&'
-                'include-passage-references=false&include-short-copyright=false&'
-                'include-footnotes=false&line-length=0&'
-                'include-heading-horizontal-lines=false')
-
-    text = http.get(base_url, passage=inp)
-
-    text = ' '.join(text.split())
-
-    if len(text) > 400:
-        text = text[:text.rfind(' ', 0, 400)] + '...'
-
-    return text
-
-
-@hook.command('allah')
-@hook.command
-def koran(inp):  # Koran look-up plugin by Ghetto Wizard
-    """.koran <chapter.verse> -- gets <chapter.verse> from the Koran"""
-
-    url = 'http://quod.lib.umich.edu/cgi/k/koran/koran-idx?type=simple'
-
-    results = http.get_html(url, q1=inp).xpath('//li')
-
-    if not results:
-        return 'No results for ' + inp
-
-    return results[0].text_content()

plugins/core_misc.py

@@ -7,9 +7,6 @@ from util import hook
 
 socket.setdefaulttimeout(10)
 
-nick_re = re.compile(":(.+?)!")
-
-
 # Auto-join on Invite (Configurable, defaults to True)
 @hook.event('INVITE')
 def invite(paraml, conn=None):
@@ -53,25 +50,6 @@ def onjoin(paraml, conn=None, bot=None):
     bot.logger.info("ONJOIN hook completed. Bot ready.")
 
 
-@hook.event("KICK")
-def onkick(paraml, conn=None, chan=None):
-    # if the bot has been kicked, remove from the channel list
-    if paraml[1] == conn.nick:
-        conn.channels.remove(chan)
-        auto_rejoin = conn.config.get('auto_rejoin', False)
-        if auto_rejoin:
-            conn.join(paraml[0])
-
-
-@hook.event("NICK")
-def onnick(paraml, bot=None, conn=None, raw=None):
-    old_nick = nick_re.search(raw).group(1)
-    new_nick = str(paraml[0])
-    if old_nick == conn.nick:
-        conn.nick = new_nick
-        bot.logger.info("Bot nick changed from '{}' to '{}'.".format(old_nick, new_nick))
-
-
 @hook.singlethread
 @hook.event('004')
 def keep_alive(paraml, conn=None):

plugins/core_tracker.py

@@ -0,0 +1,27 @@
+# plugin to keep track of bot state
+
+import re
+
+from util import hook
+
+
+nick_re = re.compile(":(.+?)!")
+
+
+@hook.event("KICK")
+def on_kick(paraml, conn=None, chan=None):
+    # if the bot has been kicked, remove from the channel list
+    if paraml[1] == conn.nick:
+        conn.channels.remove(chan)
+        auto_rejoin = conn.config.get('auto_rejoin', False)
+        if auto_rejoin:
+            conn.join(paraml[0])
+
+
+@hook.event("NICK")
+def on_nick(paraml, bot=None, conn=None, raw=None):
+    old_nick = nick_re.search(raw).group(1)
+    new_nick = str(paraml[0])
+    if old_nick == conn.nick:
+        conn.nick = new_nick
+        bot.logger.info("Bot nick changed from '{}' to '{}'.".format(old_nick, new_nick))