ouyang/AstrBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: code quality

Browse Source
This commit is contained in:
Soulter
2025-06-21 23:12:50 +08:00
parent efc0116595
commit 1057b4bc35
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
astrbot/core/platform/sources/slack/slack_adapter.py
View File

@@ -173,8 +173,7 @@ class SlackAdapter(Platform):
abm.message.append(At(qq=mention, name="")) abm.message.append(At(qq=mention, name=""))
# 清理消息文本中的@标记 # 清理消息文本中的@标记
clean_text = re.sub(r"<@[^>]+>", "", message_text).strip() if clean_text := re.sub(r"<@[^>]+>", "", message_text).strip():
if clean_text:
abm.message.append(Plain(text=clean_text)) abm.message.append(Plain(text=clean_text))
else: else:
abm.message.append(Plain(text=message_text)) abm.message.append(Plain(text=message_text))

14
astrbot/core/platform/sources/slack/slack_event.py
View File

@@ -34,7 +34,7 @@ class SlackMessageEvent(AstrMessageEvent):
return {"type": "section", "text": {"type": "mrkdwn", "text": segment.text}} return {"type": "section", "text": {"type": "mrkdwn", "text": segment.text}}
elif isinstance(segment, Image): elif isinstance(segment, Image):
# upload file # upload file
url = segment.url if segment.url else segment.file url = segment.url or segment.file
if url.startswith("http"): if url.startswith("http"):
return { return {
"type": "image", "type": "image",
@@ -63,7 +63,7 @@ class SlackMessageEvent(AstrMessageEvent):
} }
elif isinstance(segment, File): elif isinstance(segment, File):
# upload file # upload file
url = segment.url if segment.url else segment.file url = segment.url or segment.file
response = await web_client.files_upload_v2( response = await web_client.files_upload_v2(
file=url, file=url,
filename=segment.name or "file", filename=segment.name or "file",
@@ -113,7 +113,7 @@ class SlackMessageEvent(AstrMessageEvent):
{"type": "section", "text": {"type": "mrkdwn", "text": text_content}} {"type": "section", "text": {"type": "mrkdwn", "text": text_content}}
) )
return blocks, text_content if not blocks else "" return blocks, "" if blocks else text_content
async def send(self, message: MessageChain): async def send(self, message: MessageChain):
blocks, text = await SlackMessageEvent._parse_slack_blocks( blocks, text = await SlackMessageEvent._parse_slack_blocks(
@@ -126,14 +126,14 @@ class SlackMessageEvent(AstrMessageEvent):
await self.web_client.chat_postMessage( await self.web_client.chat_postMessage(
channel=self.get_group_id(), channel=self.get_group_id(),
text=text, text=text,
blocks=blocks if blocks else None, blocks=blocks or None,
) )
else: else:
# 发送私信 # 发送私信
await self.web_client.chat_postMessage( await self.web_client.chat_postMessage(
channel=self.get_sender_id(), channel=self.get_sender_id(),
text=text, text=text,
blocks=blocks if blocks else None, blocks=blocks or None,
) )
except Exception: except Exception:
# 如果块发送失败，尝试只发送文本 # 如果块发送失败，尝试只发送文本
@@ -225,7 +225,7 @@ class SlackMessageEvent(AstrMessageEvent):
members.append(MessageMember(user_id=member_id, nickname=member_id)) members.append(MessageMember(user_id=member_id, nickname=member_id))
channel_data = channel_info["channel"] channel_data = channel_info["channel"]
group = Group( return Group(
group_id=channel_id, group_id=channel_id,
group_name=channel_data.get("name", ""), group_name=channel_data.get("name", ""),
group_avatar="", group_avatar="",
@@ -233,7 +233,5 @@ class SlackMessageEvent(AstrMessageEvent):
group_owner=channel_data.get("creator", ""), group_owner=channel_data.get("creator", ""),
members=members, members=members,
) )
return group
except Exception: except Exception:
return None return None