complete mm

poetry.lock

@@ -367,7 +367,7 @@ requests = "*"
 
 [[package]]
 name = "royalnet"
-version = "5.11.8"
+version = "5.11.9"
 description = "A multipurpose bot and web framework"
 category = "main"
 optional = false
@@ -621,7 +621,7 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "1.0"
     python-versions = "^3.8"
-content-hash = "82415d2d9fb9994f4c31d1869d485f6dcc38f084f5e63894ed3010901c57f5d7"
+content-hash = "6e4a600da13a400ba271a0010a5cfc76c23775c54b64518ab7f63ffbf4732256"
 
 [metadata.files]
 aiohttp = [
@@ -921,8 +921,8 @@ riotwatcher = [
     {file = "riotwatcher-3.1.0.tar.gz", hash = "sha256:4028cbcfe95a6673750746c9d7cb1f53f5802b68801074ae0c294a2c22be71f4"},
 ]
 royalnet = [
-    {file = "royalnet-5.11.8-py3-none-any.whl", hash = "sha256:611f6050b4fff3c20ef3c90f44c009b7c2e3a56c2acaa48042c37070c26eacb9"},
+    {file = "royalnet-5.11.9-py3-none-any.whl", hash = "sha256:4162f980531a22ebac02acece847651ba99d96ce43beb49732f5c1959b8ee847"},
-    {file = "royalnet-5.11.8.tar.gz", hash = "sha256:f3dbafa36e60dc503f38d6c621b7821baa12651d1d1164ece561f532f3f952e9"},
+    {file = "royalnet-5.11.9.tar.gz", hash = "sha256:61a2c3ce48b2bfe989290061ff584fd99ba3eca9a4926976a7762934f7d1e1ba"},
 ]
 royalspells = [
     {file = "royalspells-3.2.tar.gz", hash = "sha256:2bd4a9a66514532e35c02c3907425af48c7cb292364c4843c795719a82b25dfe"},
@@ -946,21 +946,25 @@ sqlalchemy = [
     {file = "SQLAlchemy-1.3.19-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:6547b27698b5b3bbfc5210233bd9523de849b2bb8a0329cd754c9308fc8a05ce"},
     {file = "SQLAlchemy-1.3.19-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:107d4af989831d7b091e382d192955679ec07a9209996bf8090f1f539ffc5804"},
     {file = "SQLAlchemy-1.3.19-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:eb1d71643e4154398b02e88a42fc8b29db8c44ce4134cf0f4474bfc5cb5d4dac"},
+    {file = "SQLAlchemy-1.3.19-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:b6ff91356354b7ff3bd208adcf875056d3d886ed7cef90c571aef2ab8a554b12"},
     {file = "SQLAlchemy-1.3.19-cp35-cp35m-win32.whl", hash = "sha256:96f51489ac187f4bab588cf51f9ff2d40b6d170ac9a4270ffaed535c8404256b"},
     {file = "SQLAlchemy-1.3.19-cp35-cp35m-win_amd64.whl", hash = "sha256:618db68745682f64cedc96ca93707805d1f3a031747b5a0d8e150cfd5055ae4d"},
     {file = "SQLAlchemy-1.3.19-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:6557af9e0d23f46b8cd56f8af08eaac72d2e3c632ac8d5cf4e20215a8dca7cea"},
     {file = "SQLAlchemy-1.3.19-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:8280f9dae4adb5889ce0bb3ec6a541bf05434db5f9ab7673078c00713d148365"},
     {file = "SQLAlchemy-1.3.19-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:b595e71c51657f9ee3235db8b53d0b57c09eee74dfb5b77edff0e46d2218dc02"},
+    {file = "SQLAlchemy-1.3.19-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:51064ee7938526bab92acd049d41a1dc797422256086b39c08bafeffb9d304c6"},
     {file = "SQLAlchemy-1.3.19-cp36-cp36m-win32.whl", hash = "sha256:8afcb6f4064d234a43fea108859942d9795c4060ed0fbd9082b0f280181a15c1"},
     {file = "SQLAlchemy-1.3.19-cp36-cp36m-win_amd64.whl", hash = "sha256:e49947d583fe4d29af528677e4f0aa21f5e535ca2ae69c48270ebebd0d8843c0"},
     {file = "SQLAlchemy-1.3.19-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:9e865835e36dfbb1873b65e722ea627c096c11b05f796831e3a9b542926e979e"},
     {file = "SQLAlchemy-1.3.19-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:276936d41111a501cf4a1a0543e25449108d87e9f8c94714f7660eaea89ae5fe"},
     {file = "SQLAlchemy-1.3.19-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:c7adb1f69a80573698c2def5ead584138ca00fff4ad9785a4b0b2bf927ba308d"},
+    {file = "SQLAlchemy-1.3.19-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:465c999ef30b1c7525f81330184121521418a67189053bcf585824d833c05b66"},
     {file = "SQLAlchemy-1.3.19-cp37-cp37m-win32.whl", hash = "sha256:aa0554495fe06172b550098909be8db79b5accdf6ffb59611900bea345df5eba"},
     {file = "SQLAlchemy-1.3.19-cp37-cp37m-win_amd64.whl", hash = "sha256:15c0bcd3c14f4086701c33a9e87e2c7ceb3bcb4a246cd88ec54a49cf2a5bd1a6"},
     {file = "SQLAlchemy-1.3.19-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:fe7fe11019fc3e6600819775a7d55abc5446dda07e9795f5954fdbf8a49e1c37"},
     {file = "SQLAlchemy-1.3.19-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:c898b3ebcc9eae7b36bd0b4bbbafce2d8076680f6868bcbacee2d39a7a9726a7"},
     {file = "SQLAlchemy-1.3.19-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:072766c3bd09294d716b2d114d46ffc5ccf8ea0b714a4e1c48253014b771c6bb"},
+    {file = "SQLAlchemy-1.3.19-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:26c5ca9d09f0e21b8671a32f7d83caad5be1f6ff45eef5ec2f6fd0db85fc5dc0"},
     {file = "SQLAlchemy-1.3.19-cp38-cp38-win32.whl", hash = "sha256:b70bad2f1a5bd3460746c3fb3ab69e4e0eb5f59d977a23f9b66e5bdc74d97b86"},
     {file = "SQLAlchemy-1.3.19-cp38-cp38-win_amd64.whl", hash = "sha256:83469ad15262402b0e0974e612546bc0b05f379b5aa9072ebf66d0f8fef16bea"},
     {file = "SQLAlchemy-1.3.19.tar.gz", hash = "sha256:3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e"},

pyproject.toml

@@ -28,7 +28,7 @@
     itsdangerous = "^1.1.0"
 
     [tool.poetry.dependencies.royalnet]
-        version = "~5.11.8"
+        version = "~5.11.9"
         # Maybe... there is a way to make these selectable?
         extras = [
             "telegram",

royalpack/utils/mmtask.py

@@ -177,7 +177,7 @@ class MMTask:
                     session.add(mmresponse)
 
                     # Drop fiorygi
-                    if random.randrange(100) < self.command.config["Matchmaking"]["fiorygi_award_chance"]:
+                    if random.randrange(100) < self.command.config["matchmaking"]["fiorygi_award_chance"]:
                         await FiorygiTransaction.spawn_fiorygi(user, 1, "aver risposto a un matchmaking", data=data, session=session)
                 else:
                     # Change their response
@@ -220,14 +220,14 @@ class MMTask:
                 # Get the related MMEvent
                 mmevent: MMEvent = await ru.asyncify(session.query(self._EventT).get, self.mmid)
 
-            # Ensure the user has the required roles to start the matchmaking
+                # Ensure the user has the required roles to start the matchmaking
-            if user != mmevent.creator and "admin" not in user.roles:
+                if user != mmevent.creator and "admin" not in user.roles:
-                raise rc.UserError("Non hai i permessi per eliminare questo matchmaking!")
+                    raise rc.UserError("Non hai i permessi per eliminare questo matchmaking!")
 
-            # Interrupt the matchmaking with the MANUAL_DELETE reason
+                # Interrupt the matchmaking with the MANUAL_DELETE reason
-            await self.queue.put(Interrupts.MANUAL_START)
+                await self.queue.put(Interrupts.MANUAL_START)
 
-            await data.reply(f"🚩 Evento avviato!")
+                await data.reply(f"🚩 Evento avviato!")
         return callback
 
     @property
@@ -429,7 +429,7 @@ class MMTask:
 
     def start(self):
         log.debug(f"Starting task for: {self.mmid}")
-        self.task = self.loop.create_task(self.run())
+        self.task = self.command.serf.tasks.add(self.run())
 
     @ru.sentry_async_wrap()
     async def run(self):
@@ -448,7 +448,7 @@ class MMTask:
             raise rc.UnsupportedError("Currently only the Telegram interface is supported.")
 
         async with self.telegram_channel_message():
-            self.loop.create_task(self.wait_until_due())
+            self.command.serf.tasks.add(self.wait_until_due())
 
             # Sleep until something interrupts the task
             interrupt = await self.queue.get()