Merge pull request #70 from LucaBernstein/admin-notif-also-to-sender

Also send admin notifications to sender
LucaBernstein · Dec 22, 2021 · 4fc9944 · 4fc9944
2 parents 0662ca1 + e694566
commit 4fc9944
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/bot/controller.go b/bot/controller.go
@@ -420,7 +420,7 @@ func (bc *BotController) commandAdminNofify(m *tb.Message) {
 		target = command[1]
 	}
 
-	receivers := bc.Repo.IndividualsWithNotifications(m.Chat.ID, target)
+	receivers := bc.Repo.IndividualsWithNotifications(target)
 	if len(receivers) == 0 {
 		_, err := bc.Bot.Send(m.Sender, "No receivers found to send notification to (you being excluded).")
 		if err != nil {

diff --git a/db/crud/auth_user.go b/db/crud/auth_user.go
@@ -143,21 +143,20 @@ func (r *Repo) UserIsAdmin(m *tb.Message) bool {
 	return isAdmin
 }
 
-func (r *Repo) IndividualsWithNotifications(myChatId int64, chatId string) (recipients []string) {
+func (r *Repo) IndividualsWithNotifications(chatId string) (recipients []string) {
 	query := `
 		SELECT "tgChatId"
 		FROM "auth::user"
 		WHERE "tgUserId" = "tgChatId" -- is a private chat
-			AND "tgChatId" != $1
 	`
-	params := []interface{}{myChatId}
+	params := []interface{}{}
 
 	if chatId != "" {
 		i, err := strconv.ParseInt(chatId, 10, 64)
 		if err != nil {
 			LogDbf(r, helpers.ERROR, nil, "Error while parsing chatId to int64: %s", err.Error())
 		}
-		query += `AND "tgChatId" = $2`
+		query += `AND "tgChatId" = $1`
 		params = append(params, i)
 	}
 	rows, err := r.db.Query(query, params...)