Add winner info to the Splatfest results tweet

src/js/components/screenshots/splatfest/Splatfest.vue

@@ -53,6 +53,11 @@ export default {
         },
     },
     created() {
+        if (this.region == 'jp') {
+            this.$i18n.add('ja', require('@/locale/ja'));
+            this.$i18n.set('ja');
+        }
+
         axios.get('data/festivals.json')
             .then(response => this.festivals = response.data)
     },

src/js/components/splatoon/SplatfestBox.vue

@@ -73,6 +73,7 @@
 <script>
 import Vue from 'vue';
 import SplatfestResultsBox from './SplatfestResultsBox.vue';
+import { getSplatfestWinner } from '@/js/splatoon';
 
 export default {
     components: { SplatfestResultsBox },
@@ -111,15 +112,7 @@ export default {
             if (!this.results)
                 return;
 
-            // Which team won?
-            let points = { alpha: 0, bravo: 0 };
-            for (let key of ['vote', 'solo', 'team']) {
-                let rates = this.results.rates[key];
-                let winner = (rates.alpha > rates.bravo) ? 'alpha' : 'bravo';
-                points[winner]++;
-            }
-
-            let winner = (points.alpha > points.bravo) ? 'alpha' : 'bravo';
+            let winner = getSplatfestWinner(this.results);
 
             let team = `<span style="color: ${this.festival.colors[winner].css_rgb}">${this.teamNames[winner]}</span>`;
             return this.$t('splatfest.team_name_wins', { team });

src/js/splatoon.js

@@ -22,6 +22,19 @@ function getOriginalGear(gear) {
     });
 }
 
+function getSplatfestWinner(results) {
+    let points = { alpha: 0, bravo: 0 };
+
+    for (let key of ['vote', 'solo', 'team']) {
+        let rates = results.rates[key];
+        let winner = (rates.alpha > rates.bravo) ? 'alpha' : 'bravo';
+        points[winner]++;
+    }
+
+    return (points.alpha > points.bravo) ? 'alpha' : 'bravo';
+}
+
 module.exports = {
     getOriginalGear,
+    getSplatfestWinner,
 }

src/updater/twitter/SplatfestTweet.js

@@ -2,6 +2,7 @@ const TwitterPostBase = require('./TwitterPostBase');
 const { captureSplatfestScreenshot } = require('../screenshots');
 const { readData } = require('../utilities');
 const regions = require('../../js/regions');
+const { getSplatfestWinner } = require('../../js/splatoon');
 
 class SplatfestTweet extends TwitterPostBase {
     constructor(region) {
@@ -26,6 +27,11 @@ class SplatfestTweet extends TwitterPostBase {
         return festivals[this.region].festivals;
     }
 
+    getResults() {
+        let festivals = readData('festivals.json');
+        return festivals[this.region].results;
+    }
+
     getData() {
         // Festival announced
         let festival = this.getFestivals().find(f => f.times.announce == this.getDataTime());
@@ -39,8 +45,12 @@ class SplatfestTweet extends TwitterPostBase {
 
         // Festival results
         festival = this.getFestivals().find(f => f.times.result == this.getDataTime());
-        if (festival)
-            return { festival, type: 'result' };
+        if (festival) {
+            // We only want to post the results tweet if we actually have results
+            let results = this.getResults().find(r => r.festival_id == festival.festival_id);
+            if (results)
+                return { festival, results, type: 'result' };
+        }
     }
 
     getTestData() {
@@ -54,11 +64,19 @@ class SplatfestTweet extends TwitterPostBase {
     getText(data) {
         switch (data.type) {
             case 'announce':
-                return `You can now vote in the ${this.regionDemonym} Splatfest! #splatfest #splatoon2`;
+                return `You can now vote in the next ${this.regionDemonym} Splatfest! #splatfest #splatoon2`;
             case 'start':
                 return `The ${this.regionDemonym} Splatfest is now open! #splatfest #splatoon2`;
             case 'result':
-                return `Results are in for the ${this.regionDemonym} Splatfest! #splatfest #splatoon2`;
+                let winner = getSplatfestWinner(data.results);
+
+                // Just hardcoding this in here for now to avoid dealing with loading the Vuex store separately
+                // since I might be moving everything over to Vuex in the future anyway.
+                let resultsFormat = (this.region == 'jp') ? '{team}チームの勝利！' : 'Team {team} wins!';
+                let teamName = (winner == 'alpha') ? data.festival.names.alpha_short : data.festival.names.bravo_short;
+                let results = resultsFormat.replace('{team}', teamName);
+
+                return `${this.regionDemonym} Splatfest results: ${results} #splatfest #splatoon2`;
         }
     }
 }