@@ -34,11 +34,11 @@ public TelegramChatAdapter(TelegramChatAdapterOptions options, IChatManager conv
3434
3535 public bool IsActive { get ; private set ; } = false ;
3636
37- private async Task DeleteExistingWebhook ( CancellationToken cancellationToken )
37+ private async Task DeleteExistingWebhookAsync ( CancellationToken cancellationToken )
3838 {
3939 try
4040 {
41- await _botClient . DeleteWebhookAsync ( cancellationToken : cancellationToken ) ;
41+ await _botClient . DeleteWebhook ( cancellationToken : cancellationToken ) ;
4242 _isUsingWebhook = false ;
4343 }
4444 catch ( ApiRequestException e )
@@ -47,7 +47,7 @@ private async Task DeleteExistingWebhook(CancellationToken cancellationToken)
4747 }
4848 }
4949
50- private async Task HandleMessageUpdate ( Message message , CancellationToken cancellationToken )
50+ private async Task HandleMessageUpdateAsync ( Message message , CancellationToken cancellationToken )
5151 {
5252 try
5353 {
@@ -79,7 +79,7 @@ private async Task HandleUpdateAsync(ITelegramBotClient _, Update update, Cancel
7979
8080 var handler = update switch
8181 {
82- { Message : { } message } => HandleMessageUpdate ( message , cancellationToken ) ,
82+ { Message : { } message } => HandleMessageUpdateAsync ( message , cancellationToken ) ,
8383 { CallbackQuery : { } callbackQuery } => HandleCallbackQueryAsync ( callbackQuery , cancellationToken ) ,
8484 _ => HandleUnknownUpdateAsync ( update , cancellationToken )
8585 } ;
@@ -91,15 +91,13 @@ private async Task HandleErrorAsync(ITelegramBotClient _, Exception exception, C
9191 {
9292 if ( exception is ApiRequestException apiRequestException )
9393 {
94- await _botClient . SendTextMessageAsync ( _options . MasterConversationId , apiRequestException . ToString ( ) ,
94+ await _botClient . SendMessage ( _options . MasterConversationId , apiRequestException . ToString ( ) ,
9595 cancellationToken : cancelToken ) ;
9696 }
9797 }
9898
99- public async Task StartReceivingAsync ( CancellationToken cancellationToken = default )
99+ public Task StartReceivingAsync ( CancellationToken cancellationToken = default )
100100 {
101- // delete any existing webhook
102- // await DeleteExistingWebhook(cancellationToken);
103101 _isUsingWebhook = false ;
104102
105103 _botClient . Timeout = TimeSpan . FromSeconds ( 30 ) ;
@@ -111,28 +109,30 @@ public async Task StartReceivingAsync(CancellationToken cancellationToken = defa
111109 } ;
112110 _botClient . StartReceiving ( HandleUpdateAsync , HandleErrorAsync , options , cancellationToken ) ;
113111 IsActive = true ;
112+
113+ return Task . CompletedTask ;
114114 }
115115
116116 public async Task StartReceivingAsync ( string callbackUrl , CancellationToken cancellationToken = default )
117117 {
118118 _isUsingWebhook = true ;
119- await _botClient . SetWebhookAsync ( url : callbackUrl , secretToken : _options . CallbackToken , cancellationToken : cancellationToken ) ;
119+ await _botClient . SetWebhook ( url : callbackUrl , secretToken : _options . CallbackToken , cancellationToken : cancellationToken ) ;
120120 IsActive = true ;
121121 }
122122
123123 public async Task StopReceivingAsync ( CancellationToken cancellationToken = default )
124124 {
125125 if ( _isUsingWebhook )
126126 {
127- await DeleteExistingWebhook ( cancellationToken ) ;
127+ await DeleteExistingWebhookAsync ( cancellationToken ) ;
128128 }
129129
130130 IsActive = false ;
131131 }
132132
133133 public async Task < ChatAdapterStatus > GetStatusAsync ( CancellationToken cancellationToken )
134134 {
135- var webhookInfo = await _botClient . GetWebhookInfoAsync ( cancellationToken ) ;
135+ var webhookInfo = await _botClient . GetWebhookInfo ( cancellationToken ) ;
136136 return new ChatAdapterStatus (
137137 nameof ( TelegramChatAdapter ) ,
138138 _isUsingWebhook ,
@@ -192,16 +192,26 @@ public Task ReceiveMessageAsync(Update message, CancellationToken cancellationTo
192192
193193 public async Task Handle ( BotTextMessageRequest request , CancellationToken cancellationToken )
194194 {
195- await _botClient . SendTextMessageAsync ( request . ConversationId , request . Text , cancellationToken : cancellationToken ) ;
195+ await _botClient . SendMessage ( request . ConversationId , request . Text , cancellationToken : cancellationToken ) ;
196196 }
197197
198198 public async Task Handle ( BotGifMessageRequest request , CancellationToken cancellationToken )
199199 {
200200 var inputFile = new InputFileUrl ( request . GifUrl ) ;
201- await _botClient . SendAnimationAsync ( request . ConversationId , inputFile , cancellationToken : cancellationToken ) ;
201+ await _botClient . SendAnimation ( request . ConversationId , inputFile , cancellationToken : cancellationToken ) ;
202202 }
203203
204204 public async Task Handle ( BotMenuMessageRequest request , CancellationToken cancellationToken )
205+ {
206+ var rows = request . MenuOptions . Chunk ( 2 ) . ToArray ( ) ;
207+ await _botClient . SendMessage (
208+ chatId : request . ConversationId ,
209+ text : request . Text ,
210+ replyMarkup : rows ,
211+ cancellationToken : cancellationToken ) ;
212+ }
213+
214+ private async Task HandleViaCallbackButton ( BotMenuMessageRequest request , CancellationToken cancellationToken )
205215 {
206216 var options = request . MenuOptions . Select ( InlineKeyboardButton . WithCallbackData ) . ToArray ( ) ;
207217
@@ -230,7 +240,7 @@ IEnumerable<IEnumerable<InlineKeyboardButton>> GetRows(ICollection<InlineKeyboar
230240 }
231241
232242 var keyboard = new InlineKeyboardMarkup ( GetRows ( options , 2 ) ) ;
233- await _botClient . SendTextMessageAsync ( chatId : request . ConversationId , text : request . Text , replyMarkup : keyboard ,
243+ await _botClient . SendMessage ( chatId : request . ConversationId , text : request . Text , replyMarkup : keyboard ,
234244 cancellationToken : cancellationToken ) ;
235245 }
236246}
0 commit comments