Fix merge conflict with local copy

This commit is contained in:
Robert Miles 2018-12-03 01:05:17 +00:00
parent 08c726d35b
commit a61b7808e1
1 changed files with 1 additions and 0 deletions

1
bot.py
View File

@ -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])))