bugfixes and major tnt speed improvement

src/commands/admin.ts

@@ -7,7 +7,7 @@ import { vulnerableUsers } from "../lib/timeoutHelper";
 const give = createBotCommand('give', async (params, { say, broadcasterId, userId }) => {
     if (userId !== broadcasterId) return
 
-    const target = await api.users.getUserByName(params[0])
+    const target = await api.users.getUserByName(params[0].replace(/[@]/g, ''))
     if (!target) { await say(`'${params[0]}' does not exist`); return }
 
     if (isNaN(parseInt(params[2]))) { await say(`Specify the amount`); return }

src/commands/itemAliases.ts

@@ -6,13 +6,13 @@ import api from "../lib/api";
 const blaster = createBotCommand('blaster', async (params, { say, broadcasterId, userId }) => {
     const user = await api.users.getUserById(userId)
     if (params[0] === undefined) return
-    await useBlaster(broadcasterId, user!, params[0], say)
+    await useBlaster(broadcasterId, user!, params[0].replace(/[@]/g, ''), say)
 }, { aliases: ['blast'] })
 
 const silverbullet = createBotCommand('execute', async (params, { say, broadcasterId, userId }) => {
     const user = await api.users.getUserById(userId)
     if (params[0] === undefined) return
-    await useSilverBullet(broadcasterId, user!, params[0], say)
+    await useSilverBullet(broadcasterId, user!, params[0].replace(/[@]/g, ''), say)
 }, { aliases: ['silverbullet'] })
 
 const grenade = createBotCommand('grenade', async (_params, { say, broadcasterId, userId }) => {

src/commands/stats.ts

@@ -6,7 +6,7 @@ import { HelixUser } from "@twurple/api";
 export default createBotCommand('stats', async (params, { say, userName }) => {
     let user: HelixUser | null
     if (params.length !== 0) {
-        user = await api.users.getUserByName(params[0].replace(/[^a-zA-Z0-9]/g, ''))
+        user = await api.users.getUserByName(params[0].replace(/[@]/g, ''))
     } else user = await api.users.getUserByName(userName)
     if (!user) {
         await say(`User ${params[0]} not found`)

src/commands/use.ts

@@ -10,12 +10,12 @@ export default createBotCommand('use', async (params, { say, broadcasterId, user
     switch (params[0].toLowerCase()) {
         case 'blaster':
             if (params[1] === undefined) return
-            await useBlaster(broadcasterId, user!, params[1], say)
+            await useBlaster(broadcasterId, user!, params[1].replace(/[@]/g, ''), say)
             break
         case 'silver':
         case 'silverbullet':
             if (params[1] === undefined) return
-            await useSilverBullet(broadcasterId, user!, params[1], say)
+            await useSilverBullet(broadcasterId, user!, params[1].replace(/[@]/g, ''), say)
             break
         case 'grenade':
             await useGrenade(broadcasterId, user!, say)

src/lib/items.ts

@@ -56,7 +56,6 @@ export async function useSilverBullet(broadcasterId: string, attacker: HelixUser
     const target = await api.users.getUserByName(targetname)
 
     const itemResult = await changeItemCount(attacker, 'silverbullet')
-
     if (!itemResult.result && itemResult.reason === 'negative') { await say('You have no silver bullets mandoooYikes'); return }
 
     const result = await timeout(broadcasterId, target!, 60 * 60 * 24, `You got hit by a silver bullet fired by ${attacker.name}`)
@@ -105,18 +104,19 @@ export async function useTNT(broadcasterId: string, attacker: HelixUser, say: (a
     const min = vulnerableUsers.length < 3 ? vulnerableUsers.length : 3 //if less than 3 chatters, use that else 3
     const max = vulnerableUsers.length > 10 ? 10 : vulnerableUsers.length //if more than 10 chatters do 10 else 10
     const blastedusers = Math.floor(Math.random() * (max - min + 1)) + min
-    for (let i = 0; blastedusers > i; i++) {
+    const soontobedeadusers = shuffle(vulnerableUsers).slice(vulnerableUsers.length - blastedusers)
-        const target = await api.users.getUserById(vulnerableUsers[Math.floor(Math.random() * vulnerableUsers.length)])
+    const targets = await api.users.getUsersByIds(soontobedeadusers)
+    for (const target of targets) {
         const result = await timeout(broadcasterId, target!, 60, `You got hit by ${attacker.name}'s TNT`)
         if (result.status) {
-            await say(`${target?.name} got blown up by TNT! mandoooTnt`)
+            await say(`${target?.name} got blown up by TNT! mandoooTNT`)
             await addTimeoutToDB(attacker, target!, 'tnt')
         } else {
             await say(`something went wrong mandoooYikes`)
             console.error(result.reason)
         }
     }
-    await say(`${attacker.name} blew up ${blastedusers} with their TNT mandoooGOTTEM ${attacker.name} has ${itemResult.count} tnt${itemResult.count === 1 ? '' : 's'} remaining`)
+    await say(`${attacker.name} blew up ${blastedusers} chatters with their TNT mandoooGOTTEM ${attacker.name} has ${itemResult.count} tnt${itemResult.count === 1 ? '' : 's'} remaining`)
 }
 
 function getRandom(): number {
@@ -131,9 +131,21 @@ export async function useLootbox(user: HelixUser, say: (arg0: string) => Promise
     let newitems: string[] = []
     await changeBalance(user, 25)
     newitems.push('25 mbucks')
-    if (getRandom() <= 50) { newitems.push('1 grenade'); await changeItemCount(user, 'grenade', 1) }
+    if (getRandom() <= 50) { newitems.push('1 grenade'); inventory.grenade += 1 }
-    if (getRandom() <= 25) { newitems.push('1 blaster'); await changeItemCount(user, 'blaster', 1) }
+    if (getRandom() <= 25) { newitems.push('1 blaster'); inventory.blaster += 1 }
-    if (getRandom() <= 10) { newitems.push('1 tnt'); await changeItemCount(user, 'tnt', 1) }
+    if (getRandom() <= 10) { newitems.push('1 tnt'); inventory.tnt += 1 }
+    await updateInventory(user, inventory)
 
     await say(`${user.name} got: ${newitems.join(' and ')}`)
 }
+
+function shuffle(arrayold: any[]) {
+    let array = arrayold
+    let currentIndex = array.length;
+    while (currentIndex != 0) {
+        let randomIndex = Math.floor(Math.random() * currentIndex);
+        currentIndex--;
+        [array[currentIndex], array[randomIndex]] = [array[randomIndex], array[currentIndex]];
+    }
+    return array
+}