Skip to content

Commit 401c81a

Browse files
committed
fix: 改掉了一个“显而易见”的问题
1 parent 5bec5cd commit 401c81a

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

astrbot/core/config/default.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@
242242
"enable": False,
243243
"misskey_instance_url": "https://misskey.example",
244244
"misskey_token": "",
245-
"default_visibility": "public",
246-
"local_only": False,
245+
"misskey_default_visibility": "public",
246+
"misskey_local_only": False,
247247
},
248248
"Slack": {
249249
"id": "slack",
@@ -356,13 +356,13 @@
356356
"type": "string",
357357
"hint": "连接服务设置生成的 API 鉴权访问令牌(Access token)",
358358
},
359-
"default_visibility": {
359+
"misskey_default_visibility": {
360360
"description": "默认帖子可见性",
361361
"type": "string",
362362
"options": ["public", "home", "followers"],
363363
"hint": "机器人发帖时的默认可见性设置。public:公开,home:主页时间线,followers:仅关注者。",
364364
},
365-
"local_only": {
365+
"misskey_local_only": {
366366
"description": "仅限本站(不参与联合)",
367367
"type": "bool",
368368
"hint": "启用后,机器人发出的帖子将仅在本实例可见,不会联合到其他实例",

astrbot/core/platform/sources/misskey/misskey_adapter.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def __init__(
3838
self.poll_interval = self.config.get("poll_interval", 5.0)
3939
self.max_message_length = self.config.get("max_message_length", 3000)
4040

41-
self.default_visibility = self.config.get("default_visibility", "public")
42-
self.local_only = self.config.get("local_only", False)
41+
self.misskey_default_visibility = self.config.get("misskey_default_visibility", "public")
42+
self.misskey_local_only = self.config.get("misskey_local_only", False)
4343

4444
self.api: Optional[MisskeyAPI] = None
4545
self._running = False
@@ -54,8 +54,8 @@ def meta(self) -> PlatformMetadata:
5454
"misskey_token": "",
5555
"poll_interval": 5.0,
5656
"max_message_length": 3000,
57-
"default_visibility": "public",
58-
"local_only": False,
57+
"misskey_default_visibility": "public",
58+
"misskey_local_only": False,
5959
}
6060
default_config.update(self.config)
6161

@@ -220,7 +220,7 @@ async def send_by_session(
220220
user_id=user_id,
221221
user_cache=self._user_cache,
222222
self_id=self.client_self_id,
223-
default_visibility=self.default_visibility,
223+
misskey_default_visibility=self.misskey_default_visibility,
224224
)
225225

226226
if user_id and is_valid_user_session_id(user_id):
@@ -231,7 +231,7 @@ async def send_by_session(
231231
text,
232232
visibility=visibility,
233233
visible_user_ids=visible_user_ids,
234-
local_only=self.local_only,
234+
misskey_local_only=self.misskey_local_only,
235235
)
236236
logger.debug("[Misskey] 帖子发送成功")
237237

astrbot/core/platform/sources/misskey/misskey_api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ async def create_note(
161161
visibility: str = "public",
162162
reply_id: Optional[str] = None,
163163
visible_user_ids: Optional[List[str]] = None,
164-
local_only: bool = False,
164+
misskey_local_only: bool = False,
165165
) -> Dict[str, Any]:
166166
data: Dict[str, Any] = {
167167
"text": text,
168168
"visibility": visibility,
169-
"localOnly": local_only,
169+
"localOnly": misskey_local_only,
170170
}
171171
if reply_id:
172172
data["replyId"] = reply_id

astrbot/core/platform/sources/misskey/misskey_utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ def resolve_message_visibility(
4545
user_id: Optional[str],
4646
user_cache: Dict[str, Any],
4747
self_id: Optional[str],
48-
default_visibility: str = "public",
48+
misskey_default_visibility: str = "public",
4949
) -> Tuple[str, Optional[List[str]]]:
5050
"""
5151
解析 Misskey 消息的可见性设置
5252
"""
53-
visibility = default_visibility
53+
visibility = misskey_default_visibility
5454
visible_user_ids = None
5555

5656
if user_id and user_cache:
5757
user_info = user_cache.get(user_id)
5858
if user_info:
59-
original_visibility = user_info.get("visibility", default_visibility)
59+
original_visibility = user_info.get("visibility", misskey_default_visibility)
6060
if original_visibility == "specified":
6161
visibility = "specified"
6262
original_visible_users = user_info.get("visible_user_ids", [])

0 commit comments

Comments
 (0)