diff --git a/commands/admin.py b/commands/admin.py index 8bf1dce..5865bd8 100644 --- a/commands/admin.py +++ b/commands/admin.py @@ -15,5 +15,4 @@ def admin_down(self,channel,nick,subcmd,*args): @admin.command("check") def admin_check(self,channel,nick,subcmd,*args): - self.say(channel,"This would check the RSS feed but I don't wanna spam") -# self.tasks.states[0] = self.check_rss(self.tasks.states[0],self.tasks.base_state) + self.tasks.states[0] = self.check_rss(self.tasks.states[0],self.tasks.base_state) diff --git a/commands/latest.py b/commands/latest.py index 0cf0a3d..e764c03 100644 --- a/commands/latest.py +++ b/commands/latest.py @@ -11,11 +11,7 @@ def on_latest(self,channel,nick,count="5"): self.say(channel, "{}: Latest {} {}. (See cosmic.voyage for more!)".format(nick, count, (count == 1 and "entry" or "entries"))) else: self.say(channel, "{}: Latest entries matching '{}'. (See cosmic.voyage for more!)".format(nick, count)) -# output = subprocess.check_output(["/usr/local/bin/latest",str(count)]).decode("ascii").split("\n") - if type(count)==int: - output = ["Excelsior - The one khuxkm has to write {!s}".format(x+1) for x in range(count)] - else: - output = ["Your filter was {!s}".format(count)] + output = subprocess.check_output(["/usr/local/bin/latest",str(count)]).decode("ascii").split("\n") output = filter(None,output) for line in output: self.say(channel,"{}: {}".format(nick,line)) diff --git a/commands/roster.py b/commands/roster.py index e5fa022..353dca1 100644 --- a/commands/roster.py +++ b/commands/roster.py @@ -4,8 +4,7 @@ unhighlight_nick = lambda nick: "_{!s}_".format(nick) @plugin.command("roster","") def on_roster(self,channel,nick,*namecnt): -# output = subprocess.check_output(["/usr/local/bin/roster",' '.join(namecnt)]).decode("ascii").split("\n") - output = ["khuxkm\tExcelsior","","alexis\tVoortrekker"] + output = subprocess.check_output(["/usr/local/bin/roster",' '.join(namecnt)]).decode("ascii").split("\n") output = filter(None,output) for line in output: line = re.sub("\s+"," ",line).split(" ",1)