diff --git a/src/app/screenshots/screenshots.js b/src/app/screenshots/screenshots.js index e27d7ea..ccfdc86 100644 --- a/src/app/screenshots/screenshots.js +++ b/src/app/screenshots/screenshots.js @@ -53,39 +53,39 @@ async function captureScreenshot(options) { return result; } -function captureScheduleScreenshot(startTime) { - let hash = `/schedules/${startTime}`; +function captureScheduleScreenshot(now) { + let hash = `/schedules/${now}`; return captureScreenshot({ hash }); } -function captureGearScreenshot(startTime, endTime) { - let hash = `/splatNetGear/${startTime}/${endTime}`; +function captureGearScreenshot(now) { + let hash = `/splatNetGear/${now}`; return captureScreenshot({ hash, viewport: { height: 700 } }); } -function captureSalmonRunScreenshot(startTime) { - let hash = `/salmonRun/${startTime}`; +function captureSalmonRunScreenshot(now) { + let hash = `/salmonRun/${now}`; return captureScreenshot({ hash }); } -function captureSalmonRunGearScreenshot(startTime) { - let hash = `/salmonRunGear/${startTime}`; +function captureSalmonRunGearScreenshot(now) { + let hash = `/salmonRunGear/${now}`; return captureScreenshot({ hash }); } -function captureNewWeaponScreenshot(releaseTime) { - let hash = `/newWeapon/${releaseTime}`; +function captureNewWeaponScreenshot(now) { + let hash = `/newWeapon/${now}`; return captureScreenshot({ hash }); } -function captureSplatfestScreenshot(region, startTime, regions) { +function captureSplatfestScreenshot(region, now, regions) { regions = regions.join(','); - let hash = `/splatfest/${region}/${startTime}?regions=${regions}`; + let hash = `/splatfest/${region}/${now}?regions=${regions}`; return captureScreenshot({ hash }); } diff --git a/src/app/twitter/tweets/GearTweet.js b/src/app/twitter/tweets/GearTweet.js index 893b139..10bfee2 100644 --- a/src/app/twitter/tweets/GearTweet.js +++ b/src/app/twitter/tweets/GearTweet.js @@ -27,9 +27,8 @@ class GearTweet extends TwitterPostBase { } getImage(data) { - let startTime = getTopOfCurrentHour(); - let endTime = this.getDataTime(); - return captureGearScreenshot(startTime, endTime); + let now = getTopOfCurrentHour(); + return captureGearScreenshot(now); } getText(data) { diff --git a/src/web/components/Main.vue b/src/web/components/Main.vue index 12f120f..3d1bcc3 100644 --- a/src/web/components/Main.vue +++ b/src/web/components/Main.vue @@ -36,7 +36,7 @@ -
| {{ time | dateTime('en', 'UTC', 'MMMM D, YYYY HH:mm z') }} | +{{ now | dateTime('en', 'UTC', 'MMMM D, YYYY HH:mm z') }} | ||||
| {{ time | dateTime('en-us', 'America/Los_Angeles') }} | -{{ time | dateTime('en-gb', 'Europe/London') }} | +{{ now | dateTime('en-us', 'America/Los_Angeles') }} | +{{ now | dateTime('en-gb', 'Europe/London') }} | ||
| {{ time | dateTime('en-us', 'America/New_York') }} | -{{ time | dateTime('ja-jp', 'Asia/Tokyo') }} | +{{ now | dateTime('en-us', 'America/New_York') }} | +{{ now | dateTime('ja-jp', 'Asia/Tokyo') }} | ||
-
-
+
+
+
@@ -47,16 +43,14 @@