Bennett/Arcaea-server
1
0
Fork 1
mirror of https://github.com/Lost-MSth/Arcaea-server.git synced 2026-02-04 21:47:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Enhance][Bug fix] download songlist & new skill & API null recent

Browse Source 
- Add `amane` and add support for `skill_amane`
- Add a parser for `songlist` to specify downloadable files
- Fix a bug that users with no recent scores cannot get `recent30` via API
This commit is contained in:
Lost-MSth
2022-11-10 18:00:27 +08:00
parent b70bfd6081
commit e1ce4d9ec4
11 changed files with 168 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
latest version/api/api_code.py
View File

@@ -6,17 +6,17 @@ default_error = ArcError('Unknown Error')
CODE_MSG = {
0: '',
-1: 'See status code', # 基础错误
-1: 'See status code', # 基础错误
-2: 'No data',
-3: 'No data or user',
-4: 'No user_id',
-5: 'No user_id or user',
-100: 'Wrong post data', # 1xx数据错误
-101: 'Wrong data type',
-102: 'Wrong query parameter',
-103: 'Wrong sort parameter',
-104: 'Wrong sort order parameter',
-200: 'No permission', # 2xx用户相关错误
-3: 'No data or user', # 不确定是无数据还是无用户
-100: 'Invalid post data', # 1xx数据错误
-101: 'Invalid data type',
-102: 'Invalid query parameter',
-103: 'Invalid sort parameter',
-104: 'Invalid sort order parameter',
-105: 'Invalid URL parameter',
-110: 'Invalid user_id',
-200: 'No permission', # 2xx用户相关错误
-201: 'Wrong username or password',
-202: 'User is banned',
-203: 'Too many login attempts',

16
latest version/api/users.py
View File

@@ -66,7 +66,7 @@ def users_get(data, user):
def users_user_get(user, user_id):
'''查询用户信息'''
if user_id <= 0:
return error_return(InputError(api_error_code=-4))
return error_return(InputError(api_error_code=-110))
# 查别人需要select权限
if user_id != user.user_id and not user.role.has_power('select'):
return error_return(NoAccess('No permission', api_error_code=-1), 403)
@@ -114,7 +114,7 @@ def users_user_put(data, user, user_id):
def users_user_b30_get(user, user_id):
'''查询用户b30'''
if user_id <= 0:
return error_return(InputError(api_error_code=-4))
return error_return(InputError(api_error_code=-110))
# 查别人需要select权限
if user_id != user.user_id and not user.role.has_power('select'):
return error_return(NoAccess('No permission', api_error_code=-1), 403)
@@ -123,6 +123,9 @@ def users_user_b30_get(user, user_id):
x = UserScoreList(c, UserInfo(c, user_id))
x.query.limit = 30
x.select_from_user()
if not x.scores:
raise NoData(
f'No best30 data of user `{user_id}`', api_error_code=-3)
x.select_song_name()
r = x.to_dict_list()
rating_sum = sum([i.rating for i in x.scores])
@@ -136,7 +139,7 @@ def users_user_b30_get(user, user_id):
def users_user_best_get(data, user, user_id):
'''查询用户所有best成绩'''
if user_id <= 0:
return error_return(InputError(api_error_code=-4))
return error_return(InputError(api_error_code=-110))
# 查别人需要select权限
if user_id != user.user_id and not user.role.has_power('select'):
return error_return(NoAccess('No permission', api_error_code=-1), 403)
@@ -145,6 +148,9 @@ def users_user_best_get(data, user, user_id):
x = UserScoreList(c, UserInfo(c, user_id))
x.query.from_dict(data)
x.select_from_user()
if not x.scores:
raise NoData(
f'No best score data of user `{user_id}`', api_error_code=-3)
r = x.to_dict_list()
return success_return({'user_id': user_id, 'data': r})
@@ -156,7 +162,7 @@ def users_user_r30_get(user, user_id):
'''查询用户r30'''
if user_id <= 0:
return error_return(InputError(api_error_code=-4))
return error_return(InputError(api_error_code=-110))
# 查别人需要select权限
if user_id != user.user_id and not user.role.has_power('select'):
return error_return(NoAccess('No permission', api_error_code=-1), 403)
@@ -173,7 +179,7 @@ def users_user_role_get(user, user_id):
'''查询用户role和powers'''
if user_id <= 0:
return error_return(InputError(api_error_code=-4))
return error_return(InputError(api_error_code=-110))
if user_id == user.user_id:
return success_return({'user_id': user.user_id, 'role': user.role.role_id, 'powers': [i.power_id for i in user.role.powers]})