summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean B. Palmer <sean@miscoranda.com>2010-01-19 14:52:37 +0000
committerSean B. Palmer <sean@miscoranda.com>2010-01-19 14:52:37 +0000
commit3e300c4357973d4dd88cdf4a4046ef5c78409b81 (patch)
tree78a80aac404d2bcad28a6702b10b783d6855a527
parentf5ef55769ee9f22065cf714872ea1a38d48047d8 (diff)
downloadbot-3e300c4357973d4dd88cdf4a4046ef5c78409b81.tar.gz
bot-3e300c4357973d4dd88cdf4a4046ef5c78409b81.tar.bz2
bot-3e300c4357973d4dd88cdf4a4046ef5c78409b81.zip
Fixed the .commandr bug.
-rw-r--r--Makefile7
-rwxr-xr-xbot.py2
-rw-r--r--foaf.rdf54
3 files changed, 8 insertions, 55 deletions
diff --git a/Makefile b/Makefile
index f5658cb..5355824 100644
--- a/Makefile
+++ b/Makefile
@@ -5,3 +5,10 @@
archive: ;
hg archive -t tbz2 phenny-hg.tar.bz2
git archive --format=tar --prefix=phenny/ HEAD | bzip2 > phenny.tar.bz2
+
+ci: ;
+ git commit -a && git push origin master
+
+log: ;
+ # git log --date=short --format='%h %ad %s'
+ git graph
diff --git a/bot.py b/bot.py
index 1bd559f..7cfc76c 100755
--- a/bot.py
+++ b/bot.py
@@ -127,7 +127,7 @@ class Phenny(irc.Bot):
prefix = self.config.prefix
commands, pattern = func.rule
for command in commands:
- command = r'(%s)(?: +(?:%s))?' % (command, pattern)
+ command = r'(%s)\b(?: +(?:%s))?' % (command, pattern)
regexp = re.compile(prefix + command)
bind(self, func.priority, regexp, func)
diff --git a/foaf.rdf b/foaf.rdf
deleted file mode 100644
index 4ac6e13..0000000
--- a/foaf.rdf
+++ /dev/null
@@ -1,54 +0,0 @@
-
-<!-- Processed by Id: cwm.py,v 1.164 2004/10/28 17:41:59 timbl Exp -->
-
-
-<rdf:RDF xmlns="http://xmlns.com/foaf/0.1/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
-
- <PersonalProfileDocument rdf:about="http://inamidst.com/phenny/foaf">
- <dc:title>Information about phenny</dc:title>
- <maker rdf:resource="http://inamidst.com/phenny/foaf#sbp"/>
- </PersonalProfileDocument>
-
- <Agent rdf:about="http://inamidst.com/phenny/foaf#phenny">
- <homepage rdf:resource="http://inamidst.com/phenny/"/>
- <name>Phenny P. Palmersbot</name>
- <nick>phenny</nick>
- <title>Ms.</title>
- </Agent>
-
- <Person rdf:about="http://inamidst.com/phenny/foaf#sbp">
- <rdfs:seeAlso rdf:resource="http://inamidst.com/sbp/foaf"/>
- <homepage rdf:resource="http://inamidst.com/sbp/"/>
- <name>Sean B. Palmer</name>
- </Person>
-</rdf:RDF>
-
-<!-- Notation3 Source:
-
-@prefix : <http://inamidst.com/phenny/foaf#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix dc: <http://purl.org/dc/elements/1.1/> .
-@keywords a .
-
-<http://inamidst.com/phenny/foaf> a foaf:PersonalProfileDocument;
- foaf:maker sbp;
- dc:title "Information about phenny" .
-
-phenny a foaf:Agent;
- foaf:name "Phenny P. Palmersbot";
- foaf:title "Ms.";
- foaf:homepage <http://inamidst.com/phenny/>;
- # foaf:knows sbp;
- foaf:nick "phenny" .
-
-sbp a foaf:Person;
- foaf:name "Sean B. Palmer";
- foaf:homepage <http://inamidst.com/sbp/>;
- rdfs:seeAlso <http://inamidst.com/sbp/foaf> .
-
--->