Merge branch 'main' of https://github.com/SAMMISolutions/SAMMI-Bridge

SAMMISolutions · Mar 9, 2024 · 73b7a61 · 73b7a61
2 parents 1b0a4e8 + d11f40c
commit 73b7a61
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/download/bridge.html b/download/bridge.html
diff --git a/download/bridge_unminified.html b/download/bridge_unminified.html
@@ -2306,7 +2306,7 @@ <h5>YouTube Live Test Triggers</h5>
   };
   sendTriggerToSAMMI(
     5,
-    `${pullData.user_name} donated ${amount} bits! [test trigger]`,
+    `${pullData.display_name} donated ${amount} bits! [test trigger]`,
     {
       amount,
     },
@@ -2404,7 +2404,7 @@ <h5>YouTube Live Test Triggers</h5>
 ,
     SAMMITestTwitchPoll(form) {
   const pollSelect = form.elements['pollType'];
-  const amount = form.elements['pollChoiceAmount'].value || getRandomInt(2, 5);
+  const amount = parseInt(form.elements['pollChoiceAmount'].value) || getRandomInt(2, 5);
   const duration = form.elements['pollDuration'].value || getRandomInt(60, 600);
   const type = pollSelect.options[pollSelect.selectedIndex].text || 'Created';
   const typeNum = type === 'Created' ? 0 : type === 'Voted' ? 1 : type === 'Ended' ? 2 : 3;
@@ -2416,7 +2416,7 @@ <h5>YouTube Live Test Triggers</h5>
     event: type,
     poll_id: '9dd6a7a7-78f4-46ef-b674-e2864ad7fa07',
     poll_name: 'My Test Poll',
-    choice_amount: parseInt(amount),
+    choice_amount: amount,
     vote_total: voteTotal,
     vote_total_base: 0,
     vote_total_bits: 0,
@@ -2844,8 +2844,11 @@ <h5>YouTube Live Test Triggers</h5>
   // split total votes into parts for each choice
   const choiceVotesSplit = [...splitNParts(voteTotal, amount)];
   const topVotes = { ...choiceVotesSplit };
-  const topVotesSorted = Object.keys(topVotes).sort((a, b) => parseInt(topVotes[b]) - parseInt(topVotes[a]));
-  obj.top_vote_list = topVotesSorted;
+  const topVotesSorted = Object.keys(topVotes)
+  .sort((a, b) => parseInt(topVotes[b]) - parseInt(topVotes[a]))
+  .map(key => parseInt(key));
+
+obj.top_vote_list = topVotesSorted;
 
   for (let i = 0; i < amount; i++) {
     const choiceInfo = {};