From 6210db375d65539226e322b796899bb494a826fa Mon Sep 17 00:00:00 2001
From: Rodrigo Emanuel <xrodrigolima@gmail.com>
Date: Wed, 14 May 2025 18:53:08 -0300
Subject: [PATCH] Add files via upload

---
 images/3k7a2BA.png      | Bin 0 -> 7419 bytes
 index.html              |   2 +-
 js/app-mockup.js        | 125 ++++++++++++++++++++++++++++++++++++++++
 js/fourthwall/module.js |  62 +++++++++++++++-----
 js/kofi/module.js       |   6 +-
 js/lang/en.js           |  12 ++--
 js/settings.js          |   2 +-
 7 files changed, 186 insertions(+), 23 deletions(-)
 create mode 100644 images/3k7a2BA.png

diff --git a/images/3k7a2BA.png b/images/3k7a2BA.png
new file mode 100644
index 0000000000000000000000000000000000000000..be3e7ea75493ca843c385c53fe8f5d37d03b2b0f
GIT binary patch
literal 7419
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
D@S|a+

literal 0
HcmV?d00001

diff --git a/index.html b/index.html
index 06f7b1f..9c787cf 100644
--- a/index.html
+++ b/index.html
@@ -313,6 +313,6 @@
 	
 
     <script src="https://unpkg.com/@streamerbot/client/dist/streamerbot-client.js"></script>
-	<script src="js/settings.js?v=0.0.1"></script>
+	<script src="js/settings.js"></script>
 </body>
 </html>
diff --git a/js/app-mockup.js b/js/app-mockup.js
index b986e46..eeb5a86 100644
--- a/js/app-mockup.js
+++ b/js/app-mockup.js
@@ -219,6 +219,10 @@ function generateMockEvent() {
 
         'patreon-membership', 'tipeeestream-tip',
 
+        'kofi-donation', 'kofi-sub', 'kofi-resub', 'kofi-order',
+        
+        'fourthwall-donation', 'fourthwall-sub', 'fourthwall-order',
+
         'streamlabs-tip', 'streamelements-tip',
     ];
     
@@ -770,6 +774,127 @@ function generateMockEvent() {
 
 
 
+        case 'kofi-donation' :
+
+            var data = {
+                from: user.name,
+                amount: Math.floor(Math.random() * 2000) + 1,
+                currency: 'USD',
+                message: messagetext
+            };
+
+            kofiDonationMessage(data);
+
+        break;
+
+
+        case 'kofi-sub' :
+
+            var data = {
+                from: user.name,
+                amount: Math.floor(Math.random() * 2000) + 1,
+                currency: 'USD',
+                message: messagetext
+            };
+
+            kofiSubMessage(data);
+
+        break;
+
+        case 'kofi-resub' :
+
+            var data = {
+                from: user.name,
+                amount: Math.floor(Math.random() * 2000) + 1,
+                currency: 'USD',
+                tier: parseInt(Math.floor(Math.random() * 3) + 1),
+                message: messagetext
+            };
+
+            kofiReSubMessage(data);
+
+        break;
+
+        case 'kofi-order' :
+
+            var data = {
+                from: user.name,
+                amount: Math.floor(Math.random() * 200) + 1,
+                items: badgeschosen,
+                currency: 'USD',
+                message: messagetext
+            };
+
+            kofiOrderMessage(data);
+
+        break;
+        
+
+
+
+
+
+
+
+
+
+
+        case 'fourthwall-donation' :
+
+            var data = {
+                username: user.name,
+                amount: Math.floor(Math.random() * 2000) + 1,
+                currency: 'USD',
+                message: messagetext
+            };
+
+            fourthwallDonationMessage(data);
+
+        break;
+
+
+        case 'fourthwall-sub' :
+
+            var data = {
+                nickname: user.name,
+                amount: Math.floor(Math.random() * 2000) + 1,
+                currency: 'USD'
+            };
+
+            fourthwallSubMessage(data);
+
+        break;
+
+
+        case 'fourthwall-order' :
+
+            var data = {
+                username: user.name,
+                total: Math.floor(Math.random() * 200) + 1,
+                variants: [
+                    {
+                        name: 'Fake Product',
+                        image: 'images/3k7a2BA.png'
+                    }
+                ],
+                currency: 'USD',
+                statmessageus: messagetext
+            };
+
+            fourthwallOrderMessage(data);
+
+        break;
+        
+
+
+
+
+
+
+
+
+
+
         case 'streamlabs-tip' :
 
             var data = {
diff --git a/js/fourthwall/module.js b/js/fourthwall/module.js
index 724f981..f4e83e4 100644
--- a/js/fourthwall/module.js
+++ b/js/fourthwall/module.js
@@ -1,20 +1,53 @@
-const showShopifyOrders              = getURLParam("showShopifyOrders", true);
+const showFourthwallDonations           = getURLParam("showFourthwallDonations", true);
 
-const shopifyMessageHandlers = {
-    'Shopify.OrderPaid': (response) => {
-        console.debug('Shopify Order Paid', response.data);
-        //shopifyOrderPaidMessage(response.data);
+const showFourthwallOrders              = getURLParam("showFourthwallOrders", true);
+const showFourthwallShowImage           = getURLParam("showFourthwallShowImage", true);
+const showFourthwallBigImage            = getURLParam("showFourthwallBigImage", true);
+
+const showFourthwallSubscriptions       = getURLParam("showFourthwallSubscriptions", true);
+
+const showFourthwallGiftPurchase        = getURLParam("showFourthwallGiftPurchase", true);
+const showFourthwallShowGiftImage       = getURLParam("showFourthwallShowGiftImage", true);
+const showFourthwallBigGiftImage        = getURLParam("showFourthwallBigGiftImage", true);
+
+const showFourthwallGiftDraw            = getURLParam("showFourthwallGiftDraw", true);
+const fourthWallGiftDrawCommand         = getURLParam("fourthWallGiftDrawCommand", "!enter");
+
+const fourthwallMessageHandlers = {
+    'Fourthwall.Donation': (response) => {
+        console.debug('Fourthwall Donation', response.data);
+        fourthwallDonationMessage(response.data);
+    },
+    'Fourthwall.OrderPlaced': (response) => {
+        console.debug('Fourthwall Order', response.data);
+        fourthwallOrderMessage(response.data);
+    },
+    'Fourthwall.SubscriptionPurchased': (response) => {
+        console.debug('Fourthwall Sub', response.data);
+        fourthwallSubMessage(response.data);
+    },
+    'Fourthwall.GiftPurchase': (response) => {
+        console.debug('Fourthwall Gift', response.data);
+        fourthwallGiftMessage(response.data);
+    },
+    'Fourthwall.GiftDrawStarted': (response) => {
+        console.debug('Fourthwall Gift Draw Start', response.data);
+        fourthwallGiftDrawStartMessage(response.data);
+    },
+    'Fourthwall.GiftDrawEnded': (response) => {
+        console.debug('Fourthwall Gift Draw Start', response.data);
+        fourthwallGiftDrawEndMessage(response.data);
     },
 };
 
-for (const [event, handler] of Object.entries(shopifyMessageHandlers)) {
+for (const [event, handler] of Object.entries(fourthwallMessageHandlers)) {
     streamerBotClient.on(event, handler);
 }
 
 
-async function shopifyOrderPaidMessage(data) {
+async function fourthwallDonationMessage(data) {
     
-    if (showShopifyOrders == false) return;
+    if (showFourthwallDonations == false) return;
 
     const {
         username : userName,
@@ -181,7 +214,7 @@ async function fourthwallGiftMessage(data) {
         }),
     ]);
 
-    const classes = ['gift'];
+    const classes = ['order'];
     if (showFourthwallBigGiftImage == true) {
         classes.push('giantimage');
     }
@@ -210,6 +243,7 @@ async function fourthwallGiftDrawStartMessage(data) {
         durationSeconds
     } = data;
 
+    var userName = '';
     const userID = createRandomString(40);
     const messageID = createRandomString(40);
 
@@ -217,7 +251,8 @@ async function fourthwallGiftDrawStartMessage(data) {
         '',
         currentLang.fourthwall.drawstart({
             gift: itemName,
-            command: fourthWallGiftDrawCommand
+            command: fourthWallGiftDrawCommand,
+            time: durationSeconds
         }),
     ]);
 
@@ -240,18 +275,17 @@ async function fourthwallGiftDrawEndMessage(data) {
     if (showFourthwallGiftDraw == false) return;
 
     const {
-        data: {
-            gifts
-        }
+        gifts
     } = data;
 
+    var userName = '';
     const userID = createRandomString(40);
     const messageID = createRandomString(40);
 
     const [avatar, message] = await Promise.all([
         '',
         currentLang.fourthwall.drawend({
-            winners: getWinnersList(gifts)
+            winners: await getWinnersList(gifts)
         }),
     ]);
 
diff --git a/js/kofi/module.js b/js/kofi/module.js
index 6f48ea4..93087b3 100644
--- a/js/kofi/module.js
+++ b/js/kofi/module.js
@@ -110,6 +110,8 @@ async function kofiReSubMessage(data) {
 
     const {
         from : userName,
+        amount,
+        currency,
         tier,
         message: text
     } = data;
@@ -117,9 +119,12 @@ async function kofiReSubMessage(data) {
     const userID = createRandomString(40);
     const messageID = createRandomString(40);
 
+    var money = formatCurrency(amount,currency);
+
     const [avatar, message] = await Promise.all([
         '',
         currentLang.kofi.resub({
+            money: money,
             tier: tier,
             message: text
         }),
@@ -147,7 +152,6 @@ async function kofiOrderMessage(data) {
         from : userName,
         amount,
         currency,
-        message: text,
         items
     } = data;
 
diff --git a/js/lang/en.js b/js/lang/en.js
index d31e258..a953491 100644
--- a/js/lang/en.js
+++ b/js/lang/en.js
@@ -106,8 +106,8 @@ const en = {
 
     kofi : {
         donation : ({ money, message }) => ` donated 🪙 <strong>${money}</strong>${message ? '<br>'+message : ''}`,
-        sub : ({ money, tier, message }) => ` subscribed <strong>${money}</strong>${tier ? '(Tier '+tier+')' : ''}${message ? '<br>'+message : ''}`,
-        resub : ({ money, tier, message }) => ` subscribed <strong>${money}</strong>${tier ? '(Tier '+tier+')' : ''}${message ? '<br>'+message : ''}`,
+        sub : ({ money, tier, message }) => ` subscribed <strong>(${money}) ${tier ? '(Tier '+tier+')' : ''}</strong>${message ? '<br>'+message : ''}`,
+        resub : ({ money, tier, message }) => ` subscribed <strong>${money} ${tier ? '(Tier '+tier+')' : ''}</strong>${message ? '<br>'+message : ''}`,
         order : ({ money, items }) => ` ordered <strong>${items} ${items == 1 ? 'item' : 'items'} (${money == 0 ? 'Free' : money})`,
     },
 
@@ -149,13 +149,13 @@ const en = {
 
 
         
-        drawstart : ({ gift, command }) => ` 
-        <strong><i class="fa-solid fa-gift fa-beat"></i> Giveaway started!</strong> 
-        Type ${command} to have a chance to win <strong>${gift}</strong>`,
+        drawstart : ({ gift, command, time }) => ` 
+        <strong><i class="fa-solid fa-gift"></i> Giveaway started!</strong> 
+        <br>Type <strong>${command}</strong> to have a chance to win <strong>${gift}</strong>. You have <strong>${time} seconds!</strong>`,
 
         drawend : ({ winners }) => ` 
         <strong>🎉 Giveaway Ended!</strong> 
-        Congratulations <strong>${winners}</strong>`,
+        <br>Congratulations <strong>${winners}</strong>`,
 
 
 
diff --git a/js/settings.js b/js/settings.js
index 9c86aaa..8f3b061 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -369,4 +369,4 @@ document.querySelectorAll('.nav-bar a').forEach(anchor => {
 			});
 		}
 	});
-});
+});
\ No newline at end of file