No SQLModel
This commit is contained in:
1 parent
5f0e8c11b4
commit
9964fbf044
16 files changed
+91
-84
No files matched your search
@@ -1,7 +1,8 @@
|
||||
import json
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlmodel import Session, select
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from loon.web.db import engine
|
||||
from loon.web.logs.service import write_log, player_tag
|
||||
@@ -25,16 +26,16 @@ async def change_password_handler(client, userdata, msg, data):
|
||||
|
||||
with Session(engine) as session:
|
||||
statement = select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
|
||||
user = session.exec(statement).first()
|
||||
user = session.execute(statement).scalars().first()
|
||||
|
||||
if user is None:
|
||||
client.publish(f"loon/auth/change_password/{uuid}/response",
|
||||
json.dumps({"success": False, "error": "The user is not registered!"}))
|
||||
return
|
||||
|
||||
user = session.exec(
|
||||
user = session.execute(
|
||||
select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
|
||||
).first()
|
||||
).scalars().first()
|
||||
user.password = password
|
||||
internal_username = user.internal_username
|
||||
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import json
|
||||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlmodel import Session, select
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from loon.web.db import engine
|
||||
from loon.web.logs.service import write_log, player_tag
|
||||
@@ -25,7 +26,7 @@ async def register_request_handler(client, userdata, msg, data):
|
||||
internal_username = data["internalUsername"]
|
||||
|
||||
with Session(engine) as session:
|
||||
minecraft_user = session.exec(select(MinecraftUser).where(MinecraftUser.uuid == uuid)).first()
|
||||
minecraft_user = session.execute(select(MinecraftUser).where(MinecraftUser.uuid == uuid)).scalars().first()
|
||||
|
||||
if minecraft_user is None:
|
||||
client.publish(f"loon/auth/register/{uuid}/response",
|
||||
@@ -33,7 +34,7 @@ async def register_request_handler(client, userdata, msg, data):
|
||||
return
|
||||
|
||||
statement = select(User).where(User.minecraft_user_id == minecraft_user.id)
|
||||
user = session.exec(statement).first()
|
||||
user = session.execute(statement).scalars().first()
|
||||
|
||||
if user is not None:
|
||||
client.publish(f"loon/auth/register/{uuid}/response",
|
||||
@@ -41,7 +42,7 @@ async def register_request_handler(client, userdata, msg, data):
|
||||
return
|
||||
|
||||
statement = select(User).where(User.internal_username == internal_username)
|
||||
user = session.exec(statement).first()
|
||||
user = session.execute(statement).scalars().first()
|
||||
|
||||
if user is not None:
|
||||
client.publish(f"loon/auth/register/{uuid}/response",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import json
|
||||
|
||||
from sqlmodel import Session, select
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from loon.web.db import engine
|
||||
from loon.web.users.models import MinecraftUser, User
|
||||
@@ -19,9 +20,9 @@ async def show_username_handler(client, userdata, msg, data):
|
||||
return
|
||||
|
||||
with Session(engine) as session:
|
||||
user = session.exec(
|
||||
user = session.execute(
|
||||
select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
|
||||
).first()
|
||||
).scalars().first()
|
||||
|
||||
if user is None:
|
||||
client.publish(f"loon/auth/show_username/{uuid}/response",
|
||||
|
||||
Reference in new issue
Block a user