Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

h8 everything right now

Browse source
This commit is contained in:
dngfx 2018-09-09 13:20:59 +01:00 committed by dongfix
parent 7aecd2b4ca
commit 2d4dbf922f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/bitly.py
View file

@ -16,7 +16,7 @@ class Module(object):
usage="<url>") usage="<url>")
def shortlink(self, event): def shortlink(self, event):
url = event if type(event) is str else event["url"] url = event["url"]
if not re.match(REGEX_URL, url): if not re.match(REGEX_URL, url):
url = "http://%s" % url url = "http://%s" % url

5
modules/tweets.py
View file

@ -16,6 +16,7 @@ class Module(object):
def __init__(self, bot, events, exports): def __init__(self, bot, events, exports):
self.bot = bot self.bot = bot
self.bitly_is_enabled = "bitly" in self.bot.modules.modules self.bitly_is_enabled = "bitly" in self.bot.modules.modules
self.events = events
events.on("received").on("command").on("tweet", "tw" events.on("received").on("command").on("tweet", "tw"
).hook(self.tweet, ).hook(self.tweet,
@ -68,12 +69,12 @@ class Module(object):
bitly_link = "" bitly_link = ""
if self.bitly_is_enabled: if self.bitly_is_enabled:
bitly = self.bot.modules.modules["bitly"]
chopped_uname = username[1:] chopped_uname = username[1:]
tweet_link = "https://twitter.com/%s/status/%s" % ( tweet_link = "https://twitter.com/%s/status/%s" % (
chopped_uname, linked_id) chopped_uname, linked_id)
bitly_link = " -- " + bitly.shortlink(tweet_link) bitly_link = " -- " + self.events.call("get.shortlink",
url=tweet_link)
if "retweeted_status" in tweet: if "retweeted_status" in tweet:
original_username = "@%s" % tweet["retweeted_status" original_username = "@%s" % tweet["retweeted_status"