WIP

Author: Fyrlex

src/payloads/ChannelGoal.ts

@@ -0,0 +1,8 @@
+export interface APIChannelGoal {
+  channelId: string;
+  active: boolean;
+  target: number;
+  lock: boolean;
+  reset: boolean;
+  roleId: string | null;
+}

src/payloads/ChannelModifiers.ts

@@ -1,24 +1,12 @@
-import type { Modifiers } from '../utils/BaseModifier.js';
-
 export interface APICountingChannelModifiers {
-  /**
-   * The ObjectID of the channel modifiers
-   */
-  id: string;
-  /**
-   * The ID of the channel these modifiers are for.
-   */
   channelId: string;
-  /**
-   * The Coin Boost modifier
-   */
-  coin: Modifiers<number>;
-  /**
-   * The Luck modifier
-   */
-  luck: Modifiers<number>;
-  /**
-   * The XP Boost modifier
-   */
-  xp: Modifiers<number>;
+  coinDefault: number;
+  coinValue: number;
+  coinEndsAt: string | null;
+  luckDefault: number;
+  luckValue: number;
+  luckEndsAt: string | null;
+  xpDefault: number;
+  xpValue: number;
+  xpEndsAt: string | null;
 }

src/payloads/Item.ts

@@ -0,0 +1,6 @@
+import { ItemRarity, ItemType } from '../utils/items.js';
+
+export interface APIItem {
+  type: ItemType;
+  rarity: ItemRarity;
+}

src/payloads/UserModifiers.ts

@@ -1,16 +1,5 @@
-import type { Modifiers } from '../utils/BaseModifier.js';
-
 export interface APICountingUserModifiers {
-  /**
-   * The id of the user modifiers
-   */
-  id: string;
-  /**
-   * The ID of the user these modifiers are for.
-   */
   userId: string;
-  /**
-   * The freeze modifier
-   */
-  freeze: Modifiers<boolean>;
+  freezeValue: boolean;
+  freezeEndsAt: string | null;
 }

src/utils/BaseModifier.ts

@@ -1,5 +1,4 @@
 export * from './Achievement.js';
-export * from './BaseModifier.js';
 export * from './BaseReply.js';
 export * from './counting.js';
 export * from './items.js';

src/utils/CountBotAPIErrorCode.ts

@@ -1,10 +1,15 @@
 import { AchievementReward } from './Achievement.js';
+import { APIItem } from '../payloads/Item.js';
 
 export interface ItemDrop {
-  item: ItemString;
+  item: APIItem;
   result: ItemExecuteResult;
 }
 
+export interface UserInventoryEntry extends APIItem {
+  quantity: number;
+}
+
 export interface ItemExecuteResult {
   count: number;
   skipped?: number;
@@ -14,11 +19,11 @@ export interface ItemExecuteResult {
   luck?: number;
   coins?: number;
   xp?: number;
-  item?: ItemString;
+  item?: APIItem;
 }
 
 export interface ItemUseResult {
-  inventory: ItemString[];
+  inventory: UserInventoryEntry[];
   result: ItemExecuteResult;
   achievement?: AchievementReward;
 }
@@ -51,7 +56,7 @@ export enum ItemType {
   LootCrate = 65536,
 }
 
-export type ShopItem = [ItemString, number];
+export type ShopItem = [APIItem, number];
 
 export const ITEM_STRINGS: Record<ItemType, ItemTypeString> = {
   [ItemType.Skip]: 'Skip',