Merge pull request 'develop' (#16) from develop into prism_plus_support

Reviewed-on: https://gitea.tendokyu.moe/SoulGateKey/artemis/pulls/16

core/allnet.py

@@ -805,8 +805,9 @@ class BillingServlet:
             )
 
         if req.traceleft > 0:
-            self.logger.warning(f"{req.traceleft} unsent tracelogs")
-
+            self.logger.info(f"Requesting 20 more of {req.traceleft} unsent tracelogs")
+            return PlainTextResponse("result=6&waittime=0&linelimit=20\r\n")
+    
         playlimit = req.playlimit
         while req.playcnt > playlimit:
             playlimit += 1024
@@ -825,9 +826,6 @@ class BillingServlet:
         resp_str = urllib.parse.unquote(urllib.parse.urlencode(vars(resp))) + "\r\n"
 
         self.logger.debug(f"response {vars(resp)}")
-        if req.traceleft > 0: # TODO: should probably move this up so we don't do a ton of work that doesn't get used
-            self.logger.info(f"Requesting 20 more of {req.traceleft} unsent tracelogs")
-            return PlainTextResponse("result=6&waittime=0&linelimit=20\r\n")
         
         return PlainTextResponse(resp_str)
 

core/data/schema/arcade.py

@@ -433,7 +433,7 @@ class ArcadeData(BaseData):
             self.logger.error(f"Failed to add billing charge for machine {machine_id}!")
             return None
         return result.lastrowid
-    
+
     async def billing_get_last_charge(self, machine_id: int, game_id: str) -> Optional[Row]:
         result = await self.execute(billing_charge.select(
             and_(billing_charge.c.machine == machine_id, billing_charge.c.game_id == game_id)
@@ -511,7 +511,7 @@ class ArcadeData(BaseData):
 
         if result is None:
             self.logger.error(f"Failed to add playcount for machine {machine_id} running {game_id}")
-    
+
     async def billing_get_playcount_3mo(self, machine_id: int, game_id: str) -> Optional[List[Row]]:
         result = await self.execute(billing_playct.select(and_(
             billing_playct.c.machine == machine_id,

core/data/schema/user.py

@@ -124,3 +124,15 @@ class UserData(BaseData):
     async def get_user_by_username(self, username: str) -> Optional[Row]:
         result = await self.execute(aime_user.select(aime_user.c.username == username))
         if result: return result.fetchone()
+
+    async def change_permission(self, user_id: int, new_perms: int) -> Optional[bool]:
+        sql = aime_user.update(aime_user.c.id == user_id).values(permissions = new_perms)
+
+        result = await self.execute(sql)
+        return result is not None
+
+    async def change_email(self, user_id: int, new_email: int) -> Optional[bool]:
+        sql = aime_user.update(aime_user.c.id == user_id).values(email = new_email)
+
+        result = await self.execute(sql)
+        return result is not None

core/title.py

@@ -149,41 +149,3 @@ class TitleServlet:
         self.logger.info(
             f"Serving {len(self.title_registry)} game codes {'on port ' + str(core_cfg.server.port) if core_cfg.server.port > 0 else ''}"
         )
-
-    def render_GET(self, request: Request, endpoints: dict) -> bytes:
-        code = endpoints["title"]
-        subaction = endpoints['subaction']
-        
-        if code not in self.title_registry:
-            self.logger.warning(f"Unknown game code {code}")
-            request.setResponseCode(404)
-            return b""
-
-        index = self.title_registry[code]
-        handler = getattr(index, f"{subaction}", None)
-        if handler is None:
-            self.logger.error(f"{code} does not have handler for GET subaction {subaction}")
-            request.setResponseCode(500)
-            return b""
-
-        return handler(request, code, endpoints)
-
-    def render_POST(self, request: Request, endpoints: dict) -> bytes:
-        code = endpoints["title"]
-        subaction = endpoints['subaction']
-
-        if code not in self.title_registry:
-            self.logger.warning(f"Unknown game code {code}")
-            request.setResponseCode(404)
-            return b""
-
-        index = self.title_registry[code]
-        handler = getattr(index, f"{subaction}", None)
-        if handler is None:
-            self.logger.error(f"{code} does not have handler for POST subaction {subaction}")
-            request.setResponseCode(500)
-            return b""
-
-        endpoints.pop("title")
-        endpoints.pop("subaction")
-        return handler(request, code, endpoints)