Fixes

loon/mqtt/handlers/player_joined.py

@@ -0,0 +1,12 @@
+from loon.web.users.service import sync_minecraft_users
+
+
+async def player_joined_handler(client, userdata, msg, data):
+    if msg.topic != "loon/playerlist/joined":
+        return
+
+    player = data.get("player")
+    if not player:
+        return
+
+    await sync_minecraft_users([{"uuid": player["uuid"], "username": player["username"]}])

loon/mqtt/handlers/register_request.py

@@ -7,7 +7,6 @@ from loon.web.db import engine
 from loon.web.logs.service import write_log
 from loon.web.logs.types import LogTypeEnum
 from loon.web.users.models import MinecraftUser, User
-from loon.web.users.service import sync_minecraft_users
 
 
 async def register_request_handler(client, userdata, msg, data):
@@ -24,13 +23,15 @@ async def register_request_handler(client, userdata, msg, data):
 
     password = data["password"]
     internal_username = data["internalUsername"]
-    username = data["username"]
-
-    await sync_minecraft_users([{"uuid": uuid, "username": username}])
 
     with Session(engine) as session:
         minecraft_user = session.exec(select(MinecraftUser).where(MinecraftUser.uuid == uuid)).first()
 
+        if minecraft_user is None:
+            client.publish(f"loon/auth/register/{uuid}/response",
+                           json.dumps({"success": False, "error": "Player not recognized yet, please rejoin the server and try again."}))
+            return
+
         statement = select(User).where(User.minecraft_user_id == minecraft_user.id)
         user = session.exec(statement).first()
 

loon/mqtt/manager.py

@@ -9,6 +9,7 @@ from loon import logger
 from loon.mqtt.handlers.change_password_request import change_password_handler
 from loon.mqtt.handlers.marquee import marquee_handler
 from loon.mqtt.handlers.player import player_handler
+from loon.mqtt.handlers.player_joined import player_joined_handler
 from loon.mqtt.handlers.players_sync import players_sync_handler
 from loon.mqtt.handlers.register_request import register_request_handler
 from loon.mqtt.handlers.server import server_handler
@@ -17,7 +18,7 @@ from loon.mqtt.handlers.world import world_handler
 
 
 class MQTTManager:
-    BASE_HANDLERS = [player_handler, register_request_handler, world_handler, server_handler, marquee_handler, change_password_handler, show_username_handler, players_sync_handler]
+    BASE_HANDLERS = [player_handler, register_request_handler, world_handler, server_handler, marquee_handler, change_password_handler, show_username_handler, players_sync_handler, player_joined_handler]
 
     def __init__(self, inject_handlers = None):
         if inject_handlers is None:

loon/web/users/router.py

@@ -3,19 +3,17 @@ from starlette.websockets import WebSocket, WebSocketDisconnect
 
 from loon.web import get_mqtt_manager
 from loon.web.auth.middleware import authenticated
+from loon.web.users.models import User
+from loon.web.users.schema import UserPublic
 from loon.web.users.state import subscribe_player, get_user_messages, unsubscribe_player
 
 router = APIRouter(prefix="/users", tags=["users"])
 
 
-@router.get("/me")
+@router.get("/me", response_model=UserPublic)
 @authenticated
-async def me(request: Request):
-    user = request.user.user
-    return {
-        **user.model_dump(exclude={"password", "id", "minecraft_user_id"}),
-        "minecraft_user": user.minecraft_user.model_dump(exclude={"id"}),
-    }
+async def me(request: Request) -> User:
+    return request.user.user
 
 @router.post("/inventory/request")
 @authenticated

loon/web/users/schema.py

@@ -0,0 +1,16 @@
+from pydantic import BaseModel, ConfigDict
+
+
+class MinecraftUserPublic(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    uuid: str
+    username: str
+
+
+class UserPublic(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    internal_username: str
+    admin: bool
+    minecraft_user: MinecraftUserPublic