clashofclans.js 3.0.0-dev.5d2e14a → 3.0.0-dev.9a00cd8

package/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## 3.0.0 (15-10-222)
+## 3.0.0 (11-01-2023)
 
 ### Bug Fixes
 
@@ -12,7 +12,9 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Features
 
-- Support for clan capital raid seasons `Client#getCapitalRaidSeasons()`
+- Added `Client#getCapitalRaidSeasons()` method.
+- Added `Client#getCapitalLeagues()` method.
+- Added `Client#getClanCapitalRanks()` method.
 
 ### Breaking Changes
 

package/README.md

@@ -37,7 +37,7 @@ const client = new Client();
 
 ### Custom Polling Event
 
-> **Warning** <br>
+> **Warning** <br />
 > Events are neither real-time nor supported by the API. They are polled frequently and compared with the cached data. If there is a difference, the event is emitted.
 
 ```js

package/dist/client/Client.d.ts

@@ -112,8 +112,10 @@ export declare class Client extends EventEmitter {
     getPlayers(playerTags: string[], options?: OverrideOptions): Promise<Player[]>;
     /** Verify Player API token that can be found from the Game settings. */
     verifyPlayerToken(playerTag: string, token: string, options?: OverrideOptions): Promise<boolean>;
-    /** Get list of Leagues. */
+    /** Get a list of Leagues. */
     getLeagues(options?: SearchOptions): Promise<League[]>;
+    /** Get a list of Capital Leagues. */
+    getCapitalLeagues(options?: SearchOptions): Promise<import("../types").APICapitalLeague[]>;
     /** Get Legend League season Ids. */
     getLeagueSeasons(options?: SearchOptions): Promise<string[]>;
     /** Get Legend League season rankings by season Id. */
@@ -146,6 +148,12 @@ export declare class Client extends EventEmitter {
      * For global ranking, use `global` as `locationId`.
      */
     getVersusPlayerRanks(locationId: number | 'global', options?: SearchOptions): Promise<RankedPlayer[]>;
+    /**
+     * Get clan capital rankings for a specific location.
+     *
+     * For global ranking, use `global` as `locationId`.
+     */
+    getClanCapitalRanks(locationId: number | 'global', options?: SearchOptions): Promise<import("../types").APIClanCapitalRanking[]>;
     /** Get list of clan labels. */
     getClanLabels(options?: SearchOptions): Promise<Label[]>;
     /** Get list of player labels. */

package/dist/client/Client.js

@@ -66,7 +66,7 @@ class Client extends node_events_1.EventEmitter {
     /** Get capital raid seasons. */
     async getCapitalRaidSeasons(tag, options) {
         const { data } = await this.rest.getCapitalRaidSeasons(tag, options);
-        return data.items.map((entry) => new CapitalRaidSeason_1.CapitalRaidSeason(entry));
+        return data.items.map((entry) => new CapitalRaidSeason_1.CapitalRaidSeason(this, entry));
     }
     /** Get clan war log. */
     async getClanWarLog(clanTag, options) {
@@ -75,10 +75,7 @@ class Client extends node_events_1.EventEmitter {
     }
     /** Get info about currently running war (normal or friendly) in the clan. */
     async getClanWar(clanTag, options) {
-        const { data, maxAge, path, status } = await this.rest.getCurrentWar(clanTag, options);
-        if (data.state === 'notInWar') {
-            throw new HTTPError_1.HTTPError(HTTPError_1.NotInWarError, status, path, maxAge);
-        }
+        const { data, maxAge } = await this.rest.getCurrentWar(clanTag, options);
         return new struct_1.ClanWar(this, data, { clanTag, maxAge });
     }
     /**
@@ -159,19 +156,13 @@ class Client extends node_events_1.EventEmitter {
     }
     /** Get info about clan war league. */
     async getClanWarLeagueGroup(clanTag, options) {
-        const { data, status, path, maxAge } = await this.rest.getClanWarLeagueGroup(clanTag, options);
-        if (data.state === 'notInWar') {
-            throw new HTTPError_1.HTTPError(HTTPError_1.NotInWarError, status, path, maxAge);
-        }
+        const { data } = await this.rest.getClanWarLeagueGroup(clanTag, options);
         return new struct_1.ClanWarLeagueGroup(this, data);
     }
     /** Get info about a CWL round by WarTag. */
     async getClanWarLeagueRound(warTag, options) {
         const args = typeof warTag === 'string' ? { warTag } : { warTag: warTag.warTag, clanTag: warTag.clanTag };
-        const { data, maxAge, status, path } = await this.rest.getClanWarLeagueRound(args.warTag, options);
-        if (data.state === 'notInWar') {
-            throw new HTTPError_1.HTTPError(HTTPError_1.NotInWarError, status, path, maxAge);
-        }
+        const { data, maxAge } = await this.rest.getClanWarLeagueRound(args.warTag, options);
         return new struct_1.ClanWar(this, data, { warTag: args.warTag, clanTag: args.clanTag, maxAge });
     }
     /** Get info about a player by tag. */
@@ -190,11 +181,16 @@ class Client extends node_events_1.EventEmitter {
         const { data } = await this.rest.verifyPlayerToken(playerTag, token, options);
         return data.status === 'ok';
     }
-    /** Get list of Leagues. */
+    /** Get a list of Leagues. */
     async getLeagues(options) {
         const { data } = await this.rest.getLeagues(options);
         return data.items.map((entry) => new struct_1.League(entry));
     }
+    /** Get a list of Capital Leagues. */
+    async getCapitalLeagues(options) {
+        const { data } = await this.rest.getCapitalLeagues(options);
+        return data.items;
+    }
     /** Get Legend League season Ids. */
     async getLeagueSeasons(options) {
         const { data } = await this.rest.getLeagueSeasons(Constants_1.LegendLeagueId, options);
@@ -251,6 +247,15 @@ class Client extends node_events_1.EventEmitter {
         const { data } = await this.rest.getVersusPlayerRanks(locationId, options);
         return data.items.map((entry) => new struct_1.RankedPlayer(this, entry));
     }
+    /**
+     * Get clan capital rankings for a specific location.
+     *
+     * For global ranking, use `global` as `locationId`.
+     */
+    async getClanCapitalRanks(locationId, options) {
+        const { data } = await this.rest.getClanCapitalRanks(locationId, options);
+        return data.items;
+    }
     /** Get list of clan labels. */
     async getClanLabels(options) {
         const { data } = await this.rest.getClanLabels(options);

package/dist/client/PollingClient.d.ts

@@ -3,7 +3,7 @@ import { ClientOptions } from '../types';
 import { PollingEvents } from '../util/Constants';
 import { Client } from './Client';
 /**
- * Represents Clash of Clans Polling Event Client.
+ * Represents a Polling Event Client.
  * ```js
  * const { PollingClient } = require('clashofclans.js');
  * const pollingClient = new PollingClient({ keys: ['***'] });

package/dist/client/PollingClient.js

@@ -5,7 +5,7 @@ const HTTPError_1 = require("../rest/HTTPError");
 const Constants_1 = require("../util/Constants");
 const Client_1 = require("./Client");
 /**
- * Represents Clash of Clans Polling Event Client.
+ * Represents a Polling Event Client.
  * ```js
  * const { PollingClient } = require('clashofclans.js');
  * const pollingClient = new PollingClient({ keys: ['***'] });
@@ -148,6 +148,8 @@ class PollingClient extends Client_1.Client {
     }
     async maintenanceHandler() {
         setTimeout(this.maintenanceHandler.bind(this), 10000).unref();
+        if (!(this.listenerCount(Constants_1.PollingEvents.MaintenanceStart) && this.listenerCount(Constants_1.PollingEvents.MaintenanceEnd)))
+            return;
         try {
             const res = await this.rest.getClans({ maxMembers: Math.floor(Math.random() * 40) + 10, limit: 1 });
             if (res.status === 200 && this.inMaintenance) {

package/dist/index.mjs

@@ -8,8 +8,11 @@ export const BatchThrottler = mod.BatchThrottler;
 export const BuilderTroops = mod.BuilderTroops;
 export const CWLRounds = mod.CWLRounds;
 export const CacheStore = mod.CacheStore;
+export const CapitalRaidSeason = mod.CapitalRaidSeason;
+export const CapitalRaidSeasonMember = mod.CapitalRaidSeasonMember;
 export const ChatLanguage = mod.ChatLanguage;
 export const Clan = mod.Clan;
+export const ClanCapital = mod.ClanCapital;
 export const ClanMember = mod.ClanMember;
 export const ClanWar = mod.ClanWar;
 export const ClanWarAttack = mod.ClanWarAttack;
@@ -40,7 +43,6 @@ export const Leagues = mod.Leagues;
 export const LegendLeagueId = mod.LegendLeagueId;
 export const LegendStatistics = mod.LegendStatistics;
 export const Location = mod.Location;
-export const NotInWarError = mod.NotInWarError;
 export const Player = mod.Player;
 export const PlayerClan = mod.PlayerClan;
 export const PollingClient = mod.PollingClient;

package/dist/rest/HTTPError.d.ts

@@ -19,10 +19,6 @@ export declare class HTTPError extends Error {
     maxAge: number;
     constructor(error: any, status: number, path: string, maxAge: number, method?: string);
 }
-export declare const NotInWarError: {
-    message: string;
-    reason: string;
-};
 export declare const PrivateWarLogError: {
     message: string;
     reason: string;

package/dist/rest/HTTPError.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PrivateWarLogError = exports.NotInWarError = exports.HTTPError = void 0;
+exports.PrivateWarLogError = exports.HTTPError = void 0;
 const messages = {
     500: 'Unknown error happened when handling the request.',
     504: 'The user aborted this request.',
@@ -32,10 +32,6 @@ class HTTPError extends Error {
     }
 }
 exports.HTTPError = HTTPError;
-exports.NotInWarError = {
-    message: 'Clan is not in war at this moment.',
-    reason: 'notInWar'
-};
 exports.PrivateWarLogError = {
     message: 'Access denied, clan war log is private.',
     reason: 'privateWarLog'

package/dist/rest/RESTManager.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from 'node:events';
 import { Util } from '../util/Util';
-import { APIClan, APIClanList, APIClanMemberList, APICapitalRaidSeasons, APIClanRankingList, APIClanVersusRankingList, APIClanWar, APIClanWarLeagueGroup, APIClanWarLog, APIGoldPassSeason, APILabelList, APILeague, APILeagueList, APILeagueSeasonList, APILocation, APILocationList, APIPlayer, APIPlayerRankingList, APIPlayerSeasonRankingList, APIPlayerVersusRankingList, APIVerifyToken, APIWarLeague, APIWarLeagueList, SearchOptions, ClanSearchOptions, RESTOptions, OverrideOptions, LoginOptions } from '../types';
+import { APIClan, APIClanList, APIClanMemberList, APICapitalRaidSeasons, APIClanRankingList, APIClanVersusRankingList, APIClanWar, APIClanWarLeagueGroup, APIClanWarLog, APIGoldPassSeason, APILabelList, APILeague, APILeagueList, APILeagueSeasonList, APILocation, APILocationList, APIPlayer, APIPlayerRankingList, APIPlayerSeasonRankingList, APIPlayerVersusRankingList, APIVerifyToken, APIWarLeague, APIWarLeagueList, SearchOptions, ClanSearchOptions, RESTOptions, OverrideOptions, LoginOptions, APICapitalLeagueList, APICapitalLeague, APIClanCapitalRankingList } from '../types';
 import { RestEvents } from '../util/Constants';
 import { RequestHandler } from './RequestHandler';
 export interface IRestEvents {
@@ -72,10 +72,14 @@ export declare class RESTManager extends EventEmitter {
     getPlayer(playerTag: string, options?: OverrideOptions): Promise<import("../types").Response<APIPlayer>>;
     /** Verify Player API token that can be found from the Game settings. */
     verifyPlayerToken(playerTag: string, token: string, options?: OverrideOptions): Promise<import("../types").Response<APIVerifyToken>>;
-    /** Get list of Leagues. */
+    /** Get a list of Leagues. */
     getLeagues(options?: SearchOptions): Promise<import("../types").Response<APILeagueList>>;
     /** Get a League info. */
     getLeague(leagueId: string | number, options?: OverrideOptions): Promise<import("../types").Response<APILeague>>;
+    /** Get a list of Capital leagues. */
+    getCapitalLeagues(options?: SearchOptions): Promise<import("../types").Response<APICapitalLeagueList>>;
+    /** Get a Capital League info. */
+    getCapitalLeague(leagueId: string | number, options?: OverrideOptions): Promise<import("../types").Response<APICapitalLeague>>;
     /** Get Legend League season Ids. */
     getLeagueSeasons(leagueId: number, options?: SearchOptions): Promise<import("../types").Response<APILeagueSeasonList>>;
     /** Get Legend League season rankings by season Id. */
@@ -96,6 +100,8 @@ export declare class RESTManager extends EventEmitter {
     getVersusClanRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Response<APIClanVersusRankingList>>;
     /** Get player versus rankings for a specific location. */
     getVersusPlayerRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Response<APIPlayerVersusRankingList>>;
+    /** Get clan capital rankings for a specific location. */
+    getClanCapitalRanks(locationId: number | string, options?: SearchOptions): Promise<import("../types").Response<APIClanCapitalRankingList>>;
     /** Get list of clan labels. */
     getClanLabels(options?: SearchOptions): Promise<import("../types").Response<APILabelList>>;
     /** Get list of player labels. */

package/dist/rest/RESTManager.js

@@ -78,7 +78,7 @@ class RESTManager extends node_events_1.EventEmitter {
         const opts = { method: 'POST', body: JSON.stringify({ token }), ...options };
         return this.requestHandler.request(`/players/${Util_1.Util.encodeURI(playerTag)}/verifytoken`, opts);
     }
-    /** Get list of Leagues. */
+    /** Get a list of Leagues. */
     getLeagues(options) {
         const query = Util_1.Util.queryString(options);
         return this.requestHandler.request(`/leagues${query}`, options);
@@ -87,6 +87,15 @@ class RESTManager extends node_events_1.EventEmitter {
     getLeague(leagueId, options) {
         return this.requestHandler.request(`/leagues/${leagueId}`, options);
     }
+    /** Get a list of Capital leagues. */
+    getCapitalLeagues(options) {
+        const query = Util_1.Util.queryString(options);
+        return this.requestHandler.request(`/capitalleagues${query}`, options);
+    }
+    /** Get a Capital League info. */
+    getCapitalLeague(leagueId, options) {
+        return this.requestHandler.request(`/capitalleagues/${leagueId}`, options);
+    }
     /** Get Legend League season Ids. */
     getLeagueSeasons(leagueId, options) {
         const query = Util_1.Util.queryString(options);
@@ -135,6 +144,11 @@ class RESTManager extends node_events_1.EventEmitter {
         const query = Util_1.Util.queryString(options);
         return this.requestHandler.request(`/locations/${locationId}/rankings/players-versus${query}`, options);
     }
+    /** Get clan capital rankings for a specific location. */
+    getClanCapitalRanks(locationId, options) {
+        const query = Util_1.Util.queryString(options);
+        return this.requestHandler.request(`/locations/${locationId}/rankings/capitals${query}`, options);
+    }
     /** Get list of clan labels. */
     getClanLabels(options) {
         const query = Util_1.Util.queryString(options);

package/dist/struct/CapitalRaidSeason.d.ts

@@ -1,6 +1,24 @@
-import { APICapitalRaidSeason, APICapitalRaidSeasonAttackLog, APICapitalRaidSeasonDefenseLog, APICapitalRaidSeasonMember } from '../types';
+import { Client } from '../client/Client';
+import { APICapitalRaidSeason, APICapitalRaidSeasonAttackLog, APICapitalRaidSeasonDefenseLog, APICapitalRaidSeasonMember, OverrideOptions } from '../types';
+import { Player } from './Player';
+export declare class CapitalRaidSeasonMember {
+    /** The player's tag. */
+    name: string;
+    /** The player's name. */
+    tag: string;
+    /** The number of attacks the player has made. */
+    attacks: number;
+    /** The number of attacks the player can make. */
+    attackLimit: number;
+    /** The number of bonus attacks the player can make. */
+    bonusAttackLimit: number;
+    /** The number of capital resources the player has looted. */
+    capitalResourcesLooted: number;
+    constructor(data: APICapitalRaidSeasonMember);
+}
 /** Represents a Capital Raid Season. */
 export declare class CapitalRaidSeason {
+    private readonly client;
     /** The state of the raid season. */
     state: 'ongoing' | 'ended';
     /** The start time of the raid season. */
@@ -25,5 +43,7 @@ export declare class CapitalRaidSeason {
     attackLog: APICapitalRaidSeasonAttackLog[];
     /** The defense log of the raid season. */
     defenseLog: APICapitalRaidSeasonDefenseLog[];
-    constructor(data: APICapitalRaidSeason);
+    constructor(client: Client, data: APICapitalRaidSeason);
+    /** Get {@link Player} info for every Player in the clan. */
+    fetchMembers(options?: OverrideOptions): Promise<Player[]>;
 }

package/dist/struct/CapitalRaidSeason.js

@@ -1,10 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CapitalRaidSeason = void 0;
+exports.CapitalRaidSeason = exports.CapitalRaidSeasonMember = void 0;
 const Util_1 = require("../util/Util");
+class CapitalRaidSeasonMember {
+    constructor(data) {
+        this.tag = data.tag;
+        this.name = data.name;
+        this.attacks = data.attacks;
+        this.attackLimit = data.attackLimit;
+        this.bonusAttackLimit = data.bonusAttackLimit;
+        this.capitalResourcesLooted = data.capitalResourcesLooted;
+    }
+}
+exports.CapitalRaidSeasonMember = CapitalRaidSeasonMember;
 /** Represents a Capital Raid Season. */
 class CapitalRaidSeason {
-    constructor(data) {
+    constructor(client, data) {
+        this.client = client;
         this.state = data.state;
         this.startTime = Util_1.Util.formatDate(data.startTime);
         this.endTime = Util_1.Util.formatDate(data.endTime);
@@ -14,9 +26,15 @@ class CapitalRaidSeason {
         this.enemyDistrictsDestroyed = data.enemyDistrictsDestroyed;
         this.offensiveReward = data.offensiveReward;
         this.defensiveReward = data.defensiveReward;
-        this.members = data.members ?? [];
         this.attackLog = data.attackLog;
         this.defenseLog = data.defenseLog;
+        this.members = (data.members ?? []).map((member) => new CapitalRaidSeasonMember(member));
+    }
+    /** Get {@link Player} info for every Player in the clan. */
+    async fetchMembers(options) {
+        return (await Promise.allSettled(this.members.map((m) => this.client.getPlayer(m.tag, { ...options, ignoreRateLimit: true }))))
+            .filter((res) => res.status === 'fulfilled')
+            .map((res) => res.value);
     }
 }
 exports.CapitalRaidSeason = CapitalRaidSeason;

package/dist/struct/Clan.d.ts

@@ -1,4 +1,4 @@
-import { APIClan, OverrideOptions } from '../types';
+import { APICapitalLeague, APIClan, OverrideOptions } from '../types';
 import { Client } from '../client/Client';
 import { ChatLanguage } from './ChatLanguage';
 import { ClanMember } from './ClanMember';
@@ -29,6 +29,8 @@ export declare class Clan {
     level: number;
     /** The clan's trophy count. */
     points: number;
+    /** The clan's capital points. */
+    capitalPoints: number;
     /** The clan's versus trophy count. */
     versusPoints: number;
     /** The minimum trophies required to apply to this clan. */
@@ -57,6 +59,10 @@ export declare class Clan {
     labels: Label[];
     /** The clan's Clan Capital information */
     clanCapital: ClanCapital | null;
+    /** The clan's capital league. */
+    capitalLeague?: APICapitalLeague;
+    /** Whether the clan is family friendly. */
+    isFamilyFriendly: boolean;
     /**
      * List of clan members.
      * - This property returns empty array for {@link Client.getClans} method.

package/dist/struct/Clan.js

@@ -35,6 +35,9 @@ class Clan {
         this.memberCount = data.members;
         this.labels = data.labels.map((label) => new Label_1.Label(label));
         this.clanCapital = Object.keys(data.clanCapital).length > 0 ? new ClanCapital_1.ClanCapital(data.clanCapital) : null;
+        this.isFamilyFriendly = data.isFamilyFriendly;
+        this.capitalPoints = data.clanCapitalPoints;
+        this.capitalLeague = data.capitalLeague;
         this.members = data.memberList?.map((mem) => new ClanMember_1.ClanMember(this.client, mem)) ?? []; // eslint-disable-line
     }
     /** Get {@link Player} info for every Player in the clan. */

package/dist/struct/ClanMember.d.ts

@@ -1,4 +1,4 @@
-import { APIClanMember, OverrideOptions } from '../types';
+import { APIClanMember, APIPlayerHouse, OverrideOptions } from '../types';
 import { Client } from '../client/Client';
 import { League } from './League';
 export declare class ClanMember {
@@ -25,6 +25,8 @@ export declare class ClanMember {
     donations: number;
     /** The member's donation received count for this season. */
     received: number;
+    /** The member's player house details. */
+    playerHouse?: APIPlayerHouse | null;
     constructor(client: Client, data: APIClanMember);
     /** Whether this clan member is in the clan. */
     get isMember(): boolean;

package/dist/struct/ClanMember.js

@@ -18,6 +18,7 @@ class ClanMember {
         this.clanRank = data.clanRank;
         this.previousClanRank = data.previousClanRank;
         this.donations = data.donations;
+        this.playerHouse = data.playerHouse ?? null;
         this.received = data.donationsReceived;
     }
     /** Whether this clan member is in the clan. */

package/dist/struct/ClanWar.d.ts

@@ -101,11 +101,21 @@ export declare class WarClan {
     /** Get clan's formatted link to open clan in-game. */
     get shareLink(): string;
 }
-/** Represents a Clan War in Clash of Clans. */
+/**
+ * Represents a Clan War in Clash of Clans.
+ *
+ * :::caution
+ * It's recommended to see if ClanWar#state is `notInWar` available before performing operations or reading data from it. You can check this with data.ok property.
+ * :::
+ */
 export declare class ClanWar {
     client: Client;
-    /** The clan's current war state. */
-    state: 'preparation' | 'inWar' | 'warEnded';
+    /**
+     * The clan's current war state.
+     *
+     * :warning: Other properties won't be available if the state is `notInWar`.
+     */
+    state: 'preparation' | 'inWar' | 'warEnded' | 'notInWar';
     /** The number of players on each side. */
     teamSize: number;
     /** The number of attacks each member has. */
@@ -135,6 +145,8 @@ export declare class ClanWar {
     getAttack(attackerTag: string, defenderTag: string): ClanWarAttack | null;
     /** Return a list of {@link ClanWarAttack} for the defenderTag provided. */
     getDefenses(defenderTag: string): ClanWarAttack[];
+    /** Whether the clan is not in war. */
+    get isNotInWar(): boolean;
     /** Whether this is a Battle Day. */
     get isBattleDay(): boolean;
     /** Whether this is a Preparation Day. */

package/dist/struct/ClanWar.js

@@ -137,26 +137,33 @@ class WarClan {
     }
 }
 exports.WarClan = WarClan;
-/** Represents a Clan War in Clash of Clans. */
+/**
+ * Represents a Clan War in Clash of Clans.
+ *
+ * :::caution
+ * It's recommended to see if ClanWar#state is `notInWar` available before performing operations or reading data from it. You can check this with data.ok property.
+ * :::
+ */
 class ClanWar {
     constructor(client, data, extra) {
         Object.defineProperty(this, 'client', { value: client });
-        // @ts-expect-error
         this.state = data.state;
-        this.teamSize = data.teamSize;
-        this.attacksPerMember = data.attacksPerMember ?? (extra.warTag ? 1 : 2);
-        this.preparationStartTime = client.util.formatDate(data.preparationStartTime);
-        this.startTime = client.util.formatDate(data.startTime);
-        this.endTime = client.util.formatDate(data.endTime);
-        this.warTag = extra.warTag ?? null;
-        let [clan, opponent] = [data.clan, data.opponent];
-        const clanTag = extra.clanTag && client.util.formatTag(extra.clanTag);
-        if (clanTag && [data.clan.tag, data.opponent.tag].includes(clanTag)) {
-            clan = data.clan.tag === clanTag ? data.clan : data.opponent;
-            opponent = data.clan.tag === clan.tag ? data.opponent : data.clan;
+        if (this.state !== 'notInWar') {
+            this.teamSize = data.teamSize;
+            this.attacksPerMember = data.attacksPerMember ?? (extra.warTag ? 1 : 2);
+            this.preparationStartTime = client.util.formatDate(data.preparationStartTime);
+            this.startTime = client.util.formatDate(data.startTime);
+            this.endTime = client.util.formatDate(data.endTime);
+            this.warTag = extra.warTag ?? null;
+            let [clan, opponent] = [data.clan, data.opponent];
+            const clanTag = extra.clanTag && client.util.formatTag(extra.clanTag);
+            if (clanTag && [data.clan.tag, data.opponent.tag].includes(clanTag)) {
+                clan = data.clan.tag === clanTag ? data.clan : data.opponent;
+                opponent = data.clan.tag === clan.tag ? data.opponent : data.clan;
+            }
+            this.clan = new WarClan(this, clan);
+            this.opponent = new WarClan(this, opponent);
         }
-        this.clan = new WarClan(this, clan);
-        this.opponent = new WarClan(this, opponent);
         this.maxAge = extra.maxAge;
     }
     /** Return a {@link ClanWarMember} with the tag provided. */
@@ -178,6 +185,10 @@ class ClanWar {
         }
         return this.opponent.attacks.filter((atk) => atk.defenderTag === defenderTag);
     }
+    /** Whether the clan is not in war. */
+    get isNotInWar() {
+        return this.state === 'notInWar';
+    }
     /** Whether this is a Battle Day. */
     get isBattleDay() {
         return this.state === 'inWar';

package/dist/struct/Player.d.ts

@@ -1,4 +1,4 @@
-import { APIPlayer, OverrideOptions } from '../types';
+import { APIPlayer, APIPlayerHouse, OverrideOptions } from '../types';
 import { Client } from '../client/Client';
 import { LegendStatistics } from './LegendStatistics';
 import { Achievement } from './Achievement';
@@ -63,6 +63,8 @@ export declare class Player {
     spells: Spell[];
     /** An array of player's heroes (both home base and build base). */
     heroes: Hero[];
+    /** The player's clan capital house details. */
+    playerHouse?: APIPlayerHouse | null;
     constructor(client: Client, data: APIPlayer);
     /** Whether this clan member is in the clan. */
     get inClan(): boolean;

package/dist/struct/Player.js

@@ -40,6 +40,7 @@ class Player {
         this.troops = data.troops.map((unit) => new Unit_1.Troop(data, unit));
         this.spells = data.spells.map((unit) => new Unit_1.Spell(data, unit));
         this.heroes = data.heroes.map((unit) => new Unit_1.Hero(data, unit));
+        this.playerHouse = data.playerHouse ?? null;
     }
     /** Whether this clan member is in the clan. */
     get inClan() {

package/dist/struct/index.d.ts

@@ -17,3 +17,5 @@ export * from './Ranking';
 export * from './Season';
 export * from './Unit';
 export * from './WarLeague';
+export * from './ClanCapital';
+export * from './CapitalRaidSeason';

package/dist/struct/index.js

@@ -33,3 +33,5 @@ __exportStar(require("./Ranking"), exports);
 __exportStar(require("./Season"), exports);
 __exportStar(require("./Unit"), exports);
 __exportStar(require("./WarLeague"), exports);
+__exportStar(require("./ClanCapital"), exports);
+__exportStar(require("./CapitalRaidSeason"), exports);

package/dist/types/api.d.ts

@@ -58,6 +58,9 @@ export interface APIClan {
     labels: APILabel[];
     memberList: APIClanMember[];
     clanCapital: APIClanCapital;
+    isFamilyFriendly: boolean;
+    clanCapitalPoints: number;
+    capitalLeague?: APICapitalLeague;
 }
 export interface APIClanMember {
     name: string;
@@ -71,6 +74,13 @@ export interface APIClanMember {
     previousClanRank: number;
     donations: number;
     donationsReceived: number;
+    playerHouse?: APIPlayerHouse;
+}
+export interface APIPlayerHouse {
+    elements: {
+        type: string;
+        id: number;
+    }[];
 }
 export interface APIClanCapital {
     capitalHallLevel?: number;
@@ -211,16 +221,16 @@ export interface APICapitalRaidSeasonDistrict {
 }
 export interface APICapitalRaidSeasonAttackLog {
     defender: APICapitalRaidSeasonClan;
-    attackCount: 27;
-    districtCount: 7;
-    districtsDestroyed: 7;
+    attackCount: number;
+    districtCount: number;
+    districtsDestroyed: number;
     districts: APICapitalRaidSeasonDistrict[];
 }
 export interface APICapitalRaidSeasonDefenseLog {
     attacker: APICapitalRaidSeasonClan;
-    attackCount: 27;
-    districtCount: 7;
-    districtsDestroyed: 7;
+    attackCount: number;
+    districtCount: number;
+    districtsDestroyed: number;
     districts: APICapitalRaidSeasonDistrict[];
 }
 export interface APICapitalRaidSeasons {
@@ -257,6 +267,7 @@ export interface APIPlayer {
     heroes: APIPlayerItem[];
     spells: APIPlayerItem[];
     labels: APILabel[];
+    playerHouse?: APIPlayerHouse;
 }
 export interface APILegendStatistics {
     previousSeason?: APISeason;
@@ -371,6 +382,22 @@ export interface APIPlayerVersusRanking {
     previousRank: number;
     clan?: APIPlayerClan;
 }
+export interface APIClanCapitalRanking {
+    clanLevel: number;
+    clanPoints: number;
+    location: APILocation;
+    members: number;
+    tag: string;
+    name: string;
+    rank: number;
+    previousRank: number;
+    badgeUrls: APIBadge;
+    clanCapitalPoints: number;
+}
+export interface APIClanCapitalRankingList {
+    items: APIClanCapitalRanking[];
+    paging: APIPaging;
+}
 /** /leagues */
 export interface APILeagueList {
     items: APILeague[];
@@ -404,6 +431,14 @@ export interface APIWarLeague {
     id: number;
     name: string;
 }
+export interface APICapitalLeague {
+    id: number;
+    name: string;
+}
+export interface APICapitalLeagueList {
+    items: APICapitalLeague[];
+    paging: APIPaging;
+}
 export interface APILabel {
     id: number;
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "clashofclans.js",
-	"version": "3.0.0-dev.5d2e14a",
+	"version": "3.0.0-dev.9a00cd8",
 	"description": "JavaScript library for interacting with the Clash of Clans API",
 	"author": "SUVAJIT <suvajit.me@gmail.com>",
 	"license": "MIT",