api_avatars.py

@@ -1,6 +1,6 @@
 from os import makedirs, path, sep
 from fastapi import FastAPI, HTTPException
-from fastapi.responses import FileResponse, JSONResponse, Response
+from fastapi.responses import FileResponse, JSONResponse
 from starlette.status import HTTP_404_NOT_FOUND
 from modules.utils import configGet
 
@@ -9,20 +9,12 @@ makedirs(f'{configGet("cache", "locations")}{sep}avatars', exist_ok=True)
 app = FastAPI(title="HoloUA Avatars API", docs_url=None, redoc_url=None, version="1.0")
 
 @app.get("/check", response_class=JSONResponse, include_in_schema=False)
-@app.head("/check", response_class=JSONResponse, include_in_schema=False)
 async def check():
     return JSONResponse({"detail": "I'm alright, thank you"})
 
 @app.get("/", response_class=FileResponse, include_in_schema=False)
-async def avatar_get(avatar_id: str):
+async def favicon(avatar_id: str):
     if path.exists(f'{configGet("cache", "locations")}{sep}avatars{sep}{avatar_id}'):
         return FileResponse(f'{configGet("cache", "locations")}{sep}avatars{sep}{avatar_id}', media_type="image/jpg")
-    else:
-        raise HTTPException(status_code=HTTP_404_NOT_FOUND, detail="File not found")
-
-@app.head("/", response_class=Response, include_in_schema=False)
-async def avatar_head(avatar_id: str):
-    if path.exists(f'{configGet("cache", "locations")}{sep}avatars{sep}{avatar_id}'):
-        return Response(headers={"Content-Length": path.getsize(f'{configGet("cache", "locations")}{sep}avatars{sep}{avatar_id}')})
     else:
         raise HTTPException(status_code=HTTP_404_NOT_FOUND, detail="File not found")

classes/holo_user.py

@@ -100,10 +100,10 @@ class HoloUser():
         self.locale = holo_user["tg_locale"]
         self.username = holo_user["tg_username"]
 
-        if isinstance(user, User) and ((self.name != user.first_name) and (user.first_name is not None)):
+        if isinstance(user, User) and ((self.name != user.first_name) and (user.first_name is None)):
             self.set("tg_name", user.first_name)
 
-        if isinstance(user, User) and ((self.phone != user.phone_number) and (user.phone_number is not None)):
+        if isinstance(user, User) and (self.phone != user.phone_number):
             self.set("tg_phone", user.phone_number)
 
         if isinstance(user, User) and ((self.locale != user.language_code) and (user.language_code is not None)):

config_example.json

@@ -37,10 +37,6 @@
         "sponsorships": {
             "time": 9,
             "enabled": true
-        },
-        "cache_avatars": {
-            "interval": 6,
-            "enabled": true
         }
     },
     "locations": {

modules/callbacks/reapply.py

@@ -20,7 +20,7 @@ async def callback_reapply_query_accept(app, clb):
 
     await app.send_message(holo_user.id, locale("approved_joined", "message", locale=holo_user))
 
-    col_applications.delete_one({"user": holo_user.id})
+    col_applications.delete_one({"user": {"$eq": holo_user.id}})
     col_applications.insert_one({"user": holo_user.id, "date": datetime.now(), "admin": clb.from_user.id, "application": col_tmp.find_one({"user": {"$eq": holo_user.id}, "type": {"$eq": "application"}})["application"]})
     col_tmp.update_one({"user": {"$eq": holo_user.id}, "type": {"$eq": "application"}}, {"$set": {"state": "approved", "sent": False}})
 

modules/inline.py

@@ -44,10 +44,8 @@ async def inline_answer(client, inline_query):
 
     if holo_user.application_approved() or (await isAnAdmin(holo_user.id) is True):
 
-        max_results = configGet("inline_preview_count") if inline_query.query != "" else 200
-
         list_of_users = []
-        async for m in app.get_chat_members(configGet("destination_group"), limit=max_results, filter=ChatMembersFilter.SEARCH, query=inline_query.query):
+        async for m in app.get_chat_members(configGet("destination_group"), limit=configGet("inline_preview_count"), filter=ChatMembersFilter.SEARCH, query=inline_query.query):
             list_of_users.append(m)
 
         results = []

modules/scheduled.py

@@ -1,8 +1,6 @@
-from os import path, sep
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
-from datetime import datetime, timedelta
+from datetime import datetime
 from app import app
-from pyrogram.enums.chat_members_filter import ChatMembersFilter
 from modules.utils import configGet, locale, logWrite
 from dateutil.relativedelta import relativedelta
 from modules.database import col_applications
@@ -21,21 +19,6 @@ scheduler = AsyncIOScheduler()
 #             except AttributeError:
 #                 continue
 
-if configGet("enabled", "scheduler", "cache_avatars"):
-    @scheduler.scheduled_job(trigger="date", run_date=datetime.now()+timedelta(seconds=10))
-    @scheduler.scheduled_job(trigger="interval", hours=configGet("interval", "scheduler", "cache_avatars"))
-    async def cache_avatars():
-        list_of_users = []
-        async for member in app.get_chat_members(configGet("destination_group"), filter=ChatMembersFilter.SEARCH, query=""):
-            list_of_users.append(member.user)
-        for user in list_of_users:
-            if user.photo != None:
-                if not path.exists(f'{configGet("cache", "locations")}{sep}avatars{sep}{user.photo.big_file_id}'):
-                    print(f'Pre-cached avatar {user.photo.big_file_id} of {user.id}', flush=True)
-                    await app.download_media(user.photo.big_file_id, file_name=f'{configGet("cache", "locations")}{sep}avatars{sep}{user.photo.big_file_id}')
-        logWrite("Avatars caching performed")
-
-
 if configGet("enabled", "scheduler", "birthdays"):
     @scheduler.scheduled_job(trigger="cron", hour=configGet("time", "scheduler", "birthdays"))
     async def check_birthdays():