diff --git a/app/data/updaters/DataUpdater.mjs b/app/data/updaters/DataUpdater.mjs index 9628975..48e333e 100644 --- a/app/data/updaters/DataUpdater.mjs +++ b/app/data/updaters/DataUpdater.mjs @@ -10,6 +10,7 @@ import NsoClient from '../../splatnet/NsoClient.mjs'; import { locales, regionalLocales, defaultLocale } from '../../../src/common/i18n.mjs'; import { LocalizationProcessor } from '../LocalizationProcessor.mjs'; import { deriveId, getDateParts, getTopOfCurrentHour } from '../../common/util.mjs'; +import { Console } from 'node:console'; export default class DataUpdater { diff --git a/app/data/updaters/StageScheduleUpdater.mjs b/app/data/updaters/StageScheduleUpdater.mjs index de4a374..654a00c 100644 --- a/app/data/updaters/StageScheduleUpdater.mjs +++ b/app/data/updaters/StageScheduleUpdater.mjs @@ -1,4 +1,3 @@ -import ValueCache from "../../common/ValueCache.mjs"; import DataUpdater from "./DataUpdater.mjs"; import _ from 'lodash'; diff --git a/app/data/updaters/XRankUpdater.mjs b/app/data/updaters/XRankUpdater.mjs index 939c357..6a1c65e 100644 --- a/app/data/updaters/XRankUpdater.mjs +++ b/app/data/updaters/XRankUpdater.mjs @@ -1,4 +1,3 @@ -import jsonpath from 'jsonpath'; import prefixedConsole from "../../common/prefixedConsole.mjs"; import { getXRankSeasonId } from '../../common/util.mjs'; import DataUpdater from "./DataUpdater.mjs"; diff --git a/app/screenshots/HttpServer.mjs b/app/screenshots/HttpServer.mjs index 52ef82b..a78b6fa 100644 --- a/app/screenshots/HttpServer.mjs +++ b/app/screenshots/HttpServer.mjs @@ -3,7 +3,7 @@ import ecstatic from 'ecstatic'; export default class HttpServer { - /** @var {http.Server} */ + /** @member {http.Server} */ #server = null; get port() { diff --git a/app/screenshots/ScreenshotHelper.mjs b/app/screenshots/ScreenshotHelper.mjs index 733833a..39b9510 100644 --- a/app/screenshots/ScreenshotHelper.mjs +++ b/app/screenshots/ScreenshotHelper.mjs @@ -1,7 +1,6 @@ import { URL } from 'url'; import puppeteer from 'puppeteer'; import HttpServer from './HttpServer.mjs'; -import timers from 'timers/promises'; const defaultViewport = { // Using a 16:9 ratio here by default to match Twitter's image card dimensions diff --git a/app/social/StatusGeneratorManager.mjs b/app/social/StatusGeneratorManager.mjs index cea4ec8..8c83571 100644 --- a/app/social/StatusGeneratorManager.mjs +++ b/app/social/StatusGeneratorManager.mjs @@ -1,5 +1,6 @@ import prefixedConsole from "../common/prefixedConsole.mjs"; import ScreenshotHelper from "../screenshots/ScreenshotHelper.mjs"; +import Client from "./clients/Client.mjs"; import StatusGenerator from "./generators/StatusGenerator.mjs"; export default class StatusGeneratorManager diff --git a/app/social/clients/TwitterClient.mjs b/app/social/clients/TwitterClient.mjs index 73b3415..ed1f4b8 100644 --- a/app/social/clients/TwitterClient.mjs +++ b/app/social/clients/TwitterClient.mjs @@ -6,7 +6,7 @@ export default class TwitterClient extends Client key = 'twitter'; name = 'Twitter'; - /** @var {TwitterApi} */ + /** @member {TwitterApi} */ #api; async canSend() { diff --git a/app/social/generators/ChallengeStatus.mjs b/app/social/generators/ChallengeStatus.mjs index f1a6de4..9d4367e 100644 --- a/app/social/generators/ChallengeStatus.mjs +++ b/app/social/generators/ChallengeStatus.mjs @@ -2,6 +2,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useEventSchedulesStore } from "../../../src/stores/schedules.mjs"; import { br2nl } from "../../common/util.mjs"; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class ChallengeStatus extends StatusGenerator { key = 'challenge'; diff --git a/app/social/generators/DailyDropGearStatus.mjs b/app/social/generators/DailyDropGearStatus.mjs index 7d94c7e..313bf84 100644 --- a/app/social/generators/DailyDropGearStatus.mjs +++ b/app/social/generators/DailyDropGearStatus.mjs @@ -2,6 +2,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useGearStore } from "../../../src/stores/gear.mjs"; import { getGearIcon } from "../../common/util.mjs"; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class DailyDropGearStatus extends StatusGenerator { diff --git a/app/social/generators/EggstraWorkStatus.mjs b/app/social/generators/EggstraWorkStatus.mjs index 86862be..986f6fb 100644 --- a/app/social/generators/EggstraWorkStatus.mjs +++ b/app/social/generators/EggstraWorkStatus.mjs @@ -1,6 +1,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useEggstraWorkSchedulesStore } from "../../../src/stores/schedules.mjs"; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class EggstraWorkStatus extends StatusGenerator { diff --git a/app/social/generators/EggstraWorkUpcomingStatus.mjs b/app/social/generators/EggstraWorkUpcomingStatus.mjs index 47f8edf..7c7167e 100644 --- a/app/social/generators/EggstraWorkUpcomingStatus.mjs +++ b/app/social/generators/EggstraWorkUpcomingStatus.mjs @@ -2,6 +2,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useEggstraWorkSchedulesStore } from "../../../src/stores/schedules.mjs"; import { useTimeStore } from "../../../src/stores/time.mjs"; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class EggstraWorkUpcomingStatus extends StatusGenerator { diff --git a/app/social/generators/RegularGearStatus.mjs b/app/social/generators/RegularGearStatus.mjs index 1feffd1..4e90eb9 100644 --- a/app/social/generators/RegularGearStatus.mjs +++ b/app/social/generators/RegularGearStatus.mjs @@ -27,7 +27,7 @@ export default class RegularGearStatus extends StatusGenerator let icon = getGearIcon(gear); let name = gear.gear.name; let power = gear.gear.primaryGearPower.name; - let url = `https://splatoon3.ink/nso/g/${gear.id}`; + // let url = `https://splatoon3.ink/nso/g/${gear.id}`; return [ `Up now on SplatNet: ${icon} ${name} with ${power} #splatnet3`, @@ -36,7 +36,7 @@ export default class RegularGearStatus extends StatusGenerator ].join('\n'); } - /** @param {ScreenshotHelper} screenshotHelper */ + /** @param {screenshotHelper} screenshotHelper */ async _getMedia(screenshotHelper) { let media = new Media; media.file = await screenshotHelper.capture('gear/regular'); diff --git a/app/social/generators/SalmonRunGearStatus.mjs b/app/social/generators/SalmonRunGearStatus.mjs index 92654c9..3c03284 100644 --- a/app/social/generators/SalmonRunGearStatus.mjs +++ b/app/social/generators/SalmonRunGearStatus.mjs @@ -1,6 +1,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useCoopGearStore } from "../../../src/stores/gear.mjs"; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class SalmonRunGearStatus extends StatusGenerator { diff --git a/app/social/generators/SalmonRunStatus.mjs b/app/social/generators/SalmonRunStatus.mjs index d4dd015..5095438 100644 --- a/app/social/generators/SalmonRunStatus.mjs +++ b/app/social/generators/SalmonRunStatus.mjs @@ -1,6 +1,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useSalmonRunSchedulesStore } from "../../../src/stores/schedules.mjs"; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class SalmonRunStatus extends StatusGenerator { diff --git a/app/social/generators/SalmonRunUpcomingStatus.mjs b/app/social/generators/SalmonRunUpcomingStatus.mjs index 4158ef3..7b4f141 100644 --- a/app/social/generators/SalmonRunUpcomingStatus.mjs +++ b/app/social/generators/SalmonRunUpcomingStatus.mjs @@ -2,6 +2,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useSalmonRunSchedulesStore } from "../../../src/stores/schedules.mjs"; import { useTimeStore } from "../../../src/stores/time.mjs"; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class SalmonRunUpcomingStatus extends StatusGenerator { diff --git a/app/social/generators/SchedulesStatus.mjs b/app/social/generators/SchedulesStatus.mjs index aadddf2..7bb9440 100644 --- a/app/social/generators/SchedulesStatus.mjs +++ b/app/social/generators/SchedulesStatus.mjs @@ -2,6 +2,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useAnarchyOpenSchedulesStore, useAnarchySeriesSchedulesStore, useRegularSchedulesStore, useSplatfestOpenSchedulesStore, useSplatfestProSchedulesStore, useXSchedulesStore } from "../../../src/stores/schedules.mjs"; import { useUSSplatfestsStore } from '../../../src/stores/splatfests.mjs'; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class SchedulesStatus extends StatusGenerator { key = 'schedules'; diff --git a/app/social/generators/SplatfestResultsStatus.mjs b/app/social/generators/SplatfestResultsStatus.mjs index 1f4a4f7..45d8a9d 100644 --- a/app/social/generators/SplatfestResultsStatus.mjs +++ b/app/social/generators/SplatfestResultsStatus.mjs @@ -1,6 +1,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useUSSplatfestsStore, useEUSplatfestsStore, useJPSplatfestsStore, useAPSplatfestsStore } from '../../../src/stores/splatfests.mjs'; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class SplatfestResultsStatus extends StatusGenerator { diff --git a/app/social/generators/SplatfestStatus.mjs b/app/social/generators/SplatfestStatus.mjs index ed72591..5ca4577 100644 --- a/app/social/generators/SplatfestStatus.mjs +++ b/app/social/generators/SplatfestStatus.mjs @@ -2,6 +2,7 @@ import StatusGenerator from "./StatusGenerator.mjs"; import Media from "../Media.mjs"; import { useUSSplatfestsStore, useEUSplatfestsStore, useJPSplatfestsStore, useAPSplatfestsStore, STATUS_ACTIVE, STATUS_PAST } from '../../../src/stores/splatfests.mjs'; import { useTimeStore } from "../../../src/stores/time.mjs"; +import ScreenshotHelper from "../../screenshots/ScreenshotHelper.mjs"; export default class SplatfestStatus extends StatusGenerator { diff --git a/app/social/generators/StatusGenerator.mjs b/app/social/generators/StatusGenerator.mjs index c618555..f384868 100644 --- a/app/social/generators/StatusGenerator.mjs +++ b/app/social/generators/StatusGenerator.mjs @@ -3,11 +3,11 @@ import { createPinia, setActivePinia } from 'pinia'; import { useCoopDataStore, useFestivalsDataStore, useGearDataStore, useSchedulesDataStore } from '../../../src/stores/data.mjs'; import prefixedConsole from '../../common/prefixedConsole.mjs'; import Status from '../Status.mjs'; -import Client from '../clients/Client.mjs'; import ScreenshotHelper from '../../screenshots/ScreenshotHelper.mjs'; import { getTopOfCurrentHour } from '../../common/util.mjs'; import { useTimeStore } from '../../../src/stores/time.mjs'; import ValueCache from '../../common/ValueCache.mjs'; +import { Console } from 'node:console'; export default class StatusGenerator { diff --git a/src/components/RuleIcon.vue b/src/components/RuleIcon.vue index 4f391ee..75f3278 100644 --- a/src/components/RuleIcon.vue +++ b/src/components/RuleIcon.vue @@ -13,6 +13,7 @@ import ruleYaguraSvg from '@/assets/img/rules/yagura.svg'; const props = defineProps({ rule: { + type: Object, required: true, }, }); diff --git a/src/components/ScheduleDialog.vue b/src/components/ScheduleDialog.vue index 6c7f475..47293c3 100644 --- a/src/components/ScheduleDialog.vue +++ b/src/components/ScheduleDialog.vue @@ -52,6 +52,8 @@ const props = defineProps({ }, }); +defineEmits(['close']); + const { types } = useScheduleTypes(); const type = computed(() => types[props.type]); diff --git a/src/components/ScheduleRow.vue b/src/components/ScheduleRow.vue index 43422a5..e1956e4 100644 --- a/src/components/ScheduleRow.vue +++ b/src/components/ScheduleRow.vue @@ -87,6 +87,7 @@ import { useTimeStore } from '../stores/time.mjs'; const props = defineProps({ schedule: { + type: Object, required: true, }, }); diff --git a/src/components/SquidTape.vue b/src/components/SquidTape.vue index 1ca5f5b..a7a8b57 100644 --- a/src/components/SquidTape.vue +++ b/src/components/SquidTape.vue @@ -15,15 +15,19 @@ import { computed } from 'vue'; const props = defineProps({ bg: { + type: String, default: 'bg-splatoon-blue', }, squidBg: { + type: String, default: 'bg-white', }, border: { + type: String, default: 'border-white', }, squidSize: { + type: String, default: '10px', }, }); diff --git a/src/components/StageDialog.vue b/src/components/StageDialog.vue index a73d54a..c1e4f83 100644 --- a/src/components/StageDialog.vue +++ b/src/components/StageDialog.vue @@ -30,5 +30,7 @@ const props = defineProps({ stage: Object, }); +defineEmits(['close']); + const imgUrl = computed(() => props.stage?.image.url); diff --git a/src/components/TricolorBox.vue b/src/components/TricolorBox.vue index 6182288..c96f0c3 100644 --- a/src/components/TricolorBox.vue +++ b/src/components/TricolorBox.vue @@ -52,7 +52,6 @@ import { computed } from 'vue'; import { useUSSplatfestsStore } from '@/stores/splatfests'; import ProductContainer from './ProductContainer.vue'; import StageImage from './StageImage.vue'; -import RuleIcon from './RuleIcon.vue'; import { useScheduleTypes } from './concerns/scheduleTypes.mjs'; import TricolorIcon from './TricolorIcon.vue'; diff --git a/src/components/TricolorIcon.vue b/src/components/TricolorIcon.vue index fd6c2b5..ba1d67c 100644 --- a/src/components/TricolorIcon.vue +++ b/src/components/TricolorIcon.vue @@ -18,7 +18,7 @@ diff --git a/src/views/SocialsView.vue b/src/views/SocialsView.vue index 726d5a6..2f7b168 100644 --- a/src/views/SocialsView.vue +++ b/src/views/SocialsView.vue @@ -36,11 +36,15 @@ - + - +