support for removal users from aproved list

app/bot/spam.go

@@ -53,6 +53,7 @@ type Detector interface {
 	UpdateSpam(msg string) error
 	UpdateHam(msg string) error
 	AddApprovedUsers(ids ...string)
+	RemoveApprovedUsers(ids ...string)
 }
 
 // NewSpamFilter creates new spam filter
@@ -122,6 +123,17 @@ func (s *SpamFilter) AddApprovedUsers(id int64, ids ...int64) {
 	s.director.AddApprovedUsers(sids...)
 }
 
+// RemoveApprovedUsers removes users from the list of approved users
+func (s *SpamFilter) RemoveApprovedUsers(id int64, ids ...int64) {
+	combinedIDs := append([]int64{id}, ids...)
+	log.Printf("[DEBUG] remove aproved users: %v", combinedIDs)
+	sids := make([]string, len(combinedIDs))
+	for i, id := range combinedIDs {
+		sids[i] = strconv.FormatInt(id, 10)
+	}
+	s.director.RemoveApprovedUsers(sids...)
+}
+
 // watch watches for changes in samples files and reloads them
 // delay is a time to wait after the last change before reloading to avoid multiple reloads
 func (s *SpamFilter) watch(ctx context.Context, delay time.Duration) error {

app/bot/spam_test.go

@@ -364,3 +364,31 @@ func TestAddApprovedUsers(t *testing.T) {
 		assert.Equal(t, []string{"1", "2", "3"}, mockDirector.AddApprovedUsersCalls()[0].Ids)
 	})
 }
+
+func TestRemoveApprovedUsers(t *testing.T) {
+	mockDirector := &mocks.DetectorMock{RemoveApprovedUsersFunc: func(ids ...string) {}}
+
+	t.Run("remove single approved user", func(t *testing.T) {
+		mockDirector.ResetCalls()
+		sf := SpamFilter{director: mockDirector}
+		sf.RemoveApprovedUsers(1)
+		require.Equal(t, 1, len(mockDirector.RemoveApprovedUsersCalls()))
+		assert.Equal(t, []string{"1"}, mockDirector.RemoveApprovedUsersCalls()[0].Ids)
+	})
+
+	t.Run("remove multiple approved users", func(t *testing.T) {
+		mockDirector.ResetCalls()
+		sf := SpamFilter{director: mockDirector}
+		sf.RemoveApprovedUsers(1, 2, 3)
+		require.Equal(t, 1, len(mockDirector.RemoveApprovedUsersCalls()))
+		assert.Equal(t, []string{"1", "2", "3"}, mockDirector.RemoveApprovedUsersCalls()[0].Ids)
+	})
+
+	t.Run("remove empty list of approved users", func(t *testing.T) {
+		mockDirector.ResetCalls()
+		sf := SpamFilter{director: mockDirector}
+		sf.RemoveApprovedUsers(1, 2, 3)
+		require.Equal(t, 1, len(mockDirector.RemoveApprovedUsersCalls()))
+		assert.Equal(t, []string{"1", "2", "3"}, mockDirector.RemoveApprovedUsersCalls()[0].Ids)
+	})
+}

app/events/events.go

@@ -82,6 +82,7 @@ type Bot interface {
 	UpdateSpam(msg string) error
 	UpdateHam(msg string) error
 	AddApprovedUsers(id int64, ids ...int64)
+	RemoveApprovedUsers(id int64, ids ...int64)
 }
 
 // SpamWeb is an interface for the web component
@@ -305,6 +306,10 @@ func (l *TelegramListener) adminChatMsgHandler(update tbapi.Update) error {
 	if err := l.banUserOrChannel(bot.PermanentBanDuration, l.chatID, info.userID, 0); err != nil {
 		return fmt.Errorf("failed to ban user %d: %w", info.userID, err)
 	}
+
+	// remove user from the approved list
+	l.Bot.RemoveApprovedUsers(info.userID)
+
 	log.Printf("[INFO] user %q (%d) banned", update.Message.ForwardSenderName, info.userID)
 	return nil
 }

app/events/events_test.go

@@ -380,6 +380,7 @@ func TestTelegramListener_DoWithForwarded(t *testing.T) {
 			t.Logf("update-spam: %s", msg)
 			return nil
 		},
+		RemoveApprovedUsersFunc: func(id int64, ids ...int64) {},
 	}
 
 	l := TelegramListener{
@@ -428,6 +429,9 @@ func TestTelegramListener_DoWithForwarded(t *testing.T) {
 
 	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, 1, len(b.RemoveApprovedUsersCalls()))
+	assert.Equal(t, int64(88), b.RemoveApprovedUsersCalls()[0].ID)
 }
 
 func TestTelegramListener_DoWithForwarded_Reply(t *testing.T) {