arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-21 05:54:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Dragon Fire
2021-06-12 18:21:31 -04:00
parent c3806fb9b2
commit 23360e565f
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/events/holidays.js
+11 -7
View File
@@ -2,11 +2,12 @@ const Command = require('../../framework/Command');
const request = require('node-superfetch'); const request = require('node-superfetch');
const { list, today, tomorrow } = require('../../util/Util'); const { list, today, tomorrow } = require('../../util/Util');
const { GOOGLE_KEY, PERSONAL_GOOGLE_CALENDAR_ID } = process.env; const { GOOGLE_KEY, PERSONAL_GOOGLE_CALENDAR_ID } = process.env;
const holidayCals = [ const holidayCals = {
'en.usa#holiday@group.v.calendar.google.com', USA: 'en.usa#holiday@group.v.calendar.google.com',
'en.japanese#holiday@group.v.calendar.google.com', Japan: 'en.japanese#holiday@group.v.calendar.google.com',
'en.uk#holiday@group.v.calendar.google.com' UK: 'en.uk#holiday@group.v.calendar.google.com',
]; Australia: 'en.australian#holiday@group.v.calendar.google.com'
};
module.exports = class HolidaysCommand extends Command { module.exports = class HolidaysCommand extends Command {
constructor(client) { constructor(client) {
@@ -30,9 +31,12 @@ module.exports = class HolidaysCommand extends Command {
async run(msg) { async run(msg) {
try { try {
const events = []; const events = [];
for (const calID of holidayCals) { for (const [country, calID] of Object.entries(holidayCals)) {
const standardEvents = await this.fetchHolidays(calID); const standardEvents = await this.fetchHolidays(calID);
if (standardEvents) events.push(...standardEvents); if (standardEvents) {
const mapped = standardEvents.map(event => `${event} (${country})`);
events.push(...mapped);
}
} }
if (PERSONAL_GOOGLE_CALENDAR_ID) { if (PERSONAL_GOOGLE_CALENDAR_ID) {
const personalEvents = await this.fetchHolidays(PERSONAL_GOOGLE_CALENDAR_ID); const personalEvents = await this.fetchHolidays(PERSONAL_GOOGLE_CALENDAR_ID);