Skip to content

merge queue: checking #17 on main (c810c81) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: checking #17 on main (c810c81) #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c69e9b
Unsubscribe subscribers that can no longer be resolved
littlenano Oct 22, 2026
cd7106e
Merge of #17
mergify[bot] Oct 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,8 @@ async fn sweep_subscribers(
let Subscriber::Telegram { user_id, .. } = &subscriber;
let member = match bot.get_chat_member(chat, UserId(*user_id)).await {
Ok(member) => member,
// account deleted on Telegram: get_chat_member reports user not
// found instead of a member status, so remove it
Err(RequestError::Api(ApiError::UserNotFound)) => {
log::info!("remove subscriber {subscriber:?} from chat {chat}: user not found");
Err(e) if subscriber_unresolvable(&e) => {
log::info!("remove subscriber {subscriber:?} from chat {chat}: {e}");
invalid.insert(subscriber);
continue;
}
Expand Down Expand Up @@ -325,6 +323,26 @@ async fn sweep_subscribers(
Ok(())
}

/// Whether `get_chat_member` cannot resolve the subscriber as a participant of
/// the chat at all:
///
/// - `user not found` for an id Telegram no longer knows, and
/// - `PARTICIPANT_ID_INVALID`, documented as "the specified participant ID is
/// invalid" for `channels.getParticipant`, the method behind `getChatMember`.
/// teloxide has no variant for it, so it arrives as `Unknown`, and it does not
/// prove the account is gone: it is also reported for ids the bot cannot
/// resolve at all (tdlib/telegram-bot-api#802).
///
/// Either way the id cannot be mentioned in the chat, so keeping the
/// subscription changes nothing; drop it instead of retrying on every update.
fn subscriber_unresolvable(e: &RequestError) -> bool {
match e {
RequestError::Api(ApiError::UserNotFound) => true,
RequestError::Api(ApiError::Unknown(text)) => text.contains("PARTICIPANT_ID_INVALID"),
_ => false,
}
}

/// Remove invalid subscribers and replace renamed ones (mention changed).
fn update_subscribers(
subscribers: &mut BTreeSet<Subscriber>,
Expand Down
Loading