Fix getting users

Author: kosyachniy

api/app/routes/tasks/get.py

@@ -61,7 +61,11 @@ async def handler(
             "network",
         }
 
-    user_global = User.get(request.state.user)  # TODO: use local
+    user_global = await User.get(
+        token=request.state.token,
+        id=request.state.user,
+        fields=list({"id", "link"}),
+    )  # TODO: use local
     user = UserLocal.get(request.state.user)
 
     def handle(task):

api/app/routes/users/frens.py

@@ -73,7 +73,11 @@ async def handler(
     if request.state.status < 3 or not request.state.user:
         raise ErrorAccess("frens")
 
-    user_global = User.get(request.state.user)  # TODO: use local
+    user_global = await User.get(
+        token=request.state.token,
+        id=request.state.user,
+        fields=list({"id", "link"}),
+    )  # TODO: use local
     user, _ = UserLocal.get_or_create(request.state.user)
 
     fren_ids = {int(value) for value in (user.frens or []) if value}

api/app/routes/users/share/tg.py

@@ -84,7 +84,11 @@ async def handler(
             "inline_keyboard": [[{"text": button, "url": url}]],
         }
 
-    user_global = User.get(request.state.user)  # FIXME: use local
+    user_global = await User.get(
+        token=request.state.token,
+        id=request.state.user,
+        fields=list({"id", "social"}),
+    )  # FIXME: use local
     payload = {
         "user_id": int(user_global.get_social(2)["id"]),
         "result": json.dumps(result, ensure_ascii=False),

api/app/services/auth.py

@@ -2,18 +2,24 @@
 User authorization
 """
 
+# TODO: cache + use local
+
 from fastapi import Request
 from consys.errors import ErrorWrong
 
 from models.user import User
 
 
-def sign(request: Request):
+async def sign(request: Request):
     """Get user object"""
 
     if request.state.user:
         try:
-            return User.get(request.state.user)
+            return await User.get(
+                token=request.state.token,
+                id=request.state.user,
+                # fields=list({"id"}),
+            )
         except ErrorWrong:
             pass
 

api/app/verify/channel.py

@@ -3,14 +3,17 @@
 
 from lib import report
 from lib.tg import tg
-from models.user import User
+from models.user import complex_global_users
 
 
 async def check(user_id, params):
     if not params or not params.get("chat_id"):
         raise ErrorWrong("chat_id")
 
-    user_global = User.get(user_id)  # FIXME
+    user_global = await complex_global_users(
+        id=user_id,
+        fields=list({"id", "social"}),
+    )  # FIXME
 
     try:
         response = await tg.bot.get_chat_member(

api/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
     "taskiq-redis==1.2.1",
 
     # Users
-    "userhub==0.15",
+    "userhub==0.16",
 
     # DB
     "consys==0.44",

api/uv.lock

@@ -5,25 +5,8 @@ requires-python = ">=3.10,<3.15"
 dependencies = [
     "libdev==0.100",
     "fastapi==0.126.0",
-    "httptools==0.7.1",
     "uvicorn==0.38.0",
-    "PyJWT==2.10.1",
-    "python-multipart==0.0.21",
-    "slowapi==0.1.9",
-    "taskiq==0.12.1",
-    "taskiq-redis==1.2.1",
-    "userhub==0.15",
-    "consys==0.44",
-    "redis==7.1.0",
-    "python-socketio==5.15.1",
-    "websockets==15.0.1",
-    "prometheus_fastapi_instrumentator==7.1.0",
     "aiogram==3.23.0",
-    "tgio==0.17",
-    "tgreports==0.19.0",
-    "google-auth==2.45.0",
-    "pygsheets==2.0.6",
-    "pandas==2.3.3",
 ]
 
 [tool.uv]