diff --git a/src/plugins/Timezones/all_timezones.ts b/src/plugins/Timezones/all_timezones.ts index 688491a4d..a014faa23 100644 --- a/src/plugins/Timezones/all_timezones.ts +++ b/src/plugins/Timezones/all_timezones.ts @@ -17,66 +17,62 @@ */ export const timezones = [ + "EST", + "Etc/GMT", + "Etc/GMT+1", + "Etc/GMT+10", + "Etc/GMT+11", + "Etc/GMT+12", + "Etc/GMT+2", + "Etc/GMT+3", + "Etc/GMT+4", + "Etc/GMT+5", + "Etc/GMT+6", + "Etc/GMT+7", + "Etc/GMT+8", + "Etc/GMT+9", + "Etc/GMT-1", + "Etc/GMT-10", + "Etc/GMT-11", + "Etc/GMT-12", + "Etc/GMT-13", + "Etc/GMT-14", + "Etc/GMT-2", + "Etc/GMT-3", + "Etc/GMT-4", + "Etc/GMT-5", + "Etc/GMT-6", + "Etc/GMT-7", + "Etc/GMT-8", + "Etc/GMT-9", + "Etc/UTC", + "HST", + "MST", "Africa/Abidjan", "Africa/Accra", - "Africa/Addis_Ababa", "Africa/Algiers", - "Africa/Asmara", - "Africa/Bamako", - "Africa/Bangui", - "Africa/Banjul", "Africa/Bissau", - "Africa/Blantyre", - "Africa/Brazzaville", - "Africa/Bujumbura", "Africa/Cairo", "Africa/Casablanca", - "Africa/Conakry", - "Africa/Dakar", - "Africa/Dar_es_Salaam", - "Africa/Djibouti", - "Africa/Douala", + "Africa/Ceuta", "Africa/El_Aaiun", - "Africa/Freetown", - "Africa/Gaborone", - "Africa/Harare", "Africa/Johannesburg", "Africa/Juba", - "Africa/Kampala", "Africa/Khartoum", - "Africa/Kigali", - "Africa/Kinshasa", "Africa/Lagos", - "Africa/Libreville", - "Africa/Lome", - "Africa/Luanda", - "Africa/Lubumbashi", - "Africa/Lusaka", - "Africa/Malabo", "Africa/Maputo", - "Africa/Maseru", - "Africa/Mbabane", - "Africa/Mogadishu", "Africa/Monrovia", "Africa/Nairobi", "Africa/Ndjamena", - "Africa/Niamey", - "Africa/Nouakchott", - "Africa/Ouagadougou", - "Africa/Porto-Novo", "Africa/Sao_Tome", - "Africa/Timbuktu", "Africa/Tripoli", "Africa/Tunis", "Africa/Windhoek", "America/Adak", "America/Anchorage", - "America/Anguilla", - "America/Antigua", "America/Araguaina", "America/Argentina/Buenos_Aires", "America/Argentina/Catamarca", - "America/Argentina/ComodRivadavia", "America/Argentina/Cordoba", "America/Argentina/Jujuy", "America/Argentina/La_Rioja", @@ -87,7 +83,6 @@ export const timezones = [ "America/Argentina/San_Luis", "America/Argentina/Tucuman", "America/Argentina/Ushuaia", - "America/Aruba", "America/Asuncion", "America/Atikokan", "America/Bahia", @@ -104,31 +99,26 @@ export const timezones = [ "America/Cancun", "America/Caracas", "America/Cayenne", - "America/Cayman", "America/Chicago", "America/Chihuahua", - "America/Ciudad_Juarez", - "America/Coral_Harbour", "America/Costa_Rica", "America/Creston", "America/Cuiaba", "America/Curacao", + "America/Danmarkshavn", "America/Dawson", "America/Dawson_Creek", "America/Denver", "America/Detroit", - "America/Dominica", "America/Edmonton", "America/Eirunepe", "America/El_Salvador", - "America/Ensenada", "America/Fort_Nelson", "America/Fortaleza", "America/Glace_Bay", + "America/Godthab", "America/Goose_Bay", "America/Grand_Turk", - "America/Grenada", - "America/Guadeloupe", "America/Guatemala", "America/Guayaquil", "America/Guyana", @@ -166,8 +156,6 @@ export const timezones = [ "America/Moncton", "America/Monterrey", "America/Montevideo", - "America/Montreal", - "America/Montserrat", "America/Nassau", "America/New_York", "America/Nipigon", @@ -192,23 +180,19 @@ export const timezones = [ "America/Regina", "America/Resolute", "America/Rio_Branco", - "America/Rosario", "America/Santarem", "America/Santiago", "America/Santo_Domingo", "America/Sao_Paulo", + "America/Scoresbysund", "America/Sitka", "America/St_Johns", - "America/St_Kitts", - "America/St_Lucia", - "America/St_Thomas", - "America/St_Vincent", "America/Swift_Current", "America/Tegucigalpa", + "America/Thule", "America/Thunder_Bay", "America/Tijuana", "America/Toronto", - "America/Tortola", "America/Vancouver", "America/Whitehorse", "America/Winnipeg", @@ -217,109 +201,199 @@ export const timezones = [ "Antarctica/Casey", "Antarctica/Davis", "Antarctica/DumontDUrville", + "Antarctica/Macquarie", "Antarctica/Mawson", - "Antarctica/McMurdo", "Antarctica/Palmer", "Antarctica/Rothera", "Antarctica/Syowa", "Antarctica/Troll", "Antarctica/Vostok", - "Asia/Aden", - "Asia/Bahrain", + "Asia/Almaty", + "Asia/Amman", + "Asia/Anadyr", + "Asia/Aqtau", + "Asia/Aqtobe", + "Asia/Ashgabat", + "Asia/Atyrau", + "Asia/Baghdad", + "Asia/Baku", + "Asia/Bangkok", + "Asia/Barnaul", + "Asia/Beirut", + "Asia/Bishkek", "Asia/Brunei", - "Asia/Chongqing", - "Asia/Hanoi", - "Asia/Harbin", - "Asia/Kashgar", + "Asia/Chita", + "Asia/Choibalsan", + "Asia/Colombo", + "Asia/Damascus", + "Asia/Dhaka", + "Asia/Dili", + "Asia/Dubai", + "Asia/Dushanbe", + "Asia/Famagusta", + "Asia/Gaza", + "Asia/Hebron", + "Asia/Ho_Chi_Minh", + "Asia/Hong_Kong", + "Asia/Hovd", + "Asia/Irkutsk", + "Asia/Jakarta", + "Asia/Jayapura", + "Asia/Jerusalem", + "Asia/Kabul", + "Asia/Kamchatka", + "Asia/Karachi", + "Asia/Kathmandu", + "Asia/Khandyga", + "Asia/Kolkata", + "Asia/Krasnoyarsk", "Asia/Kuala_Lumpur", - "Asia/Kuwait", - "Asia/Muscat", - "Asia/Phnom_Penh", - "Asia/Tel_Aviv", - "Asia/Vientiane", + "Asia/Kuching", + "Asia/Macau", + "Asia/Magadan", + "Asia/Makassar", + "Asia/Manila", + "Asia/Nicosia", + "Asia/Novokuznetsk", + "Asia/Novosibirsk", + "Asia/Omsk", + "Asia/Oral", + "Asia/Pontianak", + "Asia/Pyongyang", + "Asia/Qatar", + "Asia/Qostanay", + "Asia/Qyzylorda", + "Asia/Riyadh", + "Asia/Sakhalin", + "Asia/Samarkand", + "Asia/Seoul", + "Asia/Shanghai", + "Asia/Singapore", + "Asia/Srednekolymsk", + "Asia/Taipei", + "Asia/Tashkent", + "Asia/Tbilisi", + "Asia/Tehran", + "Asia/Thimphu", + "Asia/Tokyo", + "Asia/Tomsk", + "Asia/Ulaanbaatar", + "Asia/Urumqi", + "Asia/Ust-Nera", + "Asia/Vladivostok", + "Asia/Yakutsk", + "Asia/Yangon", + "Asia/Yekaterinburg", + "Asia/Yerevan", + "Atlantic/Azores", "Atlantic/Bermuda", + "Atlantic/Canary", "Atlantic/Cape_Verde", - "Atlantic/Jan_Mayen", + "Atlantic/Faroe", + "Atlantic/Madeira", "Atlantic/Reykjavik", "Atlantic/South_Georgia", - "Atlantic/St_Helena", "Atlantic/Stanley", + "Australia/Adelaide", + "Australia/Brisbane", + "Australia/Broken_Hill", "Australia/Currie", - "CST6CDT", - "EST", - "EST5EDT", - "Etc/GMT", - "Etc/GMT+1", - "Etc/GMT+10", - "Etc/GMT+11", - "Etc/GMT+12", - "Etc/GMT+2", - "Etc/GMT+3", - "Etc/GMT+4", - "Etc/GMT+5", - "Etc/GMT+6", - "Etc/GMT+7", - "Etc/GMT+8", - "Etc/GMT+9", - "Etc/GMT-1", - "Etc/GMT-10", - "Etc/GMT-11", - "Etc/GMT-12", - "Etc/GMT-13", - "Etc/GMT-14", - "Etc/GMT-2", - "Etc/GMT-3", - "Etc/GMT-4", - "Etc/GMT-5", - "Etc/GMT-6", - "Etc/GMT-7", - "Etc/GMT-8", - "Etc/GMT-9", - "Etc/UTC", + "Australia/Darwin", + "Australia/Eucla", + "Australia/Hobart", + "Australia/Lindeman", + "Australia/Lord_Howe", + "Australia/Melbourne", + "Australia/Perth", + "Australia/Sydney", "Europe/Amsterdam", + "Europe/Andorra", + "Europe/Astrakhan", "Europe/Athens", - "Europe/Belfast", + "Europe/Belgrade", + "Europe/Berlin", + "Europe/Brussels", + "Europe/Bucharest", + "Europe/Budapest", + "Europe/Chisinau", "Europe/Copenhagen", - "Europe/Guernsey", - "Europe/Isle_of_Man", - "Europe/Jersey", - "Europe/Ljubljana", + "Europe/Dublin", + "Europe/Gibraltar", + "Europe/Helsinki", + "Europe/Istanbul", + "Europe/Kaliningrad", + "Europe/Kiev", + "Europe/Kirov", + "Europe/Lisbon", + "Europe/London", "Europe/Luxembourg", + "Europe/Madrid", + "Europe/Malta", + "Europe/Minsk", "Europe/Monaco", + "Europe/Moscow", "Europe/Oslo", - "Europe/Sarajevo", - "Europe/Skopje", + "Europe/Paris", + "Europe/Prague", + "Europe/Riga", + "Europe/Rome", + "Europe/Samara", + "Europe/Saratov", + "Europe/Simferopol", + "Europe/Sofia", "Europe/Stockholm", - "Europe/Tiraspol", + "Europe/Tallinn", + "Europe/Tirane", + "Europe/Ulyanovsk", "Europe/Uzhgorod", - "Europe/Vaduz", - "Europe/Zagreb", + "Europe/Vienna", + "Europe/Vilnius", + "Europe/Volgograd", + "Europe/Warsaw", "Europe/Zaporozhye", - "Factory", - "HST", - "Indian/Antananarivo", + "Europe/Zurich", + "Indian/Chagos", "Indian/Christmas", "Indian/Cocos", - "Indian/Comoro", "Indian/Kerguelen", "Indian/Mahe", + "Indian/Maldives", "Indian/Mauritius", - "Indian/Mayotte", "Indian/Reunion", - "MST", - "MST7MDT", - "PST8PDT", + "Pacific/Apia", + "Pacific/Auckland", + "Pacific/Bougainville", + "Pacific/Chatham", "Pacific/Chuuk", "Pacific/Easter", + "Pacific/Efate", "Pacific/Enderbury", + "Pacific/Fakaofo", + "Pacific/Fiji", "Pacific/Funafuti", "Pacific/Galapagos", + "Pacific/Gambier", + "Pacific/Guadalcanal", + "Pacific/Guam", "Pacific/Honolulu", - "Pacific/Johnston", + "Pacific/Kiritimati", + "Pacific/Kosrae", + "Pacific/Kwajalein", "Pacific/Majuro", - "Pacific/Midway", + "Pacific/Marquesas", + "Pacific/Nauru", + "Pacific/Niue", + "Pacific/Norfolk", + "Pacific/Noumea", + "Pacific/Pago_Pago", + "Pacific/Palau", + "Pacific/Pitcairn", "Pacific/Pohnpei", - "Pacific/Saipan", + "Pacific/Port_Moresby", + "Pacific/Rarotonga", + "Pacific/Tahiti", + "Pacific/Tarawa", + "Pacific/Tongatapu", "Pacific/Wake", "Pacific/Wallis" ] as const; diff --git a/src/plugins/Timezones/index.tsx b/src/plugins/Timezones/index.tsx index 9ac0a1bff..5d2f8945e 100644 --- a/src/plugins/Timezones/index.tsx +++ b/src/plugins/Timezones/index.tsx @@ -89,8 +89,7 @@ export default definePlugin({ ], execute(args, ctx) { const user: string | undefined = findOption(args, "user"); - const timezone = (findOption(args, "timezone", timezones[timezones.indexOf("Etc/UTC")])?.trim() as typeof timezones[number] | undefined); - + const timezone = (findOption(args, "timezone") as string | undefined)?.trim() as typeof timezones[number] | undefined; // Kinda hard to happen, but just to be safe... if (!user || !timezone) return sendBotMessage(ctx.channel.id, { content: "PLease provider both a user and a timezone." });