fix(handlers): restore the group hint's link filter

Replacing is_group(kind) with teloxide's predicates dropped the parentheses:
&& binds tighter than ||, so the branch read as is_group() OR (is_supergroup()
AND has-link) -- a plain group got the hint for any link, supported or not.
The e2e test only covered a group with a supported link (which is true either
way); it now also covers an unsupported link in a group.
This commit is contained in:
2026-09-21 17:35:07 +08:00
parent 676b4bc2ba
commit 40ab07882d
+23 -5
View File
@@ -265,11 +265,10 @@ pub(crate) async fn handle_message(
break; break;
} }
} }
} else if message.chat.is_group() } else if (message.chat.is_group() || message.chat.is_supergroup())
|| message.chat.is_supergroup() && extract_urls(&message)
&& extract_urls(&message) .iter()
.iter() .any(|url| x_media::site::cache_key(url).is_some())
.any(|url| x_media::site::cache_key(url).is_some())
{ {
// A supported link in a group used to be dropped in silence, which // A supported link in a group used to be dropped in silence, which
// reads as a broken bot (the command menu is registered globally, so // reads as a broken bot (the command menu is registered globally, so
@@ -470,5 +469,24 @@ mod tests {
vec!["EditMessageCaption", "SendMessage"], vec!["EditMessageCaption", "SendMessage"],
"a channel must not get the group hint" "a channel must not get the group hint"
); );
// And an *unsupported* link in a group stays silent too: the hint is
// for links a site adapter claims (the branch's own filter).
let unsupported: Message = serde_json::from_value(serde_json::json!({
"message_id": 4,
"date": 0,
"chat": { "id": -100, "type": "group", "title": "g" },
"text": "https://example.com/x",
"entities": [{ "type": "url", "offset": 0, "length": 19 }],
}))
.expect("a minimal group message deserializes");
handle_message(&ctx, &bot, unsupported).await.unwrap();
assert_eq!(
api.methods(),
vec!["EditMessageCaption", "SendMessage"],
"an unsupported link must not get the hint"
);
} }
} }