bump scripts to the new API version

dist/bonusBarbarianVillageFinder.js

@@ -293,14 +293,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/bonusBarbarianVillageFinder.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/bonusBarbarianVillageFinder.js
-// @version      0.4.2
+// @version      0.4.3
 // @description  Bonus barbarian village finder
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=map*
 // @grant        none
 // ==/UserScript==
 const SERVER = (0, _getCurrentServer.default)();
-const QUERY = "\n  query villages($server: String!, $filter: VillageFilter) {\n    villages(server: $server, filter: $filter) {\n      total\n      items {\n        id\n        name\n        bonus\n        x\n        y\n      }\n    }\n  }\n";
+const QUERY = "\n  query villages($server: String!, $filter: VillageFilter, $sort: [String!], $offset: Int) {\n    villages(server: $server, filter: $filter, offset: $offset, sort: $sort) {\n      total\n      items {\n        id\n        name\n        bonus\n        x\n        y\n      }\n    }\n  }\n";
 const TABLE_ID = 'bonusBarbarianVillageFinderTable';
 const ACTUAL_COORDS_ID = 'actualCoords';
 const translations = (0, _bonusBarbarianVillageFinder.default)();
@@ -311,13 +311,13 @@ const buildReqOptions = (bonus, offset) => {
     query: QUERY,
     variables: {
       server: SERVER,
+      sort: ['id DESC'],
       filter: {
         bonus,
-        sort: 'id DESC',
+        playerID: [0]
-        playerID: [0],
+      },
       offset
     }
-    }
   };
 };
 

dist/dailyAchievements.js

@@ -307,7 +307,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/dailyAchievements.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/dailyAchievements.js
-// @version      0.4.0
+// @version      0.4.1
 // @description  Daily achievements
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=info_player&mode=awards*
@@ -316,7 +316,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 const SERVER = (0, _getCurrentServer.default)();
 const LOCAL_STORAGE_KEY = 'kichiyaki_daily_achievements';
 const SERVER_QUERY = "\n    query server($server: String!) {\n        server(key: $server) {\n            key\n            historyUpdatedAt\n        }\n    }\n";
-const DAILY_STATS_QUERY = "\n    query data($server: String!, $createDateGTE: Time!) {\n        dailyPlayerStatsOrderedByScoreAtt: dailyPlayerStats(server: $server, filter: { sort: \"scoreAtt DESC\", createDateGTE: $createDateGTE, playerFilter: { sort: \"id DESC\" }, limit: 5 }) {\n            items {\n                scoreAtt\n                player {\n                    id\n                    name\n                }\n            }\n        }\n        dailyPlayerStatsOrderedByScoreDef: dailyPlayerStats(server: $server, filter: { sort: \"scoreDef DESC\", createDateGTE: $createDateGTE, playerFilter: { sort: \"id DESC\" }, limit: 5 }) {\n            items {\n                scoreDef\n                player {\n                    id\n                    name\n                }\n            }\n        }\n        dailyPlayerStatsOrderedByScoreSup: dailyPlayerStats(server: $server, filter: { sort: \"scoreSup DESC\", createDateGTE: $createDateGTE, playerFilter: { sort: \"id DESC\" }, limit: 5 }) {\n            items {\n                scoreSup\n                player {\n                    id\n                    name\n                }\n            }\n        }\n        dailyPlayerStatsOrderedByVillages: dailyPlayerStats(server: $server, filter: { sort: \"villages DESC\", createDateGTE: $createDateGTE, playerFilter: { sort: \"id DESC\" }, limit: 5 }) {\n            items {\n                villages\n                player {\n                    id\n                    name\n                }\n            }\n        }\n    }\n";
+const DAILY_STATS_QUERY = "\n    query data($server: String!, $createDateGTE: Time!) {\n        dailyPlayerStatsOrderedByScoreAtt: dailyPlayerStats(server: $server, sort: [\"scoreAtt DESC\", \"playerID desc\"], filter: { createDateGTE: $createDateGTE }, limit: 5) {\n            items {\n                scoreAtt\n                player {\n                    id\n                    name\n                }\n            }\n        }\n        dailyPlayerStatsOrderedByScoreDef: dailyPlayerStats(server: $server, sort: [\"scoreDef DESC\", \"playerID desc\"], filter: { createDateGTE: $createDateGTE }, limit: 5) {\n            items {\n                scoreDef\n                player {\n                    id\n                    name\n                }\n            }\n        }\n        dailyPlayerStatsOrderedByScoreSup: dailyPlayerStats(server: $server, sort: [\"scoreSup DESC\", \"playerID desc\"], filter: { createDateGTE: $createDateGTE }, limit: 5) {\n            items {\n                scoreSup\n                player {\n                    id\n                    name\n                }\n            }\n        }\n        dailyPlayerStatsOrderedByVillages: dailyPlayerStats(server: $server, sort: [\"villages DESC\", \"playerID desc\"], filter: { createDateGTE: $createDateGTE }, limit: 5) {\n            items {\n                villages\n                player {\n                    id\n                    name\n                }\n            }\n        }\n    }\n";
 let container = undefined;
 const translations = (0, _dailyAchievments.default)();
 

dist/extendedMapPopup.js

@@ -675,7 +675,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedMapPopup.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedMapPopup.js
-// @version      0.6.1
+// @version      0.6.2
 // @description  Extended map popup
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=map*
@@ -683,7 +683,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // ==/UserScript==
 const SERVER = (0, _getCurrentServer.default)();
 const CURR_SERVER_CONFIG = "\n    query server($key: String!) {\n        server(key: $key) {\n            config {\n                speed\n                unitSpeed\n                snob {\n                  maxDist\n                }\n            }\n            unitConfig {\n              spear {\n                speed\n              }\n              sword {\n                speed\n              }\n              axe {\n                speed\n              }\n              archer {\n                speed\n              }\n              spy {\n                speed\n              }\n              light {\n                speed\n              }\n              marcher {\n                speed\n              }\n              heavy {\n                speed\n              }\n              ram {\n                speed\n              }\n              catapult {\n                speed\n              }\n              knight {\n                speed\n              }\n              snob {\n                speed\n              }\n            }\n        }\n    }\n";
-const LAST_VILLAGE_CONQUER_QUERY = "\n    query ennoblements($server: String!, $filter: EnnoblementFilter!) {\n        ennoblements(server: $server, filter: $filter) {\n            items {\n                ennobledAt\n                village {\n                    id\n                }\n            }\n        }\n    }\n";
+const LAST_VILLAGE_CONQUER_QUERY = "\n    query ennoblements($server: String!, $filter: EnnoblementFilter!, $sort: [String!], $limit: Int) {\n        ennoblements(server: $server, filter: $filter, sort: $sort, limit: $limit) {\n            items {\n                ennobledAt\n                village {\n                    id\n                }\n            }\n        }\n    }\n";
 const SERVER_CONFIG_LOCAL_STORAGE_KEY = 'kiszkowaty_extended_map_popup_server_cfg';
 const translations = (0, _extendedMapPopup.default)();
 
@@ -734,12 +734,12 @@ const loadVillageData = async function loadVillageData(id) {
       query: LAST_VILLAGE_CONQUER_QUERY,
       variables: {
         server: SERVER,
+        sort: ['ennobledAt DESC'],
         filter: {
-          villageID: [id],
+          villageID: [id]
-          sort: 'ennobledAt DESC',
+        },
         limit: 1
       }
-      }
     });
     TWMap.popup.extendedMapPopupCache[id] = data;
     return data;

dist/extendedPlayerProfile.js

@@ -1115,12 +1115,6 @@ var _localStorage = require("./utils/localStorage");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -1130,7 +1124,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
-// @version      1.1.4
+// @version      1.1.5
 // @description  Extended player profile
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=info_player*
@@ -1146,13 +1140,13 @@ if (isNaN(PLAYER_ID) || !PLAYER_ID) {
 }
 
 const LOCAL_STORAGE_KEY = 'kichiyaki_extended_player_profile' + PLAYER_ID;
-const PLAYER_QUERY = "\n    query player($server: String!, $id: Int!, $filter: DailyPlayerStatsFilter) {\n        player(server: $server, id: $id) {\n            id\n            name\n            bestRank\n            bestRankAt\n            mostPoints\n            mostPointsAt\n            mostVillages\n            mostVillagesAt\n            servers\n            joinedAt\n            nameChanges {\n                oldName\n                newName\n                changeDate\n            }\n            dailyGrowth\n        }\n        dailyPlayerStats(server: $server, filter: $filter) {\n            items {\n              rank\n              rankAtt\n              rankDef\n              rankSup\n              rankTotal\n              points\n              scoreAtt\n              scoreAtt\n              scoreDef\n              scoreSup\n              scoreTotal\n              villages\n            }\n        }\n    }\n";
+const PLAYER_QUERY = "\n    query player($server: String!, $id: Int!, $limit: Int, $sort: [String!], $filter: DailyPlayerStatsFilter) {\n        player(server: $server, id: $id) {\n            id\n            name\n            bestRank\n            bestRankAt\n            mostPoints\n            mostPointsAt\n            mostVillages\n            mostVillagesAt\n            servers\n            joinedAt\n            nameChanges {\n                oldName\n                newName\n                changeDate\n            }\n            dailyGrowth\n        }\n        dailyPlayerStats(server: $server, limit: $limit, sort: $sort, filter: $filter) {\n            items {\n              rank\n              rankAtt\n              rankDef\n              rankSup\n              rankTotal\n              points\n              scoreAtt\n              scoreAtt\n              scoreDef\n              scoreSup\n              scoreTotal\n              villages\n            }\n        }\n    }\n";
-const TRIBE_CHANGES_QUERY = "\n    query tribeChanges($server: String!, $filter: TribeChangeFilter!) {\n      tribeChanges(server: $server, filter: $filter) {\n        total\n        items {\n          oldTribe {\n            id\n            tag\n          }\n          newTribe {\n            id\n            tag\n          }\n          createdAt\n        }\n      }\n    }\n";
+const TRIBE_CHANGES_QUERY = "\n    query tribeChanges($server: String!, $limit: Int, $offset: Int, $sort: [String!], $filter: TribeChangeFilter!) {\n      tribeChanges(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $filter) {\n        total\n        items {\n          oldTribe {\n            id\n            tag\n          }\n          newTribe {\n            id\n            tag\n          }\n          createdAt\n        }\n      }\n    }\n";
 const TRIBE_CHANGES_PAGINATION_CONTAINER_ID = 'tribeChangesPagination';
 const TRIBE_CHANGES_PER_PAGE = 15;
-const PLAYER_HISTORY_AND_PLAYER_DAILY_STATS_QUERY = "\nquery playerHistoryAndPlayerDailyStats($server: String!,\n     $playerHistoryFilter: PlayerHistoryFilter!,\n     $dailyPlayerStatsFilter: DailyPlayerStatsFilter!) {\n  playerHistory(server: $server, filter: $playerHistoryFilter) {\n    total\n    items {\n      totalVillages\n      points\n      rank\n      scoreAtt\n      rankAtt\n      scoreDef\n      rankDef\n      scoreSup\n      rankSup\n      scoreTotal\n      rankTotal\n      tribe {\n        id\n        tag\n      }\n      createDate\n    }\n  }\n  dailyPlayerStats(server: $server, filter: $dailyPlayerStatsFilter) {\n    items {\n        points\n        scoreAtt\n        scoreAtt\n        scoreDef\n        scoreSup\n        scoreTotal\n        villages\n        createDate\n      }\n    }\n}\n";
+const PLAYER_HISTORY_AND_PLAYER_DAILY_STATS_QUERY = "\nquery playerHistoryAndPlayerDailyStats($server: String!,\n     $playerHistoryFilter: PlayerHistoryFilter!,\n     $dailyPlayerStatsFilter: DailyPlayerStatsFilter!,\n     $limit: Int,\n     $offset: Int,\n     $sort: [String!]) {\n  playerHistory(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $playerHistoryFilter) {\n    total\n    items {\n      totalVillages\n      points\n      rank\n      scoreAtt\n      rankAtt\n      scoreDef\n      rankDef\n      scoreSup\n      rankSup\n      scoreTotal\n      rankTotal\n      tribe {\n        id\n        tag\n      }\n      createDate\n    }\n  }\n  dailyPlayerStats(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $dailyPlayerStatsFilter) {\n    items {\n        points\n        scoreAtt\n        scoreAtt\n        scoreDef\n        scoreSup\n        scoreTotal\n        villages\n        createDate\n      }\n    }\n}\n";
 const PLAYER_HISTORY_PER_PAGE = 15;
-const ENNOBLEMENTS_QUERY = "\n    query ennoblements($server: String!, $filter: EnnoblementFilter!) {\n      ennoblements(server: $server, filter: $filter) {\n        total\n        items {\n          village {\n            id\n            name\n            x\n            y\n          }\n          oldOwner {\n            id\n            name\n          }\n          oldOwnerTribe {\n            id\n            tag\n          }\n          newOwner {\n            id\n            name\n          }\n          newOwnerTribe {\n            id\n            tag\n          }\n          ennobledAt\n        }\n      }\n    }\n";
+const ENNOBLEMENTS_QUERY = "\n    query ennoblements($server: String!, $limit: Int, $offset: Int, $sort: [String!], $filter: EnnoblementFilter!) {\n      ennoblements(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $filter) {\n        total\n        items {\n          village {\n            id\n            name\n            x\n            y\n          }\n          oldOwner {\n            id\n            name\n          }\n          oldOwnerTribe {\n            id\n            tag\n          }\n          newOwner {\n            id\n            name\n          }\n          newOwnerTribe {\n            id\n            tag\n          }\n          ennobledAt\n        }\n      }\n    }\n";
 const ENNOBLEMENTS_PER_PAGE = 15;
 const profileInfoTBody = document.querySelector('#player_info > tbody');
 const actionContainer = PLAYER_ID === CURRENT_PLAYER_ID ? profileInfoTBody : document.querySelector('#content_value > table > tbody > tr > td:nth-child(1) > table:nth-child(2) > tbody');
@@ -1213,9 +1207,9 @@ const loadData = async () => {
     variables: {
       server: SERVER,
       id: PLAYER_ID,
-      filter: {
-        sort: 'createDate DESC',
       limit: 1,
+      sort: ['createDate DESC'],
+      filter: {
         playerID: [PLAYER_ID]
       }
     }
@@ -1392,11 +1386,11 @@ const handleShowTribeChangesButtonClick = async e => {
       query: TRIBE_CHANGES_QUERY,
       variables: {
         filter: {
-          playerID: [PLAYER_ID],
+          playerID: [PLAYER_ID]
+        },
+        sort: ['createdAt DESC'],
         offset: TRIBE_CHANGES_PER_PAGE * (page - 1),
         limit: TRIBE_CHANGES_PER_PAGE,
-          sort: 'createdAt DESC'
-        },
         server: SERVER
       }
     });
@@ -1411,10 +1405,7 @@ const handleShowPlayerHistoryClick = async e => {
   if (!isNaN(page)) {
     try {
       const filter = {
-        playerID: [PLAYER_ID],
+        playerID: [PLAYER_ID]
-        offset: PLAYER_HISTORY_PER_PAGE * (page - 1),
-        limit: PLAYER_HISTORY_PER_PAGE,
-        sort: 'createDate DESC'
       };
       const {
         playerHistory,
@@ -1424,9 +1415,10 @@ const handleShowPlayerHistoryClick = async e => {
         variables: {
           server: SERVER,
           playerHistoryFilter: filter,
-          dailyPlayerStatsFilter: _objectSpread(_objectSpread({}, filter), {}, {
+          offset: PLAYER_HISTORY_PER_PAGE * (page - 1),
-            offset: filter.offset + 1
+          limit: PLAYER_HISTORY_PER_PAGE,
-          })
+          sort: ['createDate DESC'],
+          dailyPlayerStatsFilter: filter
         }
       });
       (0, _showHistoryPopup.default)(e, playerHistory, dailyPlayerStats, {
@@ -1453,11 +1445,11 @@ const handleShowPlayerEnnoblementsClick = async e => {
           or: {
             oldOwnerID: [PLAYER_ID],
             newOwnerID: [PLAYER_ID]
+          }
         },
         offset: ENNOBLEMENTS_PER_PAGE * (page - 1),
         limit: ENNOBLEMENTS_PER_PAGE,
-          sort: 'ennobledAt DESC'
+        sort: ['ennobledAt DESC'],
-        },
         server: SERVER
       }
     });

dist/extendedTribeProfile.js

@@ -1744,7 +1744,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedTribeProfile.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedTribeProfile.js
-// @version      1.0.8
+// @version      1.0.9
 // @description  Extended tribe profile
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=info_ally*
@@ -1754,14 +1754,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 const SERVER = (0, _getCurrentServer.default)();
 const TRIBE_ID = (0, _getIDFromURL.default)(window.location.search);
 const LOCAL_STORAGE_KEY = 'kichiyaki_extended_tribe_profile' + TRIBE_ID;
-const TRIBE_QUERY = "\n    query tribe($server: String!, $id: Int!, $playerFilter: PlayerFilter!, $dailyTribeStatsFilter: DailyTribeStatsFilter!) {\n        tribe(server: $server, id: $id) {\n            id\n            bestRank\n            bestRankAt\n            mostPoints\n            mostPointsAt\n            mostVillages\n            mostVillagesAt\n            createdAt\n            dominance\n        }\n        dailyTribeStats(server: $server, filter: $dailyTribeStatsFilter) {\n          items {\n            rank\n            rankAtt\n            rankDef\n            rankTotal\n            points\n            scoreAtt\n            scoreAtt\n            scoreDef\n            scoreTotal\n            villages\n            members\n          }\n        }\n        players(server: $server, filter: $playerFilter) {\n          items {\n            id\n            rankAtt\n            rankDef\n            rankSup\n            rankTotal\n            scoreAtt\n            scoreAtt\n            scoreDef\n            scoreSup\n            scoreTotal\n            dailyGrowth\n          }\n        }\n    }\n";
+const TRIBE_QUERY = "\n    query tribe($server: String!, $id: Int!, $dailyTribeStatsSort: [String!], $dailyTribeStatsLimit: Int, $playerSort: [String!], $playerFilter: PlayerFilter!, $dailyTribeStatsFilter: DailyTribeStatsFilter!) {\n        tribe(server: $server, id: $id) {\n            id\n            bestRank\n            bestRankAt\n            mostPoints\n            mostPointsAt\n            mostVillages\n            mostVillagesAt\n            createdAt\n            dominance\n        }\n        dailyTribeStats(server: $server, limit: $dailyTribeStatsLimit, sort: $dailyTribeStatsSort, filter: $dailyTribeStatsFilter) {\n          items {\n            rank\n            rankAtt\n            rankDef\n            rankTotal\n            points\n            scoreAtt\n            scoreAtt\n            scoreDef\n            scoreTotal\n            villages\n            members\n          }\n        }\n        players(server: $server, sort: $playerSort, filter: $playerFilter) {\n          items {\n            id\n            rankAtt\n            rankDef\n            rankSup\n            rankTotal\n            scoreAtt\n            scoreAtt\n            scoreDef\n            scoreSup\n            scoreTotal\n            dailyGrowth\n          }\n        }\n    }\n";
-const ENNOBLEMENTS_QUERY = "\n    query ennoblements($server: String!, $filter: EnnoblementFilter!) {\n      ennoblements(server: $server, filter: $filter) {\n        total\n        items {\n          village {\n            id\n            name\n            x\n            y\n          }\n          oldOwner {\n            id\n            name\n          }\n          oldOwnerTribe {\n            id\n            tag\n          }\n          newOwner {\n            id\n            name\n          }\n          newOwnerTribe {\n            id\n            tag\n          }\n          ennobledAt\n        }\n      }\n    }\n";
+const ENNOBLEMENTS_QUERY = "\n    query ennoblements($server: String!, $limit: Int, $offset: Int, $sort: [String!], $filter: EnnoblementFilter!) {\n      ennoblements(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $filter) {\n        total\n        items {\n          village {\n            id\n            name\n            x\n            y\n          }\n          oldOwner {\n            id\n            name\n          }\n          oldOwnerTribe {\n            id\n            tag\n          }\n          newOwner {\n            id\n            name\n          }\n          newOwnerTribe {\n            id\n            tag\n          }\n          ennobledAt\n        }\n      }\n    }\n";
 const ENNOBLEMENTS_PER_PAGE = 15;
-const TRIBE_HISTORY_AND_TRIBE_DAILY_STATS_QUERY = "\nquery tribeHistoryAndTribeDailyStats($server: String!,\n     $tribeHistoryFilter: TribeHistoryFilter!,\n     $dailyTribeStatsFilter: DailyTribeStatsFilter!) {\n  tribeHistory(server: $server, filter: $tribeHistoryFilter) {\n    total\n    items {\n      totalVillages\n      points\n      rank\n      scoreAtt\n      rankAtt\n      scoreDef\n      rankDef\n      scoreTotal\n      rankTotal\n      createDate\n      totalMembers\n    }\n  }\n  dailyTribeStats(server: $server, filter: $dailyTribeStatsFilter) {\n    items {\n        points\n        scoreAtt\n        scoreDef\n        scoreTotal\n        villages\n        createDate\n        members\n      }\n    }\n}\n";
+const TRIBE_HISTORY_AND_TRIBE_DAILY_STATS_QUERY = "\nquery tribeHistoryAndTribeDailyStats($server: String!,\n     $tribeHistoryFilter: TribeHistoryFilter!,\n     $dailyTribeStatsFilter: DailyTribeStatsFilter!,\n     $sort: [String!],\n     $offset: Int,\n     $limit: Int) {\n  tribeHistory(server: $server, sort: $sort, limit: $limit, offset: $offset, filter: $tribeHistoryFilter) {\n    total\n    items {\n      totalVillages\n      points\n      rank\n      scoreAtt\n      rankAtt\n      scoreDef\n      rankDef\n      scoreTotal\n      rankTotal\n      createDate\n      totalMembers\n    }\n  }\n  dailyTribeStats(server: $server, sort: $sort, limit: $limit, offset: $offset, filter: $dailyTribeStatsFilter) {\n    items {\n        points\n        scoreAtt\n        scoreDef\n        scoreTotal\n        villages\n        createDate\n        members\n      }\n    }\n}\n";
 const TRIBE_HISTORY_PER_PAGE = 15;
-const TRIBE_MEMBERS_DAILY_STATS_QUERY = "\nquery tribeMembersDailyStats($server: String!,\n     $filter: DailyPlayerStatsFilter!) {\n  dailyPlayerStats(server: $server, filter: $filter) {\n    items {\n        player {\n          id\n          name\n        }\n        points\n        scoreAtt\n        scoreDef\n        scoreSup\n        scoreTotal\n        villages\n        createDate\n      }\n    }\n}\n";
+const TRIBE_MEMBERS_DAILY_STATS_QUERY = "\nquery tribeMembersDailyStats($server: String!,\n     $filter: DailyPlayerStatsFilter!,\n     $limit: Int,\n     $sort: [String!]) {\n  dailyPlayerStats(server: $server, limit: $limit, sort: $sort, filter: $filter) {\n    items {\n        player {\n          id\n          name\n        }\n        points\n        scoreAtt\n        scoreDef\n        scoreSup\n        scoreTotal\n        villages\n        createDate\n      }\n    }\n}\n";
 let MEMBERS_GROWTH_MODE = 'points';
-const TRIBE_CHANGES_QUERY = "\n    query tribeChanges($server: String!, $filter: TribeChangeFilter!) {\n      tribeChanges(server: $server, filter: $filter) {\n        total\n        items {\n          player {\n            id\n            name\n          }\n          newTribe {\n            id\n            tag\n          }\n          createdAt\n        }\n      }\n    }\n";
+const TRIBE_CHANGES_QUERY = "\n    query tribeChanges($server: String!, $limit: Int, $offset: Int, $sort: [String!], $filter: TribeChangeFilter!) {\n      tribeChanges(server: $server, offset: $offset, limit: $limit, sort: $sort, filter: $filter) {\n        total\n        items {\n          player {\n            id\n            name\n          }\n          newTribe {\n            id\n            tag\n          }\n          createdAt\n        }\n      }\n    }\n";
 const TRIBE_CHANGES_PAGINATION_CONTAINER_ID = 'tribeChangesPagination';
 const TRIBE_CHANGES_PER_PAGE = 15;
 const profileInfoTBody = document.querySelector('#content_value > table:nth-child(3) > tbody > tr > td:nth-child(1) > table > tbody');
@@ -1808,14 +1808,13 @@ const loadData = async () => {
     variables: {
       server: SERVER,
       id: TRIBE_ID,
+      dailyTribeStatsSort: ['createDate DESC'],
+      dailyTibeStatsLimit: 1,
       dailyTribeStatsFilter: {
-        sort: 'createDate DESC',
-        limit: 1,
         tribeID: [TRIBE_ID]
       },
+      playerSort: ['rank ASC'],
       playerFilter: {
-        sort: 'rank ASC',
-        limit: memberIDs.length,
         id: memberIDs
       }
     }
@@ -1940,11 +1939,11 @@ const handleShowTribeEnnoblementsClick = async e => {
           or: {
             oldOwnerTribeID: [TRIBE_ID],
             newOwnerTribeID: [TRIBE_ID]
+          }
         },
         offset: ENNOBLEMENTS_PER_PAGE * (page - 1),
         limit: ENNOBLEMENTS_PER_PAGE,
-          sort: 'ennobledAt DESC'
+        sort: ['ennobledAt DESC'],
-        },
         server: SERVER
       }
     });
@@ -1963,10 +1962,7 @@ const handleShowTribeHistoryClick = async e => {
   if (!isNaN(page)) {
     try {
       const filter = {
-        tribeID: [TRIBE_ID],
+        tribeID: [TRIBE_ID]
-        offset: TRIBE_HISTORY_PER_PAGE * (page - 1),
-        limit: TRIBE_HISTORY_PER_PAGE,
-        sort: 'createDate DESC'
       };
       const {
         tribeHistory,
@@ -1975,10 +1971,11 @@ const handleShowTribeHistoryClick = async e => {
         query: TRIBE_HISTORY_AND_TRIBE_DAILY_STATS_QUERY,
         variables: {
           server: SERVER,
+          offset: TRIBE_HISTORY_PER_PAGE * (page - 1),
+          limit: TRIBE_HISTORY_PER_PAGE,
+          sort: ['createDate DESC'],
           tribeHistoryFilter: filter,
-          dailyTribeStatsFilter: _objectSpread(_objectSpread({}, filter), {}, {
+          dailyTribeStatsFilter: filter
-            offset: filter.offset + 1
-          })
         }
       });
       (0, _showHistoryPopup.default)(e, tribeHistory, dailyTribeStats, {
@@ -2090,8 +2087,6 @@ const loadMembersGrowthData = async function loadMembersGrowthData() {
   const limit = memberIDs.length * (0, _differenceInDays.default)(createDateLTE, createDateGT);
   const filter = {
     playerID: memberIDs,
-    limit,
-    sort: 'createDate DESC',
     createDateLTE,
     createDateGT
   };
@@ -2099,6 +2094,8 @@ const loadMembersGrowthData = async function loadMembersGrowthData() {
     query: TRIBE_MEMBERS_DAILY_STATS_QUERY,
     variables: {
       filter,
+      limit,
+      sort: ['createDate DESC'],
       server: SERVER
     }
   });
@@ -2157,11 +2154,11 @@ const handleShowTribeChangesClick = async e => {
           or: {
             oldTribeID: [TRIBE_ID],
             newTribeID: [TRIBE_ID]
+          }
         },
         offset: TRIBE_CHANGES_PER_PAGE * (page - 1),
         limit: TRIBE_CHANGES_PER_PAGE,
-          sort: 'createdAt DESC'
+        sort: ['createdAt DESC'],
-        },
         server: SERVER
       }
     });
@@ -2191,7 +2188,7 @@ const loadVillages = async function loadVillages(variables) {
   try {
     const data = await (0, _requestCreator.default)({
       variables,
-      query: "\n        query villages($server: String!, $filter: VillageFilter!) {\n          villages(server: $server, filter: $filter) {\n            ".concat(total ? 'total' : '', "\n            items {\n              id\n              x\n              y\n            }\n          }\n        }\n      ")
+      query: "\n        query villages($server: String!, $sort: [String!], $limit: Int, $offset: Int, $filter: VillageFilter!) {\n          villages(server: $server, sort: $sort, limit: $limit, offset: $offset, filter: $filter) {\n            ".concat(total ? 'total' : '', "\n            items {\n              id\n              x\n              y\n            }\n          }\n        }\n      ")
     });
 
     if (data && data.villages && Array.isArray(data.villages.items)) {
@@ -2227,10 +2224,10 @@ const handleExportTribeVillagesFormSubmit = async e => {
       xGTE: parseInt(e.target[1].value),
       yLTE: parseInt(e.target[2].value),
       yGTE: parseInt(e.target[3].value),
-      limit: isNaN(limit) || !limit ? 0 : limit,
+      playerID: getMemberIDs()
-      playerID: getMemberIDs(),
-      sort: 'id ASC'
     },
+    limit: isNaN(limit) || !limit ? 0 : limit,
+    sort: ['id ASC'],
     server: SERVER
   };
   showLoadingDialog();
@@ -2248,9 +2245,8 @@ const handleExportTribeVillagesFormSubmit = async e => {
     for (let offset = length; offset < total; offset += length) {
       showLoadingDialog(offset, total);
       const more = await loadVillages(_objectSpread(_objectSpread({}, variables), {}, {
-        filter: _objectSpread(_objectSpread({}, variables.filter), {}, {
+        filter: _objectSpread({}, variables.filter),
         offset
-        })
       }));
       items = [...items, ...more.items];
     }

dist/extendedVillageProfile.js

@@ -804,7 +804,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedVillageProfile.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedVillageProfile.js
-// @version      0.7.1
+// @version      0.7.2
 // @description  Extended village profile
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=info_village*
@@ -813,8 +813,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 // ==/UserScript==
 const SERVER = (0, _getCurrentServer.default)();
 const VILLAGE_ID = (0, _getIDFromURL.default)(window.location.search);
-const LAST_CONQUER_QUERY = "\n    query ennoblements($server: String!, $filter: EnnoblementFilter!) {\n        ennoblements(server: $server, filter: $filter) {\n            items {\n                ennobledAt\n                village {\n                    id\n                }\n            }\n        }\n    }\n";
+const LAST_CONQUER_QUERY = "\n    query ennoblements($server: String!, $limit: Int, $sort: [String!], $filter: EnnoblementFilter!) {\n        ennoblements(server: $server, limit: $limit, sort: $sort, filter: $filter) {\n            items {\n                ennobledAt\n                village {\n                    id\n                }\n            }\n        }\n    }\n";
-const ENNOBLEMENTS_QUERY = "\n    query ennoblements($server: String!, $filter: EnnoblementFilter!) {\n      ennoblements(server: $server, filter: $filter) {\n        total\n        items {\n          village {\n            id\n            name\n            x\n            y\n          }\n          oldOwner {\n            id\n            name\n          }\n          oldOwnerTribe {\n            id\n            tag\n          }\n          newOwner {\n            id\n            name\n          }\n          newOwnerTribe {\n            id\n            tag\n          }\n          ennobledAt\n        }\n      }\n    }\n";
+const ENNOBLEMENTS_QUERY = "\n    query ennoblements($server: String!, $offset: Int, $limit: Int, $sort: [String!], $filter: EnnoblementFilter!) {\n      ennoblements(server: $server, offset: $offset, limit: $limit, sort: $sort, filter: $filter) {\n        total\n        items {\n          village {\n            id\n            name\n            x\n            y\n          }\n          oldOwner {\n            id\n            name\n          }\n          oldOwnerTribe {\n            id\n            tag\n          }\n          newOwner {\n            id\n            name\n          }\n          newOwnerTribe {\n            id\n            tag\n          }\n          ennobledAt\n        }\n      }\n    }\n";
 const ENNOBLEMENTS_PER_PAGE = 15;
 const CURR_SERVER_CONFIG = "\n    query server($key: String!) {\n        server(key: $key) {\n            config {\n              speed\n            }\n            unitConfig {\n              spear {\n                pop\n              }\n              sword {\n                pop\n              }\n              axe {\n                pop\n              }\n              archer {\n                pop\n              }\n              spy {\n                pop\n              }\n              light {\n                pop\n              }\n              marcher {\n                pop\n              }\n              heavy {\n                pop\n              }\n              ram {\n                pop\n              }\n              catapult {\n                pop\n              }\n              knight {\n                pop\n              }\n              snob {\n                pop\n              }\n            }\n        }\n    }\n";
 const SERVER_CONFIG_LOCAL_STORAGE_KEY = 'kiszkowaty_extended_village_profile_server_cfg';
@@ -859,11 +859,11 @@ const loadPageData = async () => {
     variables: {
       server: SERVER,
       filter: {
-        villageID: [VILLAGE_ID],
+        villageID: [VILLAGE_ID]
-        sort: 'ennobledAt DESC',
+      },
+      sort: ['ennobledAt DESC'],
       limit: 1
     }
-    }
   });
   return data;
 };
@@ -877,11 +877,11 @@ const handleShowTribeEnnoblementsClick = async e => {
       query: ENNOBLEMENTS_QUERY,
       variables: {
         filter: {
-          villageID: [VILLAGE_ID],
+          villageID: [VILLAGE_ID]
+        },
         offset: ENNOBLEMENTS_PER_PAGE * (page - 1),
         limit: ENNOBLEMENTS_PER_PAGE,
-          sort: 'ennobledAt DESC'
+        sort: ['ennobledAt DESC'],
-        },
         server: SERVER
       }
     });

dist/quickbar/bonusBarbarianVillageFinder.js

@@ -9,5 +9,5 @@ parcelRequire=function(e,r,t,n){var i,o="function"==typeof parcelRequire&&parcel
 },{}],"XOOL":[function(require,module,exports) {
 "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.calcDistanceBetweenTwoPoints=void 0;const e=(e,t,s,o)=>{const c=e-s,n=t-o;return Math.sqrt(c*c+n*n)};exports.calcDistanceBetweenTwoPoints=e;
 },{}],"fvjy":[function(require,module,exports) {
-"use strict";var e=o(require("./libs/requestCreator")),t=o(require("./i18n/bonusBarbarianVillageFinder")),n=o(require("./utils/getCurrentServer")),r=require("./utils/tribalwars"),a=require("./utils/math");function o(e){return e&&e.__esModule?e:{default:e}}function c(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),n.push.apply(n,r)}return n}function i(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?c(Object(n),!0).forEach(function(t){s(e,t,n[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))})}return e}function s(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}const l=(0,n.default)(),u="\n  query villages($server: String!, $filter: VillageFilter) {\n    villages(server: $server, filter: $filter) {\n      total\n      items {\n        id\n        name\n        bonus\n        x\n        y\n      }\n    }\n  }\n",d="bonusBarbarianVillageFinderTable",b="actualCoords",f=(0,t.default)();let p=void 0;const y=(e,t)=>({query:u,variables:{server:l,filter:{bonus:e,sort:"id DESC",playerID:[0],offset:t}}}),m=async t=>{const{villages:n}=await(0,e.default)(y(t,0));for(let r=n.length;r<n.total;r+=1e3){const r=await(0,e.default)(y(t,0));n.items=[...n.items,...r.villages.items]}return n},v=async e=>{e.preventDefault();const t=await m(parseInt(e.target[0].value)),n=TWMap.pos;t.items=t.items.map(e=>i(i({},e),{},{distance:(0,a.calcDistanceBetweenTwoPoints)(n[0],n[1],e.x,e.y)})).sort((e,t)=>e.distance-t.distance),document.querySelector("#"+d).innerHTML=h(t.items)},g=()=>{let e=[];for(let t in TWMap.bonus_data)e.push({value:t,text:TWMap.bonus_data[t].text});return e},h=e=>"\n        <tbody>\n            <tr>\n                <th>\n                    ".concat(f.village,"\n                </th>\n                <th>\n                    ").concat(f.distance,"\n                </th>\n                <th>\n                    ").concat(f.action,"\n                </th>\n            </tr>\n            ").concat(Array.isArray(e)?e.map(e=>'<tr>\n                <td>\n                    <a href="'.concat((0,r.formatVillageURL)(e.id),'">\n                        ').concat((0,r.formatVillageName)(e.name,e.x,e.y),"\n                    </a>\n                </td>\n                <td>\n                    ").concat(e.distance.toFixed(1),'\n                </td>\n                <td>\n                    <a href="#" onclick="return TWMap.focusUserSpecified(').concat(e.x,", ").concat(e.y,')">Center</a>\n                </td>\n            </tr>')).join(""):"","\n        </tbody>\n    "),O=()=>{document.querySelector("#actualCoords").innerHTML="".concat(f.actualCoords,": <strong>").concat(TWMap.pos.join("|"),"</strong>")},j=()=>{const e='\n        <p id="'.concat("actualCoords",'"></p>\n        <form>\n            <select>\n                ').concat(g().map(e=>'<option value="'.concat(e.value,'">').concat(e.text,"</option>")).join(""),'\n            </select>\n            <button type="submit">').concat(f.searchBonusBarbarianVillages,'</button>\n        </form>\n        <table class="vis" style="width: 100%;" id="').concat(d,'">\n            ').concat(h(),"\n        </table>\n    ");p||((p=document.createElement("div")).classList.add("containerBorder"),p.style.clear="both",document.querySelector("#map_big").appendChild(p)),p.innerHTML=e,p.querySelector("form").addEventListener("submit",v),O(),setInterval(O,1e3)};j();
+"use strict";var t=o(require("./libs/requestCreator")),e=o(require("./i18n/bonusBarbarianVillageFinder")),n=o(require("./utils/getCurrentServer")),r=require("./utils/tribalwars"),a=require("./utils/math");function o(t){return t&&t.__esModule?t:{default:t}}function c(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,r)}return n}function i(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?c(Object(n),!0).forEach(function(e){s(t,e,n[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))})}return t}function s(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}const l=(0,n.default)(),u="\n  query villages($server: String!, $filter: VillageFilter, $sort: [String!], $offset: Int) {\n    villages(server: $server, filter: $filter, offset: $offset, sort: $sort) {\n      total\n      items {\n        id\n        name\n        bonus\n        x\n        y\n      }\n    }\n  }\n",d="bonusBarbarianVillageFinderTable",f="actualCoords",b=(0,e.default)();let p=void 0;const y=(t,e)=>({query:u,variables:{server:l,sort:["id DESC"],filter:{bonus:t,playerID:[0]},offset:e}}),m=async e=>{const{villages:n}=await(0,t.default)(y(e,0));for(let r=n.length;r<n.total;r+=1e3){const r=await(0,t.default)(y(e,0));n.items=[...n.items,...r.villages.items]}return n},g=async t=>{t.preventDefault();const e=await m(parseInt(t.target[0].value)),n=TWMap.pos;e.items=e.items.map(t=>i(i({},t),{},{distance:(0,a.calcDistanceBetweenTwoPoints)(n[0],n[1],t.x,t.y)})).sort((t,e)=>t.distance-e.distance),document.querySelector("#"+d).innerHTML=h(e.items)},v=()=>{let t=[];for(let e in TWMap.bonus_data)t.push({value:e,text:TWMap.bonus_data[e].text});return t},h=t=>"\n        <tbody>\n            <tr>\n                <th>\n                    ".concat(b.village,"\n                </th>\n                <th>\n                    ").concat(b.distance,"\n                </th>\n                <th>\n                    ").concat(b.action,"\n                </th>\n            </tr>\n            ").concat(Array.isArray(t)?t.map(t=>'<tr>\n                <td>\n                    <a href="'.concat((0,r.formatVillageURL)(t.id),'">\n                        ').concat((0,r.formatVillageName)(t.name,t.x,t.y),"\n                    </a>\n                </td>\n                <td>\n                    ").concat(t.distance.toFixed(1),'\n                </td>\n                <td>\n                    <a href="#" onclick="return TWMap.focusUserSpecified(').concat(t.x,", ").concat(t.y,')">Center</a>\n                </td>\n            </tr>')).join(""):"","\n        </tbody>\n    "),O=()=>{document.querySelector("#actualCoords").innerHTML="".concat(b.actualCoords,": <strong>").concat(TWMap.pos.join("|"),"</strong>")},j=()=>{const t='\n        <p id="'.concat("actualCoords",'"></p>\n        <form>\n            <select>\n                ').concat(v().map(t=>'<option value="'.concat(t.value,'">').concat(t.text,"</option>")).join(""),'\n            </select>\n            <button type="submit">').concat(b.searchBonusBarbarianVillages,'</button>\n        </form>\n        <table class="vis" style="width: 100%;" id="').concat(d,'">\n            ').concat(h(),"\n        </table>\n    ");p||((p=document.createElement("div")).classList.add("containerBorder"),p.style.clear="both",document.querySelector("#map_big").appendChild(p)),p.innerHTML=t,p.querySelector("form").addEventListener("submit",g),O(),setInterval(O,1e3)};j();
 },{"./libs/requestCreator":"Ph2E","./i18n/bonusBarbarianVillageFinder":"MRps","./utils/getCurrentServer":"DMkL","./utils/tribalwars":"fHHP","./utils/math":"XOOL"}]},{},["fvjy"], null)

src/bonusBarbarianVillageFinder.js

@@ -9,7 +9,7 @@ import { calcDistanceBetweenTwoPoints } from './utils/math';
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/bonusBarbarianVillageFinder.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/bonusBarbarianVillageFinder.js
-// @version      0.4.2
+// @version      0.4.3
 // @description  Bonus barbarian village finder
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=map*
@@ -18,8 +18,8 @@ import { calcDistanceBetweenTwoPoints } from './utils/math';
 
 const SERVER = getCurrentServer();
 const QUERY = `
-  query villages($server: String!, $filter: VillageFilter) {
+  query villages($server: String!, $filter: VillageFilter, $sort: [String!], $offset: Int) {
-    villages(server: $server, filter: $filter) {
+    villages(server: $server, filter: $filter, offset: $offset, sort: $sort) {
       total
       items {
         id
@@ -41,12 +41,12 @@ const buildReqOptions = (bonus, offset) => {
     query: QUERY,
     variables: {
       server: SERVER,
+      sort: ['id DESC'],
       filter: {
         bonus,
-        sort: 'id DESC',
         playerID: [0],
-        offset,
       },
+      offset,
     },
   };
 };

src/dailyAchievements.js

@@ -9,7 +9,7 @@ import getCurrentServer from './utils/getCurrentServer';
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/dailyAchievements.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/dailyAchievements.js
-// @version      0.4.0
+// @version      0.4.1
 // @description  Daily achievements
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=info_player&mode=awards*
@@ -28,7 +28,7 @@ const SERVER_QUERY = `
 `;
 const DAILY_STATS_QUERY = `
     query data($server: String!, $createDateGTE: Time!) {
-        dailyPlayerStatsOrderedByScoreAtt: dailyPlayerStats(server: $server, filter: { sort: "scoreAtt DESC", createDateGTE: $createDateGTE, playerFilter: { sort: "id DESC" }, limit: 5 }) {
+        dailyPlayerStatsOrderedByScoreAtt: dailyPlayerStats(server: $server, sort: ["scoreAtt DESC", "playerID desc"], filter: { createDateGTE: $createDateGTE }, limit: 5) {
             items {
                 scoreAtt
                 player {
@@ -37,7 +37,7 @@ const DAILY_STATS_QUERY = `
                 }
             }
         }
-        dailyPlayerStatsOrderedByScoreDef: dailyPlayerStats(server: $server, filter: { sort: "scoreDef DESC", createDateGTE: $createDateGTE, playerFilter: { sort: "id DESC" }, limit: 5 }) {
+        dailyPlayerStatsOrderedByScoreDef: dailyPlayerStats(server: $server, sort: ["scoreDef DESC", "playerID desc"], filter: { createDateGTE: $createDateGTE }, limit: 5) {
             items {
                 scoreDef
                 player {
@@ -46,7 +46,7 @@ const DAILY_STATS_QUERY = `
                 }
             }
         }
-        dailyPlayerStatsOrderedByScoreSup: dailyPlayerStats(server: $server, filter: { sort: "scoreSup DESC", createDateGTE: $createDateGTE, playerFilter: { sort: "id DESC" }, limit: 5 }) {
+        dailyPlayerStatsOrderedByScoreSup: dailyPlayerStats(server: $server, sort: ["scoreSup DESC", "playerID desc"], filter: { createDateGTE: $createDateGTE }, limit: 5) {
             items {
                 scoreSup
                 player {
@@ -55,7 +55,7 @@ const DAILY_STATS_QUERY = `
                 }
             }
         }
-        dailyPlayerStatsOrderedByVillages: dailyPlayerStats(server: $server, filter: { sort: "villages DESC", createDateGTE: $createDateGTE, playerFilter: { sort: "id DESC" }, limit: 5 }) {
+        dailyPlayerStatsOrderedByVillages: dailyPlayerStats(server: $server, sort: ["villages DESC", "playerID desc"], filter: { createDateGTE: $createDateGTE }, limit: 5) {
             items {
                 villages
                 player {

src/extendedMapPopup.js

@@ -14,7 +14,7 @@ import countLoyalty from './utils/countLoyalty';
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedMapPopup.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedMapPopup.js
-// @version      0.6.1
+// @version      0.6.2
 // @description  Extended map popup
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=map*
@@ -74,8 +74,8 @@ const CURR_SERVER_CONFIG = `
     }
 `;
 const LAST_VILLAGE_CONQUER_QUERY = `
-    query ennoblements($server: String!, $filter: EnnoblementFilter!) {
+    query ennoblements($server: String!, $filter: EnnoblementFilter!, $sort: [String!], $limit: Int) {
-        ennoblements(server: $server, filter: $filter) {
+        ennoblements(server: $server, filter: $filter, sort: $sort, limit: $limit) {
             items {
                 ennobledAt
                 village {
@@ -138,11 +138,11 @@ const loadVillageData = async (id, { cacheOnly = false } = {}) => {
       query: LAST_VILLAGE_CONQUER_QUERY,
       variables: {
         server: SERVER,
+        sort: ['ennobledAt DESC'],
         filter: {
           villageID: [id],
-          sort: 'ennobledAt DESC',
-          limit: 1,
         },
+        limit: 1,
       },
     });
     TWMap.popup.extendedMapPopupCache[id] = data;

src/extendedPlayerProfile.js

@@ -24,7 +24,7 @@ import { setItem, getItem } from './utils/localStorage';
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedPlayerProfile.js
-// @version      1.1.4
+// @version      1.1.5
 // @description  Extended player profile
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=info_player*
@@ -40,7 +40,7 @@ if (isNaN(PLAYER_ID) || !PLAYER_ID) {
 }
 const LOCAL_STORAGE_KEY = 'kichiyaki_extended_player_profile' + PLAYER_ID;
 const PLAYER_QUERY = `
-    query player($server: String!, $id: Int!, $filter: DailyPlayerStatsFilter) {
+    query player($server: String!, $id: Int!, $limit: Int, $sort: [String!], $filter: DailyPlayerStatsFilter) {
         player(server: $server, id: $id) {
             id
             name
@@ -59,7 +59,7 @@ const PLAYER_QUERY = `
             }
             dailyGrowth
         }
-        dailyPlayerStats(server: $server, filter: $filter) {
+        dailyPlayerStats(server: $server, limit: $limit, sort: $sort, filter: $filter) {
             items {
               rank
               rankAtt
@@ -78,8 +78,8 @@ const PLAYER_QUERY = `
     }
 `;
 const TRIBE_CHANGES_QUERY = `
-    query tribeChanges($server: String!, $filter: TribeChangeFilter!) {
+    query tribeChanges($server: String!, $limit: Int, $offset: Int, $sort: [String!], $filter: TribeChangeFilter!) {
-      tribeChanges(server: $server, filter: $filter) {
+      tribeChanges(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $filter) {
         total
         items {
           oldTribe {
@@ -100,8 +100,11 @@ const TRIBE_CHANGES_PER_PAGE = 15;
 const PLAYER_HISTORY_AND_PLAYER_DAILY_STATS_QUERY = `
 query playerHistoryAndPlayerDailyStats($server: String!,
      $playerHistoryFilter: PlayerHistoryFilter!,
-     $dailyPlayerStatsFilter: DailyPlayerStatsFilter!) {
+     $dailyPlayerStatsFilter: DailyPlayerStatsFilter!,
-  playerHistory(server: $server, filter: $playerHistoryFilter) {
+     $limit: Int,
+     $offset: Int,
+     $sort: [String!]) {
+  playerHistory(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $playerHistoryFilter) {
     total
     items {
       totalVillages
@@ -122,7 +125,7 @@ query playerHistoryAndPlayerDailyStats($server: String!,
       createDate
     }
   }
-  dailyPlayerStats(server: $server, filter: $dailyPlayerStatsFilter) {
+  dailyPlayerStats(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $dailyPlayerStatsFilter) {
     items {
         points
         scoreAtt
@@ -138,8 +141,8 @@ query playerHistoryAndPlayerDailyStats($server: String!,
 `;
 const PLAYER_HISTORY_PER_PAGE = 15;
 const ENNOBLEMENTS_QUERY = `
-    query ennoblements($server: String!, $filter: EnnoblementFilter!) {
+    query ennoblements($server: String!, $limit: Int, $offset: Int, $sort: [String!], $filter: EnnoblementFilter!) {
-      ennoblements(server: $server, filter: $filter) {
+      ennoblements(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $filter) {
         total
         items {
           village {
@@ -230,9 +233,9 @@ const loadData = async () => {
     variables: {
       server: SERVER,
       id: PLAYER_ID,
-      filter: {
-        sort: 'createDate DESC',
       limit: 1,
+      sort: ['createDate DESC'],
+      filter: {
         playerID: [PLAYER_ID],
       },
     },
@@ -567,10 +570,10 @@ const handleShowTribeChangesButtonClick = async (e) => {
       variables: {
         filter: {
           playerID: [PLAYER_ID],
+        },
+        sort: ['createdAt DESC'],
         offset: TRIBE_CHANGES_PER_PAGE * (page - 1),
         limit: TRIBE_CHANGES_PER_PAGE,
-          sort: 'createdAt DESC',
-        },
         server: SERVER,
       },
     });
@@ -585,19 +588,16 @@ const handleShowPlayerHistoryClick = async (e) => {
     try {
       const filter = {
         playerID: [PLAYER_ID],
-        offset: PLAYER_HISTORY_PER_PAGE * (page - 1),
-        limit: PLAYER_HISTORY_PER_PAGE,
-        sort: 'createDate DESC',
       };
       const { playerHistory, dailyPlayerStats } = await requestCreator({
         query: PLAYER_HISTORY_AND_PLAYER_DAILY_STATS_QUERY,
         variables: {
           server: SERVER,
           playerHistoryFilter: filter,
-          dailyPlayerStatsFilter: {
+          offset: PLAYER_HISTORY_PER_PAGE * (page - 1),
-            ...filter,
+          limit: PLAYER_HISTORY_PER_PAGE,
-            offset: filter.offset + 1,
+          sort: ['createDate DESC'],
-          },
+          dailyPlayerStatsFilter: filter,
         },
       });
       showHistoryPopup(e, playerHistory, dailyPlayerStats, {
@@ -624,10 +624,10 @@ const handleShowPlayerEnnoblementsClick = async (e) => {
             oldOwnerID: [PLAYER_ID],
             newOwnerID: [PLAYER_ID],
           },
+        },
         offset: ENNOBLEMENTS_PER_PAGE * (page - 1),
         limit: ENNOBLEMENTS_PER_PAGE,
-          sort: 'ennobledAt DESC',
+        sort: ['ennobledAt DESC'],
-        },
         server: SERVER,
       },
     });

src/extendedTribeProfile.js

@@ -24,7 +24,7 @@ import { formatPlayerURL as formatPlayerURLTribalWars } from './utils/tribalwars
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedTribeProfile.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedTribeProfile.js
-// @version      1.0.8
+// @version      1.0.9
 // @description  Extended tribe profile
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=info_ally*
@@ -36,7 +36,7 @@ const SERVER = getCurrentServer();
 const TRIBE_ID = getIDFromURL(window.location.search);
 const LOCAL_STORAGE_KEY = 'kichiyaki_extended_tribe_profile' + TRIBE_ID;
 const TRIBE_QUERY = `
-    query tribe($server: String!, $id: Int!, $playerFilter: PlayerFilter!, $dailyTribeStatsFilter: DailyTribeStatsFilter!) {
+    query tribe($server: String!, $id: Int!, $dailyTribeStatsSort: [String!], $dailyTribeStatsLimit: Int, $playerSort: [String!], $playerFilter: PlayerFilter!, $dailyTribeStatsFilter: DailyTribeStatsFilter!) {
         tribe(server: $server, id: $id) {
             id
             bestRank
@@ -48,7 +48,7 @@ const TRIBE_QUERY = `
             createdAt
             dominance
         }
-        dailyTribeStats(server: $server, filter: $dailyTribeStatsFilter) {
+        dailyTribeStats(server: $server, limit: $dailyTribeStatsLimit, sort: $dailyTribeStatsSort, filter: $dailyTribeStatsFilter) {
           items {
             rank
             rankAtt
@@ -63,7 +63,7 @@ const TRIBE_QUERY = `
             members
           }
         }
-        players(server: $server, filter: $playerFilter) {
+        players(server: $server, sort: $playerSort, filter: $playerFilter) {
           items {
             id
             rankAtt
@@ -81,8 +81,8 @@ const TRIBE_QUERY = `
     }
 `;
 const ENNOBLEMENTS_QUERY = `
-    query ennoblements($server: String!, $filter: EnnoblementFilter!) {
+    query ennoblements($server: String!, $limit: Int, $offset: Int, $sort: [String!], $filter: EnnoblementFilter!) {
-      ennoblements(server: $server, filter: $filter) {
+      ennoblements(server: $server, limit: $limit, offset: $offset, sort: $sort, filter: $filter) {
         total
         items {
           village {
@@ -116,8 +116,11 @@ const ENNOBLEMENTS_PER_PAGE = 15;
 const TRIBE_HISTORY_AND_TRIBE_DAILY_STATS_QUERY = `
 query tribeHistoryAndTribeDailyStats($server: String!,
      $tribeHistoryFilter: TribeHistoryFilter!,
-     $dailyTribeStatsFilter: DailyTribeStatsFilter!) {
+     $dailyTribeStatsFilter: DailyTribeStatsFilter!,
-  tribeHistory(server: $server, filter: $tribeHistoryFilter) {
+     $sort: [String!],
+     $offset: Int,
+     $limit: Int) {
+  tribeHistory(server: $server, sort: $sort, limit: $limit, offset: $offset, filter: $tribeHistoryFilter) {
     total
     items {
       totalVillages
@@ -133,7 +136,7 @@ query tribeHistoryAndTribeDailyStats($server: String!,
       totalMembers
     }
   }
-  dailyTribeStats(server: $server, filter: $dailyTribeStatsFilter) {
+  dailyTribeStats(server: $server, sort: $sort, limit: $limit, offset: $offset, filter: $dailyTribeStatsFilter) {
     items {
         points
         scoreAtt
@@ -149,8 +152,10 @@ query tribeHistoryAndTribeDailyStats($server: String!,
 const TRIBE_HISTORY_PER_PAGE = 15;
 const TRIBE_MEMBERS_DAILY_STATS_QUERY = `
 query tribeMembersDailyStats($server: String!,
-     $filter: DailyPlayerStatsFilter!) {
+     $filter: DailyPlayerStatsFilter!,
-  dailyPlayerStats(server: $server, filter: $filter) {
+     $limit: Int,
+     $sort: [String!]) {
+  dailyPlayerStats(server: $server, limit: $limit, sort: $sort, filter: $filter) {
     items {
         player {
           id
@@ -169,8 +174,8 @@ query tribeMembersDailyStats($server: String!,
 `;
 let MEMBERS_GROWTH_MODE = 'points';
 const TRIBE_CHANGES_QUERY = `
-    query tribeChanges($server: String!, $filter: TribeChangeFilter!) {
+    query tribeChanges($server: String!, $limit: Int, $offset: Int, $sort: [String!], $filter: TribeChangeFilter!) {
-      tribeChanges(server: $server, filter: $filter) {
+      tribeChanges(server: $server, offset: $offset, limit: $limit, sort: $sort, filter: $filter) {
         total
         items {
           player {
@@ -236,14 +241,13 @@ const loadData = async () => {
     variables: {
       server: SERVER,
       id: TRIBE_ID,
+      dailyTribeStatsSort: ['createDate DESC'],
+      dailyTibeStatsLimit: 1,
       dailyTribeStatsFilter: {
-        sort: 'createDate DESC',
-        limit: 1,
         tribeID: [TRIBE_ID],
       },
+      playerSort: ['rank ASC'],
       playerFilter: {
-        sort: 'rank ASC',
-        limit: memberIDs.length,
         id: memberIDs,
       },
     },
@@ -374,10 +378,10 @@ const handleShowTribeEnnoblementsClick = async (e) => {
             oldOwnerTribeID: [TRIBE_ID],
             newOwnerTribeID: [TRIBE_ID],
           },
+        },
         offset: ENNOBLEMENTS_PER_PAGE * (page - 1),
         limit: ENNOBLEMENTS_PER_PAGE,
-          sort: 'ennobledAt DESC',
+        sort: ['ennobledAt DESC'],
-        },
         server: SERVER,
       },
     });
@@ -396,19 +400,16 @@ const handleShowTribeHistoryClick = async (e) => {
     try {
       const filter = {
         tribeID: [TRIBE_ID],
-        offset: TRIBE_HISTORY_PER_PAGE * (page - 1),
-        limit: TRIBE_HISTORY_PER_PAGE,
-        sort: 'createDate DESC',
       };
       const { tribeHistory, dailyTribeStats } = await requestCreator({
         query: TRIBE_HISTORY_AND_TRIBE_DAILY_STATS_QUERY,
         variables: {
           server: SERVER,
+          offset: TRIBE_HISTORY_PER_PAGE * (page - 1),
+          limit: TRIBE_HISTORY_PER_PAGE,
+          sort: ['createDate DESC'],
           tribeHistoryFilter: filter,
-          dailyTribeStatsFilter: {
+          dailyTribeStatsFilter: filter,
-            ...filter,
-            offset: filter.offset + 1,
-          },
         },
       });
       showHistoryPopup(e, tribeHistory, dailyTribeStats, {
@@ -574,8 +575,6 @@ const loadMembersGrowthData = async ({ createDateLTE, createDateGT } = {}) => {
     memberIDs.length * differenceInDays(createDateLTE, createDateGT);
   const filter = {
     playerID: memberIDs,
-    limit,
-    sort: 'createDate DESC',
     createDateLTE,
     createDateGT,
   };
@@ -583,6 +582,8 @@ const loadMembersGrowthData = async ({ createDateLTE, createDateGT } = {}) => {
     query: TRIBE_MEMBERS_DAILY_STATS_QUERY,
     variables: {
       filter,
+      limit,
+      sort: ['createDate DESC'],
       server: SERVER,
     },
   });
@@ -673,10 +674,10 @@ const handleShowTribeChangesClick = async (e) => {
             oldTribeID: [TRIBE_ID],
             newTribeID: [TRIBE_ID],
           },
+        },
         offset: TRIBE_CHANGES_PER_PAGE * (page - 1),
         limit: TRIBE_CHANGES_PER_PAGE,
-          sort: 'createdAt DESC',
+        sort: ['createdAt DESC'],
-        },
         server: SERVER,
       },
     });
@@ -709,8 +710,8 @@ const loadVillages = async (variables, total = false) => {
     const data = await requestCreator({
       variables,
       query: `
-        query villages($server: String!, $filter: VillageFilter!) {
+        query villages($server: String!, $sort: [String!], $limit: Int, $offset: Int, $filter: VillageFilter!) {
-          villages(server: $server, filter: $filter) {
+          villages(server: $server, sort: $sort, limit: $limit, offset: $offset, filter: $filter) {
             ${total ? 'total' : ''}
             items {
               id
@@ -752,10 +753,10 @@ const handleExportTribeVillagesFormSubmit = async (e) => {
       xGTE: parseInt(e.target[1].value),
       yLTE: parseInt(e.target[2].value),
       yGTE: parseInt(e.target[3].value),
-      limit: isNaN(limit) || !limit ? 0 : limit,
       playerID: getMemberIDs(),
-      sort: 'id ASC',
     },
+    limit: isNaN(limit) || !limit ? 0 : limit,
+    sort: ['id ASC'],
     server: SERVER,
   };
   showLoadingDialog();
@@ -772,8 +773,8 @@ const handleExportTribeVillagesFormSubmit = async (e) => {
         ...variables,
         filter: {
           ...variables.filter,
-          offset,
         },
+        offset,
       });
       items = [...items, ...more.items];
     }

src/extendedVillageProfile.js

@@ -15,7 +15,7 @@ import showEnnoblementsPopup from './common/showEnnoblementsPopup';
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedVillageProfile.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/extendedVillageProfile.js
-// @version      0.7.1
+// @version      0.7.2
 // @description  Extended village profile
 // @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*screen=info_village*
@@ -26,8 +26,8 @@ import showEnnoblementsPopup from './common/showEnnoblementsPopup';
 const SERVER = getCurrentServer();
 const VILLAGE_ID = getIDFromURL(window.location.search);
 const LAST_CONQUER_QUERY = `
-    query ennoblements($server: String!, $filter: EnnoblementFilter!) {
+    query ennoblements($server: String!, $limit: Int, $sort: [String!], $filter: EnnoblementFilter!) {
-        ennoblements(server: $server, filter: $filter) {
+        ennoblements(server: $server, limit: $limit, sort: $sort, filter: $filter) {
             items {
                 ennobledAt
                 village {
@@ -38,8 +38,8 @@ const LAST_CONQUER_QUERY = `
     }
 `;
 const ENNOBLEMENTS_QUERY = `
-    query ennoblements($server: String!, $filter: EnnoblementFilter!) {
+    query ennoblements($server: String!, $offset: Int, $limit: Int, $sort: [String!], $filter: EnnoblementFilter!) {
-      ennoblements(server: $server, filter: $filter) {
+      ennoblements(server: $server, offset: $offset, limit: $limit, sort: $sort, filter: $filter) {
         total
         items {
           village {
@@ -167,9 +167,9 @@ const loadPageData = async () => {
       server: SERVER,
       filter: {
         villageID: [VILLAGE_ID],
-        sort: 'ennobledAt DESC',
-        limit: 1,
       },
+      sort: ['ennobledAt DESC'],
+      limit: 1,
     },
   });
   return data;
@@ -184,10 +184,10 @@ const handleShowTribeEnnoblementsClick = async (e) => {
       variables: {
         filter: {
           villageID: [VILLAGE_ID],
+        },
         offset: ENNOBLEMENTS_PER_PAGE * (page - 1),
         limit: ENNOBLEMENTS_PER_PAGE,
-          sort: 'ennobledAt DESC',
+        sort: ['ennobledAt DESC'],
-        },
         server: SERVER,
       },
     });

src/latestEnnoblements.js

@@ -16,9 +16,9 @@ import loadTranslations from './i18n/latestEnnoblements';
 // @namespace    https://github.com/tribalwarshelp/scripts
 // @updateURL    https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/latestEnnoblements.js
 // @downloadURL  https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/latestEnnoblements.js
-// @version      1.0.4
+// @version      1.0.5
 // @description  Show the latest ennoblements
-// @author       Kichiyaki http://dawid-wysokinski.pl/ | Icon author *GD*
+// @author       Kichiyaki http://dawid-wysokinski.pl/
 // @match        *://*/game.php*
 // @grant        none
 // @run-at       document-end