chiark
/
gitweb
/
~matthewv
/
irc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more trouts from anon
[irc.git]
/
acrobat-chiark-0.2.py
diff --git
a/acrobat-chiark-0.2.py
b/acrobat-chiark-0.2.py
index e258636eed6cfce43ea4b630fd134a62f1a9acf4..7469ae7b0ac628be1be473e35b07e3b963411b25 100755
(executable)
--- a/
acrobat-chiark-0.2.py
+++ b/
acrobat-chiark-0.2.py
@@
-49,10
+49,6
@@
class Acrobat(SingleServerIRCBot):
[(server, port)], nickname, nickname)
self.channel = channel
self.owner = owner
[(server, port)], nickname, nickname)
self.channel = channel
self.owner = owner
- # version control magic
- acrorevision="$Revision$"
- acrorev1=re.sub(Revision$\([^$]*\)$,\1,acrorevision)
- acrorev2=re.sub($\(.*\),\1,acrorev1)
# load the karma db
try:
f = open("karmadump", "r")
# load the karma db
try:
f = open("karmadump", "r")
@@
-138,16
+134,20
@@
class Acrobat(SingleServerIRCBot):
len(self.karma.dict.keys()))
# query bot status
def infoq(self, cmd, nick, conn, public):
len(self.karma.dict.keys()))
# query bot status
def infoq(self, cmd, nick, conn, public):
+ # version control magic
+ acrorevision="$Revision$"
+ acrorev1=re.sub(r'\$Revision: (.*)',r'\1',acrorevision)
+ acroversion=re.sub(r'(.*) \$',r'\1',acrorev1)
if public == 1:
conn.privmsg(self.channel,
if public == 1:
conn.privmsg(self.channel,
- "I am Acrobat
0.2.1chiark
, on %s, as nick %s." %
- (self.channel, self.connection.get_nickname()))
+ "I am Acrobat
%s
, on %s, as nick %s." %
+ (
acroversion,
self.channel, self.connection.get_nickname()))
conn.privmsg(self.channel,
"My owner is %s; I have karma on %s items." %
(self.owner, len(self.karma.dict.keys())))
else:
conn.privmsg(self.channel,
"My owner is %s; I have karma on %s items." %
(self.owner, len(self.karma.dict.keys())))
else:
- conn.notice(nick, "I am Acrobat
0.2.1chiark
, on %s, as nick %s." %
- (self.channel, self.connection.get_nickname()))
+ conn.notice(nick, "I am Acrobat
%s
, on %s, as nick %s." %
+ (
acroversion,
self.channel, self.connection.get_nickname()))
conn.notice(nick, "My owner is %s; I have karma on %s items." %
(self.owner, len(self.karma.dict.keys())))
conn.notice(nick, "My owner is %s; I have karma on %s items." %
(self.owner, len(self.karma.dict.keys())))