diff --git a/COMMANDS.md b/COMMANDS.md
index 5ff2dbf..eb5221e 100644
--- a/COMMANDS.md
+++ b/COMMANDS.md
@@ -5,7 +5,7 @@ Required arguments are enclosed in { and }, optional arguments are enclosed in [
$botname refers to the name of the IRC bot, e.g. MinetestBot
- Command | Description | Usable by |
+ Command | Description | Usable by |
admin.py | | |
!join {channel} [channel-key] | Join the specified channel | Admins |
!part {channel} | Leave the specified channel | Admins |
@@ -43,9 +43,6 @@ Required arguments are enclosed in { and }, optional arguments are enclosed in [
!b16d {string} | Base16-decode a string | Anyone |
!hash {hashtype} {string} | Hash a string, supports various hash functions | Anyone |
!rand [min] {max} | Says a random number between(incl.) min and max | Anyone |
- search.py | | |
- !g {string} | Output first Google result for string | Anyone |
- !gc {string} | Output Google result count for string | Anyone |
seen.py | | |
!seen {person} | Output when person was last seen | Anyone |
server.py | | |
@@ -70,8 +67,6 @@ Required arguments are enclosed in { and }, optional arguments are enclosed in [
| Supports multiple Ports e.g. 123-456,999 | |
title.py | | |
!title [link] | Query Page Title | Anyone |
- twitter.py | | |
- !tw {link/username/tweet_id} | Query Tweet from Twitter | Anyone |
wiki.py | | |
!wik {term} | Query wiki.minetest.com for term | Anyone |
devwiki.py | | |
diff --git a/search.py b/search.py
deleted file mode 100755
index d67dcd0..0000000
--- a/search.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-"""
-search.py - Phenny Web Search Module
-Copyright 2008-9, Sean B. Palmer, inamidst.com
-Modified by sfan5 2012
-Licensed under the Eiffel Forum License 2.
-
-http://inamidst.com/phenny/
-"""
-
-import web
-import re
-
-def google_ajax(query):
- """Search using AjaxSearch, and return its JSON."""
- uri = 'http://ajax.googleapis.com/ajax/services/search/web'
- args = '?v=1.0&safe=off&q=' + web.urlencode(query)
- data, sc = web.get(uri + args)
- data = str(data, 'utf-8')
- return web.json(data)
-
-def google_search(query):
- results = google_ajax(query)
- try: return results['responseData']['results'][0]['unescapedUrl']
- except IndexError: return None
- except TypeError:
- return False
-
-def g(phenny, input):
- """Queries Google for the specified input."""
- query = input.group(2)
- if not query:
- return phenny.reply('.g what?')
- log.log("event", "%s searched Google for '%s'" % (log.fmt_user(input), query), phenny)
- uri = google_search(query)
- if uri:
- phenny.reply(uri)
- phenny.bot.last_seen_uri = uri
- elif uri is False: phenny.reply("Problem getting data from Google.")
- else: phenny.reply("No results found for '%s'." % query)
-g.commands = ['g']
-g.priority = 'high'
-g.example = '.g minetest'
-
-def gc(phenny, input):
- query = input.group(2)
- if not query:
- return phenny.reply("No query term.")
- log.log("event", "%s searched Google for '%s'" % (log.fmt_user(input), query), phenny)
- result = new_gc(query)
- if result:
- phenny.say(query + ": " + result)
- else: phenny.reply("Sorry, couldn't get a result.")
-
-def new_gc(query):
- uri = 'https://www.google.com/search?hl=en&q='
- uri = uri + web.urlencode(query).replace('+', '%2B')
- if '"' in query: uri += '&tbs=li:1'
- data, sc = web.get(uri)
- data = str(data, 'utf-8')
- if "did not match any documents" in data:
- return "0"
- for result in re.compile(r'(?ims)([0-9,]+) results?').findall(data):
- return result
- return None
-
-gc.commands = ['gc']
-gc.priority = 'high'
-gc.example = '.gc minetest'
-
-if __name__ == '__main__':
- print(__doc__.strip())
diff --git a/twitter.py b/twitter.py
deleted file mode 100755
index 05a32a0..0000000
--- a/twitter.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/env python
-"""
-twitter.py - Phenny Twitter Module
-Copyright 2012, Sean B. Palmer, inamidst.com
-Modified by sfan5 2012
-Licensed under the Eiffel Forum License 2.
-
-http://inamidst.com/phenny/
-"""
-
-import re, time
-import web
-
-r_username = re.compile(r'^@[a-zA-Z0-9_]{1,15}$')
-r_link = re.compile(r'^https?://twitter.com/\S+$')
-r_p = re.compile(r'(?ims)(