Subscription Events Change

vortisrd · vortisrd · commit 362e7833c5c0 · 2025-09-18T15:26:40.000-03:00
diff --git a/js/chatrd.js b/js/chatrd.js
@@ -354,6 +354,25 @@ async function cleanStringOfHTMLButEmotes(string) {
 }
 
 
+function formatSubMonthDuration(months) {
+    /*if (months < 12) {
+        return `${months} ${months === 1 ? 'Month' : 'Months'}`;
+    }
+
+    const years = Math.floor(months / 12);
+    const remainingMonths = months % 12;
+
+    const yearText = `${years} ${years === 1 ? 'Year' : 'Years'}`;
+
+    const monthText = remainingMonths > 0 
+        ? ` and ${remainingMonths} ${remainingMonths === 1 ? 'Month' : 'Months'}`
+        : '';
+
+    return `${yearText}${monthText}`;*/
+    return `${months} ${months === 1 ? 'Month' : 'Months'}`;
+}
+
+
 const pushNotify = (data) => {
 
     const SimpleNotify = {
diff --git a/js/modules/kick/module.js b/js/modules/kick/module.js
@@ -437,9 +437,10 @@ async function kickSubMessage(data) {
 
     action.innerHTML = ` subscribed for `;
 
-    var months = data.months > 1 ? 'months' : 'month';
+    //var months = data.months > 1 ? 'months' : 'month';
+    var months = formatSubMonthDuration(data.months);
     
-    value.innerHTML = `<strong>${data.months} ${months}</strong>`;
+    value.innerHTML = `<strong>${months}</strong>`;
 
     message.remove();
 
diff --git a/js/modules/tiktok/module.js b/js/modules/tiktok/module.js
@@ -449,9 +449,10 @@ async function tiktokSubMessage(data) {
     
     user.innerHTML = `<strong>${data.nickname}</strong>`;
     action.innerHTML = ` subscribed for `;
-
-    var months = data.subMonth > 1 ? 'months' : 'month';
-    value.innerHTML = `<strong>${data.subMonth} ${months}</strong>`;
+    
+    //var months = data.subMonth > 1 ? 'months' : 'month';
+    var months = formatSubMonthDuration(data.subMonth);
+    value.innerHTML = `<strong>${months}</strong>`;
 
     message.remove();
 
diff --git a/js/modules/twitch/module.js b/js/modules/twitch/module.js
@@ -522,10 +522,17 @@ async function twitchSubMessage(data) {
 
     action.innerHTML = ` subscribed for `;
 
-    var months = data.duration_months > 1 ? 'months' : 'month';
+    //var months = data.duration_months > 1 ? 'months' : 'month';
+    var months = formatSubMonthDuration(data.duration_months);
     var tier = data.is_prime ? 'Prime' : 'Tier '+Math.floor(data.sub_tier/1000);
 
-    value.innerHTML = `<strong>${data.duration_months} ${months} (${tier})</strong>`;
+    //value.innerHTML = `<strong>${months} (${tier})</strong>`;
+    value.innerHTML = `
+        <div class="gift-info">
+            <span class="gift-image"><strong>${months}</strong></span>
+            <span class="gift-value">${tier}</span>
+        </div>
+    `;
 
     addEventItem('twitch', clone, classes, userId, messageId);
 }
@@ -561,10 +568,17 @@ async function twitchReSubMessage(data) {
 
     action.innerHTML = ` subscribed for `;
 
-    var months = data.cumulativeMonths > 1 ? 'months' : 'month';
+    //var months = data.cumulativeMonths > 1 ? 'months' : 'month';
+    var months = formatSubMonthDuration(data.cumulativeMonths);
     var tier = data.isPrime ? 'Prime' : 'Tier '+Math.floor(data.subTier/1000);
     
-    value.innerHTML = `<strong>${data.cumulativeMonths} ${months} (${tier})</strong>`;
+    //value.innerHTML = `<strong>${months} (${tier})</strong>`;
+    value.innerHTML = `
+        <div class="gift-info">
+            <span class="gift-image"><strong>${months}</strong></span>
+            <span class="gift-value">${tier}</span>
+        </div>
+    `;
 
     message.textContent = data.text;
     await getTwitchEmotesOnParts(data, message);
@@ -612,8 +626,11 @@ async function twitchGiftMessage(data) {
     
     user.innerHTML = `<strong>${data.user.name}</strong>`;
 
-    var months = data.durationMonths > 1 ? 'months' : 'month';
-    action.innerHTML = ` gifted <strong>${data.durationMonths} ${months}</strong> subscription <strong>(Tier ${Math.floor(data.subTier/1000)})</strong> to `;
+    //var months = data.durationMonths > 1 ? 'months' : 'month';
+    var months = formatSubMonthDuration(data.durationMonths);
+    var subs = data.durationMonths > 1 ? 'subscription' : 'subscription'
+
+    action.innerHTML = ` gifted <strong>${months}</strong> ${subs} <strong>(Tier ${Math.floor(data.subTier/1000)})</strong> to `;
     
     value.innerHTML = `<strong>${data.recipient.name}</strong>`;
 
diff --git a/js/modules/youtube/module.js b/js/modules/youtube/module.js
@@ -259,8 +259,9 @@ async function youTubeNewSponsorMessage(data) {
     user.innerHTML = `<strong>${data.user.name}</strong>`;
     action.innerHTML = ` became a member for `;
 
-    var months = data.months > 1 ? 'months' : 'month';
-    value.innerHTML = `<strong>${data.months || 1} ${months}</strong>`;
+    //var months = data.months > 1 ? 'months' : 'month';
+    var months = formatSubMonthDuration(data.months);
+    value.innerHTML = `<strong>${months}</strong>`;
 
     if (data.message) {
         message.textContent = data.message;
