val
/
ubuntu-bots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Add new value substitution code missing from last import from ubottu

This commit is contained in:
Terence Simpson 2009-11-22 22:32:40 +00:00
parent 24a8f2041f
commit 2aa2031d86
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Encyclopedia/config.py
View File

@ -39,3 +39,23 @@ conf.registerChannelValue(Encyclopedia, 'ignores',
conf.registerChannelValue(Encyclopedia, 'privateNotFound',
registry.Boolean(False, "If set to True, send notfoundmsg in private rather than in the channel"))
conf.registerGlobalValue(Encyclopedia, 'curStable',
registry.String('Karmic', "Current stable release"))
conf.registerGlobalValue(Encyclopedia, 'curStableLong',
registry.String('Karmic Koala', "Current stable release"))
conf.registerGlobalValue(Encyclopedia, 'curStableNum',
registry.String('9.10', "Current stable release"))
conf.registerGlobalValue(Encyclopedia, 'curDevel',
registry.String('Lucid', "Current development release"))
conf.registerGlobalValue(Encyclopedia, 'curDevelLong',
registry.String('Lucid Lynx', "Current development release"))
conf.registerGlobalValue(Encyclopedia, 'curDevelNum',
registry.String('10.04', "Current development release"))
conf.registerGlobalValue(Encyclopedia, 'curLTS',
registry.String('Hardy', "Current LTS release"))
conf.registerGlobalValue(Encyclopedia, 'curLTSLong',
registry.String('Hardy Herron', "Current LTS release"))
conf.registerGlobalValue(Encyclopedia, 'curLTSNum',
registry.String('8.04', "Current LTS release"))

30
Encyclopedia/plugin.py
View File

@ -613,6 +613,30 @@ class Encyclopedia(callbacks.Plugin):
return "I'll remember that, %s" % editor[:editor.find('!')]
def factoid_lookup(self, text, channel, display_info):
def subvars(val):
curStable = self.registryValue('curStable')
curStableLong = self.registryValue('curStableLong')
curStableNum = self.registryValue('curStableNum')
curLTS = self.registryValue('curLTS')
curLTSLong = self.registryValue('curLTSLong')
curLTSNum = self.registryValue('curLTSNum')
curDevel = self.registryValue('curDevel')
curDevelLong = self.registryValue('curDevelLong')
curDevelNum = self.registryValue('curDevelNum')
val = val.replace('$chan',channel)
val = val.replace('$curStableLong',curStableLong)
val = val.replace('$curStableNum',curStableNum)
val = val.replace('$curStableLower',curStable.lower())
val = val.replace('$curStable',curStable)
val = val.replace('$curLTSLong',curLTSLong)
val = val.replace('$curLTSNum',curLTSNum)
val = val.replace('$curLTSLower',curLTS.lower())
val = val.replace('$curLTS',curLTS)
val = val.replace('$curDevelLong',curDevelLong)
val = val.replace('$curDevelNum',curDevelNum)
val = val.replace('$curDevelLower',curDevel.lower())
val = val.replace('$curDevel',curDevel)
return val
db = self.get_db(channel)
factoids = self.get_factoids(text.lower(), channel, resolve = not display_info, info = display_info)
ret = []
@ -626,14 +650,14 @@ class Encyclopedia(callbacks.Plugin):
cur.execute("UPDATE FACTS SET popularity = %d WHERE name = %s", factoid.popularity+1, factoid.name)
db.commit()
if factoid.value.startswith('<reply>'):
ret.append(factoid.value[7:].strip().replace('$chan',channel))
ret.append(subvars(factoid.value[7:].strip()))
elif order == 'secondary':
ret.append(factoid.value.strip().replace('$chan',channel))
ret.append(subvars(factoid.value.strip()))
else:
n = factoid.name
if '-#' in n:
n = n[:n.find('-#')]
ret.append('%s is %s' % (n, factoid.value.replace('$chan',channel)))
ret.append('%s is %s' % (n, subvars(factoid.value))
if not display_info:
break
return ret