Skip to content

Commit bc19d06

Browse files
committed
fix: 修复 ranking.user_earning 模块 RecordData 字段未标记可空类型的问题
1 parent 5a6afda commit bc19d06

3 files changed

Lines changed: 8 additions & 15 deletions

File tree

jkit/ranking/article_earning.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
UserUploadedUrl,
1717
)
1818
from jkit.exceptions import APIUnsupportedError, ResourceUnavailableError
19-
from jkit.identifier_convert import article_slug_to_url
2019

2120
if TYPE_CHECKING:
2221
from jkit.article import Article
@@ -44,11 +43,7 @@ class RecordData(DataObject, frozen=True):
4443

4544
def to_article_obj(self) -> Article:
4645
if not self.slug:
47-
raise ResourceUnavailableError(
48-
f"文章 {article_slug_to_url(self.slug)} 不存在或已被删除 / 私密 / 锁定"
49-
if self.slug
50-
else "文章不存在或已被删除 / 私密 / 锁定"
51-
)
46+
raise ResourceUnavailableError("文章不存在或已被删除 / 私密 / 锁定")
5247

5348
from jkit.article import Article
5449

jkit/ranking/user_assets.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
UserUploadedUrl,
1515
)
1616
from jkit.exceptions import ResourceUnavailableError
17-
from jkit.identifier_convert import user_slug_to_url
1817

1918
if TYPE_CHECKING:
2019
from jkit.user import User
@@ -30,11 +29,7 @@ def to_user_obj(self) -> User:
3029
from jkit.user import User
3130

3231
if not self.slug:
33-
raise ResourceUnavailableError(
34-
f"用户 {user_slug_to_url(self.slug)} 不存在或已注销 / 被封禁"
35-
if self.slug
36-
else "用户不存在或已注销 / 被封禁"
37-
)
32+
raise ResourceUnavailableError("用户不存在或已注销 / 被封禁")
3833

3934
return User.from_slug(self.slug)._as_checked()
4035

jkit/ranking/user_earning.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,17 @@ class SummaryData(DataObject, frozen=True):
2929

3030
class RecordData(DataObject, frozen=True):
3131
ranking: PositiveInt
32-
name: UserName
33-
slug: UserSlug
34-
avatar_url: UserUploadedUrl
32+
name: UserName | None
33+
slug: UserSlug | None
34+
avatar_url: UserUploadedUrl | None
3535
total_fp_amount: PositiveFloat
3636
fp_by_creating_amount: NonNegativeFloat
3737
fp_by_voting_amount: NonNegativeFloat
3838

3939
def to_user_obj(self) -> User:
40+
if not self.slug:
41+
raise ResourceUnavailableError("用户不存在或已注销 / 被封禁")
42+
4043
from jkit.user import User
4144

4245
return User.from_slug(self.slug)._as_checked()

0 commit comments

Comments
 (0)