Release 1.3 (#3)

* Allow all messages in private chats * Update logging * Fix docker-compose file formatting
vova-lantsov-dev · Aug 19, 2023 · e642eb5 · e642eb5
1 parent 80b2bc2
commit e642eb5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -13,8 +13,7 @@ x-host-config: &host_config
 
 services:
   host:
-    << : *restart_policy
-    << : *host_config
+    << : [*restart_policy, *host_config]
     build:
       context: .
       dockerfile: src/ElectricityOffNotifier.AppHost/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,8 +13,7 @@ x-host-config: &host_config
 
 services:
   host:
-    << : *restart_policy
-    << : *host_config
+    << : [*restart_policy, *host_config]
     build:
       context: .
       dockerfile: src/ElectricityOffNotifier.AppHost/Dockerfile

diff --git a/src/ElectricityOffNotifier.AppHost/Services/BotUpdateHandler.Commands.cs b/src/ElectricityOffNotifier.AppHost/Services/BotUpdateHandler.Commands.cs
@@ -11,7 +11,7 @@ namespace ElectricityOffNotifier.AppHost.Services;
 
 internal sealed partial class BotUpdateHandler
 {
-    private static async Task HandleGetIdCommand(ITelegramBotClient botClient, long chatId, int? messageThreadId,
+    private async Task HandleGetIdCommand(ITelegramBotClient botClient, long chatId, int? messageThreadId,
         int messageId, CancellationToken cancellationToken)
     {
         var messageBuilder = new StringBuilder();
@@ -30,9 +30,9 @@ await botClient.SendTextMessageAsync(
                 replyToMessageId: messageId,
                 cancellationToken: cancellationToken);
         }
-        catch
+        catch (Exception ex)
         {
-            // silent
+            _logger.LogDebug(ex, "Error occurred while sending Telegram message");
         }
     }
 
@@ -340,7 +340,7 @@ await botClient.SendTextMessageAsync(chatId,
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error occurred while fetching the chat member");
+                _logger.LogDebug(ex, "Error occurred while fetching the chat member");
                 return;
             }
 

diff --git a/src/ElectricityOffNotifier.AppHost/Services/BotUpdateHandler.cs b/src/ElectricityOffNotifier.AppHost/Services/BotUpdateHandler.cs
@@ -45,7 +45,7 @@ public async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update,
             botClient.BotId, update.Message.Text);
 
         string? botTokenById = _botAccessor.GetTokenByBotId(botClient.BotId.GetValueOrDefault());
-        if (botTokenById != null)
+        if (botTokenById != null && update.Message.Chat.Type != ChatType.Private)
         {
             _logger.LogDebug("Non-default token is registered for bot {BotId} in chat {ChatId}",
                 botClient.BotId, chatId);
@@ -86,7 +86,7 @@ public async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update,
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogDebug(ex, "Unable to get the chat member {UserId} in chat {ChatId}", fromId, chatId);
+                    _logger.LogWarning(ex, "Unable to get the chat member {UserId} in chat {ChatId}", fromId, chatId);
                     return;
                 }
             }
@@ -155,7 +155,8 @@ await HandleTemplateCommandWithReply(botClient, replyMessageText, chatId, messag
                     MessageId: var messageId,
                     MessageThreadId: var messageThreadId
                 }
-            }:
+            }
+            when isAdmin:
             {
                 await HandleInfoCommand(botClient, currentChat, chatId, messageThreadId, messageId, context, isAdmin,
                     cancellationToken);

diff --git a/src/ElectricityOffNotifier.AppHost/appsettings.json b/src/ElectricityOffNotifier.AppHost/appsettings.json
@@ -12,8 +12,7 @@
       "LogLevel": {
         "Default": "Warning",
         "ElectricityOffNotifier.AppHost.Services": "Information",
-        "Microsoft.AspNetCore.DataProtection": "Error",
-        "ElectricityOffNotifier.AppHost.Services.BotUpdateHandler": "Debug"
+        "Microsoft.AspNetCore.DataProtection": "Error"
       }
     }
   },