chore(deps): update dependency eslint to v8

Reviewed-on: #13

.eslintignore

@@ -4,3 +4,4 @@ dist
 k8s
 .prettierrc.js
 .terserrc.js
+commitlint.config.js

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit ${1}

.terserrc.js

@@ -1,8 +1,8 @@
 const preambles = {
   'extended-player-profile': `// ==UserScript==
 // @name         Extended player profile
-// @version      1.1.0
-// @description  Adds additional info and actions to a player's profile.
+// @version      1.1.2
+// @description  Adds additional info and actions on a player overview.
 // @author       Dawid Wysokiński - Kichiyaki - contact@dwysokinski.me
 // @match        https://*/game.php?*screen=info_player*
 // @downloadURL  ${process.env.PUBLIC_URL}/extended-player-profile.user.js
@@ -10,6 +10,42 @@ const preambles = {
 // @icon         https://www.google.com/s2/favicons?domain=plemiona.pl
 // @grant        none
 // @run-at       document-end
+// ==/UserScript==`,
+  'extended-map-popup': `// ==UserScript==
+// @name         Extended map popup
+// @version      1.0.2
+// @description  Extends the map popup with additional info.
+// @author       Dawid Wysokiński - Kichiyaki - contact@dwysokinski.me
+// @match        https://*/game.php?*screen=map*
+// @downloadURL  ${process.env.PUBLIC_URL}/extended-map-popup.user.js
+// @updateURL    ${process.env.PUBLIC_URL}/extended-map-popup.user.js
+// @icon         https://www.google.com/s2/favicons?domain=plemiona.pl
+// @grant        none
+// @run-at       document-end
+// ==/UserScript==`,
+  'extended-village-profile': `// ==UserScript==
+// @name         Extended village profile
+// @version      1.0.1
+// @description  Adds additional info and actions on a village overview.
+// @author       Dawid Wysokiński - Kichiyaki - contact@dwysokinski.me
+// @match        https://*/game.php?*screen=info_village*
+// @downloadURL  ${process.env.PUBLIC_URL}/extended-village-profile.user.js
+// @updateURL    ${process.env.PUBLIC_URL}/extended-village-profile.user.js
+// @icon         https://www.google.com/s2/favicons?domain=plemiona.pl
+// @grant        none
+// @run-at       document-end
+// ==/UserScript==`,
+  'extended-tribe-profile': `// ==UserScript==
+// @name         Extended tribe profile
+// @version      1.0.0
+// @description  Adds additional info and actions on a tribe overview.
+// @author       Dawid Wysokiński - Kichiyaki - contact@dwysokinski.me
+// @match        https://*/game.php?*screen=info_ally*
+// @downloadURL  ${process.env.PUBLIC_URL}/extended-tribe-profile.user.js
+// @updateURL    ${process.env.PUBLIC_URL}/extended-tribe-profile.user.js
+// @icon         https://www.google.com/s2/favicons?domain=plemiona.pl
+// @grant        none
+// @run-at       document-end
 // ==/UserScript==`,
 };
 

Caddyfile

@@ -5,5 +5,4 @@
 	header Cache-Control max-age=3600
 	header *.js Content-type "text/javascript; charset=UTF-8"
 	header /*.js Content-type "text/javascript; charset=UTF-8"
-	redir /userscripts/extendedPlayerProfile.js /extended-player-profile.user.js permanent
 }

Dockerfile

@@ -8,7 +8,7 @@ COPY . ./
 ENV NODE_ENV=production
 RUN yarn build
 
-FROM caddy:2.6.2-alpine
+FROM caddy:2.6.4-alpine
 
 COPY --from=build-deps /app/dist /var/www
 COPY Caddyfile /etc/caddy/Caddyfile

README.md

@@ -6,7 +6,7 @@ This repo contains a variety of scripts for [Tribal Wars](https://www.tribalwars
 
 ### Extended player profile
 
-This script adds additional info and actions to a player's profile.
+This script adds additional info and actions on a player overview.
 
 ![img.png](docs/extended-player-profile.png)
 
@@ -20,6 +20,54 @@ javascript:
     $.getScript('https://scripts.tribalwarshelp.com/extended-player-profile.quickbar.js')
 ```
 
+### Extended tribe profile
+
+This script adds additional info and actions on a tribe overview.
+
+![img.png](docs/extended-tribe-profile.png)
+
+#### Installation
+
+[User script](https://scripts.tribalwarshelp.com/extended-tribe-profile.user.js)
+
+Quick bar:
+```javascript
+javascript:
+    $.getScript('https://scripts.tribalwarshelp.com/extended-tribe-profile.quickbar.js')
+```
+
+### Extended map popup
+
+This script extends the map popup with additional info.
+
+![img.png](docs/extended-map-popup.png)
+
+#### Installation
+
+[User script](https://scripts.tribalwarshelp.com/extended-map-popup.user.js)
+
+Quick bar:
+```javascript
+javascript:
+    $.getScript('https://scripts.tribalwarshelp.com/extended-map-popup.quickbar.js')
+```
+
+### Extended village profile
+
+This script adds additional info and actions on a village overview.
+
+![img.png](docs/extended-village-profile.png)
+
+#### Installation
+
+[User script](https://scripts.tribalwarshelp.com/extended-village-profile.user.js)
+
+Quick bar:
+```javascript
+javascript:
+    $.getScript('https://scripts.tribalwarshelp.com/extended-village-profile.quickbar.js')
+```
+
 ## License
 
 Distributed under the MIT License. See ``LICENSE`` for more information.

commitlint.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+};

package.json

@@ -3,9 +3,16 @@
   "version": "0.1.0",
   "license": "MIT",
   "scripts": {
+    "prepare": "husky install",
     "build-single": "PUBLIC_URL=https://scripts.tribalwarshelp.com parcel build",
     "build:extended-player-profile-user": "PREAMBLE=extended-player-profile yarn build-single ./src/extended-player-profile.user.ts",
     "build:extended-player-profile-quickbar": "yarn build-single ./src/extended-player-profile.quickbar.ts",
+    "build:extended-map-popup-user": "PREAMBLE=extended-map-popup yarn build-single ./src/extended-map-popup.user.ts",
+    "build:extended-map-popup-quickbar": "yarn build-single ./src/extended-map-popup.quickbar.ts",
+    "build:extended-village-profile-user": "PREAMBLE=extended-village-profile yarn build-single ./src/extended-village-profile.user.ts",
+    "build:extended-village-profile-quickbar": "yarn build-single ./src/extended-village-profile.quickbar.ts",
+    "build:extended-tribe-profile-user": "PREAMBLE=extended-tribe-profile yarn build-single ./src/extended-tribe-profile.user.ts",
+    "build:extended-tribe-profile-quickbar": "yarn build-single ./src/extended-tribe-profile.quickbar.ts",
     "build": "npm-run-all build:*",
     "lint": "eslint src/**/*.ts"
   },
@@ -24,6 +31,8 @@
     "since 2017-06"
   ],
   "devDependencies": {
+    "@commitlint/cli": "^17.4.4",
+    "@commitlint/config-conventional": "^17.4.4",
     "@parcel/validator-eslint": "^2.8.3",
     "@parcel/validator-typescript": "^2.8.3",
     "@types/jquery": "^3.5.14",
@@ -34,6 +43,7 @@
     "buffer": "^5.5.0",
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^8.6.0",
+    "husky": "^8.0.3",
     "npm-run-all": "^4.1.5",
     "parcel": "^2.8.3",
     "prettier": "^2.8.3",

src/extended-map-popup.quickbar.ts

@@ -0,0 +1,2 @@
+// Parcel doesn't have an option to rename output files
+import './extended-map-popup.user';

src/extended-map-popup.user.ts

@@ -0,0 +1,283 @@
+import addSeconds from 'date-fns/addSeconds';
+import {
+  Ennoblement,
+  ServerConfig,
+  TWHelpClient,
+  UnitInfo,
+} from './lib/twhelp';
+import { Cache, InMemoryStorage } from './lib/cache';
+import { calcDistance, calcLoyalty } from './lib/tw';
+import { createTranslationFunc } from './utils';
+
+declare global {
+  interface Window {
+    TWMap: {
+      popup: {
+        loadVillage: (villageId: string) => void;
+        _loadVillage: (villageId: string) => void;
+        displayForVillage: (
+          village: { id: string },
+          x: number,
+          y: number
+        ) => void;
+        _displayForVillage: (
+          village: { id: string },
+          x: number,
+          y: number
+        ) => void;
+      };
+    };
+  }
+}
+
+const t = createTranslationFunc({
+  pl_PL: {
+    'Ennobled at': 'Ostatnio przejęta',
+    Loyalty: 'Poparcie',
+    'Can send a nobleman': 'Można wysłać szlachica',
+    Yes: 'Tak',
+    No: 'Nie',
+    Never: 'Nigdy',
+  },
+});
+
+class TWHelpConnector {
+  private static readonly SERVER_CONFIG_CACHE_KEY =
+    'extended_map_popup_server_config';
+  private static readonly UNIT_INFO_CACHE_KEY = 'extended_map_popup_unit_info';
+  private static readonly VILLAGE_CACHE_KEY_PREFIX =
+    'extended_map_popup_village_';
+
+  private readonly localStorageCache = new Cache(localStorage);
+  private readonly inMemoryCache = new Cache(new InMemoryStorage());
+  constructor(
+    private readonly client: TWHelpClient,
+    private readonly version: string,
+    private readonly server: string
+  ) {}
+
+  serverConfig() {
+    return this.localStorageCache.load(
+      TWHelpConnector.SERVER_CONFIG_CACHE_KEY,
+      3600,
+      () => {
+        return this.client.serverConfig(this.version, this.server);
+      }
+    );
+  }
+
+  unitInfo() {
+    return this.localStorageCache.load(
+      TWHelpConnector.UNIT_INFO_CACHE_KEY,
+      3600,
+      () => {
+        return this.client.unitInfo(this.version, this.server);
+      }
+    );
+  }
+
+  async latestEnnoblement(id: number, cacheOnly?: boolean) {
+    const key = TWHelpConnector.VILLAGE_CACHE_KEY_PREFIX + id.toString();
+
+    if (cacheOnly) {
+      return this.inMemoryCache.get<Ennoblement | null>(key);
+    }
+
+    return this.inMemoryCache.load(key, 86400, async () => {
+      const ennoblements = await this.client.villageEnnoblements(
+        this.version,
+        this.server,
+        id,
+        {
+          limit: 1,
+          sort: ['createdAt:DESC'],
+        }
+      );
+      return ennoblements.data.length > 0 ? ennoblements.data[0] : null;
+    });
+  }
+}
+
+class Popup {
+  private static readonly ID_ENNOBLED_AT = 'extended_map_popup_ennobled_at';
+  private static readonly ID_LOYALTY = 'extended_map_popup_loyalty';
+
+  constructor(
+    private readonly config: ServerConfig,
+    private readonly unitInfo: UnitInfo,
+    private readonly currentVillage: Window['game_data']['village'],
+    private readonly connector: TWHelpConnector
+  ) {}
+
+  addHandlers() {
+    window.TWMap.popup._loadVillage = window.TWMap.popup.loadVillage;
+    window.TWMap.popup.loadVillage = this.loadVillage.bind(this);
+    window.TWMap.popup._displayForVillage =
+      window.TWMap.popup.displayForVillage;
+    window.TWMap.popup.displayForVillage = this.display.bind(this);
+  }
+
+  private async loadVillage(villageId: string) {
+    window.TWMap.popup._loadVillage(villageId);
+
+    await this.displayLatestEnnoblementAndLoyalty(parseInt(villageId), false);
+  }
+
+  private async display(village: { id: string }, x: number, y: number) {
+    window.TWMap.popup._displayForVillage(village, x, y);
+
+    this.displayArrivalTimes(x, y);
+    this.displayCanSendNobleman(x, y);
+    await this.displayLatestEnnoblementAndLoyalty(
+      parseInt(village.id),
+      window.game_data.features.Premium.active
+    );
+  }
+
+  private displayArrivalTimes(x: number, y: number) {
+    const dist = calcDistance({ x, y }, this.currentVillage);
+    if (dist <= 0) {
+      return;
+    }
+
+    const imgs = document.querySelectorAll(
+      '#map_popup #info_content tbody img[src*="unit/unit_"]'
+    );
+    if (imgs.length === 0) {
+      return;
+    }
+
+    const tbody = imgs[0].closest('tbody');
+    if (!(tbody instanceof HTMLTableSectionElement)) {
+      return;
+    }
+
+    const tr = document.createElement('tr');
+    tr.classList.add('center');
+
+    imgs.forEach((img, idx) => {
+      if (!(img instanceof HTMLImageElement)) {
+        return;
+      }
+
+      for (const [unit, config] of Object.entries(this.unitInfo)) {
+        if (!img.src.includes(unit)) {
+          continue;
+        }
+
+        const td = document.createElement('td');
+        td.style.padding = '2px';
+        td.style.backgroundColor = idx % 2 === 0 ? '#F8F4E8' : '#DED3B9';
+        td.style.maxWidth = '70px';
+        td.innerText = addSeconds(
+          window.Timing.getCurrentServerTime(),
+          Math.round(dist * config.speed * 60)
+        ).toLocaleString();
+        tr.appendChild(td);
+
+        break;
+      }
+    });
+
+    tbody.appendChild(tr);
+  }
+
+  private displayCanSendNobleman(x: number, y: number) {
+    const dist = calcDistance({ x, y }, this.currentVillage);
+    if (dist <= 0) {
+      return;
+    }
+
+    const tbody = document.querySelector('#map_popup #info_content tbody');
+    if (!(tbody instanceof HTMLTableSectionElement)) {
+      return;
+    }
+
+    const tr = document.createElement('tr');
+
+    tr.innerHTML = `
+      <td>${t('Can send a nobleman')}:</td>
+      <td>${dist <= this.config.snob.maxDist ? t('Yes') : t('No')}</td>
+    `;
+
+    tbody.appendChild(tr);
+  }
+
+  private async displayLatestEnnoblementAndLoyalty(
+    id: number,
+    cacheOnly: boolean
+  ) {
+    const ennoblement = await this.connector.latestEnnoblement(id, cacheOnly);
+
+    const tbody = document.querySelector('#map_popup #info_content tbody');
+    if (!(tbody instanceof HTMLTableSectionElement)) {
+      return;
+    }
+
+    [
+      {
+        id: Popup.ID_ENNOBLED_AT,
+        title: t('Ennobled at'),
+        value: ennoblement
+          ? new Date(ennoblement.createdAt).toLocaleString()
+          : t('Never'),
+      },
+      {
+        id: Popup.ID_LOYALTY,
+        title: t('Loyalty'),
+        value: calcLoyalty(ennoblement?.createdAt ?? 0, this.config.speed),
+      },
+    ].forEach(({ id, title, value }) => {
+      let tr = tbody.querySelector('#' + id);
+      if (!tr) {
+        tr = document.createElement('tr');
+        tr.id = id;
+        tbody.appendChild(tr);
+      }
+
+      tr.innerHTML = `
+       <td>${title}:</td>
+       <td>${value}</td>
+`;
+    });
+  }
+}
+
+class ExtendedMapPopup {
+  connector: TWHelpConnector;
+  constructor(client: TWHelpClient) {
+    this.connector = new TWHelpConnector(
+      client,
+      window.game_data.market,
+      window.game_data.world
+    );
+  }
+
+  async run() {
+    const [config, unitInfo] = await Promise.all([
+      this.connector.serverConfig(),
+      this.connector.unitInfo(),
+    ]);
+
+    new Popup(
+      config,
+      unitInfo,
+      window.game_data.village,
+      this.connector
+    ).addHandlers();
+  }
+}
+
+(async () => {
+  if (window.game_data.screen !== 'map' || window.game_data.mode !== null) {
+    return;
+  }
+
+  await new ExtendedMapPopup(
+    new TWHelpClient(process.env.TWHELP_API_BASE_URL ?? '')
+  )
+    .run()
+    .catch((err) => {
+      console.log(err);
+    });
+})();

src/extended-player-profile.user.ts

@@ -119,11 +119,11 @@ class InADayConnector {
 }
 
 enum DialogId {
-  OTHER_SERVERS = 'kichiyaki_other_servers',
-  IN_A_DAY_RANKS = 'kichiyaki_in_a_day_ranks',
-  TRIBE_CHANGES = 'kichiyaki_tribe_changes',
-  ENNOBLEMENTS = 'kichiyaki_ennoblements',
-  HISTORY = 'kichiyaki_history',
+  OTHER_SERVERS = 'extended_player_profile_other_servers',
+  IN_A_DAY_RANKS = 'extended_player_profile_in_a_day_ranks',
+  TRIBE_CHANGES = 'extended_player_profile_tribe_changes',
+  ENNOBLEMENTS = 'extended_player_profile_ennoblements',
+  HISTORY = 'extended_player_profile_history',
 }
 
 class UI {
@@ -313,7 +313,6 @@ class UI {
       a.innerText = name;
       a.href = '#';
       a.addEventListener('click', handler);
-      a.setAttribute('data-player-id', this.player.id.toString());
       td.appendChild(a);
       tr.appendChild(td);
       tbody.appendChild(tr);
@@ -589,9 +588,11 @@ class ExtendedPlayerProfile {
     );
   }
 
-  async render() {
-    const player = await this.twhelpConnector.player();
-    const latestSnapshot = await this.twhelpConnector.latestSnapshot();
+  async run() {
+    const [player, latestSnapshot] = await Promise.all([
+      this.twhelpConnector.player(),
+      this.twhelpConnector.latestSnapshot(),
+    ]);
 
     new UI(
       player,
@@ -630,7 +631,7 @@ class ExtendedPlayerProfile {
     new TWHelpClient(process.env.TWHELP_API_BASE_URL ?? ''),
     new InADayClient()
   )
-    .render()
+    .run()
     .catch((err) => {
       console.log(err);
     });

src/extended-tribe-profile.quickbar.ts

@@ -0,0 +1,2 @@
+// Parcel doesn't have an option to rename output files
+import './extended-tribe-profile.user';

src/extended-tribe-profile.user.ts

@@ -0,0 +1,553 @@
+import { Player, Tribe, TribeSnapshot, TWHelpClient } from './lib/twhelp';
+import { createTranslationFunc } from './utils';
+import { DialogTable } from './common/dialog-table';
+import { buildURL } from './lib/twstats';
+
+const t = createTranslationFunc({
+  pl_PL: {
+    'Created at': 'Data/czas utworzenia',
+    Dominance: 'Dominacja',
+    'Best rank': 'Najwyższy ranking',
+    'Most points': 'Najwięcej punktów',
+    'Most villages': 'Najwięcej wiosek',
+    'Show tribe changes': 'Pokaż zmiany plemion',
+    'Show history': 'Pokaż historię',
+    'Show ennoblements': 'Pokaż przejęcia',
+    Changes: 'Zmiany',
+    Members: 'Członkowie',
+    Points: 'Punkty',
+    Rank: 'Ranking',
+    Villages: 'Wioski',
+    Village: 'Wioska',
+    OD: 'Pokonani ogólnie',
+    'OD - rank': 'Pokonani ogólnie - ranking',
+    ODA: 'Pokonani agresor',
+    'ODA - rank': 'Pokonani agresor - ranking',
+    ODD: 'Pokonani obrońca',
+    'ODD - rank': 'Pokonani obrońca - ranking',
+    ODS: 'Pokonani wspierający',
+    'ODS - rank': 'Pokonani wspierający - ranking',
+    Player: 'Gracz',
+    'New owner': 'Nowy właściciel',
+    'New tribe': 'Nowe plemię',
+    'Old owner': 'Stary własciciel',
+    'Old tribe': 'Stare plemię',
+    'Date/time': 'Data/czas',
+    Action: 'Akcja',
+    Joined: 'Dołączył',
+    Left: 'Opuścił',
+    Barbarian: 'Barbarzyńska',
+    Unknown: 'Nieznany',
+    'Last activity at': 'Ostatnia aktywność',
+    Actions: 'Akcje',
+  },
+});
+
+class TWHelpConnector {
+  constructor(
+    private readonly client: TWHelpClient,
+    private readonly version: string,
+    private readonly server: string,
+    private readonly id: number
+  ) {}
+
+  tribe() {
+    return this.client.tribe(this.version, this.server, this.id);
+  }
+
+  tribeMembers() {
+    return this.client.tribeMembers(this.version, this.server, this.id);
+  }
+
+  async latestSnapshot() {
+    const history = await this.tribeHistory(1, 1);
+    return history.data.length > 0 ? history.data[0] : null;
+  }
+
+  tribeHistory(page: number, limit: number) {
+    return this.client.tribeHistory(this.version, this.server, this.id, {
+      offset: (page - 1) * limit,
+      limit,
+      sort: ['date:desc'],
+    });
+  }
+
+  tribeTribeChanges(page: number, limit: number) {
+    return this.client.tribeTribeChanges(this.version, this.server, this.id, {
+      offset: (page - 1) * limit,
+      limit,
+      sort: ['createdAt:desc'],
+    });
+  }
+
+  tribeEnnoblements(page: number, limit: number) {
+    return this.client.tribeEnnoblements(this.version, this.server, this.id, {
+      offset: (page - 1) * limit,
+      limit,
+      sort: ['createdAt:desc'],
+    });
+  }
+}
+
+enum DialogId {
+  HISTORY = 'extended_tribe_profile_history',
+  TRIBE_CHANGES = 'extended_tribe_profile_tribe_changes',
+  ENNOBLEMENTS = 'extended_tribe_profile_ennoblements',
+}
+
+class UI {
+  constructor(
+    private readonly serverKey: string,
+    private readonly tribe: Tribe,
+    private readonly latestSnapshot: TribeSnapshot | null,
+    private readonly members: Player[],
+    private readonly twhelpConnector: TWHelpConnector
+  ) {}
+
+  public render() {
+    this.renderAdditionalInfo();
+    this.renderStats();
+    this.renderActions();
+    this.extendMemberTable();
+  }
+
+  private renderAdditionalInfo() {
+    const tbody = document
+      .querySelector('#content_value a[href*="twstats"]')
+      ?.closest('tbody');
+    if (!(tbody instanceof HTMLTableSectionElement)) {
+      return;
+    }
+
+    tbody.insertAdjacentHTML(
+      'beforeend',
+      `
+    <tr>
+        <td>${t('Created at')}:</td>
+        <td>${new Date(this.tribe.createdAt).toLocaleString()}</td>
+    </tr>
+    <tr>
+        <td>${t('Dominance')}:</td>
+        <td>${this.tribe.dominance.toFixed(2)}%</td>
+    </tr>
+    <tr>
+        <td>${t('Best rank')}:</td>
+        <td>${this.tribe.bestRank} (${new Date(
+        this.tribe.bestRankAt
+      ).toLocaleString()})</td>
+    </tr>
+    <tr>
+        <td>${t('Most points')}:</td>
+        <td>${this.tribe.mostPoints.toLocaleString()} (${new Date(
+        this.tribe.mostPointsAt
+      ).toLocaleString()})</td>
+    </tr>
+    <tr>
+        <td>${t('Most villages')}:</td>
+        <td>${this.tribe.mostVillages.toLocaleString()} (${new Date(
+        this.tribe.mostVillagesAt
+      ).toLocaleString()})</td>
+    </tr>
+  `
+    );
+  }
+
+  private renderStats() {
+    const td = document.querySelector(
+      '#content_value td[valign="top"]:nth-child(2)'
+    );
+    if (!(td instanceof HTMLTableCellElement)) {
+      return;
+    }
+
+    const rows = [
+      {
+        header: t('Points'),
+        value: this.tribe.allPoints - (this.latestSnapshot?.allPoints ?? 0),
+      },
+      {
+        header: t('Dominance'),
+        value: this.tribe.dominance - (this.latestSnapshot?.dominance ?? 0),
+        customFormat: (v: number) => `${v.toFixed(4)}%`,
+      },
+      {
+        header: t('Members'),
+        value: this.tribe.numMembers - (this.latestSnapshot?.numMembers ?? 0),
+      },
+      {
+        header: t('Rank'),
+        value: this.tribe.rank - (this.latestSnapshot?.rank ?? 0),
+        rank: true,
+      },
+      {
+        header: t('Villages'),
+        value: this.tribe.numVillages - (this.latestSnapshot?.numVillages ?? 0),
+      },
+      {
+        header: t('ODA'),
+        value: this.tribe.scoreAtt - (this.latestSnapshot?.scoreAtt ?? 0),
+      },
+      {
+        header: t('ODA - rank'),
+        value: this.tribe.rankAtt - (this.latestSnapshot?.rankAtt ?? 0),
+        rank: true,
+      },
+      {
+        header: t('ODD'),
+        value: this.tribe.scoreDef - (this.latestSnapshot?.scoreDef ?? 0),
+      },
+      {
+        header: t('ODD - rank'),
+        value: this.tribe.rankDef - (this.latestSnapshot?.rankDef ?? 0),
+        rank: true,
+      },
+      {
+        header: t('OD'),
+        value: this.tribe.scoreTotal - (this.latestSnapshot?.scoreTotal ?? 0),
+      },
+      {
+        header: t('OD - rank'),
+        value: this.tribe.rankTotal - (this.latestSnapshot?.rankTotal ?? 0),
+        rank: true,
+      },
+    ];
+
+    td.insertAdjacentHTML(
+      'afterbegin',
+      `
+    <table style="width: 100%" class="vis">
+       <tbody>
+          <tr>
+            <th colspan="2">
+              ${t('Changes')}
+            </th>
+          </tr>
+          ${rows
+            .map(
+              (r) => `
+            <tr>
+             <td>${r.header}</td>
+             <td style="color: #000; background-color: ${this.getStatBgColor(
+               r.value,
+               r.rank
+             )}">${
+                r.customFormat
+                  ? r.customFormat(r.value)
+                  : Math.abs(r.value).toLocaleString()
+              }</td>
+            </tr>
+          `
+            )
+            .join('')}
+      </tbody>
+    </table>
+  `
+    );
+  }
+
+  private getStatBgColor(val: number, rank?: boolean): string {
+    if ((val > 0 && !rank) || (val < 0 && rank)) {
+      return '#0f0';
+    }
+    if ((val < 0 && !rank) || (val > 0 && rank)) {
+      return '#f00';
+    }
+    return '#808080';
+  }
+
+  private renderActions() {
+    const tbody = document
+      .querySelector('#content_value a[href*="twstats"]')
+      ?.closest('tbody');
+    if (!(tbody instanceof HTMLTableSectionElement)) {
+      return;
+    }
+
+    [
+      {
+        name: t('Show tribe changes'),
+        handler: this.showTribeChanges.bind(this),
+      },
+      { name: t('Show history'), handler: this.showHistory.bind(this) },
+      {
+        name: t('Show ennoblements'),
+        handler: this.showEnnoblements.bind(this),
+      },
+    ].forEach(({ name, handler }) => {
+      const tr = document.createElement('tr');
+      const td = document.createElement('td');
+      td.colSpan = 2;
+      const a = document.createElement('a');
+      a.innerText = name;
+      a.href = '#';
+      a.addEventListener('click', handler);
+      td.appendChild(a);
+      tr.appendChild(td);
+      tbody.appendChild(tr);
+    });
+  }
+
+  private async showTribeChanges(e: Event) {
+    e.preventDefault();
+
+    await new DialogTable(
+      DialogId.TRIBE_CHANGES,
+      [
+        {
+          header: t('Player'),
+          accessor: (tc) =>
+            `<a href="${tc.player.profileUrl}">${tc.player.name}</a>`,
+        },
+        {
+          header: t('Action'),
+          accessor: (tc) =>
+            t(tc.newTribe?.id !== this.tribe.id ? 'Left' : 'Joined'),
+        },
+        {
+          header: t('Old tribe'),
+          accessor: (tc) =>
+            tc.player.tribe
+              ? `<a href="${tc.player.tribe.profileUrl}">${tc.player.tribe.tag}</a>`
+              : '-',
+        },
+        {
+          header: t('New tribe'),
+          accessor: (tc) =>
+            tc.newTribe
+              ? `<a href="${tc.newTribe.profileUrl}">${tc.newTribe.tag}</a>`
+              : '-',
+        },
+        {
+          header: t('Date/time'),
+          accessor: (tc) => new Date(tc.createdAt).toLocaleString(),
+        },
+      ],
+      30,
+      (page: number, limit: number) => {
+        return this.twhelpConnector.tribeTribeChanges(page, limit);
+      }
+    ).render();
+  }
+
+  private async showHistory(e: Event) {
+    e.preventDefault();
+
+    await new DialogTable(
+      DialogId.HISTORY,
+      [
+        {
+          header: t('Date'),
+          accessor: (s) => s.date,
+        },
+        {
+          header: t('Points'),
+          accessor: (s) =>
+            `${s.allPoints.toLocaleString()} (<strong>${s.rank}</strong>)`,
+        },
+        {
+          header: t('Villages'),
+          accessor: (s) => `${s.numVillages.toLocaleString()}`,
+        },
+        {
+          header: t('Members'),
+          accessor: (s) => `${s.numMembers.toLocaleString()}`,
+        },
+        {
+          header: t('Dominance'),
+          accessor: (s) => `${s.dominance.toFixed(2)}%`,
+        },
+        {
+          header: t('OD'),
+          accessor: (s) =>
+            `${s.scoreTotal.toLocaleString()} (<strong>${
+              s.rankTotal
+            }</strong>)`,
+        },
+        {
+          header: t('ODA'),
+          accessor: (s) =>
+            `${s.scoreAtt.toLocaleString()} (<strong>${s.rankAtt}</strong>)`,
+        },
+        {
+          header: t('ODD'),
+          accessor: (s) =>
+            `${s.scoreDef.toLocaleString()} (<strong>${s.rankDef}</strong>)`,
+        },
+      ],
+      30,
+      (page: number, limit: number) => {
+        return this.twhelpConnector.tribeHistory(page, limit);
+      }
+    ).render();
+  }
+
+  private async showEnnoblements(e: Event) {
+    e.preventDefault();
+
+    await new DialogTable(
+      DialogId.ENNOBLEMENTS,
+      [
+        {
+          header: t('Village'),
+          accessor: (e) =>
+            `<a href="${e.village.profileUrl}">${e.village.fullName}</a>`,
+        },
+        {
+          header: t('Points'),
+          accessor: (e) => e.points.toLocaleString(),
+        },
+        {
+          header: t('Old owner'),
+          accessor: ({ village: { player } }) => {
+            if (!player) {
+              return t('Barbarian');
+            }
+            return `<a href="${player.profileUrl}">${player.name}</a>${
+              player.tribe
+                ? ` (<a href="${player.tribe.profileUrl}">${player.tribe.tag}</a>)`
+                : ''
+            }`;
+          },
+        },
+        {
+          header: t('New owner'),
+          accessor: ({ newOwner }) => {
+            if (!newOwner) {
+              return t('Unknown');
+            }
+            return `<a href="${newOwner.profileUrl}">${newOwner.name}</a>${
+              newOwner.tribe
+                ? ` (<a href="${newOwner.tribe.profileUrl}">${newOwner.tribe.tag}</a>)`
+                : ''
+            }`;
+          },
+        },
+        {
+          header: t('Date/time'),
+          accessor: (e) => new Date(e.createdAt).toLocaleString(),
+        },
+      ],
+      30,
+      (page: number, limit: number) => {
+        return this.twhelpConnector.tribeEnnoblements(page, limit);
+      }
+    ).render();
+  }
+
+  private extendMemberTable() {
+    const table = document.querySelector('#content_value .vis:nth-child(3)');
+    if (
+      !(table instanceof HTMLTableElement) ||
+      !table.querySelector('a[href*="info_player"]')
+    ) {
+      return;
+    }
+
+    if (!(table.previousElementSibling instanceof HTMLHeadingElement)) {
+      return;
+    }
+
+    const div = document.createElement('div');
+    if (table.previousElementSibling instanceof HTMLHeadingElement) {
+      div.appendChild(table.previousElementSibling);
+    }
+    div.appendChild(table);
+
+    document.querySelector('#content_value')?.appendChild(div);
+
+    for (const el of table.querySelectorAll('tr')) {
+      const a = el.querySelector('a[href*="info_player"]');
+      if (!(a instanceof HTMLAnchorElement)) {
+        [
+          t('ODA'),
+          t('ODD'),
+          t('ODS'),
+          t('OD'),
+          t('Last activity at'),
+          t('Actions'),
+        ].forEach((s) => {
+          const th = document.createElement('th');
+          th.innerHTML = s;
+          el.appendChild(th);
+        });
+        continue;
+      }
+
+      const id = parseInt(new URL(a.href).searchParams.get('id') ?? '');
+      const member = this.members.find((m) => m.id === id);
+
+      [
+        (member?.rankAtt ?? 0).toString(),
+        (member?.rankDef ?? 0).toString(),
+        (member?.rankSup ?? 0).toString(),
+        (member?.rankTotal ?? 0).toString(),
+        member?.lastActivityAt
+          ? new Date(member.lastActivityAt).toLocaleString()
+          : '-',
+        `<a href="${buildURL({
+          entity: 'player',
+          id,
+          server: this.serverKey,
+        })}" target="_blank">TWStats</a>`,
+      ].forEach((v) => {
+        const td = document.createElement('td');
+        td.innerHTML = v;
+        el.appendChild(td);
+      });
+    }
+  }
+}
+
+class ExtendedTribeProfile {
+  private readonly twhelpConnector: TWHelpConnector;
+
+  constructor(twhelpClient: TWHelpClient) {
+    this.twhelpConnector = new TWHelpConnector(
+      twhelpClient,
+      window.game_data.market,
+      window.game_data.world,
+      this.getTribeId()
+    );
+  }
+
+  async run() {
+    const [tribe, latestSnapshot, { data: members }] = await Promise.all([
+      this.twhelpConnector.tribe(),
+      this.twhelpConnector.latestSnapshot(),
+      this.twhelpConnector.tribeMembers(),
+    ]);
+
+    await new UI(
+      window.game_data.world,
+      tribe,
+      latestSnapshot,
+      members,
+      this.twhelpConnector
+    ).render();
+  }
+
+  private getTribeId() {
+    const str = new URLSearchParams(window.location.search).get('id');
+    if (!str) {
+      throw new Error(`couldn't extract tribe id`);
+    }
+    return parseInt(str);
+  }
+}
+
+(async () => {
+  if (
+    window.game_data.screen !== 'info_ally' ||
+    window.game_data.mode !== null
+  ) {
+    return;
+  }
+
+  await new ExtendedTribeProfile(
+    new TWHelpClient(process.env.TWHELP_API_BASE_URL ?? '')
+  )
+    .run()
+    .catch((err) => {
+      console.log(err);
+    });
+})();

src/extended-village-profile.quickbar.ts

@@ -0,0 +1,2 @@
+// Parcel doesn't have an option to rename output files
+import './extended-village-profile.user';

src/extended-village-profile.user.ts

@@ -0,0 +1,236 @@
+import { Ennoblement, ServerConfig, TWHelpClient } from './lib/twhelp';
+import { createTranslationFunc } from './utils';
+import { DialogTable } from './common/dialog-table';
+import { calcLoyalty } from './lib/tw';
+import { Cache } from './lib/cache';
+
+const t = createTranslationFunc({
+  pl_PL: {
+    'Show ennoblements': 'Pokaż przejęcia',
+    'Date/time': 'Data/czas',
+    Village: 'Wioska',
+    'Old owner': 'Stary właściciel',
+    'New owner': 'Nowy właściciel',
+    Points: 'Punkty',
+    Barbarian: 'Barbarzyńska',
+    'Ennobled at': 'Ostatnio przejęta',
+    Unknown: 'Nieznany',
+    Loyalty: 'Poparcie',
+    Never: 'Nigdy',
+  },
+});
+
+class TWHelpConnector {
+  private static SERVER_CONFIG_CACHE_KEY =
+    'extended_village_profile_server_config';
+
+  private cache = new Cache(localStorage);
+  constructor(
+    private readonly client: TWHelpClient,
+    private readonly version: string,
+    private readonly server: string,
+    private readonly id: number
+  ) {}
+
+  serverConfig() {
+    return this.cache.load(
+      TWHelpConnector.SERVER_CONFIG_CACHE_KEY,
+      3600,
+      () => {
+        return this.client.serverConfig(this.version, this.server);
+      }
+    );
+  }
+
+  async latestEnnoblement() {
+    const ennoblements = await this.client.villageEnnoblements(
+      this.version,
+      this.server,
+      this.id,
+      {
+        limit: 1,
+        sort: ['createdAt:DESC'],
+      }
+    );
+    return ennoblements.data.length > 0 ? ennoblements.data[0] : null;
+  }
+
+  villageEnnoblements(page: number, limit: number) {
+    return this.client.villageEnnoblements(this.version, this.server, this.id, {
+      offset: (page - 1) * limit,
+      limit,
+      sort: ['createdAt:desc'],
+    });
+  }
+}
+
+enum DialogId {
+  ENNOBLEMENTS = 'extended_village_profile_ennoblements',
+}
+
+class UI {
+  constructor(
+    private readonly config: ServerConfig,
+    private readonly ennoblement: Ennoblement | null,
+    private readonly connector: TWHelpConnector
+  ) {}
+
+  render() {
+    this.renderAdditionalInfo();
+    this.renderActions();
+  }
+
+  private renderAdditionalInfo() {
+    const tbody = document.querySelector('#embedmap_village')?.closest('tbody');
+    if (!(tbody instanceof HTMLTableSectionElement)) {
+      return;
+    }
+
+    tbody.insertAdjacentHTML(
+      'beforeend',
+      `
+    <tr>
+        <td>${t('Ennobled at')}:</td>
+        <td>${
+          this.ennoblement
+            ? new Date(this.ennoblement.createdAt).toLocaleString()
+            : t('Never')
+        }</td>
+    </tr>
+    <tr>
+        <td>${t('Loyalty')}:</td>
+        <td>${calcLoyalty(
+          this.ennoblement?.createdAt ?? 0,
+          this.config.speed
+        )}</td>
+    </tr>
+  `
+    );
+  }
+
+  private renderActions() {
+    const tbody = document
+      .querySelector('#content_value a[href*="twstats"]')
+      ?.closest('tbody');
+    if (!(tbody instanceof HTMLTableSectionElement)) {
+      return;
+    }
+
+    [
+      {
+        name: t('Show ennoblements'),
+        handler: this.showEnnoblements.bind(this),
+      },
+    ].forEach(({ name, handler }) => {
+      const tr = document.createElement('tr');
+      const td = document.createElement('td');
+      td.colSpan = 2;
+      const a = document.createElement('a');
+      a.innerText = name;
+      a.href = '#';
+      a.addEventListener('click', handler);
+      td.appendChild(a);
+      tr.appendChild(td);
+      tbody.appendChild(tr);
+    });
+  }
+
+  private async showEnnoblements(e: Event) {
+    e.preventDefault();
+
+    await new DialogTable(
+      DialogId.ENNOBLEMENTS,
+      [
+        {
+          header: t('Village'),
+          accessor: (e) =>
+            `<a href="${e.village.profileUrl}">${e.village.fullName}</a>`,
+        },
+        {
+          header: t('Points'),
+          accessor: (e) => e.points.toLocaleString(),
+        },
+        {
+          header: t('Old owner'),
+          accessor: ({ village: { player } }) => {
+            if (!player) {
+              return t('Barbarian');
+            }
+            return `<a href="${player.profileUrl}">${player.name}</a>${
+              player.tribe
+                ? ` (<a href="${player.tribe.profileUrl}">${player.tribe.tag}</a>)`
+                : ''
+            }`;
+          },
+        },
+        {
+          header: t('New owner'),
+          accessor: ({ newOwner }) => {
+            if (!newOwner) {
+              return t('Unknown');
+            }
+            return `<a href="${newOwner.profileUrl}">${newOwner.name}</a>${
+              newOwner.tribe
+                ? ` (<a href="${newOwner.tribe.profileUrl}">${newOwner.tribe.tag}</a>)`
+                : ''
+            }`;
+          },
+        },
+        {
+          header: t('Date/time'),
+          accessor: (e) => new Date(e.createdAt).toLocaleString(),
+        },
+      ],
+      30,
+      (page: number, limit: number) => {
+        return this.connector.villageEnnoblements(page, limit);
+      }
+    ).render();
+  }
+}
+
+class ExtendedVillageProfile {
+  connector: TWHelpConnector;
+  constructor(client: TWHelpClient) {
+    this.connector = new TWHelpConnector(
+      client,
+      window.game_data.market,
+      window.game_data.world,
+      this.getVillageId()
+    );
+  }
+
+  async run() {
+    const [config, ennoblement] = await Promise.all([
+      this.connector.serverConfig(),
+      this.connector.latestEnnoblement(),
+    ]);
+
+    new UI(config, ennoblement, this.connector).render();
+  }
+
+  private getVillageId() {
+    const str = new URLSearchParams(window.location.search).get('id');
+    if (!str) {
+      return 0;
+    }
+    return parseInt(str);
+  }
+}
+
+(async () => {
+  if (
+    window.game_data.screen !== 'info_village' ||
+    window.game_data.mode !== null
+  ) {
+    return;
+  }
+
+  await new ExtendedVillageProfile(
+    new TWHelpClient(process.env.TWHELP_API_BASE_URL ?? '')
+  )
+    .run()
+    .catch((err) => {
+      console.log(err);
+    });
+})();

src/global.d.ts

@@ -10,12 +10,19 @@ declare global {
       };
       village: {
         id: number;
+        x: number;
+        y: number;
       };
       market: string;
       locale: string;
       screen: string;
       mode: string | null;
       world: string;
+      features: {
+        Premium: {
+          active: boolean;
+        };
+      };
     };
     TribalWars: {
       redirect: (queryParams: Record<string, string>) => void;
@@ -33,5 +40,8 @@ declare global {
       show: (id: string, html: string) => void;
       close: () => void;
     };
+    Timing: {
+      getCurrentServerTime: () => number;
+    };
   }
 }

src/lib/cache.ts

@@ -0,0 +1,65 @@
+import addSeconds from 'date-fns/addSeconds';
+import isAfter from 'date-fns/isAfter';
+
+export interface Storage {
+  getItem(key: string): string | null;
+  setItem(key: string, value: string): void;
+  removeItem(key: string): void;
+}
+
+export class InMemoryStorage {
+  private readonly data = new Map<string, string>();
+
+  getItem(key: string): string | null {
+    const d = this.data.get(key);
+    return d ? d : null;
+  }
+
+  setItem(key: string, value: string) {
+    this.data.set(key, value);
+  }
+
+  removeItem(key: string) {
+    this.data.delete(key);
+  }
+}
+
+export class Cache {
+  constructor(private readonly storage: Storage) {}
+
+  // load first tries to load data from storage, if there is no data or it is expired then it executes the given function and caches the result
+  async load<T>(key: string, ttl: number, func: () => Promise<T>): Promise<T> {
+    const data = this.get<T>(key);
+    if (data) {
+      return data;
+    }
+
+    const res = await func();
+
+    this.storage.setItem(
+      key,
+      JSON.stringify({
+        data: res,
+        exp: addSeconds(new Date(), ttl),
+      })
+    );
+
+    return res;
+  }
+
+  get<T>(key: string): T | null {
+    try {
+      const fromStorage = JSON.parse(this.storage.getItem(key) ?? '');
+      if (!fromStorage.exp || !fromStorage.data) {
+        return null;
+      }
+      if (isAfter(new Date(), new Date(fromStorage.exp))) {
+        this.storage.removeItem(key);
+        return null;
+      }
+      return fromStorage.data;
+    } catch (err) {
+      return null;
+    }
+  }
+}

src/lib/tw/constants.ts

@@ -0,0 +1,2 @@
+export const LOYALTY_AFTER_CONQUER = 25;
+export const MAX_LOYALTY = 100;

src/lib/tw/in-a-day-client.ts

@@ -1,6 +1,6 @@
 import axios, { AxiosInstance } from 'axios';
 import random from 'lodash/random';
-import { wait } from '../utils';
+import { wait } from '../../utils';
 
 type InADayScore = {
   player: {

src/lib/tw/index.ts

@@ -0,0 +1,3 @@
+export * from './in-a-day-client';
+export * from './utils';
+export * from './constants';

src/lib/tw/utils.ts

@@ -0,0 +1,22 @@
+import differenceInMinutes from 'date-fns/differenceInMinutes';
+import { LOYALTY_AFTER_CONQUER, MAX_LOYALTY } from './constants';
+
+export const calcLoyalty = (
+  ennobledAt: Date | string | number,
+  speed: number
+) => {
+  const loyalty =
+    LOYALTY_AFTER_CONQUER +
+    Math.abs(differenceInMinutes(new Date(ennobledAt), new Date())) *
+      (speed / 60);
+  return loyalty > MAX_LOYALTY ? MAX_LOYALTY : Math.floor(loyalty);
+};
+
+export type Coords = {
+  x: number;
+  y: number;
+};
+
+export const calcDistance = (coords1: Coords, coords2: Coords) => {
+  return Math.hypot(coords1.x - coords2.x, coords1.y - coords2.y);
+};

src/lib/twhelp.ts

@@ -4,18 +4,38 @@ import axios, {
   RawAxiosResponseHeaders,
 } from 'axios';
 
-export type Version = {
-  code: string;
-  host: string;
-  name: string;
-  timezone: string;
-};
-
 export type ServerMeta = {
   key: string;
   open: boolean;
 };
 
+export type Tribe = {
+  id: number;
+  name: string;
+  tag: string;
+  numMembers: number;
+  numVillages: number;
+  points: number;
+  allPoints: number;
+  rank: number;
+  dominance: number;
+  rankAtt: number;
+  scoreAtt: number;
+  rankDef: number;
+  scoreDef: number;
+  rankTotal: number;
+  scoreTotal: number;
+  profileUrl: string;
+  bestRank: number;
+  bestRankAt: string;
+  mostPoints: number;
+  mostPointsAt: string;
+  mostVillages: number;
+  mostVillagesAt: string;
+  createdAt: string;
+  deletedAt: string | null;
+};
+
 export type TribeMeta = {
   id: number;
   name: string;
@@ -83,6 +103,23 @@ export type Ennoblement = {
   createdAt: string;
 };
 
+export type TribeSnapshot = {
+  id: number;
+  numMembers: number;
+  numVillages: number;
+  points: number;
+  allPoints: number;
+  rank: number;
+  dominance: number;
+  rankAtt: number;
+  scoreAtt: number;
+  rankDef: number;
+  scoreDef: number;
+  rankTotal: number;
+  scoreTotal: number;
+  date: string;
+};
+
 export type PlayerSnapshot = {
   id: number;
   tribe: TribeMeta | null;
@@ -100,6 +137,34 @@ export type PlayerSnapshot = {
   date: string;
 };
 
+export type ServerConfig = {
+  speed: number;
+  unitSpeed: number;
+  snob: {
+    maxDist: number;
+  };
+};
+
+export type Unit = {
+  speed: number;
+};
+
+export type UnitInfo = {
+  archer: Unit;
+  axe: Unit;
+  catapult: Unit;
+  heavy: Unit;
+  knight: Unit;
+  light: Unit;
+  marcher: Unit;
+  militia: Unit;
+  ram: Unit;
+  snob: Unit;
+  spear: Unit;
+  spy: Unit;
+  sword: Unit;
+};
+
 export type ListResult<T> = {
   data: T[];
   total: number;
@@ -117,7 +182,13 @@ export type ListEnnoblementsParams = {
   sort?: string[];
 };
 
-export type ListPlayerSnapshotsParams = {
+export type ListTribeMembers = {
+  offset?: number;
+  limit?: number;
+  sort?: string[];
+};
+
+export type ListSnapshotsParams = {
   offset?: number;
   limit?: number;
   sort?: string[];
@@ -138,8 +209,92 @@ export class TWHelpClient {
     });
   }
 
-  public async versions(): Promise<ListResult<Version>> {
-    const resp = await this.client.get('/api/v1/versions');
+  public async serverConfig(
+    version: string,
+    server: string
+  ): Promise<ServerConfig> {
+    const resp = await this.client.get(
+      `/api/v1/versions/${version}/servers/${server}/config`
+    );
+    return resp.data.data;
+  }
+
+  public async unitInfo(version: string, server: string): Promise<UnitInfo> {
+    const resp = await this.client.get(
+      `/api/v1/versions/${version}/servers/${server}/unit-info`
+    );
+    return resp.data.data;
+  }
+
+  public async tribe(
+    version: string,
+    server: string,
+    id: number
+  ): Promise<Tribe> {
+    const resp = await this.client.get(
+      `/api/v1/versions/${version}/servers/${server}/tribes/${id}`
+    );
+    return resp.data.data;
+  }
+
+  public async tribeHistory(
+    version: string,
+    server: string,
+    id: number,
+    queryParams?: ListSnapshotsParams
+  ): Promise<ListResult<TribeSnapshot>> {
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
+    const resp = await this.client.get(
+      `/api/v1/versions/${version}/servers/${server}/tribes/${id}/history?${queryString}`
+    );
+    return {
+      data: resp.data.data,
+      total: this.parseTotal(resp.headers),
+    };
+  }
+
+  public async tribeTribeChanges(
+    version: string,
+    server: string,
+    id: number,
+    queryParams?: ListTribeChangesQueryParams
+  ): Promise<ListResult<TribeChange>> {
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
+    const resp = await this.client.get(
+      `/api/v1/versions/${version}/servers/${server}/tribes/${id}/tribe-changes?${queryString}`
+    );
+    return {
+      data: resp.data.data,
+      total: this.parseTotal(resp.headers),
+    };
+  }
+
+  public async tribeEnnoblements(
+    version: string,
+    server: string,
+    id: number,
+    queryParams?: ListEnnoblementsParams
+  ): Promise<ListResult<Ennoblement>> {
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
+    const resp = await this.client.get(
+      `/api/v1/versions/${version}/servers/${server}/tribes/${id}/ennoblements?${queryString}`
+    );
+    return {
+      data: resp.data.data,
+      total: this.parseTotal(resp.headers),
+    };
+  }
+
+  public async tribeMembers(
+    version: string,
+    server: string,
+    id: number,
+    queryParams?: ListTribeMembers
+  ): Promise<ListResult<Player>> {
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
+    const resp = await this.client.get(
+      `/api/v1/versions/${version}/servers/${server}/tribes/${id}/members?${queryString}`
+    );
     return {
       data: resp.data.data,
       total: this.parseTotal(resp.headers),
@@ -163,24 +318,9 @@ export class TWHelpClient {
     id: number,
     queryParams?: ListTribeChangesQueryParams
   ): Promise<ListResult<TribeChange>> {
-    const params = new URLSearchParams();
-
-    if (queryParams?.limit) {
-      params.set('limit', queryParams.limit.toString());
-    }
-
-    if (queryParams?.offset) {
-      params.set('offset', queryParams.offset.toString());
-    }
-
-    if (Array.isArray(queryParams?.sort)) {
-      queryParams?.sort.forEach((s) => {
-        params.append('sort', s);
-      });
-    }
-
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
     const resp = await this.client.get(
-      `/api/v1/versions/${version}/servers/${server}/players/${id}/tribe-changes?${params.toString()}`
+      `/api/v1/versions/${version}/servers/${server}/players/${id}/tribe-changes?${queryString}`
     );
     return {
       data: resp.data.data,
@@ -194,24 +334,9 @@ export class TWHelpClient {
     id: number,
     queryParams?: ListEnnoblementsParams
   ): Promise<ListResult<Ennoblement>> {
-    const params = new URLSearchParams();
-
-    if (queryParams?.limit) {
-      params.set('limit', queryParams.limit.toString());
-    }
-
-    if (queryParams?.offset) {
-      params.set('offset', queryParams.offset.toString());
-    }
-
-    if (Array.isArray(queryParams?.sort)) {
-      queryParams?.sort.forEach((s) => {
-        params.append('sort', s);
-      });
-    }
-
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
     const resp = await this.client.get(
-      `/api/v1/versions/${version}/servers/${server}/players/${id}/ennoblements?${params.toString()}`
+      `/api/v1/versions/${version}/servers/${server}/players/${id}/ennoblements?${queryString}`
     );
     return {
       data: resp.data.data,
@@ -223,26 +348,11 @@ export class TWHelpClient {
     version: string,
     server: string,
     id: number,
-    queryParams?: ListPlayerSnapshotsParams
+    queryParams?: ListSnapshotsParams
   ): Promise<ListResult<PlayerSnapshot>> {
-    const params = new URLSearchParams();
-
-    if (queryParams?.limit) {
-      params.set('limit', queryParams.limit.toString());
-    }
-
-    if (queryParams?.offset) {
-      params.set('offset', queryParams.offset.toString());
-    }
-
-    if (Array.isArray(queryParams?.sort)) {
-      queryParams?.sort.forEach((s) => {
-        params.append('sort', s);
-      });
-    }
-
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
     const resp = await this.client.get(
-      `/api/v1/versions/${version}/servers/${server}/players/${id}/history?${params.toString()}`
+      `/api/v1/versions/${version}/servers/${server}/players/${id}/history?${queryString}`
     );
     return {
       data: resp.data.data,
@@ -256,18 +366,9 @@ export class TWHelpClient {
     id: number,
     queryParams?: ListPlayerOtherServersParams
   ): Promise<ListResult<PlayerWithServer>> {
-    const params = new URLSearchParams();
-
-    if (queryParams?.limit) {
-      params.set('limit', queryParams.limit.toString());
-    }
-
-    if (queryParams?.offset) {
-      params.set('offset', queryParams.offset.toString());
-    }
-
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
     const resp = await this.client.get(
-      `/api/v1/versions/${version}/servers/${server}/players/${id}/other-servers?${params.toString()}`
+      `/api/v1/versions/${version}/servers/${server}/players/${id}/other-servers?${queryString}`
     );
     return {
       data: resp.data.data,
@@ -275,6 +376,46 @@ export class TWHelpClient {
     };
   }
 
+  public async villageEnnoblements(
+    version: string,
+    server: string,
+    id: number,
+    queryParams?: ListEnnoblementsParams
+  ): Promise<ListResult<Ennoblement>> {
+    const queryString = queryParams ? this.buildQueryString(queryParams) : '';
+    const resp = await this.client.get(
+      `/api/v1/versions/${version}/servers/${server}/villages/${id}/ennoblements?${queryString}`
+    );
+    return {
+      data: resp.data.data,
+      total: this.parseTotal(resp.headers),
+    };
+  }
+
+  private buildQueryString(
+    queryParams: Record<string, string | boolean | number | Date | string[]>
+  ): string {
+    const params = new URLSearchParams();
+
+    for (const [name, val] of Object.entries(queryParams)) {
+      if (Array.isArray(val)) {
+        val.forEach((s) => {
+          params.append(name, s);
+        });
+        continue;
+      }
+
+      if (val instanceof Date) {
+        params.set(name, val.toISOString());
+        continue;
+      }
+
+      params.set(name, val.toString());
+    }
+
+    return params.toString();
+  }
+
   private parseTotal(
     headers: RawAxiosResponseHeaders | AxiosResponseHeaders
   ): number {