Fixed Fourthwall giveaways

This commit is contained in:
nuttylmao
2025-08-31 13:51:12 +10:00
parent 482ad37f55
commit 3497d95635
3 changed files with 47 additions and 42 deletions
+4 -4
View File
@@ -1167,7 +1167,7 @@ function FourthwallGiftPurchase(data) {
if (!showFourthwallAlerts)
return;
let user = data.username;
// let user = data.username;
const total = data.total;
const currency = data.currency;
const gifts = data.gifts.length;
@@ -1176,7 +1176,8 @@ function FourthwallGiftPurchase(data) {
let message = "";
// If the user ordered more than one item, write how many items they ordered
message += `${user} gifted`;
// message += `${user} gifted`;
message += `Someone has gifted`;
// If there is more than one gifted item, display the number of gifts
if (gifts > 1)
@@ -1202,10 +1203,9 @@ function FourthwallGiftDrawStarted(data) {
const itemName = data.offer.name;
let message = "";
message += `${user} gifted`;
// If the user ordered more than one item, write how many items they ordered
message += `🎁 ${itemName} Giveaway! • Type !join in the next ${durationSeconds} seconds for your chance to win!`;
message += `🎁 ${itemName} Giveaway! • Type 'join' in the next ${durationSeconds} seconds for your chance to win!`;
ShowAlert(message, 'fourthwall');
}
+32 -22
View File
@@ -1946,28 +1946,32 @@ function FourthwallGiftPurchase(data) {
const contentDiv = instance.querySelector("#content");
// Set the card background colors
cardDiv.classList.add('blank');
titleDiv.classList.add('centerThatShitHomie');
contentDiv.classList.add('centerThatShitHomie');
cardDiv.classList.add('fourthwall');
// // Set the card background colors
// cardDiv.classList.add('blank');
// titleDiv.classList.add('centerThatShitHomie');
// contentDiv.classList.add('centerThatShitHomie');
// Set the text
let user = data.username;
// let user = data.username;
const total = data.total;
const currency = data.currency;
const gifts = data.gifts.length;
const itemName = data.offer.name;
const itemImageUrl = data.offer.imageUrl;
const fourthwallProductImage = `<img src="${itemImageUrl}" class="productImage"/>`;
const message = DecodeHTMLString(data.statmessageus);
// const itemImageUrl = data.offer.imageUrl;
// const fourthwallProductImage = `<img src="${itemImageUrl}" class="productImage"/>`;
// const message = DecodeHTMLString(data.statmessageus);
let contents = "";
contents += fourthwallProductImage;
// contents += fourthwallProductImage;
contents += "<br><br>";
// contents += "<br><br>";
// If the user ordered more than one item, write how many items they ordered
contents += `${user} gifted`;
// contents += `${user} gifted`;
contents += `Someone has gifted`;
// If there is more than one gifted item, display the number of gifts
if (gifts > 1)
@@ -1984,11 +1988,11 @@ function FourthwallGiftPurchase(data) {
titleDiv.innerHTML = contents;
// Add the custom message from the user
if (message.trim() != "")
contentDiv.innerHTML = `${message}`;
else
contentDiv.style.display = 'none'
// // Add the custom message from the user
// if (message.trim() != "")
// contentDiv.innerHTML = `${message}`;
// else
// contentDiv.style.display = 'none'
AddMessageItem(instance, data.id);
}
@@ -2013,8 +2017,11 @@ function FourthwallGiftDrawStarted(data) {
// Set the card background colors
cardDiv.classList.add('fourthwall');
titleDiv.classList.add('centerThatShitHomie');
contentDiv.classList.add('centerThatShitHomie');
// // Set the card background colors
// cardDiv.classList.add('fourthwall');
// titleDiv.classList.add('centerThatShitHomie');
// contentDiv.classList.add('centerThatShitHomie');
// Set the text
const durationSeconds = data.durationSeconds;
@@ -2023,10 +2030,10 @@ function FourthwallGiftDrawStarted(data) {
let contents = "";
// If the user ordered more than one item, write how many items they ordered
contents += `<h3>🎁 ${itemName} Giveaway!</h3>`;
contents += `🎁 ${itemName} Giveaway!`;
titleDiv.innerHTML = contents;
contentDiv.innerHTML = `Type !join in the next ${durationSeconds} seconds for your chance to win!`;
contentDiv.innerHTML = `Type 'join' in the next ${durationSeconds} seconds for your chance to win!`;
//contentDiv.style.display = `none`;
AddMessageItem(instance, data.id);
@@ -2052,13 +2059,16 @@ function FourthwallGiftDrawEnded(data) {
// Set the card background colors
cardDiv.classList.add('fourthwall');
titleDiv.classList.add('centerThatShitHomie');
contentDiv.classList.add('centerThatShitHomie');
// // Set the card background colors
// cardDiv.classList.add('fourthwall');
// titleDiv.classList.add('centerThatShitHomie');
// contentDiv.classList.add('centerThatShitHomie');
let contents = "";
// If the user ordered more than one item, write how many items they ordered
contents += `<h3>🥳 GIVEAWAY ENDED 🥳</h3>`;
contents += `🥳 GIVEAWAY ENDED 🥳`;
//contents += `Congratulations ${GetWinnersList(data.gifts)}!`
titleDiv.innerHTML = contents;
+11 -16
View File
@@ -130,7 +130,7 @@ if (useCustomBackground) {
hexOpacity = "0" + hexOpacity;
}
//document.body.style.background = `${background}${hexOpacity}`;
console.log(`${background}${hexOpacity}`);
//console.log(`${background}${hexOpacity}`);
document.documentElement.style.setProperty('--custom-background', `${background}${hexOpacity}`);
}
@@ -1148,18 +1148,17 @@ function FourthwallSubscriptionPurchased(data) {
}
function FourthwallGiftPurchase(data) {
console.log(data);
if (!showFourthwallAlerts)
return;
// Set the text
let user = data.username;
// let user = data.username;
const total = data.total;
const currency = data.currency;
const gifts = data.gifts.length;
const itemName = data.offer.name;
const itemImageUrl = data.offer.imageUrl;
const message = DecodeHTMLString(data.statmessageus);
// const itemImageUrl = data.offer.imageUrl;
// const message = DecodeHTMLString(data.statmessageus);
let contents = '';
let attributesText = '';
@@ -1179,12 +1178,12 @@ function FourthwallGiftPurchase(data) {
UpdateAlertBox(
'fourthwall',
itemImageUrl,
`${user}`,
`gifted ${contents}`,
'', // itemImageUrl,
`An item has been gifted!`,// `${user}`,
`${contents}`, // `gifted ${contents}`,
attributesText,
user,
message,
'', // user,
'', // message,
fourthwallAlertAction,
data
);
@@ -1202,7 +1201,7 @@ function FourthwallGiftDrawStarted(data) {
'fourthwall',
'',
`<span style="font-size: 1.2em">🎁 ${itemName} Giveaway!</span>`,
`Type !join in the next ${durationSeconds} seconds for your chance to win!`,
`Type 'join' in the next ${durationSeconds} seconds for your chance to win!`,
'',
'',
'',
@@ -1215,13 +1214,9 @@ function FourthwallGiftDrawEnded(data) {
if (!showFourthwallAlerts)
return;
// Render avatars
if (showAvatar) {
avatar.src = '';
}
UpdateAlertBox(
'fourthwall',
'',
`<span style="font-size: 1.2em">🥳 GIVEAWAY ENDED 🥳</span>`,
`Congratulations ${GetWinnersList(data.gifts)}!`,
'',