🎨 按ruff和black格式化代码

This commit is contained in:
Chenric
2024-09-21 20:18:40 +08:00
parent 65dc67c6ac
commit 8d905cb647
6 changed files with 31 additions and 31 deletions

View File

@@ -2,7 +2,7 @@ import os
import asyncio
import unicodedata
from typing import Dict, List, Optional
from typing import Dict, List
from sqlalchemy import or_, select
from sqlalchemy.sql import ColumnElement
@@ -184,7 +184,9 @@ async def get_rank_image(rank: List[UserRankInfo]) -> bytes:
},
pages={"viewport": {"width": 1000, "height": 10}},
)
def _get_user_nickname(user_info:UserInfo)->str:
def _get_user_nickname(user_info: UserInfo) -> str:
user_nickname = (
user_info.user_displayname
if user_info.user_displayname
@@ -192,27 +194,31 @@ def _get_user_nickname(user_info:UserInfo)->str:
)
return user_nickname
async def _get_user_default_avatar()->bytes:
async def _get_user_default_avatar() -> bytes:
img = open(
os.path.dirname(os.path.abspath(__file__))
+ "/template/avatar/default.jpg",
os.path.dirname(os.path.abspath(__file__)) + "/template/avatar/default.jpg",
"rb",
).read()
).read()
return img
def get_default_user_info()->UserInfo:
def get_default_user_info() -> UserInfo:
user_info = UserInfo(
user_id="114514",
user_name="鬼知道这谁bot获取不了",
)
return user_info
async def get_user_infos(bot:Bot,event:Event,rank:List,use_cache: bool = True)-> List[UserRankInfo]:
async def get_user_infos(
bot: Bot, event: Event, rank: List, use_cache: bool = True
) -> List[UserRankInfo]:
user_ids = [i[0] for i in rank]
pool = [get_user_info(bot, event, id, use_cache) for id in user_ids]
user_infos = (await asyncio.gather(*pool))
user_infos = await asyncio.gather(*pool)
pool = []
for i in user_infos:
if not i:
@@ -223,25 +229,24 @@ async def get_user_infos(bot:Bot,event:Event,rank:List,use_cache: bool = True)->
user_avatars = await asyncio.gather(*pool)
for i in user_avatars:
if not i:
user_avatars[user_avatars.index(i)] = await(_get_user_default_avatar())
user_avatars[user_avatars.index(i)] = await _get_user_default_avatar()
total = sum([i[1] for i in rank])
rank2 = []
for i in range(len(rank)):
user_info = user_infos[i]
if not user_info:
user_info = get_default_user_info()
user = UserRankInfo(
**model_dump(user_info),
user_bnum=rank[i][1],
user_proportion=round(rank[i][1] / total * 100, 2),
user_index=i+1,
user_index=i + 1,
user_nickname=_get_user_nickname(user_info),
user_avatar_bytes=user_avatars[i],
)
rank2.append(user)
return rank2