forked from khuxkm/cosmicbot
Fix merge conflict with local copy
This commit is contained in:
parent
08c726d35b
commit
a61b7808e1
1
bot.py
1
bot.py
|
@ -52,6 +52,7 @@ class CosmicBot(teambot.Handler):
|
|||
self.tasks.states[0] = self.check_rss(self.tasks.states[0],self.tasks.base_state)
|
||||
def on_roster(self,channel,nick,namecnt=""):
|
||||
output = subprocess.check_output(["/usr/local/bin/roster",namecnt]).decode("ascii").split("\n")
|
||||
output = filter(None,output)
|
||||
for line in output:
|
||||
line = re.sub("\s+"," ",line).split()
|
||||
self.say(channel,"{}: {} (by {})".format(nick,line[1],unhighlight_nick(line[0])))
|
||||
|
|
Loading…
Reference in New Issue