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

support extended url shorteners that take server and optional context (channel)

Browse source
This commit is contained in:
jesopo 2020-03-08 23:34:22 +00:00
parent d4ce93cf84
commit e41ea90c62
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/shorturl.py
View file

@ -16,23 +16,32 @@ class Module(ModuleManager.BaseModule):
self.exports.add("botset", setting) self.exports.add("botset", setting)
def _shorturl_options_factory(self): def _shorturl_options_factory(self):
shorteners = self.exports.find("shorturl-s-") shorteners = set(self.exports.find("shorturl-s-"))
return [s.replace("shorturl-s-", "", 1) for s in shorteners] shorteners.update(self.exports.find("shorturl-x-"))
return sorted(s.split("-", 2)[-1] for s in shorteners)
def _get_shortener(self, name): def _get_shortener(self, name):
return self.exports.get("shorturl-s-%s" % name, None) extended = self.exports.get("shorturl-x-%s" % name, None)
if not extended == None:
return True, extended
return False, self.exports.get("shorturl-s-%s" % name, None)
def _call_shortener(self, shortener_name, url): def _call_shortener(self, shortener_name, url):
shortener = self._get_shortener(shortener_name) extended, shortener = self._get_shortener(shortener_name)
if shortener == None: if shortener == None:
return None return None
if extended:
short_url = shortener(server, context, url)
else:
short_url = shortener(url) short_url = shortener(url)
if short_url == None: if short_url == None:
return None return None
return short_url return short_url
@utils.export("shorturl-any") @utils.export("shorturl-any")
def _shorturl_any(self, url): def _shorturl_any(self, url):
return self._call_shortener("bitly", url) or url return self._call_shortener(server, None, "bitly", url) or url
@utils.export("shorturl") @utils.export("shorturl")
def _shorturl(self, server, url, context=None): def _shorturl(self, server, url, context=None):
@ -45,7 +54,8 @@ class Module(ModuleManager.BaseModule):
if shortener_name == None: if shortener_name == None:
return url return url
return self._call_shortener(shortener_name, url) or url return self._call_shortener(
server, context, shortener_name, url) or url
@utils.export("shorturl-s-bitly") @utils.export("shorturl-s-bitly")
def _bitly(self, url): def _bitly(self, url):