mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-23 03:38:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mastodon: Avoid reconnecting to Streaming API manually (let the lib to do its job in their async code)

Browse Source
This commit is contained in:
Manuel Cortez 2023-02-05 18:59:16 -06:00
parent aca51a2fb9
commit ef2e63e195
No known key found for this signature in database
GPG Key ID: 9E0735CA15EFE790
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sessions/mastodon/session.py
View File

@ -66,7 +66,7 @@ class Session(base.baseSession):
return return
try: try:
client_id, client_secret = mastodon.Mastodon.create_app("TWBlue", api_base_url=authorisation_dialog.GetValue(), website="https://twblue.es") client_id, client_secret = mastodon.Mastodon.create_app("TWBlue", api_base_url=authorisation_dialog.GetValue(), website="https://twblue.es")
temporary_api = mastodon.Mastodon(client_id=client_id, client_secret=client_secret, api_base_url=instance, mastodon_version=MASTODON_VERSION) temporary_api = mastodon.Mastodon(client_id=client_id, client_secret=client_secret, api_base_url=instance, mastodon_version=MASTODON_VERSION, user_agent="TWBlue/{}".format(application.version))
auth_url = temporary_api.auth_request_url() auth_url = temporary_api.auth_request_url()
except MastodonError: except MastodonError:
dlg = wx.MessageDialog(None, _("We could not connect to your mastodon instance. Please verify that the domain exists and the instance is accessible via a web browser."), _("Instance error"), wx.ICON_ERROR) dlg = wx.MessageDialog(None, _("We could not connect to your mastodon instance. Please verify that the domain exists and the instance is accessible via a web browser."), _("Instance error"), wx.ICON_ERROR)
@ -229,8 +229,8 @@ class Session(base.baseSession):
try: try:
stream_healthy = self.api.stream_healthy() stream_healthy = self.api.stream_healthy()
if stream_healthy == True: if stream_healthy == True:
self.user_stream = self.api.stream_user(listener, run_async=True) self.user_stream = self.api.stream_user(listener, run_async=True, reconnect_async=True, reconnect_async_wait_sec=30)
self.direct_stream = self.api.stream_direct(listener, run_async=True) self.direct_stream = self.api.stream_direct(listener, run_async=True, reconnect_async=True, reconnect_async_wait_sec=30)
log.debug("Started streams for session {}.".format(self.get_name())) log.debug("Started streams for session {}.".format(self.get_name()))
except Exception as e: except Exception as e:
log.exception("Detected streaming unhealthy in {} session.".format(self.get_name())) log.exception("Detected streaming unhealthy in {} session.".format(self.get_name()))
@ -238,20 +238,9 @@ class Session(base.baseSession):
def stop_streaming(self): def stop_streaming(self):
if config.app["app-settings"]["no_streaming"]: if config.app["app-settings"]["no_streaming"]:
return return
# if hasattr(self, "user_stream"):
# self.user_stream.close()
# log.debug("Stream stopped for accounr {}".format(self.db["user_name"]))
# if hasattr(self, "direct_stream"):
# self.direct_stream.close()
# log.debug("Stream stopped for accounr {}".format(self.db["user_name"]))
def check_streams(self): def check_streams(self):
if config.app["app-settings"]["no_streaming"]: pass
return
if not hasattr(self, "user_stream"):
return
if self.user_stream.is_alive() == False or self.user_stream.is_receiving() == False or self.direct_stream.is_alive() == False or self.direct_stream.is_receiving() == False:
self.start_streaming()
def check_buffers(self, status): def check_buffers(self, status):
buffers = [] buffers = []