Просмотр исходного кода

Added refunded points announcement

deadtom 1 месяц назад
Родитель
Сommit
094ed41dfc
1 измененных файлов с 14 добавлено и 13 удалено
  1. 14 13
      ownchatbot/web_panels.py

+ 14 - 13
ownchatbot/web_panels.py

@@ -3,7 +3,7 @@ from datetime import timezone
 from ownchatbot.db import get_db, reread_goals, reread_votes, rem_vote, reset_vote, reset_goal, clear_fulfilled_rewards, clear_reward_queue, rem_cool, rem_from_queue
 from ownchatbot.reward_handlers import all_active_votes, all_active_goals, all_active_rewards, get_queue, fulfill_reward, save_rewards, activate_category, deactivate_category, refund_reward, reread_categories, save_config, save_alerts, del_alert_file, all_active_redeems
 from ownchatbot.user_handlers import get_all_users, get_all_users_by_name, refund_points, adjust_points, change_email, get_email_code, del_email_code, save_todolist
-from ownchatbot.bot_messages import save_announce
+from ownchatbot.bot_messages import save_announce, porps
 from ownchatbot.owncast_com import send_private_chat, send_chat
 import json
 import emoji
@@ -222,8 +222,9 @@ def refund():
     points = rewards[reward]['price']
     username = request.args.get('username')
     user_id = request.args.get('rewarder_id')
-    refund_points(db, user_id, points)  # resets points
-    refund_reward(db, reward_id)  # marks the reward as refunded
+    if refund_points(db, user_id, points):  # resets points
+        if refund_reward(db, reward_id):  # marks the reward as refunded
+            send_chat(f'Refunded {porps(points)} to {username}.')
     return redirect(url_for('web_panels.mgmtqueue'))
 
 
@@ -238,16 +239,16 @@ def edit_account(user_id):
         user_id = request.form['user_id']
         name = request.form['name']
         newpoints = request.form['newpoints']
-        adjust_points(db, user_id, newpoints)
-        newemail = request.form['newemail']
-        if newemail == 'None':
-            current_app.logger.info(f'No email change requested')
-        else:
-            if change_email(db, user_id, newemail):
-                if newemail == '':
-                    current_app.logger.info(f'Removed {name}\'s email')
-                else:
-                    current_app.logger.info(f'Changed {name}\'s email to {newemail}')
+        if adjust_points(db, user_id, newpoints):
+            newemail = request.form['newemail']
+            if newemail == 'None':
+                current_app.logger.info(f'No email change requested')
+            else:
+                if change_email(db, user_id, newemail):
+                    if newemail == '':
+                        current_app.logger.info(f'Removed {name}\'s email')
+                    else:
+                        current_app.logger.info(f'Changed {name}\'s email to {newemail}')
         return redirect(url_for('web_panels.mgmt', activeTab='accounts'))
 
     return render_template('edit_account.html',