summaryrefslogtreecommitdiffstats
path: root/news
diff options
context:
space:
mode:
authormakefu <root@pigstarter.de>2014-01-22 15:57:12 +0100
committermakefu <root@pigstarter.de>2014-01-22 15:57:12 +0100
commit2dffcc408f13f7bfe462901d8dd1971f19cbb2c1 (patch)
tree785649178c98889fec425152eda36a0cdca075e8 /news
parenta774db6b3d89a106689fb1365f65b4a49c2dedec (diff)
parent07a3ca010414bf249a8e865eca9e597c9013a986 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'news')
-rw-r--r--news/newsbot.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/news/newsbot.py b/news/newsbot.py
index 54a2e7d2..899c5dd2 100644
--- a/news/newsbot.py
+++ b/news/newsbot.py
@@ -39,6 +39,7 @@ class NewsBot(asybot):
def on_invite(self, prefix, command, params, rest):
for chan in rest.split():
self.push('JOIN ' + chan)
+ self.channels.append(chan)
def read_message(self, args):
try:
@@ -215,6 +216,7 @@ class RssBot(asybot):
def on_invite(self, prefix, command, params, rest):
for chan in rest.split():
self.push('JOIN ' + chan)
+ self.channels.append(chan)
feedfile = 'new_feeds'
url_shortener = 'http://wall'
@@ -231,7 +233,7 @@ F.close()
for line in lines:
line = line.strip('\n')
linear = line.split('|')
- bot = RssBot(linear[1], linear[0], init_channels + linear[2].split(), url_shortener=url_shortener)
+ bot = RssBot(linear[1], linear[0], linear[2].split(), url_shortener=url_shortener)
bot.start_rss()
bots[linear[0]] = bot