Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure messages are sent in order, one at a time

Browse Source
This commit is contained in:
miruka 2019-05-08 10:37:46 -04:00
parent d08f43e6be
commit a15e2a5c9d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
harmonyqml/backend/client.py
View File

@ -13,7 +13,7 @@ from PyQt5.QtCore import (
import nio
from .network_manager import NetworkManager
from .pyqt_future import futurize
from .pyqt_future import PyQtFuture, futurize
class Client(QObject):
@ -234,7 +234,7 @@ class Client(QObject):
@pyqtSlot(str, str)
def sendMarkdown(self, room_id: str, text: str) -> None:
def sendMarkdown(self, room_id: str, text: str) -> PyQtFuture:
html = self.manager.backend.htmlFilter.fromMarkdown(text)
content = {
"body": text,
@ -247,8 +247,12 @@ class Client(QObject):
# If the thread pool workers are all occupied, and @futurize
# wrapped sendMarkdown, the messageAboutToBeSent signal neccessary
# for local echoes would not be sent until a thread is free.
@futurize(max_running=1)
def send(self):
#
# send() only takes the room_id argument explicitely because
# of consider_args=True: This means the max number of messages being
# sent at a time is one per room at a time.
@futurize(max_running=1, consider_args=True)
def send(self, room_id: str) -> PyQtFuture:
return self.net.talk(
self.nio.room_send,
room_id = room_id,
@ -256,7 +260,7 @@ class Client(QObject):
content = content,
)
return send(self)
return send(self, room_id)
@pyqtSlot(str, result="QVariant")