mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2026-08-21 04:18:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(mastodon): close duplicate streaming connections

Browse Source
This commit is contained in:
manuelcortez
2026-08-13 13:49:18 -06:00
parent 18290d9265
commit c3700f4a4d
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controller/mainController.py
+4
View File
@@ -473,6 +473,8 @@ class Controller(object):
def logout_account(self, session_id):
for i in sessions.sessions:
if sessions.sessions[i].session_id == session_id: session = sessions.sessions[i]
if hasattr(session, "stop_streaming"):
session.stop_streaming()
name =session.get_name()
delete_buffers = []
for i in self.buffers:
@@ -635,6 +637,8 @@ class Controller(object):
for item in sessions.sessions:
if sessions.sessions[item].logged == False:
continue
if hasattr(sessions.sessions[item], "stop_streaming"):
sessions.sessions[item].stop_streaming()
sessions.sessions[item].sound.cleaner.cancel()
log.debug("Saving database for " + sessions.sessions[item].session_id)
sessions.sessions[item].save_persistent_data()
src/sessions/mastodon/session.py
+30 -12
View File
@@ -3,11 +3,11 @@ import os
import paths
import time
import logging
import threading
import webbrowser
import wx
import mastodon
import demoji
import config
import config_utils
import output
import application
@@ -36,6 +36,9 @@ class Session(base.baseSession):
self.post_visibility = "public"
self.expand_spoilers = False
self.software = "mastodon"
self.user_stream = None
self.direct_stream = None
self._stream_lock = threading.Lock()
pub.subscribe(self.on_status, "mastodon.status_received")
pub.subscribe(self.on_status_updated, "mastodon.status_updated")
pub.subscribe(self.on_notification, "mastodon.notification_received")
@@ -444,19 +447,34 @@ class Session(base.baseSession):
return
if self.software == "gotosocial":
return
listener = streaming.StreamListener(session_name=self.get_name(), user_id=self.db["user_id"])
try:
stream_healthy = self.api.stream_healthy()
if stream_healthy == 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, reconnect_async=True, reconnect_async_wait_sec=30)
log.debug("Started streams for session {}.".format(self.get_name()))
except Exception as e:
log.exception("Detected streaming unhealthy in {} session.".format(self.get_name()))
with self._stream_lock:
if any(stream is not None and stream.is_alive() for stream in (self.user_stream, self.direct_stream)):
log.debug("Streams for session {} are already running.".format(self.get_name()))
return
listener = streaming.StreamListener(session_name=self.get_name(), user_id=self.db["user_id"])
try:
stream_healthy = self.api.stream_healthy()
if stream_healthy == 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, reconnect_async=True, reconnect_async_wait_sec=30)
log.debug("Started streams for session {}.".format(self.get_name()))
except Exception:
log.exception("Detected streaming unhealthy in {} session.".format(self.get_name()))
def stop_streaming(self):
if config.app["app-settings"]["no_streaming"]:
return
with self._stream_lock:
streams = (self.user_stream, self.direct_stream)
self.user_stream = None
self.direct_stream = None
for stream in streams:
if stream is None:
continue
try:
stream.close()
except Exception:
log.exception("Unable to stop a stream for session {}.".format(self.get_name()))
if any(stream is not None for stream in streams):
log.debug("Stopped streams for session {}.".format(self.get_name()))
def check_streams(self):
pass