format dates in accordance with the user's browser settings, replace the deprecated liveEnnoblements query with the new one - ennoblements
This commit is contained in:
parent
bffc728a64
commit
f11a93b751
|
|
@ -3080,7 +3080,7 @@ exports.default = _default;
|
|||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.inUTC = exports.inTZ = void 0;
|
||||
exports.formatDate = exports.inUTC = exports.inTZ = void 0;
|
||||
|
||||
const inTZ = function inTZ() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
|
|
@ -3098,6 +3098,19 @@ const inUTC = function inUTC() {
|
|||
};
|
||||
|
||||
exports.inUTC = inUTC;
|
||||
|
||||
const formatDate = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(undefined, options ? options : {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit'
|
||||
});
|
||||
};
|
||||
|
||||
exports.formatDate = formatDate;
|
||||
},{}],"gvXE":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
|
|
|
|||
|
|
@ -372,16 +372,33 @@ var _default = function _default() {
|
|||
};
|
||||
|
||||
exports.default = _default;
|
||||
},{}],"V6Mf":[function(require,module,exports) {
|
||||
},{}],"ZbyX":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
exports.formatDate = exports.inUTC = exports.inTZ = void 0;
|
||||
|
||||
var _default = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(window.game_data.locale.replace('_', '-'), options ? options : {
|
||||
const inTZ = function inTZ() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
let tz = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'UTC';
|
||||
return new Date(new Date(d).toLocaleString('en-US', {
|
||||
timeZone: tz
|
||||
}));
|
||||
};
|
||||
|
||||
exports.inTZ = inTZ;
|
||||
|
||||
const inUTC = function inUTC() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
return inTZ(d);
|
||||
};
|
||||
|
||||
exports.inUTC = inUTC;
|
||||
|
||||
const formatDate = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(undefined, options ? options : {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
|
|
@ -391,7 +408,7 @@ var _default = (date, options) => {
|
|||
});
|
||||
};
|
||||
|
||||
exports.default = _default;
|
||||
exports.formatDate = formatDate;
|
||||
},{}],"DMkL":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
|
|
@ -649,7 +666,7 @@ var _extendedMapPopup = _interopRequireDefault(require("./i18n/extendedMapPopup"
|
|||
|
||||
var _requestCreator = _interopRequireDefault(require("./libs/requestCreator"));
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("./utils/formatDate"));
|
||||
var _date = require("./utils/date");
|
||||
|
||||
var _getCurrentServer = _interopRequireDefault(require("./utils/getCurrentServer"));
|
||||
|
||||
|
|
@ -676,7 +693,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.6
|
||||
// @version 0.6.7
|
||||
// @description Extended map popup
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*screen=map*
|
||||
|
|
@ -772,7 +789,7 @@ const buildUnitHeader = (unit, index) => {
|
|||
};
|
||||
|
||||
const buildUnitArrivalInfo = (t, index) => {
|
||||
return "\n <td style=\"padding: 2px; background-color: ".concat(getUnitTdBgColor(index), ";\">\n ").concat((0, _formatDate.default)((0, _addMinutes.default)(Timing.getCurrentServerTime(), t)), "\n </td>\n ");
|
||||
return "\n <td style=\"padding: 2px; background-color: ".concat(getUnitTdBgColor(index), ";\">\n ").concat((0, _date.formatDate)((0, _addMinutes.default)(Timing.getCurrentServerTime(), t)), "\n </td>\n ");
|
||||
};
|
||||
|
||||
const renderAdditionalInfo = (id, data, _ref) => {
|
||||
|
|
@ -804,7 +821,7 @@ const renderAdditionalInfo = (id, data, _ref) => {
|
|||
parent.appendChild(lastEnnobledAt);
|
||||
}
|
||||
|
||||
lastEnnobledAt.innerHTML = "\n <td>\n ".concat(translations.ennobledAt, ":\n </td>\n <td>\n ").concat(ennoblement ? (0, _formatDate.default)(ennoblement.ennobledAt) : translations.never, "\n </td>\n ");
|
||||
lastEnnobledAt.innerHTML = "\n <td>\n ".concat(translations.ennobledAt, ":\n </td>\n <td>\n ").concat(ennoblement ? (0, _date.formatDate)(ennoblement.ennobledAt) : translations.never, "\n </td>\n ");
|
||||
let loyalty = parent.querySelector('#loyalty');
|
||||
|
||||
if (!loyalty) {
|
||||
|
|
@ -853,4 +870,4 @@ const createDisplayForVillageHandler = cfg => async (e, a, t) => {
|
|||
console.log('extended map popup', error);
|
||||
}
|
||||
})();
|
||||
},{"date-fns/addMinutes":"pfh4","./i18n/extendedMapPopup":"ddIN","./libs/requestCreator":"Ph2E","./utils/formatDate":"V6Mf","./utils/getCurrentServer":"DMkL","./utils/math":"XOOL","./utils/buildUnitImgURL":"KX6P","./utils/localStorage":"KWxH","./utils/tribalwars":"fHHP","./utils/calcLoyalty":"kcC2"}]},{},["HdqX"], null)
|
||||
},{"date-fns/addMinutes":"pfh4","./i18n/extendedMapPopup":"ddIN","./libs/requestCreator":"Ph2E","./utils/date":"ZbyX","./utils/getCurrentServer":"DMkL","./utils/math":"XOOL","./utils/buildUnitImgURL":"KX6P","./utils/localStorage":"KWxH","./utils/tribalwars":"fHHP","./utils/calcLoyalty":"kcC2"}]},{},["HdqX"], null)
|
||||
|
|
@ -543,16 +543,33 @@ const generatePaginationItems = function generatePaginationItems() {
|
|||
};
|
||||
|
||||
exports.generatePaginationItems = generatePaginationItems;
|
||||
},{}],"V6Mf":[function(require,module,exports) {
|
||||
},{}],"ZbyX":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
exports.formatDate = exports.inUTC = exports.inTZ = void 0;
|
||||
|
||||
var _default = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(window.game_data.locale.replace('_', '-'), options ? options : {
|
||||
const inTZ = function inTZ() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
let tz = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'UTC';
|
||||
return new Date(new Date(d).toLocaleString('en-US', {
|
||||
timeZone: tz
|
||||
}));
|
||||
};
|
||||
|
||||
exports.inTZ = inTZ;
|
||||
|
||||
const inUTC = function inUTC() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
return inTZ(d);
|
||||
};
|
||||
|
||||
exports.inUTC = inUTC;
|
||||
|
||||
const formatDate = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(undefined, options ? options : {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
|
|
@ -562,7 +579,7 @@ var _default = (date, options) => {
|
|||
});
|
||||
};
|
||||
|
||||
exports.default = _default;
|
||||
exports.formatDate = formatDate;
|
||||
},{}],"fHHP":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
|
|
@ -633,7 +650,7 @@ var _pagination = require("../utils/pagination");
|
|||
|
||||
var _showPopup = _interopRequireDefault(require("../utils/showPopup"));
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("../utils/formatDate"));
|
||||
var _date = require("../utils/date");
|
||||
|
||||
var twutils = _interopRequireWildcard(require("../utils/tribalwars"));
|
||||
|
||||
|
|
@ -666,7 +683,7 @@ var _default = function _default(e, ennoblements) {
|
|||
currentPage
|
||||
});
|
||||
const html = "\n <div style=\"".concat((0, _pagination.getContainerStyles)(), "\" id=\"").concat(PAGINATION_CONTAINER_ID, "\">\n ").concat(paginationItems.join(''), "\n </div>\n <table class=\"vis\" style=\"border-collapse: separate; border-spacing: 2px; width: 100%;\">\n <tbody>\n <tr>\n <th>\n ").concat(translations.date, "\n </th>\n <th>\n ").concat(translations.village, "\n </th>\n <th>\n ").concat(translations.newOwner, "\n </th>\n <th>\n ").concat(translations.oldOwner, "\n </th>\n </tr>\n ").concat(ennoblements.items.map(ennoblement => {
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _formatDate.default)(ennoblement.ennobledAt), "</td>");
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _date.formatDate)(ennoblement.ennobledAt), "</td>");
|
||||
|
||||
if (ennoblement.village) {
|
||||
rowHTML += "<td><a href=\"".concat(twutils.buildVillageURL(ennoblement.village.id), "\">").concat(twutils.buildVillageName(ennoblement.village.name, ennoblement.village.x, ennoblement.village.y), "</a></td>");
|
||||
|
|
@ -690,7 +707,7 @@ var _default = function _default(e, ennoblements) {
|
|||
};
|
||||
|
||||
exports.default = _default;
|
||||
},{"../i18n/showEnnoblementsPopup":"tKRp","../utils/pagination":"fCHX","../utils/showPopup":"chDM","../utils/formatDate":"V6Mf","../utils/tribalwars":"fHHP"}],"VYL5":[function(require,module,exports) {
|
||||
},{"../i18n/showEnnoblementsPopup":"tKRp","../utils/pagination":"fCHX","../utils/showPopup":"chDM","../utils/date":"ZbyX","../utils/tribalwars":"fHHP"}],"VYL5":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
|
|
@ -938,7 +955,7 @@ var _showPopup = _interopRequireDefault(require("../utils/showPopup"));
|
|||
|
||||
var _pagination = require("../utils/pagination");
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("../utils/formatDate"));
|
||||
var _date = require("../utils/date");
|
||||
|
||||
var twutils = _interopRequireWildcard(require("../utils/tribalwars"));
|
||||
|
||||
|
|
@ -972,7 +989,7 @@ var _default = function _default(e, history, daily) {
|
|||
const stats = daily.items.find(stats => {
|
||||
return stats.createDate === subtracted;
|
||||
});
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _formatDate.default)(history.createDate, {
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _date.formatDate)(history.createDate, {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit'
|
||||
|
|
@ -999,7 +1016,7 @@ var _default = function _default(e, history, daily) {
|
|||
};
|
||||
|
||||
exports.default = _default;
|
||||
},{"date-fns/subDays":"mRRL","../i18n/showHistoryPopup":"hNDe","../utils/showPopup":"chDM","../utils/pagination":"fCHX","../utils/formatDate":"V6Mf","../utils/tribalwars":"fHHP"}],"GxsT":[function(require,module,exports) {
|
||||
},{"date-fns/subDays":"mRRL","../i18n/showHistoryPopup":"hNDe","../utils/showPopup":"chDM","../utils/pagination":"fCHX","../utils/date":"ZbyX","../utils/tribalwars":"fHHP"}],"GxsT":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
|
|
@ -1152,7 +1169,7 @@ var _getCurrentServer = _interopRequireDefault(require("./utils/getCurrentServer
|
|||
|
||||
var _getServerVersionCode = _interopRequireDefault(require("./utils/getServerVersionCode"));
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("./utils/formatDate"));
|
||||
var _date = require("./utils/date");
|
||||
|
||||
var twutils = _interopRequireWildcard(require("./utils/tribalwars"));
|
||||
|
||||
|
|
@ -1175,7 +1192,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.9
|
||||
// @version 1.2.0
|
||||
// @description Extended player profile
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*screen=info_player*
|
||||
|
|
@ -1331,7 +1348,7 @@ const renderPlayerOtherNames = player => {
|
|||
}
|
||||
|
||||
playerOtherNames.innerHTML = "\n <table width=\"100%\" class=\"vis\">\n <tbody>\n <tr>\n <th>\n ".concat(translations.oldName, "\n </th>\n <th>\n ").concat(translations.newName, "\n </th>\n <th>\n ").concat(translations.date, "\n </th>\n </tr>\n ").concat(player.nameChanges.map(nameChange => {
|
||||
return "\n <tr>\n <td>\n ".concat(nameChange.oldName, "\n </td>\n <td>\n ").concat(nameChange.newName, "\n </td>\n <td>\n ").concat((0, _formatDate.default)(nameChange.changeDate, {
|
||||
return "\n <tr>\n <td>\n ".concat(nameChange.oldName, "\n </td>\n <td>\n ").concat(nameChange.newName, "\n </td>\n <td>\n ").concat((0, _date.formatDate)(nameChange.changeDate, {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit'
|
||||
|
|
@ -1359,7 +1376,7 @@ const render = (_ref3) => {
|
|||
} = _ref3;
|
||||
[{
|
||||
title: translations.joinedAt + ':',
|
||||
data: (0, _formatDate.default)(player.joinedAt),
|
||||
data: (0, _date.formatDate)(player.joinedAt),
|
||||
id: 'joined_at'
|
||||
}, {
|
||||
title: translations.dailyGrowth + ':',
|
||||
|
|
@ -1367,15 +1384,15 @@ const render = (_ref3) => {
|
|||
id: 'dg'
|
||||
}, {
|
||||
title: translations.bestRank + ':',
|
||||
data: player.bestRank + ' ' + "(".concat((0, _formatDate.default)(player.bestRankAt), ")"),
|
||||
data: player.bestRank + ' ' + "(".concat((0, _date.formatDate)(player.bestRankAt), ")"),
|
||||
id: 'best_rank'
|
||||
}, {
|
||||
title: translations.mostPoints + ':',
|
||||
data: player.mostPoints.toLocaleString() + ' ' + "(".concat((0, _formatDate.default)(player.mostPointsAt), ")"),
|
||||
data: player.mostPoints.toLocaleString() + ' ' + "(".concat((0, _date.formatDate)(player.mostPointsAt), ")"),
|
||||
id: 'most_points'
|
||||
}, {
|
||||
title: translations.mostVillages + ':',
|
||||
data: player.mostVillages + ' ' + "(".concat((0, _formatDate.default)(player.mostVillagesAt), ")"),
|
||||
data: player.mostVillages + ' ' + "(".concat((0, _date.formatDate)(player.mostVillagesAt), ")"),
|
||||
id: 'most_villages'
|
||||
}].forEach(data => {
|
||||
renderTr(data);
|
||||
|
|
@ -1402,7 +1419,7 @@ const renderTribeChanges = (e, currentPage, tribeChanges) => {
|
|||
currentPage
|
||||
});
|
||||
const html = "\n <div style=\"".concat((0, _pagination.getContainerStyles)(), "\" id=\"").concat(TRIBE_CHANGES_PAGINATION_CONTAINER_ID, "\">\n ").concat(paginationItems.join(''), "\n </div>\n <table class=\"vis\" style=\"border-collapse: separate; border-spacing: 2px; width: 100%;\">\n <tbody>\n <tr>\n <th>\n ").concat(translations.date, "\n </th>\n <th>\n ").concat(translations.newTribe, "\n </th>\n <th>\n ").concat(translations.oldTribe, "\n </th>\n </tr>\n ").concat(tribeChanges.items.map(tribeChange => {
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _formatDate.default)(tribeChange.createdAt), "</td>");
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _date.formatDate)(tribeChange.createdAt), "</td>");
|
||||
|
||||
if (tribeChange.newTribe) {
|
||||
rowHTML += "<td><a href=\"".concat(twutils.buildTribeURL(tribeChange.newTribe.id), "\">").concat(tribeChange.newTribe.tag, "</a></td>");
|
||||
|
|
@ -1575,4 +1592,4 @@ const renderActions = () => {
|
|||
console.log('extended player profile', error);
|
||||
}
|
||||
})();
|
||||
},{"./libs/InADayParser":"dSAr","./libs/requestCreator":"Ph2E","./i18n/extendedPlayerProfile":"I8dv","./common/renderTodaysStats":"yrCm","./utils/showPopup":"chDM","./common/showEnnoblementsPopup":"vNT1","./common/showHistoryPopup":"kEDU","./utils/hyphensToCamelCase":"GxsT","./utils/pagination":"fCHX","./utils/getIDFromURL":"tQUs","./utils/getCurrentServer":"DMkL","./utils/getServerVersionCode":"J1Ly","./utils/formatDate":"V6Mf","./utils/tribalwars":"fHHP","./utils/twhelp":"gvXE","./utils/localStorage":"KWxH"}]},{},["yRop"], null)
|
||||
},{"./libs/InADayParser":"dSAr","./libs/requestCreator":"Ph2E","./i18n/extendedPlayerProfile":"I8dv","./common/renderTodaysStats":"yrCm","./utils/showPopup":"chDM","./common/showEnnoblementsPopup":"vNT1","./common/showHistoryPopup":"kEDU","./utils/hyphensToCamelCase":"GxsT","./utils/pagination":"fCHX","./utils/getIDFromURL":"tQUs","./utils/getCurrentServer":"DMkL","./utils/getServerVersionCode":"J1Ly","./utils/date":"ZbyX","./utils/tribalwars":"fHHP","./utils/twhelp":"gvXE","./utils/localStorage":"KWxH"}]},{},["yRop"], null)
|
||||
|
|
@ -783,16 +783,33 @@ const showPopup = function showPopup() {
|
|||
|
||||
var _default = showPopup;
|
||||
exports.default = _default;
|
||||
},{}],"V6Mf":[function(require,module,exports) {
|
||||
},{}],"ZbyX":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
exports.formatDate = exports.inUTC = exports.inTZ = void 0;
|
||||
|
||||
var _default = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(window.game_data.locale.replace('_', '-'), options ? options : {
|
||||
const inTZ = function inTZ() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
let tz = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'UTC';
|
||||
return new Date(new Date(d).toLocaleString('en-US', {
|
||||
timeZone: tz
|
||||
}));
|
||||
};
|
||||
|
||||
exports.inTZ = inTZ;
|
||||
|
||||
const inUTC = function inUTC() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
return inTZ(d);
|
||||
};
|
||||
|
||||
exports.inUTC = inUTC;
|
||||
|
||||
const formatDate = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(undefined, options ? options : {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
|
|
@ -802,7 +819,7 @@ var _default = (date, options) => {
|
|||
});
|
||||
};
|
||||
|
||||
exports.default = _default;
|
||||
exports.formatDate = formatDate;
|
||||
},{}],"fHHP":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
|
|
@ -873,7 +890,7 @@ var _pagination = require("../utils/pagination");
|
|||
|
||||
var _showPopup = _interopRequireDefault(require("../utils/showPopup"));
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("../utils/formatDate"));
|
||||
var _date = require("../utils/date");
|
||||
|
||||
var twutils = _interopRequireWildcard(require("../utils/tribalwars"));
|
||||
|
||||
|
|
@ -906,7 +923,7 @@ var _default = function _default(e, ennoblements) {
|
|||
currentPage
|
||||
});
|
||||
const html = "\n <div style=\"".concat((0, _pagination.getContainerStyles)(), "\" id=\"").concat(PAGINATION_CONTAINER_ID, "\">\n ").concat(paginationItems.join(''), "\n </div>\n <table class=\"vis\" style=\"border-collapse: separate; border-spacing: 2px; width: 100%;\">\n <tbody>\n <tr>\n <th>\n ").concat(translations.date, "\n </th>\n <th>\n ").concat(translations.village, "\n </th>\n <th>\n ").concat(translations.newOwner, "\n </th>\n <th>\n ").concat(translations.oldOwner, "\n </th>\n </tr>\n ").concat(ennoblements.items.map(ennoblement => {
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _formatDate.default)(ennoblement.ennobledAt), "</td>");
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _date.formatDate)(ennoblement.ennobledAt), "</td>");
|
||||
|
||||
if (ennoblement.village) {
|
||||
rowHTML += "<td><a href=\"".concat(twutils.buildVillageURL(ennoblement.village.id), "\">").concat(twutils.buildVillageName(ennoblement.village.name, ennoblement.village.x, ennoblement.village.y), "</a></td>");
|
||||
|
|
@ -930,7 +947,7 @@ var _default = function _default(e, ennoblements) {
|
|||
};
|
||||
|
||||
exports.default = _default;
|
||||
},{"../i18n/showEnnoblementsPopup":"tKRp","../utils/pagination":"fCHX","../utils/showPopup":"chDM","../utils/formatDate":"V6Mf","../utils/tribalwars":"fHHP"}],"VYL5":[function(require,module,exports) {
|
||||
},{"../i18n/showEnnoblementsPopup":"tKRp","../utils/pagination":"fCHX","../utils/showPopup":"chDM","../utils/date":"ZbyX","../utils/tribalwars":"fHHP"}],"VYL5":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
|
|
@ -1103,7 +1120,7 @@ var _showPopup = _interopRequireDefault(require("../utils/showPopup"));
|
|||
|
||||
var _pagination = require("../utils/pagination");
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("../utils/formatDate"));
|
||||
var _date = require("../utils/date");
|
||||
|
||||
var twutils = _interopRequireWildcard(require("../utils/tribalwars"));
|
||||
|
||||
|
|
@ -1137,7 +1154,7 @@ var _default = function _default(e, history, daily) {
|
|||
const stats = daily.items.find(stats => {
|
||||
return stats.createDate === subtracted;
|
||||
});
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _formatDate.default)(history.createDate, {
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _date.formatDate)(history.createDate, {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit'
|
||||
|
|
@ -1164,7 +1181,7 @@ var _default = function _default(e, history, daily) {
|
|||
};
|
||||
|
||||
exports.default = _default;
|
||||
},{"date-fns/subDays":"mRRL","../i18n/showHistoryPopup":"hNDe","../utils/showPopup":"chDM","../utils/pagination":"fCHX","../utils/formatDate":"V6Mf","../utils/tribalwars":"fHHP"}],"tQUs":[function(require,module,exports) {
|
||||
},{"date-fns/subDays":"mRRL","../i18n/showHistoryPopup":"hNDe","../utils/showPopup":"chDM","../utils/pagination":"fCHX","../utils/date":"ZbyX","../utils/tribalwars":"fHHP"}],"tQUs":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
|
|
@ -1321,7 +1338,7 @@ var _getCurrentServer = _interopRequireDefault(require("./utils/getCurrentServer
|
|||
|
||||
var _localStorage = require("./utils/localStorage");
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("./utils/formatDate"));
|
||||
var _date = require("./utils/date");
|
||||
|
||||
var _getServerVersionCode = _interopRequireDefault(require("./utils/getServerVersionCode"));
|
||||
|
||||
|
|
@ -1348,7 +1365,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.1.2
|
||||
// @version 1.1.3
|
||||
// @description Extended tribe profile
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*screen=info_ally*
|
||||
|
|
@ -1513,7 +1530,7 @@ const render = (_ref3) => {
|
|||
} = _ref3;
|
||||
[{
|
||||
title: translations.createdAt + ':',
|
||||
data: (0, _formatDate.default)(tribe.createdAt),
|
||||
data: (0, _date.formatDate)(tribe.createdAt),
|
||||
id: 'created_at'
|
||||
}, {
|
||||
title: translations.dominance + ':',
|
||||
|
|
@ -1521,15 +1538,15 @@ const render = (_ref3) => {
|
|||
id: 'dominance'
|
||||
}, {
|
||||
title: translations.bestRank + ':',
|
||||
data: tribe.bestRank + ' ' + "(".concat((0, _formatDate.default)(tribe.bestRankAt), ")"),
|
||||
data: tribe.bestRank + ' ' + "(".concat((0, _date.formatDate)(tribe.bestRankAt), ")"),
|
||||
id: 'best_rank'
|
||||
}, {
|
||||
title: translations.mostPoints + ':',
|
||||
data: tribe.mostPoints.toLocaleString() + ' ' + "(".concat((0, _formatDate.default)(tribe.mostPointsAt), ")"),
|
||||
data: tribe.mostPoints.toLocaleString() + ' ' + "(".concat((0, _date.formatDate)(tribe.mostPointsAt), ")"),
|
||||
id: 'most_points'
|
||||
}, {
|
||||
title: translations.mostVillages + ':',
|
||||
data: tribe.mostVillages + ' ' + "(".concat((0, _formatDate.default)(tribe.mostVillagesAt), ")"),
|
||||
data: tribe.mostVillages + ' ' + "(".concat((0, _date.formatDate)(tribe.mostVillagesAt), ")"),
|
||||
id: 'most_villages'
|
||||
}].forEach(data => {
|
||||
renderTr(data);
|
||||
|
|
@ -1642,7 +1659,7 @@ const mapMembersGrowthTdValue = i => {
|
|||
const buildMembersGrowthTBody = stats => {
|
||||
const dates = [...new Set(stats.items.map(item => item.createDate))].reverse();
|
||||
return "\n <tbody>\n <tr>\n <th>".concat(translations.player, "</th>\n ").concat(dates.map(date => {
|
||||
return "<th>".concat((0, _formatDate.default)(date, {
|
||||
return "<th>".concat((0, _date.formatDate)(date, {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit'
|
||||
|
|
@ -1737,7 +1754,7 @@ const renderTribeChanges = (e, currentPage, tribeChanges) => {
|
|||
currentPage
|
||||
});
|
||||
const html = "\n <div style=\"".concat((0, _pagination.getContainerStyles)(), "\" id=\"").concat(TRIBE_CHANGES_PAGINATION_CONTAINER_ID, "\">\n ").concat(paginationItems.join(''), "\n </div>\n <table class=\"vis\" style=\"border-collapse: separate; border-spacing: 2px; width: 100%;\">\n <tbody>\n <tr>\n <th>\n ").concat(translations.date, "\n </th>\n <th>\n ").concat(translations.player, "\n </th>\n <th>\n ").concat(translations.act, "\n </th>\n </tr>\n ").concat(tribeChanges.items.map(tribeChange => {
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _formatDate.default)(tribeChange.createdAt), "</td>");
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _date.formatDate)(tribeChange.createdAt), "</td>");
|
||||
|
||||
if (tribeChange.player) {
|
||||
rowHTML += "<td><a href=\"".concat(twutils.buildPlayerURL(tribeChange.player.id), "\">").concat(tribeChange.player.name, "</a></td>");
|
||||
|
|
@ -1948,4 +1965,4 @@ const renderActions = () => {
|
|||
console.log('extended tribe profile', error);
|
||||
}
|
||||
})();
|
||||
},{"date-fns/differenceInDays":"mdVI","./i18n/extendedTribeProfile":"iFDG","./libs/requestCreator":"Ph2E","./utils/pagination":"fCHX","./common/renderTodaysStats":"yrCm","./common/showEnnoblementsPopup":"vNT1","./common/showHistoryPopup":"kEDU","./utils/showPopup":"chDM","./utils/getIDFromURL":"tQUs","./utils/getCurrentServer":"DMkL","./utils/localStorage":"KWxH","./utils/formatDate":"V6Mf","./utils/getServerVersionCode":"J1Ly","./utils/twstats":"Syko","./utils/twhelp":"gvXE","./utils/tribalwars":"fHHP"}]},{},["r4nF"], null)
|
||||
},{"date-fns/differenceInDays":"mdVI","./i18n/extendedTribeProfile":"iFDG","./libs/requestCreator":"Ph2E","./utils/pagination":"fCHX","./common/renderTodaysStats":"yrCm","./common/showEnnoblementsPopup":"vNT1","./common/showHistoryPopup":"kEDU","./utils/showPopup":"chDM","./utils/getIDFromURL":"tQUs","./utils/getCurrentServer":"DMkL","./utils/localStorage":"KWxH","./utils/date":"ZbyX","./utils/getServerVersionCode":"J1Ly","./utils/twstats":"Syko","./utils/twhelp":"gvXE","./utils/tribalwars":"fHHP"}]},{},["r4nF"], null)
|
||||
|
|
@ -373,16 +373,33 @@ var _default = unit => {
|
|||
};
|
||||
|
||||
exports.default = _default;
|
||||
},{"./tribalwars":"fHHP"}],"V6Mf":[function(require,module,exports) {
|
||||
},{"./tribalwars":"fHHP"}],"ZbyX":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
exports.formatDate = exports.inUTC = exports.inTZ = void 0;
|
||||
|
||||
var _default = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(window.game_data.locale.replace('_', '-'), options ? options : {
|
||||
const inTZ = function inTZ() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
let tz = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'UTC';
|
||||
return new Date(new Date(d).toLocaleString('en-US', {
|
||||
timeZone: tz
|
||||
}));
|
||||
};
|
||||
|
||||
exports.inTZ = inTZ;
|
||||
|
||||
const inUTC = function inUTC() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
return inTZ(d);
|
||||
};
|
||||
|
||||
exports.inUTC = inUTC;
|
||||
|
||||
const formatDate = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(undefined, options ? options : {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
|
|
@ -392,7 +409,7 @@ var _default = (date, options) => {
|
|||
});
|
||||
};
|
||||
|
||||
exports.default = _default;
|
||||
exports.formatDate = formatDate;
|
||||
},{}],"oUdd":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
|
|
@ -766,7 +783,7 @@ var _pagination = require("../utils/pagination");
|
|||
|
||||
var _showPopup = _interopRequireDefault(require("../utils/showPopup"));
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("../utils/formatDate"));
|
||||
var _date = require("../utils/date");
|
||||
|
||||
var twutils = _interopRequireWildcard(require("../utils/tribalwars"));
|
||||
|
||||
|
|
@ -799,7 +816,7 @@ var _default = function _default(e, ennoblements) {
|
|||
currentPage
|
||||
});
|
||||
const html = "\n <div style=\"".concat((0, _pagination.getContainerStyles)(), "\" id=\"").concat(PAGINATION_CONTAINER_ID, "\">\n ").concat(paginationItems.join(''), "\n </div>\n <table class=\"vis\" style=\"border-collapse: separate; border-spacing: 2px; width: 100%;\">\n <tbody>\n <tr>\n <th>\n ").concat(translations.date, "\n </th>\n <th>\n ").concat(translations.village, "\n </th>\n <th>\n ").concat(translations.newOwner, "\n </th>\n <th>\n ").concat(translations.oldOwner, "\n </th>\n </tr>\n ").concat(ennoblements.items.map(ennoblement => {
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _formatDate.default)(ennoblement.ennobledAt), "</td>");
|
||||
let rowHTML = '<tr>' + "<td>".concat((0, _date.formatDate)(ennoblement.ennobledAt), "</td>");
|
||||
|
||||
if (ennoblement.village) {
|
||||
rowHTML += "<td><a href=\"".concat(twutils.buildVillageURL(ennoblement.village.id), "\">").concat(twutils.buildVillageName(ennoblement.village.name, ennoblement.village.x, ennoblement.village.y), "</a></td>");
|
||||
|
|
@ -823,7 +840,7 @@ var _default = function _default(e, ennoblements) {
|
|||
};
|
||||
|
||||
exports.default = _default;
|
||||
},{"../i18n/showEnnoblementsPopup":"tKRp","../utils/pagination":"fCHX","../utils/showPopup":"chDM","../utils/formatDate":"V6Mf","../utils/tribalwars":"fHHP"}],"UdfQ":[function(require,module,exports) {
|
||||
},{"../i18n/showEnnoblementsPopup":"tKRp","../utils/pagination":"fCHX","../utils/showPopup":"chDM","../utils/date":"ZbyX","../utils/tribalwars":"fHHP"}],"UdfQ":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
var _requestCreator = _interopRequireDefault(require("./libs/requestCreator"));
|
||||
|
|
@ -838,7 +855,7 @@ var _getIDFromURL = _interopRequireDefault(require("./utils/getIDFromURL"));
|
|||
|
||||
var _buildUnitImgURL = _interopRequireDefault(require("./utils/buildUnitImgURL"));
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("./utils/formatDate"));
|
||||
var _date = require("./utils/date");
|
||||
|
||||
var _wait = _interopRequireDefault(require("./utils/wait"));
|
||||
|
||||
|
|
@ -869,7 +886,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.5
|
||||
// @version 0.7.6
|
||||
// @description Extended village profile
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*screen=info_village*
|
||||
|
|
@ -1138,7 +1155,7 @@ const renderAdditionalInfo = function renderAdditionalInfo() {
|
|||
renderTr({
|
||||
id: 'ennobledAt',
|
||||
title: "".concat(translations.ennobledAt, ":"),
|
||||
data: firstEnnoblement ? (0, _formatDate.default)(firstEnnoblement.ennobledAt) : translations.never
|
||||
data: firstEnnoblement ? (0, _date.formatDate)(firstEnnoblement.ennobledAt) : translations.never
|
||||
});
|
||||
|
||||
try {
|
||||
|
|
@ -1169,4 +1186,4 @@ const renderAdditionalInfo = function renderAdditionalInfo() {
|
|||
console.log('extended village profile', error);
|
||||
}
|
||||
})();
|
||||
},{"./libs/requestCreator":"Ph2E","./i18n/extendedVillageProfile":"LNef","./utils/pagination":"fCHX","./utils/getCurrentServer":"DMkL","./utils/getIDFromURL":"tQUs","./utils/buildUnitImgURL":"KX6P","./utils/formatDate":"V6Mf","./utils/wait":"oUdd","./utils/localStorage":"KWxH","./utils/calcLoyalty":"kcC2","./utils/getServerVersionCode":"J1Ly","./utils/twhelp":"gvXE","./common/showEnnoblementsPopup":"vNT1"}]},{},["UdfQ"], null)
|
||||
},{"./libs/requestCreator":"Ph2E","./i18n/extendedVillageProfile":"LNef","./utils/pagination":"fCHX","./utils/getCurrentServer":"DMkL","./utils/getIDFromURL":"tQUs","./utils/buildUnitImgURL":"KX6P","./utils/date":"ZbyX","./utils/wait":"oUdd","./utils/localStorage":"KWxH","./utils/calcLoyalty":"kcC2","./utils/getServerVersionCode":"J1Ly","./utils/twhelp":"gvXE","./common/showEnnoblementsPopup":"vNT1"}]},{},["UdfQ"], null)
|
||||
|
|
@ -196,16 +196,33 @@ exports.default = void 0;
|
|||
var _default = () => window.location.host.split('.')[0];
|
||||
|
||||
exports.default = _default;
|
||||
},{}],"V6Mf":[function(require,module,exports) {
|
||||
},{}],"ZbyX":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
exports.formatDate = exports.inUTC = exports.inTZ = void 0;
|
||||
|
||||
var _default = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(window.game_data.locale.replace('_', '-'), options ? options : {
|
||||
const inTZ = function inTZ() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
let tz = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'UTC';
|
||||
return new Date(new Date(d).toLocaleString('en-US', {
|
||||
timeZone: tz
|
||||
}));
|
||||
};
|
||||
|
||||
exports.inTZ = inTZ;
|
||||
|
||||
const inUTC = function inUTC() {
|
||||
let d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
|
||||
return inTZ(d);
|
||||
};
|
||||
|
||||
exports.inUTC = inUTC;
|
||||
|
||||
const formatDate = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(undefined, options ? options : {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
|
|
@ -215,7 +232,7 @@ var _default = (date, options) => {
|
|||
});
|
||||
};
|
||||
|
||||
exports.default = _default;
|
||||
exports.formatDate = formatDate;
|
||||
},{}],"fHHP":[function(require,module,exports) {
|
||||
"use strict";
|
||||
|
||||
|
|
@ -415,7 +432,7 @@ var _showPopup = _interopRequireDefault(require("./utils/showPopup"));
|
|||
|
||||
var _getCurrentServer = _interopRequireDefault(require("./utils/getCurrentServer"));
|
||||
|
||||
var _formatDate = _interopRequireDefault(require("./utils/formatDate"));
|
||||
var _date = require("./utils/date");
|
||||
|
||||
var twutils = _interopRequireWildcard(require("./utils/tribalwars"));
|
||||
|
||||
|
|
@ -444,7 +461,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/latestEnnoblements.js
|
||||
// @downloadURL https://raw.githubusercontent.com/tribalwarshelp/scripts/master/dist/latestEnnoblements.js
|
||||
// @version 1.0.8
|
||||
// @version 1.1.0
|
||||
// @description Show the latest ennoblements
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*
|
||||
|
|
@ -452,12 +469,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
|
|||
// @run-at document-end
|
||||
// ==/UserScript==
|
||||
const SERVER = (0, _getCurrentServer.default)();
|
||||
const FILTER_FORM_ID = 'sle_form';
|
||||
const TABLE_ID = 'sle_table';
|
||||
const FILTER_FORM_ID = 'le_form';
|
||||
const TABLE_ID = 'le_table';
|
||||
const CACHE_LOCAL_STORAGE_KEY = 'kiszkowaty_show_latest_ennoblements_cache';
|
||||
const FILTERS_LOCAL_STORAGE_KEY = 'kiszkowaty_show_latest_ennoblements_filter';
|
||||
const ICON_URL = 'https://i.imgur.com/4WP4098.png';
|
||||
const query = "\n query liveEnnoblements($server: String!) {\n liveEnnoblements(server: $server) {\n newOwner {\n id\n name\n tribe {\n id\n name\n tag\n }\n }\n oldOwner {\n id\n name\n tribe {\n id\n name\n tag\n }\n }\n ennobledAt\n village {\n id\n name\n x\n y\n }\n }\n }\n ";
|
||||
const query = "\n query ennoblements($server: String!, $sort: [String!], $limit: Int) {\n ennoblements(server: $server, sort: $sort, limit: $limit) {\n items {\n newOwner {\n id\n name\n tribe {\n id\n name\n tag\n }\n }\n oldOwner {\n id\n name\n tribe {\n id\n name\n tag\n }\n }\n ennobledAt\n village {\n id\n name\n x\n y\n }\n }\n }\n }\n ";
|
||||
const DEFAULT_FILTER = {
|
||||
newOwner: '',
|
||||
newOwnerTribe: '',
|
||||
|
|
@ -488,7 +505,9 @@ const loadLatestEnnoblements = () => {
|
|||
return (0, _requestCreator.default)({
|
||||
query,
|
||||
variables: {
|
||||
server: SERVER
|
||||
server: SERVER,
|
||||
limit: 50,
|
||||
sort: ['ennobledAt DESC']
|
||||
}
|
||||
}).then(data => {
|
||||
cacheEnnoblements(data);
|
||||
|
|
@ -533,7 +552,7 @@ const filterEnnoblements = function filterEnnoblements() {
|
|||
});
|
||||
};
|
||||
|
||||
const handleFilterFormSubmit = (e, ennoblements) => {
|
||||
const applyFilters = (e, ennoblements) => {
|
||||
e.preventDefault();
|
||||
|
||||
const filters = _objectSpread(_objectSpread({}, DEFAULT_FILTER), {}, {
|
||||
|
|
@ -550,7 +569,7 @@ const handleFilterFormSubmit = (e, ennoblements) => {
|
|||
const addEventListeners = function addEventListeners() {
|
||||
let ennoblements = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
||||
document.querySelector('#' + FILTER_FORM_ID).addEventListener('submit', e => {
|
||||
handleFilterFormSubmit(e, ennoblements);
|
||||
applyFilters(e, ennoblements);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -563,8 +582,8 @@ const getVillageHTML = village => {
|
|||
};
|
||||
|
||||
const buildEnnoblementsRows = ennoblements => {
|
||||
return ennoblements.reverse().map(ennoblement => {
|
||||
return "<tr>\n <td>".concat(getVillageHTML(ennoblement.village), "</td>\n <td>").concat(getPlayerHTML(ennoblement.newOwner), "</td>\n <td>").concat(getPlayerHTML(ennoblement.oldOwner), "</td>\n <td>").concat((0, _formatDate.default)(ennoblement.ennobledAt), "</td>\n </tr>");
|
||||
return ennoblements.map(ennoblement => {
|
||||
return "<tr>\n <td>".concat(getVillageHTML(ennoblement.village), "</td>\n <td>").concat(getPlayerHTML(ennoblement.newOwner), "</td>\n <td>").concat(getPlayerHTML(ennoblement.oldOwner), "</td>\n <td>").concat((0, _date.formatDate)(ennoblement.ennobledAt), "</td>\n </tr>");
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -576,9 +595,6 @@ const renderLatestEnnoblements = function renderLatestEnnoblements() {
|
|||
|
||||
const html = "\n <form style=\"margin-bottom: 15px\" id=\"".concat(FILTER_FORM_ID, "\">\n <h1 style=\"margin-bottom: 0px; text-align: center;\"><a href=\"").concat(twhelputils.buildURLToServerPage((0, _getServerVersionCode.default)(SERVER), SERVER), "\">TWHelp</a></h1>\n <h3 style=\"margin-bottom: 10px; margin-top: 0;\">").concat(translations.devNote, "</h3>\n <h3 style=\"margin-bottom: 5px\">").concat(translations.filters, "</h3>\n <input type=\"text\" placeholder=\"").concat(translations.newOwner, "\" value=\"").concat(prepared.newOwner, "\" />\n <input type=\"text\" placeholder=\"").concat(translations.newOwnerTribe, "\" value=\"").concat(prepared.newOwnerTribe, "\" />\n <input type=\"text\" placeholder=\"").concat(translations.oldOwner, "\" value=\"").concat(prepared.oldOwner, "\" />\n <input type=\"text\" placeholder=\"").concat(translations.oldOwnerTribe, "\" value=\"").concat(prepared.oldOwnerTribe, "\" />\n <div>\n <button type=\"submit\">").concat(translations.apply, "</button>\n </div>\n </form>\n <table class=\"vis\" id=\"").concat(TABLE_ID, "\" style=\"width: 100%\">\n <thead>\n <tr>\n <th>").concat(translations.village, "</th>\n <th>").concat(translations.newOwner, "</th>\n <th>").concat(translations.oldOwner, "</th>\n <th>").concat(translations.date, "</th>\n </tr>\n </thead>\n <tbody>\n ").concat(buildEnnoblementsRows(filterEnnoblements(ennoblements, prepared)).join(''), "\n </tbody>\n </table>\n ");
|
||||
(0, _showPopup.default)({
|
||||
e: {
|
||||
clientY: 60
|
||||
},
|
||||
title: translations.ennoblements,
|
||||
id: 'ennoblements',
|
||||
html
|
||||
|
|
@ -591,14 +607,14 @@ const handleButtonClick = async () => {
|
|||
const cache = loadLatestEnnoblementsFromCache();
|
||||
const filters = loadFilters();
|
||||
|
||||
if (Array.isArray(cache.liveEnnoblements) && cache.liveEnnoblements.length > 0) {
|
||||
renderLatestEnnoblements(cache.liveEnnoblements, filters);
|
||||
if (cache.ennoblements && Array.isArray(cache.ennoblements.items) && cache.ennoblements.items.length > 0) {
|
||||
renderLatestEnnoblements(cache.ennoblements.items, filters);
|
||||
}
|
||||
|
||||
const {
|
||||
liveEnnoblements
|
||||
ennoblements
|
||||
} = await loadLatestEnnoblements();
|
||||
renderLatestEnnoblements(liveEnnoblements, filters);
|
||||
renderLatestEnnoblements(ennoblements.items, filters);
|
||||
} catch (error) {
|
||||
console.log('latestEnnoblements', error);
|
||||
}
|
||||
|
|
@ -622,4 +638,4 @@ const renderButton = () => {
|
|||
(function () {
|
||||
renderButton();
|
||||
})();
|
||||
},{"./libs/requestCreator":"Ph2E","./utils/showPopup":"chDM","./utils/getCurrentServer":"DMkL","./utils/formatDate":"V6Mf","./utils/tribalwars":"fHHP","./utils/localStorage":"KWxH","./utils/twhelp":"gvXE","./utils/getServerVersionCode":"J1Ly","./i18n/latestEnnoblements":"FxgK"}]},{},["hkfB"], null)
|
||||
},{"./libs/requestCreator":"Ph2E","./utils/showPopup":"chDM","./utils/getCurrentServer":"DMkL","./utils/date":"ZbyX","./utils/tribalwars":"fHHP","./utils/localStorage":"KWxH","./utils/twhelp":"gvXE","./utils/getServerVersionCode":"J1Ly","./i18n/latestEnnoblements":"FxgK"}]},{},["hkfB"], null)
|
||||
|
|
@ -75,7 +75,7 @@ parcelRequire=function(e,r,t,n){var i,o="function"==typeof parcelRequire&&parcel
|
|||
},{}],"J1Ly":[function(require,module,exports) {
|
||||
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var e=function(){return(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"").substr(0,2)};exports.default=e;
|
||||
},{}],"ZbyX":[function(require,module,exports) {
|
||||
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.inUTC=exports.inTZ=void 0;const e=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new Date,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"UTC";return new Date(new Date(e).toLocaleString("en-US",{timeZone:t}))};exports.inTZ=e;const t=function(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new Date;return e(t)};exports.inUTC=t;
|
||||
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formatDate=exports.inUTC=exports.inTZ=void 0;const t=function(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new Date,e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"UTC";return new Date(new Date(t).toLocaleString("en-US",{timeZone:e}))};exports.inTZ=t;const e=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new Date;return t(e)};exports.inUTC=e;const n=(t,e)=>new Date(t).toLocaleDateString(void 0,e||{year:"numeric",month:"2-digit",day:"2-digit",hour:"2-digit",minute:"2-digit",second:"2-digit"});exports.formatDate=n;
|
||||
},{}],"gvXE":[function(require,module,exports) {
|
||||
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.buildVillageURL=exports.buildTribeURL=exports.buildPlayerURL=exports.buildURLToProfile=exports.buildURLToServerPage=exports.BASE_URL=void 0;const e="tribalwarshelp.com";exports.BASE_URL=e;const t=function(){let t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return"https://".concat(t,".").concat(e,"/server/").concat(o)};exports.buildURLToServerPage=t;const o=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0,n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"";return"".concat(t(e,o),"/").concat(n,"/").concat(l)};exports.buildURLToProfile=o;const l=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0;return o(e,t,l,"player")};exports.buildPlayerURL=l;const n=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0;return o(e,t,l,"tribe")};exports.buildTribeURL=n;const i=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",l=arguments.length>2&&void 0!==arguments[2]?arguments[2]:0;return o(e,t,l,"village")};exports.buildVillageURL=i;
|
||||
},{}],"Jg9g":[function(require,module,exports) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -4,7 +4,7 @@ import {
|
|||
getContainerStyles,
|
||||
} from '../utils/pagination';
|
||||
import showPopup from '../utils/showPopup';
|
||||
import formatDate from '../utils/formatDate';
|
||||
import { formatDate } from '../utils/date';
|
||||
import * as twutils from '../utils/tribalwars';
|
||||
|
||||
const PAGINATION_CONTAINER_ID = 'ennoblementsPagination';
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import {
|
|||
generatePaginationItems,
|
||||
getContainerStyles,
|
||||
} from '../utils/pagination';
|
||||
import formatDate from '../utils/formatDate';
|
||||
import { formatDate } from '../utils/date';
|
||||
import * as twutils from '../utils/tribalwars';
|
||||
|
||||
const PAGINATION_CONTAINER_ID = 'historyPagination';
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import addMinutes from 'date-fns/addMinutes';
|
||||
import getTranslations from './i18n/extendedMapPopup';
|
||||
import requestCreator from './libs/requestCreator';
|
||||
import formatDate from './utils/formatDate';
|
||||
import { formatDate } from './utils/date';
|
||||
import getCurrentServer from './utils/getCurrentServer';
|
||||
import { calcDistanceBetweenTwoPoints } from './utils/math';
|
||||
import buildUnitImgURL from './utils/buildUnitImgURL';
|
||||
|
|
@ -14,7 +14,7 @@ import calcLoyalty from './utils/calcLoyalty';
|
|||
// @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.6
|
||||
// @version 0.6.7
|
||||
// @description Extended map popup
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*screen=map*
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import {
|
|||
import getIDFromURL from './utils/getIDFromURL';
|
||||
import getCurrentServer from './utils/getCurrentServer';
|
||||
import getServerVersionCode from './utils/getServerVersionCode';
|
||||
import formatDate from './utils/formatDate';
|
||||
import { formatDate } from './utils/date';
|
||||
import * as twutils from './utils/tribalwars';
|
||||
import * as twhelputils from './utils/twhelp';
|
||||
import { setItem, getItem } from './utils/localStorage';
|
||||
|
|
@ -25,7 +25,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.9
|
||||
// @version 1.2.0
|
||||
// @description Extended player profile
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*screen=info_player*
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import showPopup from './utils/showPopup';
|
|||
import getIDFromURL from './utils/getIDFromURL';
|
||||
import getCurrentServer from './utils/getCurrentServer';
|
||||
import { setItem, getItem } from './utils/localStorage';
|
||||
import formatDate from './utils/formatDate';
|
||||
import { formatDate } from './utils/date';
|
||||
import getServerVersionCode from './utils/getServerVersionCode';
|
||||
import * as twstatsutils from './utils/twstats';
|
||||
import * as twhelputils from './utils/twhelp';
|
||||
|
|
@ -25,7 +25,7 @@ import * as twutils 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.1.2
|
||||
// @version 1.1.3
|
||||
// @description Extended tribe profile
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*screen=info_ally*
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import { setPage, getPage } from './utils/pagination';
|
|||
import getCurrentServer from './utils/getCurrentServer';
|
||||
import getIDFromURL from './utils/getIDFromURL';
|
||||
import buildUnitImgURL from './utils/buildUnitImgURL';
|
||||
import formatDate from './utils/formatDate';
|
||||
import { formatDate } from './utils/date';
|
||||
import wait from './utils/wait';
|
||||
import { setItem, getItem } from './utils/localStorage';
|
||||
import calcLoyalty from './utils/calcLoyalty';
|
||||
|
|
@ -17,7 +17,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.5
|
||||
// @version 0.7.6
|
||||
// @description Extended village profile
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*screen=info_village*
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import requestCreator from './libs/requestCreator';
|
||||
import showPopup from './utils/showPopup';
|
||||
import getCurrentServer from './utils/getCurrentServer';
|
||||
import formatDate from './utils/formatDate';
|
||||
import { formatDate } from './utils/date';
|
||||
import * as twutils from './utils/tribalwars';
|
||||
import { setItem, getItem } from './utils/localStorage';
|
||||
import * as twhelputils from './utils/twhelp';
|
||||
|
|
@ -13,7 +13,7 @@ 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.8
|
||||
// @version 1.1.0
|
||||
// @description Show the latest ennoblements
|
||||
// @author Kichiyaki https://dwysokinski.me/
|
||||
// @match *://*/game.php*
|
||||
|
|
@ -22,38 +22,40 @@ import loadTranslations from './i18n/latestEnnoblements';
|
|||
// ==/UserScript==
|
||||
|
||||
const SERVER = getCurrentServer();
|
||||
const FILTER_FORM_ID = 'sle_form';
|
||||
const TABLE_ID = 'sle_table';
|
||||
const FILTER_FORM_ID = 'le_form';
|
||||
const TABLE_ID = 'le_table';
|
||||
const CACHE_LOCAL_STORAGE_KEY = 'kiszkowaty_show_latest_ennoblements_cache';
|
||||
const FILTERS_LOCAL_STORAGE_KEY = 'kiszkowaty_show_latest_ennoblements_filter';
|
||||
const ICON_URL = 'https://i.imgur.com/4WP4098.png';
|
||||
const query = `
|
||||
query liveEnnoblements($server: String!) {
|
||||
liveEnnoblements(server: $server) {
|
||||
newOwner {
|
||||
id
|
||||
name
|
||||
tribe {
|
||||
query ennoblements($server: String!, $sort: [String!], $limit: Int) {
|
||||
ennoblements(server: $server, sort: $sort, limit: $limit) {
|
||||
items {
|
||||
newOwner {
|
||||
id
|
||||
name
|
||||
tag
|
||||
tribe {
|
||||
id
|
||||
name
|
||||
tag
|
||||
}
|
||||
}
|
||||
}
|
||||
oldOwner {
|
||||
id
|
||||
name
|
||||
tribe {
|
||||
oldOwner {
|
||||
id
|
||||
name
|
||||
tag
|
||||
tribe {
|
||||
id
|
||||
name
|
||||
tag
|
||||
}
|
||||
}
|
||||
ennobledAt
|
||||
village {
|
||||
id
|
||||
name
|
||||
x
|
||||
y
|
||||
}
|
||||
}
|
||||
ennobledAt
|
||||
village {
|
||||
id
|
||||
name
|
||||
x
|
||||
y
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -87,6 +89,8 @@ const loadLatestEnnoblements = () => {
|
|||
query,
|
||||
variables: {
|
||||
server: SERVER,
|
||||
limit: 50,
|
||||
sort: ['ennobledAt DESC'],
|
||||
},
|
||||
}).then((data) => {
|
||||
cacheEnnoblements(data);
|
||||
|
|
@ -134,7 +138,7 @@ const filterEnnoblements = (
|
|||
});
|
||||
};
|
||||
|
||||
const handleFilterFormSubmit = (e, ennoblements) => {
|
||||
const applyFilters = (e, ennoblements) => {
|
||||
e.preventDefault();
|
||||
const filters = {
|
||||
...DEFAULT_FILTER,
|
||||
|
|
@ -155,7 +159,7 @@ const addEventListeners = (ennoblements = []) => {
|
|||
document
|
||||
.querySelector('#' + FILTER_FORM_ID)
|
||||
.addEventListener('submit', (e) => {
|
||||
handleFilterFormSubmit(e, ennoblements);
|
||||
applyFilters(e, ennoblements);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -178,7 +182,7 @@ const getVillageHTML = (village) => {
|
|||
};
|
||||
|
||||
const buildEnnoblementsRows = (ennoblements) => {
|
||||
return ennoblements.reverse().map((ennoblement) => {
|
||||
return ennoblements.map((ennoblement) => {
|
||||
return `<tr>
|
||||
<td>${getVillageHTML(ennoblement.village)}</td>
|
||||
<td>${getPlayerHTML(ennoblement.newOwner)}</td>
|
||||
|
|
@ -237,7 +241,6 @@ const renderLatestEnnoblements = (ennoblements = [], filters = {}) => {
|
|||
`;
|
||||
|
||||
showPopup({
|
||||
e: { clientY: 60 },
|
||||
title: translations.ennoblements,
|
||||
id: 'ennoblements',
|
||||
html,
|
||||
|
|
@ -251,13 +254,14 @@ const handleButtonClick = async () => {
|
|||
const cache = loadLatestEnnoblementsFromCache();
|
||||
const filters = loadFilters();
|
||||
if (
|
||||
Array.isArray(cache.liveEnnoblements) &&
|
||||
cache.liveEnnoblements.length > 0
|
||||
cache.ennoblements &&
|
||||
Array.isArray(cache.ennoblements.items) &&
|
||||
cache.ennoblements.items.length > 0
|
||||
) {
|
||||
renderLatestEnnoblements(cache.liveEnnoblements, filters);
|
||||
renderLatestEnnoblements(cache.ennoblements.items, filters);
|
||||
}
|
||||
const { liveEnnoblements } = await loadLatestEnnoblements();
|
||||
renderLatestEnnoblements(liveEnnoblements, filters);
|
||||
const { ennoblements } = await loadLatestEnnoblements();
|
||||
renderLatestEnnoblements(ennoblements.items, filters);
|
||||
} catch (error) {
|
||||
console.log('latestEnnoblements', error);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,3 +5,19 @@ export const inTZ = (d = new Date(), tz = 'UTC') => {
|
|||
export const inUTC = (d = new Date()) => {
|
||||
return inTZ(d);
|
||||
};
|
||||
|
||||
export const formatDate = (date, options) => {
|
||||
return new Date(date).toLocaleDateString(
|
||||
undefined,
|
||||
options
|
||||
? options
|
||||
: {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit',
|
||||
}
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
export default (date, options) => {
|
||||
return new Date(date).toLocaleDateString(
|
||||
window.game_data.locale.replace('_', '-'),
|
||||
options
|
||||
? options
|
||||
: {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit',
|
||||
}
|
||||
);
|
||||
};
|
||||
Reference in New Issue