ban user instead of applying restrictions

umputun · Feb 3, 2024 · c0b01ba · c0b01ba
1 parent 0612662
commit c0b01ba
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/app/events/admin.go b/app/events/admin.go
@@ -359,7 +359,7 @@ func (a *admin) callbackUnbanConfirmed(query *tbapi.CallbackQuery) error {
 		// onlyIfBanned seems to prevent user from being removed from the chat according to this confusing doc:
 		// https://core.telegram.org/bots/api#unbanchatmember
 		_, err = a.tbAPI.Request(tbapi.UnbanChatMemberConfig{
-			ChatMemberConfig: tbapi.ChatMemberConfig{UserID: userID, ChatID: a.primChatID}})
+			ChatMemberConfig: tbapi.ChatMemberConfig{UserID: userID, ChatID: a.primChatID}, OnlyIfBanned: true})
 		if err != nil {
 			return fmt.Errorf("failed to unban user %d: %w", userID, err)
 		}

diff --git a/app/events/events.go b/app/events/events.go
@@ -149,18 +149,12 @@ func banUserOrChannel(r banRequest) error {
 		return nil
 	}
 
-	resp, err := r.tbAPI.Request(tbapi.RestrictChatMemberConfig{
+	resp, err := r.tbAPI.Request(tbapi.BanChatMemberConfig{
 		ChatMemberConfig: tbapi.ChatMemberConfig{
 			ChatID: r.chatID,
 			UserID: r.userID,
 		},
 		UntilDate: time.Now().Add(r.duration).Unix(),
-		Permissions: &tbapi.ChatPermissions{
-			CanSendMessages:       false,
-			CanSendMediaMessages:  false,
-			CanSendOtherMessages:  false,
-			CanAddWebPagePreviews: false,
-		},
 	})
 	if err != nil {
 		return err

diff --git a/app/events/listener_test.go b/app/events/listener_test.go
@@ -160,7 +160,7 @@ func TestTelegramListener_DoWithBotBan(t *testing.T) {
 		assert.Equal(t, 1, len(mockAPI.SendCalls()))
 		assert.Equal(t, "bot's answer", mockAPI.SendCalls()[0].C.(tbapi.MessageConfig).Text)
 		assert.Equal(t, 1, len(mockAPI.RequestCalls()))
-		assert.Equal(t, int64(123), mockAPI.RequestCalls()[0].C.(tbapi.RestrictChatMemberConfig).ChatID)
+		assert.Equal(t, int64(123), mockAPI.RequestCalls()[0].C.(tbapi.BanChatMemberConfig).ChatID)
 	})
 
 	t.Run("test ban of the channel", func(t *testing.T) {
@@ -450,8 +450,8 @@ func TestTelegramListener_DoWithForwarded(t *testing.T) {
 	assert.Equal(t, 2, len(mockAPI.RequestCalls()))
 	assert.Equal(t, int64(123), mockAPI.RequestCalls()[0].C.(tbapi.DeleteMessageConfig).ChatID)
 	assert.Equal(t, 999999, mockAPI.RequestCalls()[0].C.(tbapi.DeleteMessageConfig).MessageID)
-	assert.Equal(t, int64(123), mockAPI.RequestCalls()[1].C.(tbapi.RestrictChatMemberConfig).ChatID)
-	assert.Equal(t, int64(88), mockAPI.RequestCalls()[1].C.(tbapi.RestrictChatMemberConfig).UserID)
+	assert.Equal(t, int64(123), mockAPI.RequestCalls()[1].C.(tbapi.BanChatMemberConfig).ChatID)
+	assert.Equal(t, int64(88), mockAPI.RequestCalls()[1].C.(tbapi.BanChatMemberConfig).UserID)
 
 	assert.Equal(t, 1, len(b.RemoveApprovedUserCalls()))
 	assert.Equal(t, int64(88), b.RemoveApprovedUserCalls()[0].ID)
@@ -897,8 +897,8 @@ func TestTelegramListener_DoWithAdminBanConfirmedTraining(t *testing.T) {
 	assert.Equal(t, 0, len(kb), "buttons cleared")
 	assert.Contains(t, mockAPI.SendCalls()[0].C.(tbapi.EditMessageTextConfig).Text, "confirmed by admin in ")
 	require.Equal(t, 2, len(mockAPI.RequestCalls()))
-	assert.Equal(t, int64(999), mockAPI.RequestCalls()[0].C.(tbapi.RestrictChatMemberConfig).UserID, "user banned")
-	assert.Equal(t, int64(123), mockAPI.RequestCalls()[0].C.(tbapi.RestrictChatMemberConfig).ChatID, "chat id")
+	assert.Equal(t, int64(999), mockAPI.RequestCalls()[0].C.(tbapi.BanChatMemberConfig).UserID, "user banned")
+	assert.Equal(t, int64(123), mockAPI.RequestCalls()[0].C.(tbapi.BanChatMemberConfig).ChatID, "chat id")
 	assert.Equal(t, 987654, mockAPI.RequestCalls()[1].C.(tbapi.DeleteMessageConfig).MessageID, "message deleted")
 
 	assert.Equal(t, 1, len(b.UpdateSpamCalls()))