beerpsi/artemis
1
0
Fork 0
forked from Hay1tsme/artemis
Code Pull Requests Activity

fix: ignore guest plays correctly

Browse Source
This commit is contained in:
beerpsi
2024-04-23 14:48:40 +00:00
parent 2537822ec3
commit 19732c1a02
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
titles/chuni/base.py
View File

@ -809,8 +809,10 @@ class ChuniBase:
upsert = data["upsertUserAll"] upsert = data["upsertUserAll"]
user_id = data["userId"] user_id = data["userId"]
if int(user_id) & (1 << 48) != 0: if int(user_id) & 0x1000000000001 == 0x1000000000001:
self.logger.info("Guest play, ignoring.") place_id = int(user_id) & 0xFFFC00000000
self.logger.info("Guest play from place ID %d, ignoring.", place_id)
return {"returnCode": "1"} return {"returnCode": "1"}
if "userData" in upsert: if "userData" in upsert:

7
titles/mai2/base.py
View File

@ -238,9 +238,10 @@ class Mai2Base:
user_id = data["userId"] user_id = data["userId"]
upsert = data["upsertUserAll"] upsert = data["upsertUserAll"]
if int(user_id) & 1000000000001 == 1000000000001: if int(user_id) & 0x1000000000001 == 0x1000000000001:
self.logger.info("Guest play, ignoring.") place_id = int(user_id) & 0xFFFC00000000
return {"returnCode": 1, "apiName": "UpsertUserAllApi"}
self.logger.info("Guest play from place ID %d, ignoring.", place_id)
if "userData" in upsert and len(upsert["userData"]) > 0: if "userData" in upsert and len(upsert["userData"]) > 0:
upsert["userData"][0].pop("accessCode") upsert["userData"][0].pop("accessCode")

6
titles/mai2/dx.py
View File

@ -119,8 +119,10 @@ class Mai2DX(Mai2Base):
user_id = data["userId"] user_id = data["userId"]
upsert = data["upsertUserAll"] upsert = data["upsertUserAll"]
if int(user_id) & 1000000000001 == 1000000000001: if int(user_id) & 0x1000000000001 == 0x1000000000001:
self.logger.info("Guest play, ignoring.") place_id = int(user_id) & 0xFFFC00000000
self.logger.info("Guest play from place ID %d, ignoring.", place_id)
return {"returnCode": 1, "apiName": "UpsertUserAllApi"} return {"returnCode": 1, "apiName": "UpsertUserAllApi"}
if "userData" in upsert and len(upsert["userData"]) > 0: if "userData" in upsert and len(upsert["userData"]) > 0:

10
titles/ongeki/base.py
View File

@ -293,7 +293,9 @@ class OngekiBase:
async def handle_upsert_user_gplog_api_request(self, data: Dict) -> Dict: async def handle_upsert_user_gplog_api_request(self, data: Dict) -> Dict:
user = data["userId"] user = data["userId"]
if user >= 200000000000000: # Account for guest play
# If playing as guest, the user ID is or(0x1000000000001, (placeId & 65535) << 32)
if user & 0x1000000000001 == 0x1000000000001:
user = None user = None
await self.data.log.put_gp_log( await self.data.log.put_gp_log(
@ -945,6 +947,12 @@ class OngekiBase:
upsert = data["upsertUserAll"] upsert = data["upsertUserAll"]
user_id = data["userId"] user_id = data["userId"]
if user_id & 0x1000000000001 == 0x1000000000001:
place_id = int(user_id) & 0xFFFC00000000
self.logger.info("Guest play from place ID %d, ignoring.", place_id)
return {"returnCode": 1, "apiName": "UpsertUserAllApi"}
# The isNew fields are new as of Red and up. We just won't use them for now. # The isNew fields are new as of Red and up. We just won't use them for now.
if "userData" in upsert and len(upsert["userData"]) > 0: if "userData" in upsert and len(upsert["userData"]) > 0: