From cf409d78a1f6112086ac0ffd7d903bc2be07ce7e Mon Sep 17 00:00:00 2001 From: UnitedAirforce Date: Mon, 1 Dec 2025 18:30:06 +0800 Subject: [PATCH] fixes --- new_server_7003/api/account.py | 6 +-- new_server_7003/api/discord_hook.py | 16 ++++---- new_server_7003/api/email_hook.py | 6 +-- new_server_7003/api/misc.py | 2 + new_server_7003/api/user.py | 5 ++- new_server_7003/files/web/status.js | 5 +-- new_server_7003/web/admin.html | 6 ++- new_server_7003/web/history.html | 58 ++++++++++++++--------------- 8 files changed, 54 insertions(+), 50 deletions(-) diff --git a/new_server_7003/api/account.py b/new_server_7003/api/account.py index 3e6baf8..c1915ee 100644 --- a/new_server_7003/api/account.py +++ b/new_server_7003/api/account.py @@ -323,7 +323,7 @@ async def ttag(request: Request): bind_state = await get_bind(user_id) if bind_state and bind_state['is_verified'] == 1: - bind_element = f'

Email verified: {bind_state["bind_acc"]}\nTo remove a bind, contact the administrator.

' + bind_element = f'

Email verified: {bind_state["bind_account"]}\nTo remove a bind, contact the administrator.

' else: bind_element = f"""
@@ -348,9 +348,9 @@ async def ttag(request: Request): elif AUTHORIZATION_MODE == 2: bind_state = await get_bind(user_id) - bind_code = await generate_salt(username, user_id) + bind_code = await generate_salt(user_id) if bind_state and bind_state['is_verified'] == 1: - bind_element = f'

Discord verified: {bind_state["bind_acc"]}
To remove a bind, contact the administrator.

' + bind_element = f'

Discord verified: {bind_state["bind_account"]}
To remove a bind, contact the administrator.

' else: bind_element = f"""

To receive a verification code, please join our Discord server 'https://discord.gg/vugfJdc2rk' and use the !bind command with your account name and the following code. Do not leak this code to others.

diff --git a/new_server_7003/api/discord_hook.py b/new_server_7003/api/discord_hook.py index d066a6a..2edc663 100644 --- a/new_server_7003/api/discord_hook.py +++ b/new_server_7003/api/discord_hook.py @@ -49,7 +49,7 @@ async def verify_user(request: Request): if not decrypted_fields: return inform_page("FAILED:
Invalid request data.", 0) - account_record, device_record = await decrypt_fields_to_user_info(decrypted_fields) + account_record, _ = await decrypt_fields_to_user_info(decrypted_fields) if not account_record: return inform_page("FAILED:
User does not exist.", 0) @@ -85,7 +85,7 @@ async def discord_get_token(request: Request, form): if bind_state and bind_state['is_verified'] < 0: return JSONResponse({"state": 0, "message": "This account cannot be binded now. Please contact the administrator."}, status_code=400) - binded_search_query = binds.select().where(binds.c.bind_acc == discord_id).where(binds.c.is_verified == 1) + binded_search_query = binds.select().where(binds.c.bind_account == discord_id).where(binds.c.is_verified == 1) binded_search_record = await player_database.fetch_one(binded_search_query) if binded_search_record: @@ -99,17 +99,17 @@ async def discord_get_token(request: Request, form): if (datetime.utcnow() - bind_state['bind_date']).total_seconds() < 60: return JSONResponse({"state": 0, "message": "Too many requests. Please wait a while before retrying."}, status_code=400) - verify_code, hash_code = generate_otp() + verify_code, _ = generate_otp() if bind_state: await player_database.execute(binds.update().where(binds.c.user_id == user_id).values( - bind_acc=discord_id, + bind_account=discord_id, bind_code=verify_code, bind_date=datetime.utcnow() )) else: query = binds.insert().values( user_id=user_id, - bind_acc=discord_id, + bind_account=discord_id, bind_code=verify_code, is_verified=0, bind_date=datetime.utcnow() @@ -124,7 +124,7 @@ async def discord_get_token(request: Request, form): async def discord_get_bind(request: Request, form): discord_id = form.get("discord_id") - query = binds.select().where(binds.c.bind_acc == discord_id).where(binds.c.is_verified == 1) + query = binds.select().where(binds.c.bind_account == discord_id).where(binds.c.is_verified == 1) bind_record = await player_database.fetch_one(query) bind_record = dict(bind_record) if bind_record else None if not bind_record: @@ -145,7 +145,7 @@ async def discord_get_bind(request: Request, form): async def discord_ban(request: Request, form): discord_id = form.get("discord_id") - query = binds.select().where(binds.c.bind_acc == discord_id).where(binds.c.is_verified == 1) + query = binds.select().where(binds.c.bind_account == discord_id).where(binds.c.is_verified == 1) bind_record = await player_database.fetch_one(query) bind_record = dict(bind_record) if bind_record else None @@ -166,7 +166,7 @@ async def discord_ban(request: Request, form): async def discord_unban(request: Request, form): discord_id = form.get("discord_id") - query = binds.select().where(binds.c.bind_acc == discord_id).where(binds.c.is_verified == -1) + query = binds.select().where(binds.c.bind_account == discord_id).where(binds.c.is_verified == -1) bind_record = await player_database.fetch_one(query) bind_record = dict(bind_record) if bind_record else None diff --git a/new_server_7003/api/email_hook.py b/new_server_7003/api/email_hook.py index 9ad94f8..c6e47ae 100644 --- a/new_server_7003/api/email_hook.py +++ b/new_server_7003/api/email_hook.py @@ -47,7 +47,7 @@ async def send_email_to_user(email, user_id): if not email or not check_email(email): return "Invalid Email." - verify = await player_database.fetch_one(binds.select().where(binds.c.bind_acc == email)) + verify = await player_database.fetch_one(binds.select().where(binds.c.bind_account == email)) if verify: if (datetime.utcnow() - verify['bind_date']).total_seconds() < 60: return "Too many requests. Please try again later." @@ -57,14 +57,14 @@ async def send_email_to_user(email, user_id): await send_email(email, verify_code, "en") if verify: await player_database.execute(binds.update().where(binds.c.user_id == user_id).values( - bind_acc=email, + bind_account=email, bind_code=verify_code, bind_date=datetime.utcnow() )) else: query = binds.insert().values( user_id=user_id, - bind_acc=email, + bind_account=email, bind_code=verify_code, is_verified=0, bind_date=datetime.utcnow() diff --git a/new_server_7003/api/misc.py b/new_server_7003/api/misc.py index 67b6afc..832bc0c 100644 --- a/new_server_7003/api/misc.py +++ b/new_server_7003/api/misc.py @@ -253,6 +253,8 @@ async def should_serve(decrypted_fields): if AUTHORIZATION_MODE and should_serve: user_info, _ = await decrypt_fields_to_user_info(decrypted_fields) + if not user_info: + return False bind_info = await get_bind(user_info["id"]) if not bind_info or bind_info['is_verified'] != 1: should_serve = False diff --git a/new_server_7003/api/user.py b/new_server_7003/api/user.py index d00da9c..8523c73 100644 --- a/new_server_7003/api/user.py +++ b/new_server_7003/api/user.py @@ -12,11 +12,12 @@ from api.misc import get_model_pak, get_tune_pak, get_skin_pak, get_m4a_path, ge from api.database import decrypt_fields_to_user_info, refresh_bind, get_user_entitlement_from_devices, set_device_data_using_decrypted_fields, create_device from api.crypt import decrypt_fields from api.template import START_AVATARS, START_STAGES, START_XML, SYNC_XML +from config import SIMULTANEOUS_LOGINS async def info(request: Request): try: with open("web/history.html", "r", encoding="utf-8") as file: - html_content = file.read() + html_content = file.read().format(SIMULTANEOUS_LOGINS=SIMULTANEOUS_LOGINS) except FileNotFoundError: return inform_page("history.html not found", 1) @@ -25,7 +26,7 @@ async def info(request: Request): async def history(request: Request): try: with open("web/history.html", "r", encoding="utf-8") as file: - html_content = file.read() + html_content = file.read().format(SIMULTANEOUS_LOGINS=SIMULTANEOUS_LOGINS) except FileNotFoundError: return inform_page("history.html not found", 1) diff --git a/new_server_7003/files/web/status.js b/new_server_7003/files/web/status.js index 1f7f902..24238d0 100644 --- a/new_server_7003/files/web/status.js +++ b/new_server_7003/files/web/status.js @@ -57,12 +57,12 @@ function loadUI() { } if (title === userObject['title']) { titlesHtml += ` - Title ${title} + Title ${title} `; } else { titlesHtml += ` - Title ${title} + Title ${title} `; } @@ -162,6 +162,5 @@ function restoreBaseStructure() { window.onload = function(){ - restoreBaseStructure(); on_initialize(); }; \ No newline at end of file diff --git a/new_server_7003/web/admin.html b/new_server_7003/web/admin.html index 53cfc5a..ee732e2 100644 --- a/new_server_7003/web/admin.html +++ b/new_server_7003/web/admin.html @@ -80,6 +80,7 @@
  • Blacklist
  • BatchTokens
  • Bind
    • +
  • Webs
  • Logs
    • @@ -480,11 +481,12 @@ document.getElementById('whitelistTab').onclick = () => showTable("whitelist"); document.getElementById('blacklistTab').onclick = () => showTable("blacklist"); document.getElementById('batchTokensTab').onclick = () => showTable("batch_tokens"); document.getElementById('bindTab').onclick = () => showTable("binds"); +document.getElementById('websTab').onclick = () => showTable("webs"); document.getElementById('logsTab').onclick = () => showTable("logs"); document.getElementById('logoutBtn').addEventListener('click', function() { document.cookie = "token=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;"; - window.location.href = "/Login"; + window.location.href = "/login"; }); document.getElementById('searchBtn').onclick = function() { @@ -570,7 +572,7 @@ document.getElementById('insertRowForm').onsubmit = async function(e) { } }; -const validTabs = ["accounts", "results", "devices", "whitelist", "blacklist", "batch_tokens", "binds", "logs"]; +const validTabs = ["accounts", "results", "devices", "whitelist", "blacklist", "batch_tokens", "binds", "logs", "webs"]; const lastTab = getCookie("lastTab"); if (validTabs.includes(lastTab)) { showTable(lastTab); diff --git a/new_server_7003/web/history.html b/new_server_7003/web/history.html index 8565166..dc0bbf9 100644 --- a/new_server_7003/web/history.html +++ b/new_server_7003/web/history.html @@ -13,21 +13,21 @@
    -
    This is a Private Server
    +
    This is a Private Server
    -
    Your text here
    +
    Your text here
    -
    About Coins
    +
    About Coins
    -
    Coins are an in-game currency used within GROOVE COASTER ZERO. +
    Coins are an in-game currency used within GROOVE COASTER ZERO. They may be used to purchase special tracks, Avatars, and Items unavailable through regular game play. Spent Coins will not be refunded under any circumstances. - Please note that Coin-related records are stored online, so a network connection is required for Coin use. + Please note that coin-related records are stored online, so a network connection is required for Coin use.
    @@ -35,13 +35,13 @@
    -
    Regarding Data Backup
    +
    Regarding Data Backup
    -
    Please note that while the Backup/TAITO ID Registration option may be used to save play data. +
    Please note that while the Backup/TAITO ID Registration option may be used to save play data. Item stock information and replays are not saved. Contrary to the official server, you can log out of the TAITO ID, change username, and password. - However, each account can only be linked to one device at a time. - When logging on to another device, the previous device will be automatically removed. + However, each account can only be linked to {SIMULTANEOUS_LOGINS} device(s) at a time. + When logging on to another device, the oldest device will be automatically removed. Thus, please refrain from sharing credentials, and keep your password strong, as the username is on leaderboard display.
    @@ -50,9 +50,9 @@
    -
    Regarding Online Use
    +
    Regarding Online Use
    -
    Once the application's tutorial is complete the game may be played offline (without a network connection). +
    Once the application's tutorial is complete the game may be played offline (without a network connection). However, please note that a network connection is required for certain operations, including track data downloads, SHOP use, save backup/restore, etc.
    @@ -61,36 +61,36 @@
    -
    About HELP and OPTIONS
    +
    About HELP and OPTIONS
    -
    Tapping on the question mark (?) in the top left of the screen will bring up the application's help and settings.
    +
    Tapping on the question mark (?) in the top left of the screen will bring up the application's help and settings.

    -
    There are many different settings under Options in the Help menu for you to customize to your liking.
    +
    There are many different settings under Options in the Help menu for you to customize to your liking.

    -
    - SCREEN SETTINGS
    -
    This menu is where you may adjust the visuals if you feel like the frame rate is unstable, or you want to disable AD-LIBS or Hit SFX when there's no TARGET to hit.
    +
    - SCREEN SETTINGS
    +
    This menu is where you may adjust the visuals if you feel like the frame rate is unstable, or you want to disable AD-LIBS or Hit SFX when there's no TARGET to hit.

    -
    - SOUND AND VISUAL TIMING ADJUSTMENT
    -
    Adjust the settings here when you feel like the visuals or audio is not in sync.
    -
    If you feel the visuals are ahead of the sound press the - button, if they're behind then use the + button. These buttons will adjust the visual display timing with the audio.
    +
    - SOUND AND VISUAL TIMING ADJUSTMENT
    +
    Adjust the settings here when you feel like the visuals or audio is not in sync.
    +
    If you feel the visuals are ahead of the sound press the - button, if they're behind then use the + button. These buttons will adjust the visual display timing with the audio.

    -
    - INPUT REGISTRY ADJUSTMENT
    -
    Adjust these settings if even though you feel like you're right in time with the beat, you still don't get a GREAT rating.
    -
    +
    - INPUT REGISTRY ADJUSTMENT
    +
    Adjust these settings if even though you feel like you're right in time with the beat, you still don't get a GREAT rating.
    +
    Press the - button if you feel like you have to press earlier than you should for a GREAT rating, or press the + button if you feel like you have to press later than you should for a GREAT rating.

    -
    ■MICROPHONE INPUT SENSITIVITY
    -
    This setting will help to make playing ORIGINAL STYLE more smooth.
    +
    ■MICROPHONE INPUT SENSITIVITY
    +
    This setting will help to make playing ORIGINAL STYLE more smooth.
    -

    About Arcade Mode

    +

    About Arcade Mode

    -

    +

    Now you can play Arcade Mode which lets you enjoy a the same experience you'd have on a Groove Coaster arcade machine!

    *Please be aware that you will not be able to play Arcade Mode, even if you own it, if you have not yet cleared the NORMAL difficulty on the specified track. @@ -101,9 +101,9 @@

    -

    Play the game by making sounds!

    +

    Play the game by making sounds!

    -

    +

    ★What's Original Style?

    It gives you a brand new way to play the game by making sounds!
    @@ -139,4 +139,4 @@

    - + \ No newline at end of file