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

support path-arg variables in url_for

Browse source
This commit is contained in:
jesopo 2019-09-20 10:41:52 +01:00
parent 744a384c47
commit cf65614832
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/rest_api.py
View file

@ -79,8 +79,9 @@ class Handler(http.server.BaseHTTPRequestHandler):
return _bot.get_setting("rest-api-minify", False) return _bot.get_setting("rest-api-minify", False)
def _url_for(self, headers): def _url_for(self, headers):
return lambda route, endpoint, get_params={}: _module._url_for( return (lambda route, endpoint, args=[], get_params={}:
route, endpoint, get_params, headers.get("Host", None)) _module._url_for(route, endpoint, args, get_params,
headers.get("Host", None))
def _handle(self, method, path, endpoint, args): def _handle(self, method, path, endpoint, args):
headers = utils.CaseInsensitiveDict(dict(self.headers.items())) headers = utils.CaseInsensitiveDict(dict(self.headers.items()))
@ -199,7 +200,8 @@ class Module(ModuleManager.BaseModule):
}) })
event["stdout"].write("New API key ('%s'): %s" % (comment, api_key)) event["stdout"].write("New API key ('%s'): %s" % (comment, api_key))
def _url_for(self, route, endpoint, get_params={}, host_override=None): def _url_for(self, route, endpoint, args=[], get_params={},
host_override=None):
host = host_override or self.bot.get_setting("rest-api-host", None) host = host_override or self.bot.get_setting("rest-api-host", None)
host, _, port = host.partition(":") host, _, port = host.partition(":")
@ -208,9 +210,13 @@ class Module(ModuleManager.BaseModule):
host = "%s:%s" % (host, port) host = "%s:%s" % (host, port)
if host: if host:
args_str = ""
if args:
args_str = "/%s" % "/".join(args)
get_params_str = "" get_params_str = ""
if get_params: if get_params:
get_params_str = "?%s" % urllib.parse.urlencode(get_params) get_params_str = "?%s" % urllib.parse.urlencode(get_params)
return "%s/%s/%s%s" % (host, route, endpoint, get_params_str) return "%s/%s/%s%s%s" % (host, route, endpoint, args_str,
get_params_str)
else: else:
return None return None