MC Users

loon/mqtt/handlers/change_password_request.py

@@ -6,7 +6,7 @@ from sqlmodel import Session, select
 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 User
+from loon.web.users.models import MinecraftUser, User
 
 
 async def change_password_handler(client, userdata, msg, data):
@@ -24,7 +24,7 @@ async def change_password_handler(client, userdata, msg, data):
     password = data["password"]
 
     with Session(engine) as session:
-        statement = select(User).where(User.uuid == uuid)
+        statement = select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
         user = session.exec(statement).first()
 
         if user is None:
@@ -33,7 +33,7 @@ async def change_password_handler(client, userdata, msg, data):
             return
 
         user = session.exec(
-            select(User).where(User.uuid == uuid)
+            select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
         ).first()
         user.password = password
         internal_username = user.internal_username

loon/mqtt/handlers/players_sync.py

@@ -0,0 +1,8 @@
+from loon.web.users.service import sync_minecraft_users
+
+
+async def players_sync_handler(client, userdata, msg, data):
+    if msg.topic != "loon/playerlist/sync":
+        return
+
+    await sync_minecraft_users(data.get("players", []))

loon/mqtt/handlers/register_request.py

@@ -6,7 +6,8 @@ from sqlmodel import Session, select
 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 User
+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):
@@ -23,9 +24,14 @@ 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:
-        statement = select(User).where(User.uuid == uuid)
+        minecraft_user = session.exec(select(MinecraftUser).where(MinecraftUser.uuid == uuid)).first()
+
+        statement = select(User).where(User.minecraft_user_id == minecraft_user.id)
         user = session.exec(statement).first()
 
         if user is not None:
@@ -41,7 +47,7 @@ async def register_request_handler(client, userdata, msg, data):
                            json.dumps({"success": False, "error": f"The {internal_username} is taken!"}))
             return
 
-        user = User(uuid=uuid, password=password, internal_username=internal_username, admin=False)
+        user = User(minecraft_user_id=minecraft_user.id, password=password, internal_username=internal_username, admin=False)
         session.add(user)
         try:
             session.commit()

loon/mqtt/handlers/show_username_request.py

@@ -3,7 +3,7 @@ import json
 from sqlmodel import Session, select
 
 from loon.web.db import engine
-from loon.web.users.models import User
+from loon.web.users.models import MinecraftUser, User
 
 
 async def show_username_handler(client, userdata, msg, data):
@@ -19,7 +19,9 @@ async def show_username_handler(client, userdata, msg, data):
         return
 
     with Session(engine) as session:
-        user = session.exec(select(User).where(User.uuid == uuid)).first()
+        user = session.exec(
+            select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
+        ).first()
 
         if user is None:
             client.publish(f"loon/auth/show_username/{uuid}/response",

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.players_sync import players_sync_handler
 from loon.mqtt.handlers.register_request import register_request_handler
 from loon.mqtt.handlers.server import server_handler
 from loon.mqtt.handlers.show_username_request import show_username_handler
@@ -16,7 +17,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]
+    BASE_HANDLERS = [player_handler, register_request_handler, world_handler, server_handler, marquee_handler, change_password_handler, show_username_handler, players_sync_handler]
 
     def __init__(self, inject_handlers = None):
         if inject_handlers is None:
@@ -53,6 +54,8 @@ class MQTTManager:
         logger.info(f"MQTT connected (rc={reason_code})")
         client.subscribe("loon/#")
 
+        client.publish("loon/playerlist/sync/request")
+
     @staticmethod
     def on_disconnect(client, userdata, reason_code):
         logger.warning(f"MQTT disconnected (rc={reason_code}). Reconnecting...")