grinder now deletes all channel messages (#7)

fsharplang-ru · Feb 10, 2022 · c73fa5e · c73fa5e
1 parent 3505d7f
commit c73fa5e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Grinder/Program.fs b/src/Grinder/Program.fs
@@ -176,7 +176,7 @@ module Program =
                                     newMessage.MessageText
                                     newMessage.FromUsername
                                     newMessage.ChatUsername
-                                |> logDbg
+                                |> logInfo
                         | None ->
                             sprintf "Skipping message %A from %A" message context.Me.Username
                             |> logDbg
@@ -200,13 +200,17 @@ module Program =
                                     replyMessage.MessageText
                                     replyMessage.FromUsername
                                     replyMessage.ChatUsername
-                                |> logDbg
+                                |> logInfo
                         | None ->
                             sprintf "Skipping message %A from %A" reply context.Me.Username
                             |> logDbg
                     | IgnoreMessage ->
                         sprintf "Ignoring message %A" context.Update.Message
                         |> logDbg
+                    | ChannelMessage message ->
+                        $"Deleting message {message.Text} from channel {message.From}"
+                        |> logInfo
+                        do! botApi.DeleteMessage %message.Chat.Id %message.MessageId
                 }
                 |> Option.defaultValue Async.Unit
         } |> Async.Start

diff --git a/src/Grinder/Types.fs b/src/Grinder/Types.fs
@@ -56,6 +56,7 @@ type UpdateType =
     | NewUsersAdded of User list
     | NewMessage of Message
     | NewAdminPrivateMessage of Document
+    | ChannelMessage of Message
 
 [<RequireQualifiedAccess>]   
 module UpdateType =
@@ -69,6 +70,14 @@ module UpdateType =
                 | None ->
                     IgnoreMessage
             else
+                // check if message comes from channel, we should delete it immediately
+                if message.From.IsSome &&
+                   message.From.Value.IsBot &&
+                   message.From.Value.FirstName = "Channel" &&
+                   message.From.Value.Username = Some "Channel_Bot" then
+                       ChannelMessage message
+                else
+
                 let hasCodeBlock =
                     message.Entities
                     |> Option.filter ^ fun entities ->