diff --git a/dist/quickbar/warStatsGenerator.js b/dist/quickbar/warStatsGenerator.js
index 76cb76b..093833a 100644
--- a/dist/quickbar/warStatsGenerator.js
+++ b/dist/quickbar/warStatsGenerator.js
@@ -7,5 +7,5 @@ parcelRequire=function(e,r,t,n){var i,o="function"==typeof parcelRequire&&parcel
},{}],"chDM":[function(require,module,exports) {
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.POPUP_SELECTOR=void 0;const e=".popup_helper",t="#inline_popup";exports.POPUP_SELECTOR=t;var o=function(){let{e:e,title:o,html:n,id:l}=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};const p=document.querySelector(t);p&&(p.style.width="auto",p.style.maxWidth="1000px"),p.classList.contains("show")?(p.querySelector("#inline_popup_title").innerHTML=o,p.querySelector("#inline_popup_content").innerHTML=n):inlinePopup(e,l,null,{offset_x:0,offset_y:0},n,o);const i=document.querySelector(".popup_helper");i&&(i.style.width="auto",i.style.position="fixed",i.style.zIndex="50001")};exports.default=o;
},{}],"H9GS":[function(require,module,exports) {
-"use strict";var e=a(require("./libs/requestCreator")),t=a(require("./i18n/warStatsGenerator")),n=a(require("./utils/getCurrentServer")),r=i(require("./utils/showPopup"));function o(){if("function"!=typeof WeakMap)return null;var e=new WeakMap;return o=function(){return e},e}function i(e){if(e&&e.__esModule)return e;if(null===e||"object"!=typeof e&&"function"!=typeof e)return{default:e};var t=o();if(t&&t.has(e))return t.get(e);var n={},r=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var i in e)if(Object.prototype.hasOwnProperty.call(e,i)){var a=r?Object.getOwnPropertyDescriptor(e,i):null;a&&(a.get||a.set)?Object.defineProperty(n,i,a):n[i]=e[i]}return n.default=e,t&&t.set(e,n),n}function a(e){return e&&e.__esModule?e:{default:e}}const c=(0,n.default)(),l="sideOneAdd",s="sideOneInputs",d="sideTwoAdd",u="sideTwoInputs",b="to",p="from",v="warStatsResult",m="\n query tribes($server: String!, $filter: TribeFilter) {\n tribes(server: $server, filter: $filter) {\n items {\n id\n tag\n }\n }\n }\n",f="\n query ennoblements($server: String!, $filter: EnnoblementFilter) {\n ennoblements(server: $server, filter: $filter) {\n total\n }\n }\n",g=(0,t.default)(),y=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;const n="\n
\n
".concat(g.conquers,':
\n
').concat(g.sideOne,": ").concat(e,'
\n
').concat(g.sideTwo,": ").concat(t,'
\n
').concat(g.difference,": ").concat(Math.abs(e-t),'
\n
\n
\n ');document.querySelector("#warStatsResult").innerHTML=n},T=e=>()=>{const t=document.createElement("div");t.innerHTML="\n \n \n \n "),t.querySelector("button").addEventListener("click",()=>{t.remove()}),e.appendChild(t)},w=async t=>{t.preventDefault();const n=[],o=[];if(t.target.querySelectorAll("#".concat("sideOneInputs"," input")).forEach(e=>{e.value.trim()&&n.push(e.value.trim())}),t.target.querySelectorAll("#".concat("sideTwoInputs"," input")).forEach(e=>{e.value.trim()&&o.push(e.value.trim())}),console.log("sideOneTags",n,"sideTwoTags",o),0===n.length)return UI.ErrorMessage(g.notEnoughTribesSideOne);if(0===o.length)return UI.ErrorMessage(g.notEnoughTribesSideTwo);const i=document.querySelectorAll("".concat(r.POPUP_SELECTOR," form #").concat("from"," input"));let a;2===i.length&&i[0].value&&i[1].value&&(a=new Date("".concat(i[0].value,"T").concat(i[1].value,":00")));const l=document.querySelectorAll("".concat(r.POPUP_SELECTOR," form #").concat("to"," input"));let s;2===l.length&&l[0].value&&l[1].value&&(s=new Date("".concat(l[0].value,"T").concat(l[1].value,":00"))),t.target.querySelectorAll("button").forEach(e=>{e.disabled=!0});try{const{tribes:t}=await(0,e.default)({query:m,variables:{server:c,filter:{tag:[...n,...o]}}}),r=t.items.filter(e=>n.some(t=>e.tag===t)).map(e=>e.id),i=t.items.filter(e=>o.some(t=>e.tag===t)).map(e=>e.id);console.log(r,i);const{ennoblements:l}=await(0,e.default)({query:f,variables:{server:c,filter:{newOwnerTribeID:r,oldOwnerTribeID:i,ennobledAtGTE:a,ennobledAtLTE:s}}}),{ennoblements:u}=await(0,e.default)({query:f,variables:{server:c,filter:{newOwnerTribeID:i,oldOwnerTribeID:r,ennobledAtGTE:a,ennobledAtLTE:s}}});console.log("sideOneEnnoblements",l,"sideTwoEnnoblements",u),y(l.total,u.total)}catch(d){console.log("handleFormSubmit",d)}t.target.querySelectorAll("button").forEach(e=>{e.disabled=!1})},E=e=>{const t='\n \n ");(0,r.default)({title:g.warStatsGenerator,id:"warStats",html:t,e:e}),document.querySelector("".concat(r.POPUP_SELECTOR," form #").concat("sideOneAdd")).addEventListener("click",T(document.querySelector("#sideOneInputs"))),document.querySelector("".concat(r.POPUP_SELECTOR," form #").concat("sideTwoAdd")).addEventListener("click",T(document.querySelector("#sideTwoInputs"))),document.querySelector("".concat(r.POPUP_SELECTOR," form")).addEventListener("submit",w)},O=()=>{const e=document.createElement("div"),t=document.createElement("button");t.innerHTML=g.generateWarStats,t.addEventListener("click",E),e.appendChild(t),document.querySelector("#wars_ranking_table").parentElement.prepend(e)};!function(){try{O()}catch(e){console.log("war stats",e)}}();
+"use strict";var e=a(require("./libs/requestCreator")),t=a(require("./i18n/warStatsGenerator")),n=a(require("./utils/getCurrentServer")),r=i(require("./utils/showPopup"));function o(){if("function"!=typeof WeakMap)return null;var e=new WeakMap;return o=function(){return e},e}function i(e){if(e&&e.__esModule)return e;if(null===e||"object"!=typeof e&&"function"!=typeof e)return{default:e};var t=o();if(t&&t.has(e))return t.get(e);var n={},r=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var i in e)if(Object.prototype.hasOwnProperty.call(e,i)){var a=r?Object.getOwnPropertyDescriptor(e,i):null;a&&(a.get||a.set)?Object.defineProperty(n,i,a):n[i]=e[i]}return n.default=e,t&&t.set(e,n),n}function a(e){return e&&e.__esModule?e:{default:e}}const l=(0,n.default)(),c="sideOneAdd",s="sideOneInputs",d="sideTwoAdd",u="sideTwoInputs",b="to",m="from",p="warStatsResult",v="\n query tribes($server: String!, $filter: TribeFilter) {\n tribes(server: $server, filter: $filter) {\n items {\n id\n tag\n }\n }\n }\n",f="\n query ennoblements($server: String!, $sideOneFilter: EnnoblementFilter, $sideTwoFilter: EnnoblementFilter) {\n sideOneEnnoblements: ennoblements(server: $server, filter: $sideOneFilter) {\n total\n }\n sideTwoEnnoblements: ennoblements(server: $server, filter: $sideTwoFilter) {\n total\n }\n }\n",g=(0,t.default)(),y=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;const n="\n \n
".concat(g.conquers,':
\n
').concat(g.sideOne,": ").concat(e,'
\n
').concat(g.sideTwo,": ").concat(t,'
\n
').concat(g.difference,": ").concat(Math.abs(e-t),'
\n
\n
\n ');document.querySelector("#warStatsResult").innerHTML=n},T=e=>()=>{const t=document.createElement("div");t.innerHTML="\n \n \n \n "),t.querySelector("button").addEventListener("click",()=>{t.remove()}),e.appendChild(t)},w=async t=>{t.preventDefault();const n=[],o=[];if(t.target.querySelectorAll("#".concat("sideOneInputs"," input")).forEach(e=>{e.value.trim()&&n.push(e.value.trim())}),t.target.querySelectorAll("#".concat("sideTwoInputs"," input")).forEach(e=>{e.value.trim()&&o.push(e.value.trim())}),console.log("sideOneTags",n,"sideTwoTags",o),0===n.length)return UI.ErrorMessage(g.notEnoughTribesSideOne);if(0===o.length)return UI.ErrorMessage(g.notEnoughTribesSideTwo);const i=document.querySelectorAll("".concat(r.POPUP_SELECTOR," form #").concat("from"," input"));let a;2===i.length&&i[0].value&&i[1].value&&(a=new Date("".concat(i[0].value,"T").concat(i[1].value,":00")));const c=document.querySelectorAll("".concat(r.POPUP_SELECTOR," form #").concat("to"," input"));let s;2===c.length&&c[0].value&&c[1].value&&(s=new Date("".concat(c[0].value,"T").concat(c[1].value,":00"))),t.target.querySelectorAll("button").forEach(e=>{e.disabled=!0});try{const{tribes:t}=await(0,e.default)({query:v,variables:{server:l,filter:{tag:[...n,...o]}}}),r=t.items.filter(e=>n.some(t=>e.tag===t)).map(e=>e.id),i=t.items.filter(e=>o.some(t=>e.tag===t)).map(e=>e.id),{sideOneEnnoblements:c,sideTwoEnnoblements:u}=await(0,e.default)({query:f,variables:{server:l,sideOneFilter:{newOwnerTribeID:r,oldOwnerTribeID:i,ennobledAtGTE:a,ennobledAtLTE:s},sideTwoFilter:{newOwnerTribeID:i,oldOwnerTribeID:r,ennobledAtGTE:a,ennobledAtLTE:s}}});console.log("sideOneEnnoblements",c,"sideTwoEnnoblements",u),y(c.total,u.total)}catch(d){console.log("handleFormSubmit",d)}t.target.querySelectorAll("button").forEach(e=>{e.disabled=!1})},E=e=>{const t='\n \n ");(0,r.default)({title:g.warStatsGenerator,id:"warStats",html:t,e:e}),document.querySelector("".concat(r.POPUP_SELECTOR," form #").concat("sideOneAdd")).addEventListener("click",T(document.querySelector("#sideOneInputs"))),document.querySelector("".concat(r.POPUP_SELECTOR," form #").concat("sideTwoAdd")).addEventListener("click",T(document.querySelector("#sideTwoInputs"))),document.querySelector("".concat(r.POPUP_SELECTOR," form")).addEventListener("submit",w)},O=()=>{const e=document.createElement("div"),t=document.createElement("button");t.innerHTML=g.generateWarStats,t.addEventListener("click",E),e.appendChild(t),document.querySelector("#wars_ranking_table").parentElement.prepend(e)};!function(){try{O()}catch(e){console.log("war stats",e)}}();
},{"./libs/requestCreator":"Ph2E","./i18n/warStatsGenerator":"vPH5","./utils/getCurrentServer":"DMkL","./utils/showPopup":"chDM"}]},{},["H9GS"], null)
\ No newline at end of file
diff --git a/dist/warStatsGenerator.js b/dist/warStatsGenerator.js
index a0373c7..8188a31 100644
--- a/dist/warStatsGenerator.js
+++ b/dist/warStatsGenerator.js
@@ -279,7 +279,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
// @namespace https://github.com/tribalwarshelp/scripts
// @updateURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/warStatsGenerator.js
// @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/warStatsGenerator.js
-// @version 0.2.7
+// @version 0.3.0
// @description War stats generator
// @author Kichiyaki http://dawid-wysokinski.pl/
// @match *://*/game.php*screen=ranking*mode=wars*
@@ -295,7 +295,7 @@ const TO_INPUT_ID = 'to';
const FROM_INPUT_ID = 'from';
const RESULT_CONTAINER_ID = 'warStatsResult';
const TRIBES_QUERY = "\n query tribes($server: String!, $filter: TribeFilter) {\n tribes(server: $server, filter: $filter) {\n items {\n id\n tag\n }\n }\n }\n";
-const ENNOBLEMENTS_QUERY = "\n query ennoblements($server: String!, $filter: EnnoblementFilter) {\n ennoblements(server: $server, filter: $filter) {\n total\n }\n }\n";
+const ENNOBLEMENTS_QUERY = "\n query ennoblements($server: String!, $sideOneFilter: EnnoblementFilter, $sideTwoFilter: EnnoblementFilter) {\n sideOneEnnoblements: ennoblements(server: $server, filter: $sideOneFilter) {\n total\n }\n sideTwoEnnoblements: ennoblements(server: $server, filter: $sideTwoFilter) {\n total\n }\n }\n";
const translations = (0, _warStatsGenerator.default)();
const showResult = function showResult() {
@@ -365,28 +365,20 @@ const handleFormSubmit = async e => {
});
const sideOneTribes = tribes.items.filter(item => sideOneTags.some(tag => item.tag === tag)).map(tribe => tribe.id);
const sideTwoTribes = tribes.items.filter(item => sideTwoTags.some(tag => item.tag === tag)).map(tribe => tribe.id);
- console.log(sideOneTribes, sideTwoTribes);
const {
- ennoblements: sideOneEnnoblements
+ sideOneEnnoblements,
+ sideTwoEnnoblements
} = await (0, _requestCreator.default)({
query: ENNOBLEMENTS_QUERY,
variables: {
server: SERVER,
- filter: {
+ sideOneFilter: {
newOwnerTribeID: sideOneTribes,
oldOwnerTribeID: sideTwoTribes,
ennobledAtGTE,
ennobledAtLTE
- }
- }
- });
- const {
- ennoblements: sideTwoEnnoblements
- } = await (0, _requestCreator.default)({
- query: ENNOBLEMENTS_QUERY,
- variables: {
- server: SERVER,
- filter: {
+ },
+ sideTwoFilter: {
newOwnerTribeID: sideTwoTribes,
oldOwnerTribeID: sideOneTribes,
ennobledAtGTE,
@@ -406,7 +398,7 @@ const handleFormSubmit = async e => {
};
const showWarStatsForm = e => {
- const html = "\n \n ");
+ const html = "\n \n ");
(0, _showPopup.default)({
title: translations.warStatsGenerator,
id: 'warStats',
diff --git a/src/warStatsGenerator.js b/src/warStatsGenerator.js
index 6c3ff47..8dbb67f 100644
--- a/src/warStatsGenerator.js
+++ b/src/warStatsGenerator.js
@@ -8,7 +8,7 @@ import showPopup, { POPUP_SELECTOR } from './utils/showPopup';
// @namespace https://github.com/tribalwarshelp/scripts
// @updateURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/warStatsGenerator.js
// @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/warStatsGenerator.js
-// @version 0.2.7
+// @version 0.3.0
// @description War stats generator
// @author Kichiyaki http://dawid-wysokinski.pl/
// @match *://*/game.php*screen=ranking*mode=wars*
@@ -35,8 +35,11 @@ const TRIBES_QUERY = `
}
`;
const ENNOBLEMENTS_QUERY = `
- query ennoblements($server: String!, $filter: EnnoblementFilter) {
- ennoblements(server: $server, filter: $filter) {
+ query ennoblements($server: String!, $sideOneFilter: EnnoblementFilter, $sideTwoFilter: EnnoblementFilter) {
+ sideOneEnnoblements: ennoblements(server: $server, filter: $sideOneFilter) {
+ total
+ }
+ sideTwoEnnoblements: ennoblements(server: $server, filter: $sideTwoFilter) {
total
}
}
@@ -139,25 +142,18 @@ const handleFormSubmit = async (e) => {
const sideTwoTribes = tribes.items
.filter((item) => sideTwoTags.some((tag) => item.tag === tag))
.map((tribe) => tribe.id);
- console.log(sideOneTribes, sideTwoTribes);
- const { ennoblements: sideOneEnnoblements } = await requestCreator({
+ const { sideOneEnnoblements, sideTwoEnnoblements } = await requestCreator({
query: ENNOBLEMENTS_QUERY,
variables: {
server: SERVER,
- filter: {
+ sideOneFilter: {
newOwnerTribeID: sideOneTribes,
oldOwnerTribeID: sideTwoTribes,
ennobledAtGTE,
ennobledAtLTE,
},
- },
- });
- const { ennoblements: sideTwoEnnoblements } = await requestCreator({
- query: ENNOBLEMENTS_QUERY,
- variables: {
- server: SERVER,
- filter: {
+ sideTwoFilter: {
newOwnerTribeID: sideTwoTribes,
oldOwnerTribeID: sideOneTribes,
ennobledAtGTE,
@@ -198,7 +194,7 @@ const showWarStatsForm = (e) => {
-