Merge branch 'master' of https://github.com/krebscode/painload

3 files changed, 2 insertions, 4 deletions

diff --git a/go/etc/conf.d/go.env b/go/etc/conf.d/go.env
index 477c7eeb..6045deac 100644
--- a/go/etc/conf.d/go.env
+++ b/go/etc/conf.d/go.env
@@ -1,4 +1,2 @@
-HOSTN=go
 PORT=1337
-URI_PREFIX=http://go
 REDIS_KEY_PREFIX=go:
diff --git a/ircbot/contoller.py b/ircbot/contoller.py
index 8db32b8e..26e88ca9 100755
--- a/ircbot/contoller.py
+++ b/ircbot/contoller.py
@@ -118,7 +118,7 @@ class commands():
 
 
 feedfile = 'new_feeds'
-url_shortener = 'http://localhost:1337'
+url_shortener = 'http://wall'
 init_channels = ['#news']
 
 if 'FEEDFILE' in os.environ:
diff --git a/ircbot/rssbot.py b/ircbot/rssbot.py
index 531e50c5..14126f7a 100755
--- a/ircbot/rssbot.py
+++ b/ircbot/rssbot.py
@@ -58,7 +58,7 @@ class RssBot(irc.bot.SingleServerIRCBot):
                     #    self.send(entry.title + " " + entry.link + " com: " + entry.comments)
                     #except AttributeError:
                     shorturl = subprocess.check_output(["curl", "-sS", "-F", "uri=" + entry.link, self.url_shortener]).decode()
-                    self.send(entry.title + " " + shorturl)
+                    self.send(entry.title + " " + shorturl + '#' + entry.link.partition('://')[2].partition('/')[0])
                     self.oldnews.append(entry.link)
                     self.lastnew = datetime.now()
             sleep(self.to)