spla/Mastodonplus.py
1
0
Fork 0
Codi Incidències Sol·licituds Pull repo.project Llançaments Paquets Wiki Activitat

Merge branch 'master' of https://github.com/halcy/Mastodon.py

Explorar la Font
This commit is contained in:
Lorenz Diener 2017-11-24 15:26:42 +01:00
commit 18f69451ed
S'han modificat 1 arxius amb 9 adicions i 2 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

11
mastodon/Mastodon.py
Veure arxiu

@ -1279,9 +1279,16 @@ class Mastodon:
instance = self.instance() instance = self.instance()
if "streaming_api" in instance["urls"] and instance["urls"]["streaming_api"] != self.api_base_url: if "streaming_api" in instance["urls"] and instance["urls"]["streaming_api"] != self.api_base_url:
# This is probably a websockets URL, which is really for the browser, but requests can't handle it # This is probably a websockets URL, which is really for the browser, but requests can't handle it
# So we do this below to turn it into an HTTPS URL # So we do this below to turn it into an HTTPS or HTTP URL
parse = urlparse(instance["urls"]["streaming_api"]) parse = urlparse(instance["urls"]["streaming_api"])
url = "https://" + parse.netloc if parse.scheme == 'wss':
url = "https://" + parse.netloc
elif parse.scheme == 'ws':
url = "http://" + parse.netloc
else:
raise MastodonAPIError(
"Could not parse streaming api location returned from server: {}.".format(
instance["urls"]["streaming_api"]))
else: else:
url = self.api_base_url url = self.api_base_url