From 347a43f4fe8335d40b5c2206245265f9286b0415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Mon, 16 Oct 2023 19:02:42 -0400
Subject: [PATCH] fix: rewards fixes

fix enabled/disabled button
sort rewards from oldest to newest
---
 public/language/en-GB/rewards.json | 10 ++++++++++
 public/src/admin/extend/rewards.js | 14 +++++++-------
 src/notifications.js               |  2 +-
 src/rewards/admin.js               |  3 ++-
 src/rewards/index.js               |  6 +++++-
 src/views/admin/extend/rewards.tpl |  4 ++--
 6 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 public/language/en-GB/rewards.json

diff --git a/public/language/en-GB/rewards.json b/public/language/en-GB/rewards.json
new file mode 100644
index 0000000000..f923cf1500
--- /dev/null
+++ b/public/language/en-GB/rewards.json
@@ -0,0 +1,10 @@
+{
+	"awarded-x-reputation": "You have been awarded <strong>%1</strong> reputation",
+	"awarded-group-membership": "You have been added to the group <strong>%1</strong>",
+
+	"essentials/user.reputation-conditional-value": "<span class=\"text-xs\">(Reputation %1 %2)</span>",
+	"essentials/user.postcount-conditional-value": "<span class=\"text-xs\">(Post Count %1 %2)</span>",
+	"essentials/user.lastonline-conditional-value": "<span class=\"text-xs\">(Last Online %1 %2)</span>",
+	"essentials/user.joindate-conditional-value": "<span class=\"text-xs\">(Join Date %1 %2)</span>",
+	"essentials/user.daysregistered-conditional-value": "<span class=\"text-xs\">(Days Registered %1 %2)</span>"
+}
\ No newline at end of file
diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js
index f8f2deb478..109c84695a 100644
--- a/public/src/admin/extend/rewards.js
+++ b/public/src/admin/extend/rewards.js
@@ -41,8 +41,8 @@ define('admin/extend/rewards', ['alerts'], function (alerts) {
 			})
 			.on('click', '.toggle', function () {
 				const btn = $(this);
-				const disabled = btn.hasClass('btn-success');
-				btn.toggleClass('btn-warning').toggleClass('btn-success').translateHtml('[[admin/extend/rewards:' + (disabled ? 'disable' : 'enable') + ']]');
+				btn.parent().find('.toggle').removeClass('hidden');
+				btn.addClass('hidden');
 				// send disable api call
 				return false;
 			});
@@ -92,16 +92,16 @@ define('admin/extend/rewards', ['alerts'], function (alerts) {
 		}
 
 		inputs.forEach(function (input) {
-			html += '<label for="' + input.name + '">' + input.label + '<br />';
+			html += `<label class="form-label text-nowrap" for="${input.name}">${input.label}<br />`;
 			switch (input.type) {
 				case 'select':
-					html += '<select class="form-select form-select-sm" name="' + input.name + '">';
+					html += `<select class="form-select form-select-sm" name="${input.name}" >`;
 					input.values.forEach(function (value) {
-						html += '<option value="' + value.value + '">' + value.name + '</option>';
+						html += `<option value="${value.value}">${value.name}</option>`;
 					});
 					break;
 				case 'text':
-					html += '<input type="text" class="form-control form-control-sm" name="' + input.name + '" />';
+					html += `<input type="text" class="form-control form-control-sm" name="${input.name}"  />`;
 					break;
 			}
 			html += '</label>';
@@ -162,7 +162,7 @@ define('admin/extend/rewards', ['alerts'], function (alerts) {
 			});
 
 			data.id = $(this).attr('data-id');
-			data.disabled = $(this).find('.toggle').hasClass('btn-success');
+			data.disabled = $(this).find('.toggle.disable').hasClass('hidden');
 
 			activeRewards.push(data);
 		});
diff --git a/src/notifications.js b/src/notifications.js
index 3499a6caaa..13f81337a9 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -99,7 +99,7 @@ Notifications.getMultiple = async function (nids) {
 			}
 
 			notification.user = usersData[index];
-			if (notification.user) {
+			if (notification.user && notification.from) {
 				notification.image = notification.user.picture || null;
 				if (notification.user.username === '[[global:guest]]') {
 					notification.bodyShort = notification.bodyShort.replace(/([\s\S]*?),[\s\S]*?,([\s\S]*?)/, '$1, [[global:guest]], $2');
diff --git a/src/rewards/admin.js b/src/rewards/admin.js
index edd3202e26..cddbec401b 100644
--- a/src/rewards/admin.js
+++ b/src/rewards/admin.js
@@ -67,13 +67,14 @@ async function getActiveRewards() {
 			db.getObject(`rewards:id:${id}:rewards`),
 		]);
 		if (main) {
-			main.disabled = main.disabled === 'true';
+			main.disabled = main.disabled === 'true' || main.disabled === true;
 			main.rewards = rewards;
 		}
 		return main;
 	}
 
 	const rewardsList = await db.getSetMembers('rewards:list');
+	rewardsList.sort((a, b) => a - b);
 	const rewardData = await Promise.all(rewardsList.map(id => load(id)));
 	return rewardData.filter(Boolean);
 }
diff --git a/src/rewards/index.js b/src/rewards/index.js
index b4c9f8418f..49e88d1b09 100644
--- a/src/rewards/index.js
+++ b/src/rewards/index.js
@@ -72,7 +72,11 @@ async function giveRewards(uid, rewards) {
 	const rewardData = await getRewardsByRewardData(rewards);
 	for (let i = 0; i < rewards.length; i++) {
 		/* eslint-disable no-await-in-loop */
-		await plugins.hooks.fire(`action:rewards.award:${rewards[i].rid}`, { uid: uid, reward: rewardData[i] });
+		await plugins.hooks.fire(`action:rewards.award:${rewards[i].rid}`, {
+			uid: uid,
+			rewardData: rewards[i],
+			reward: rewardData[i],
+		});
 		await db.sortedSetIncrBy(`uid:${uid}:rewards`, 1, rewards[i].id);
 	}
 }
diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl
index 5c17dda540..1477430dec 100644
--- a/src/views/admin/extend/rewards.tpl
+++ b/src/views/admin/extend/rewards.tpl
@@ -35,7 +35,7 @@
 									{{{ end }}}
 								</select>
 
-								<input class="form-control form-control-sm" type="text" name="value" value="{active.value}" style="max-width: 64px;"/>
+								<input class="form-control form-control-sm" type="text" name="value" value="{active.value}" style="max-width: 128px;"/>
 							</div>
 						</div>
 						<div class="card card-body m-0 then-block border-primary border border-2">
@@ -47,7 +47,7 @@
 							</select>
 						</div>
 					</form>
-					<form class="rewards">
+					<form class="rewards flex-1">
 						<div class="inputs card card-body m-0 h-100 reward-block border-success border border-2"><div class="d-flex h-100 align-items-center">[[admin/extend/rewards:select-reward]]</div></div>
 					</form>
 				</div>