dkforest

commit f4963b93b697e537a6a022aba70e817845326274
parent c9cba7374315776740f677230cc806b833a72f9e
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri, 26 May 2023 08:58:51 -0700

fix queries

Diffstat:
M
pkg/database/tableIgnoredUsers.go
 | 
5
+++--
M
pkg/database/tablePmBlacklistedUsers.go
 | 
4
+++-
M
pkg/database/tablePmWhitelistedUsers.go
 | 
4
+++-

3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pkg/database/tableIgnoredUsers.go b/pkg/database/tableIgnoredUsers.go
@@ -15,8 +15,9 @@ type IgnoredUser struct {
 }
 
 func (d *DkfDB) DeleteOldIgnoredUsers() {
-	d.db.Exec(`DELETE FROM ignored_users INNER JOIN users u ON ignored_user_id = u.id WHERE u.last_seen_at < date('now', '-60 Day')`)
-	// d.db.Exec(`DELETE FROM ignored_users INNER JOIN users u ON user_id = u.id WHERE u.last_seen_at < date('now', '-60 Day')`)
+	if err := d.db.Exec(`DELETE FROM ignored_users WHERE ignored_user_id IN (SELECT u.id FROM users u WHERE u.last_seen_at < date('now', '-60 Day'))`).Error; err != nil {
+		logrus.Error(err)
+	}
 }
 
 func (d *DkfDB) GetIgnoredUsers(userID UserID) (out []IgnoredUser, err error) {
diff --git a/pkg/database/tablePmBlacklistedUsers.go b/pkg/database/tablePmBlacklistedUsers.go
@@ -11,7 +11,9 @@ type PmBlacklistedUsers struct {
 }
 
 func (d *DkfDB) DeleteOldPmBlacklistedUsers() {
-	d.db.Exec(`DELETE FROM pm_blacklisted_users INNER JOIN users u ON blacklisted_user_id = u.id WHERE u.last_seen_at < date('now', '-90 Day')`)
+	if err := d.db.Exec(`DELETE FROM pm_blacklisted_users WHERE blacklisted_user_id IN (SELECT id FROM users u WHERE u.last_seen_at < date('now', '-90 Day'))`).Error; err != nil {
+		logrus.Error(err)
+	}
 }
 
 // IsUserPmBlacklisted returns either or not toUserID blacklisted fromUserID
diff --git a/pkg/database/tablePmWhitelistedUsers.go b/pkg/database/tablePmWhitelistedUsers.go
@@ -11,7 +11,9 @@ type PmWhitelistedUsers struct {
 }
 
 func (d *DkfDB) DeleteOldPmWhitelistedUsers() {
-	d.db.Exec(`DELETE FROM pm_whitelisted_users INNER JOIN users u ON whitelisted_user_id = u.id WHERE u.last_seen_at < date('now', '-90 Day')`)
+	if err := d.db.Exec(`DELETE FROM pm_whitelisted_users WHERE whitelisted_user_id IN (SELECT u.id FROM users u WHERE u.last_seen_at < date('now', '-90 Day'))`).Error; err != nil {
+		logrus.Error(err)
+	}
 }
 
 func (d *DkfDB) IsUserPmWhitelisted(fromUserID, toUserID UserID) bool {