Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions assistant/src/config/bundled-skills/messaging/tools/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ export function resolveProvider(platformInput?: string): MessagingProvider {

/**
* Execute a callback with a valid OAuth token for the given provider.
* Providers that manage their own auth (e.g. Telegram with a bot token)
* expose isConnected() and don't need an OAuth access_token lookup.
*/
export async function withProviderToken<T>(
provider: MessagingProvider,
fn: (token: string) => Promise<T>,
): Promise<T> {
if (provider.isConnected?.()) {
return fn('');
}
return withValidToken(provider.credentialService, fn);
}

Expand Down
37 changes: 23 additions & 14 deletions assistant/src/messaging/providers/telegram-bot/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,26 +74,35 @@ export const telegramBotMessagingProvider: MessagingProvider = {
};
}

const resp = await telegram.getMe(botToken);
if (!resp.ok || !resp.result) {
try {
const resp = await telegram.getMe(botToken);
if (!resp.ok || !resp.result) {
return {
connected: false,
user: 'unknown',
platform: 'telegram',
metadata: { error: resp.description ?? 'getMe failed' },
};
}

return {
connected: true,
user: resp.result.username ?? resp.result.first_name,
platform: 'telegram',
metadata: {
botId: resp.result.id,
botUsername: resp.result.username,
botName: resp.result.first_name,
},
};
} catch (e) {
return {
connected: false,
user: 'unknown',
platform: 'telegram',
metadata: { error: resp.description ?? 'getMe failed' },
metadata: { error: e instanceof Error ? e.message : 'getMe failed' },
};
}

return {
connected: true,
user: resp.result.username ?? resp.result.first_name,
platform: 'telegram',
metadata: {
botId: resp.result.id,
botUsername: resp.result.username,
botName: resp.result.first_name,
},
};
},

async sendMessage(_token: string, conversationId: string, text: string, _options?: SendOptions): Promise<SendResult> {
Expand Down
Loading