From 929a2283255180027fa889354e9db6d7d691a247 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Sat, 3 Feb 2024 03:45:54 +0200
Subject: [PATCH] fix two bugs in ping group charging logic for friends and
 enemies

---
 files/helpers/alerts.py  | 28 +++++++++++++++-------------
 files/routes/settings.py | 16 ++++++++++++----
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/files/helpers/alerts.py b/files/helpers/alerts.py
index 00bf65a09..0ae2de9be 100644
--- a/files/helpers/alerts.py
+++ b/files/helpers/alerts.py
@@ -137,7 +137,7 @@ def add_notif(cid, uid, text, pushnotif_url='', check_existing=True):
 		push_notif({uid}, 'New notification', text, pushnotif_url)
 
 
-def NOTIFY_USERS(text, v, oldtext=None, ghost=False, obj=None, followers_ping=True, commenters_ping_post_id=None):
+def NOTIFY_USERS(text, v, oldtext=None, ghost=False, obj=None, followers_ping=True, commenters_ping_post_id=None, charge=True):
 	# Restrict young accounts from generating notifications
 	if v.age < NOTIFICATION_SPAM_AGE_THRESHOLD:
 		return set()
@@ -178,13 +178,14 @@ def NOTIFY_USERS(text, v, oldtext=None, ghost=False, obj=None, followers_ping=Tr
 				abort(403, f"Only admins can mention !focusgroup")
 
 			if i.group(1) == 'everyone':
-				cost = g.db.query(User).count() * 5
-				if cost > v.coins + v.marseybux:
-					abort(403, f"You need {cost} currency to mention these ping groups!")
+				if charge:
+					cost = g.db.query(User).count() * 5
+					if cost > v.coins + v.marseybux:
+						abort(403, f"You need {cost} currency to mention these ping groups!")
 
-				v.charge_account('coins/marseybux', cost)
-				if obj:
-					obj.ping_cost += cost
+					v.charge_account('coins/marseybux', cost)
+					if obj:
+						obj.ping_cost += cost
 				return 'everyone'
 			elif i.group(1) == 'jannies':
 				group = None
@@ -224,13 +225,14 @@ def NOTIFY_USERS(text, v, oldtext=None, ghost=False, obj=None, followers_ping=Tr
 				if i.group(1) in {'biofoids','neofoids','jannies'}:
 					coin_receivers.update(member_ids)
 
-		if cost:
-			v.charge_account('coins/marseybux', cost)
-			if obj:
-				obj.ping_cost += cost
+		if charge:
+			if cost:
+				v.charge_account('coins/marseybux', cost)
+				if obj:
+					obj.ping_cost += cost
 
-		if coin_receivers:
-			g.db.query(User).options(load_only(User.id)).filter(User.id.in_(coin_receivers)).update({ User.coins: User.coins + 5 })
+			if coin_receivers:
+				g.db.query(User).options(load_only(User.id)).filter(User.id.in_(coin_receivers)).update({ User.coins: User.coins + 5 })
 
 	if len(notify_users) > 400 and v.admin_level < PERMS['POST_COMMENT_INFINITE_PINGS']:
 		abort(403, "You can only notify a maximum of 400 users.")
diff --git a/files/routes/settings.py b/files/routes/settings.py
index 0519d6738..22d02c633 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -277,8 +277,12 @@ def settings_personal_post(v):
 					add_notif(cid, x, text, pushnotif_url=f'{SITE_FULL}{v.url}')
 
 		if v.friends:
-			removed_users = NOTIFY_USERS(v.friends, v) - NOTIFY_USERS(friends, v)
-			notify_removed_users(removed_users, 'friends')
+			try:
+				removed_users = NOTIFY_USERS(v.friends, v, charge=False) - NOTIFY_USERS(friends, v, charge=False)
+			except TypeError:
+				pass
+			else:
+				notify_removed_users(removed_users, 'friends')
 
 		v.friends = friends
 		v.friends_html=friends_html
@@ -307,8 +311,12 @@ def settings_personal_post(v):
 					add_notif(cid, x, text, pushnotif_url=f'{SITE_FULL}{v.url}')
 
 		if v.enemies:
-			removed_users = NOTIFY_USERS(v.enemies, v) - NOTIFY_USERS(enemies, v)
-			notify_removed_users(removed_users, 'enemies')
+			try:
+				removed_users = NOTIFY_USERS(v.enemies, v, charge=False) - NOTIFY_USERS(enemies, v, charge=False)
+			except TypeError:
+				pass
+			else:
+				notify_removed_users(removed_users, 'enemies')
 
 		v.enemies = enemies
 		v.enemies_html=enemies_html