Commit f69698a

benny-dou <60535774+benny-dou@users.noreply.github.com>
2026-05-23 09:45:41
docs(favorite): update help message
1 parent 34ccf47
Changed files (1)
src
src/others/favorite.py
@@ -16,11 +16,9 @@ from utils import slim_cid, strings_list, to_int
 HELP = f"""⭐️**收藏消息**
 - `{FAVORITE.SAVE_PREFIX} keyword` : 保存消息为"keyword"到收藏夹
 - `{FAVORITE.SEND_PREFIX} keyword` : 从收藏夹发送"keyword"的消息
-- `{FAVORITE.SEND_PREFIX} fwd keyword` : 转发原始消息
 
 保存同一条消息为多个关键词时, 需使用逗号分隔
 """
-PRESERVED_KEYS = {"fwd"}  # these keys are preserved
 
 
 async def save_favorite(client: Client, message: Message, **kwargs):
@@ -73,9 +71,6 @@ async def save_favorite(client: Client, message: Message, **kwargs):
         if not is_force_save and await get_cf_r2(FAVORITE.R2_PREFIX + key):
             await send2tg(client, message, texts=f"⚠️【{key}】已存在\n🔄请使用以下命令覆盖收藏:\n`{FAVORITE.SAVE_PREFIX}! {keyword}`", **kwargs)
             return
-        if key.lower() in PRESERVED_KEYS:
-            await message.reply(f"【{key}】为保留关键字, 请使用其他关键词", quote=True)
-            return
 
     # forward message to backup chat
     if msg_to_save.media_group_id:
@@ -124,9 +119,6 @@ async def send_favorite(client: Client, message: Message, **kwargs):
         await message.reply("【发送收藏】功能缺失必要参数设置", quote=True)
         return
     keyword: str = info["text"].removeprefix(FAVORITE.SEND_PREFIX).strip()
-    use_forward = keyword.lower().startswith("fwd ")
-    if use_forward:
-        keyword = keyword[4:]
     if not keyword:
         return
 
@@ -140,13 +132,7 @@ async def send_favorite(client: Client, message: Message, **kwargs):
         return
     reply_message_id = message.reply_to_message.id if message.reply_to_message else None
     reply = ReplyParameters(message_id=reply_message_id)  # type: ignore
-    if use_forward:
-        if save_info.get("media_group_id"):
-            messages = await client.get_media_group(save_info["cid"], save_info["mid"])
-            succ = await client.forward_messages(chat_id=info["cid"], from_chat_id=save_info["cid"], message_ids=[m.id for m in messages])
-        else:
-            succ = await client.forward_messages(chat_id=info["cid"], from_chat_id=save_info["cid"], message_ids=save_info["mid"])
-    elif save_info.get("media_group_id"):
+    if save_info.get("media_group_id"):
         succ = await client.copy_media_group(chat_id=info["cid"], from_chat_id=save_info["cid"], message_id=save_info["mid"], reply_parameters=reply)
     else:
         succ = await client.copy_message(chat_id=info["cid"], from_chat_id=save_info["cid"], message_id=save_info["mid"], reply_parameters=reply)