Trae/main fishing update

riffy_test.mjs

@@ -0,0 +1,39 @@
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const { Riffy } = require('riffy');
+
+const nodes = [
+  { host: 'lavalinkv4.serenetia.com', port: 443, password: 'https://seretia.link/discord', secure: true, name: 'Serenetia' },
+  { host: 'lavalink.jirayu.net', port: 443, password: 'youshallnotpass', secure: true, name: 'Jirayu' },
+  { host: 'lava-v4.millohost.my.id', port: 443, password: 'https://discord.gg/mjS5J2K3ep', secure: true, name: 'MilloHost' },
+  { host: 'lavalink-v4.triniumhost.com', port: 443, password: 'free', secure: true, name: 'TriniumHost' },
+];
+
+const fakeClient = {
+  user: { id: '123456789' },
+  guilds: { cache: new Map() },
+  ws: { shards: new Map([[0, { send() {} }]]) },
+  on() {},
+};
+
+const riffy = new Riffy(fakeClient, nodes, {
+  send() {},
+  defaultSearchPlatform: 'ytmsearch',
+  restVersion: 'v4',
+  bypassChecks: { nodeFetchInfo: true },
+});
+
+let connected = 0;
+riffy.on('nodeConnect', (node) => { console.log(`CONNECTED: ${node.name}`); connected++; });
+riffy.on('nodeError', (node, err) => console.log(`ERROR ${node.name}: ${err?.message || err}`));
+riffy.on('nodeDisconnect', (node) => console.log(`DISCONNECT: ${node.name}`));
+
+riffy.init('123456789');
+
+setTimeout(() => {
+  console.log(`\n=== After 10s: ${connected} node(s) connected ===`);
+  for (const node of riffy.nodeMap.values()) {
+    console.log(`  ${node.name}: connected=${node.connected}`);
+  }
+  process.exit(0);
+}, 10000);

riffy_test2.mjs

@@ -0,0 +1,35 @@
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const { Riffy } = require('riffy');
+
+const nodes = [
+  { host: 'lava-v4.millohost.my.id', port: 443, password: 'https://discord.gg/mjS5J2K3ep', secure: true, name: 'MilloHost' },
+];
+
+const fakeClient = {
+  user: { id: '123456789' },
+  guilds: { cache: new Map() },
+  ws: { shards: new Map([[0, { send() {} }]]) },
+  on() {},
+};
+
+const riffy = new Riffy(fakeClient, nodes, {
+  send() {},
+  defaultSearchPlatform: 'ytmsearch',
+  restVersion: 'v4',
+  // NO bypassChecks
+});
+
+riffy.on('nodeConnect', (node) => console.log(`CONNECTED: ${node.name}`));
+riffy.on('nodeError', (node, err) => console.log(`ERROR ${node.name}: ${err?.message || err}`));
+riffy.on('nodeDisconnect', (node) => console.log(`DISCONNECT: ${node.name}`));
+riffy.on('nodeReconnect', (node) => console.log(`RECONNECT: ${node.name}`));
+
+riffy.init('123456789');
+
+setTimeout(() => {
+  for (const node of riffy.nodeMap.values()) {
+    console.log(`${node.name}: connected=${node.connected}`);
+  }
+  process.exit(0);
+}, 8000);

riffy_test3.mjs

@@ -0,0 +1,35 @@
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const { Riffy } = require('riffy');
+
+const nodes = [
+  { host: 'lava-v4.millohost.my.id', port: 443, password: 'https://discord.gg/mjS5J2K3ep', secure: true, name: 'MilloHost' },
+];
+
+const fakeClient = {
+  user: { id: '123456789' },
+  guilds: { cache: new Map() },
+  ws: { shards: new Map([[0, { send() {} }]]) },
+  on() {},
+};
+
+const riffy = new Riffy(fakeClient, nodes, {
+  send() {},
+  defaultSearchPlatform: 'ytmsearch',
+  restVersion: 'v4',
+  bypassChecks: { nodeFetchInfo: true },
+});
+
+riffy.on('debug', (msg) => console.log('[DEBUG]', msg));
+riffy.on('nodeConnect', (node) => console.log(`CONNECTED: ${node.name}`));
+riffy.on('nodeError', (node, err) => console.log(`ERROR ${node.name}: ${err?.message || err}`));
+riffy.on('nodeDisconnect', (node, e) => console.log(`DISCONNECT: ${node.name} code=${e?.event?.code}`));
+
+riffy.init('123456789');
+
+setTimeout(() => {
+  for (const node of riffy.nodeMap.values()) {
+    console.log(`${node.name}: connected=${node.connected}, wsUrl=${node.wsUrl}`);
+  }
+  process.exit(0);
+}, 8000);

src/commands/Economy/buy.js

@@ -7,6 +7,17 @@ import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHan
 import { InteractionHelper } from '../../utils/interactionHelper.js';
 
 const SHOP_ITEMS = shopItems;
+const ADMIN_POTION_ID = 'admin_potion';
+// Potion ini langsung aktif saat dibeli. Admin potion TIDAK termasuk di sini:
+// admin potion disimpan ke inventory dulu supaya bisa dipakai (/use) atau dikirim (/give).
+const LUCK_POTION_IDS = new Set([
+    'luck_potion_1',
+    'luck_potion_2',
+    'luck_potion_3',
+    'luck_potion_4',
+    'luck_potion_5',
+]);
+const DEFAULT_LUCK_POTION_DURATION_MS = 5 * 60 * 1000;
 
 export default {
     data: new SlashCommandBuilder()
@@ -136,11 +147,22 @@ export default {
             } else if (item.type === "upgrade") {
                 userData.upgrades[itemId] = true;
                 successDescription += `\n\n**✨ Your upgrade is now active!**`;
+            } else if (item.type === "consumable" && LUCK_POTION_IDS.has(itemId)) {
+                const now = Date.now();
+                const potionExpiries = userData.luckPotionExpiresAt || {};
+                const currentExpiry = Math.max(now, Number(potionExpiries[itemId]) || 0);
+                const duration = Number(item.effect?.duration) || DEFAULT_LUCK_POTION_DURATION_MS;
+                potionExpiries[itemId] = currentExpiry + (duration * quantity);
+                userData.luckPotionExpiresAt = potionExpiries;
+                const activeMinutes = Math.ceil((potionExpiries[itemId] - now) / 60000);
+                successDescription += `\n\n🧪 **Active for ${activeMinutes} minutes. Timer started at purchase.**`;
             } else if (item.type === "consumable" || item.type === "tool") {
                 userData.inventory[itemId] =
                     (userData.inventory[itemId] || 0) + quantity;
                 if (item.type === "tool") {
                     successDescription += `\n\n**🛠️ ${item.name} added to your inventory!**`;
+                } else if (itemId === ADMIN_POTION_ID) {
+                    successDescription += `\n\n👑 **Added to your inventory!** Activate it with \`/use item_id:${ADMIN_POTION_ID}\` or gift it with \`/give\`.`;
                 }
             }
 
@@ -157,4 +179,4 @@ export default {
 
             await InteractionHelper.safeEditReply(interaction, { embeds: [embed], flags: [MessageFlags.Ephemeral] });
     }, { command: 'buy' })
-};
+};

src/commands/Economy/daily.js

@@ -1,7 +1,6 @@
 import { SlashCommandBuilder } from 'discord.js';
 import { createEmbed, errorEmbed, successEmbed, infoEmbed, warningEmbed } from '../../utils/embeds.js';
 import { getEconomyData, setEconomyData } from '../../utils/economy.js';
-import { getGuildConfig } from '../../services/config/guildConfig.js';
 import { formatDuration } from '../../utils/embeds.js';
 import { withErrorHandling, createError, ErrorTypes } from '../../utils/errorHandler.js';
 import { logger } from '../../utils/logger.js';
@@ -10,7 +9,6 @@ import { botConfig } from '../../config/bot.js';
 
 const DAILY_COOLDOWN = 24 * 60 * 60 * 1000;
 const DAILY_AMOUNT = botConfig.economy?.dailyAmount ?? 100;
-const PREMIUM_BONUS_PERCENTAGE = 0.1;
 
 export default {
     data: new SlashCommandBuilder()
@@ -50,25 +48,7 @@ export default {
                 );
             }
 
-            const guildConfig = await getGuildConfig(client, guildId);
-            const PREMIUM_ROLE_ID = guildConfig.premiumRoleId;
-
-            let earned = DAILY_AMOUNT;
-            let bonusMessage = "";
-            let hasPremiumRole = false;
-
-            if (
-                PREMIUM_ROLE_ID &&
-                interaction.member &&
-                interaction.member.roles.cache.has(PREMIUM_ROLE_ID)
-            ) {
-                const bonusAmount = Math.floor(
-                    DAILY_AMOUNT * PREMIUM_BONUS_PERCENTAGE,
-                );
-                earned += bonusAmount;
-                bonusMessage = `\n✨ **Premium Bonus:** +$${bonusAmount.toLocaleString()}`;
-                hasPremiumRole = true;
-            }
+            const earned = DAILY_AMOUNT;
 
             userData.wallet = (userData.wallet || 0) + earned;
             userData.lastDaily = now;
@@ -80,25 +60,22 @@ export default {
                 guildId,
                 amount: earned,
                 newWallet: userData.wallet,
-                hasPremium: hasPremiumRole,
                 timestamp: new Date().toISOString()
             });
 
             const embed = successEmbed(
                 "✅ Daily Claimed!",
-                `You have claimed your daily **$${earned.toLocaleString()}**!${bonusMessage}`
+                `You have claimed your daily **$${earned.toLocaleString()}**!`
             )
                 .addFields({
                     name: "New Cash Balance",
                     value: `$${userData.wallet.toLocaleString()}`,
                     inline: true,
                 })
                 .setFooter({
-                    text: hasPremiumRole
-                        ? `Next claim in 24 hours. (Premium Active)`
-                        : `Next claim in 24 hours.`,
+                    text: `Next claim in 24 hours.`,
                 });
 
             await InteractionHelper.safeEditReply(interaction, { embeds: [embed] });
     }, { command: 'daily' })
-};
+};