Mega commit, contains fix #60, #59, #58, #57"

> - #57, when multiple commits were conducted by the same user, the revert url redirect to history page so the reviewer can have a better overview. > we will further improve this with ROLLBACK feature or ADMIN notice feature in future release when we are granted Oauth > - #58, package-lock.json rescyned by running `npm i` > - #59, added template.env > - #60, the error is caused by when ORES score is not available for an individual revision. We ignore them in this case.
google · Aug 7, 2019 · 0e5c6ec · 0e5c6ec
1 parent 5d37423
commit 0e5c6ec
Show file tree

Hide file tree

Showing 11 changed files with 171 additions and 35 deletions.
diff --git a/assets/wikiloop-battlefield-logo.png b/assets/wikiloop-battlefield-logo.png
diff --git a/components/NewRevisionCard.vue b/components/NewRevisionCard.vue
@@ -96,14 +96,13 @@
                 class="btn btn-sm" target="_blank"
             >Should revert {{getJudgementCount(`ShouldRevert`)}}
             </button>
-<!--            TODO(xinbenlv, #57 https://github.com/google/wikiloop-battlefield/issues/57): temp disable revert per Grahamwp@'s report-->
-<!--            <transition name="fade">-->
-<!--              <button v-if="enableRevertRedirect()"-->
-<!--                      v-on:click="redirectToRevert()"-->
-<!--                      class="btn btn-outline-primary">-->
-<!--                Go-->
-<!--              </button>-->
-<!--            </transition>-->
+            <transition name="fade">
+              <button v-if="enableRevertRedirect()"
+                      v-on:click="redirectToRevert()"
+                      class="btn btn-outline-primary">
+                Go
+              </button>
+            </transition>
 
           </div>
         </div>
@@ -118,7 +117,7 @@
               <td class="col-4">
                 <router-link :to="`/marked/?userGaId=${judgement.userGaId}`" replace>
                   <object class="avatar-object" v-bind:data="`/api/avatar/${judgement.userGaId}`" ></object>
-                  <span v-if="$cookies.get('_ga') === judgement.userGaId ">Me</span>
+                  <span v-if="$cookiez.get('_ga') === judgement.userGaId ">Me</span>
                   <span v-else>Someone</span>
                 </router-link>
               </td>
@@ -191,7 +190,17 @@
       },
       loadStiki: async function() {
         console.log(`Load Stiki`);
-        let stikiRemote = this.stikiProp || await this.$axios.$get(`/extra/stiki/${this.wikiRevId}`);
+        let stikiRemote;
+        if (this.stikiProp) {
+          stikiRemote = this.stikiProp;
+        } else {
+          try {
+            await this.$axios.$get(`/extra/stiki/${this.wikiRevId}`);
+          } catch(err) {
+            // ignoring
+            stikiRemote = [];
+          }
+        }
         if (stikiRemote.length) {
           this.stiki = parseFloat(stikiRemote[0].SCORE);
         } else {
@@ -201,7 +210,17 @@
       },
       loadCbng: async function() {
         console.log(`Load CBNG for ${this.wikiRevId}`);
-        let cbngRemote = this.stikiProp || await this.$axios.$get(`/extra/cbng/${this.wikiRevId}`);
+        let cbngRemote;
+        if (this.cbngProp) {
+          cbngRemote = this.cbngProp;
+        } else {
+          try {
+            await this.$axios.$get(`/extra/cbng/${this.wikiRevId}`);
+          } catch(err) {
+            // ignoring
+            cbngRemote = [];
+          }
+        }
         if (cbngRemote.length) {
           this.cbng = parseFloat(cbngRemote[0].SCORE);
         } else {
@@ -220,7 +239,7 @@
       },
       getMyJudgement: function() {
         if (this.interaction) {
-          let myGaId = this.$cookies.get("_ga");
+          let myGaId = this.$cookiez.get("_ga");
           let result = this.interaction.judgements.filter(j => j.userGaId === myGaId);
           if (result.length === 1) {
             return result[0].judgement;
@@ -238,19 +257,34 @@
           }
         });
         return this.myJudgement === `ShouldRevert` && !this.isOverriden();
-
       },
       redirectToRevert: async function() {
         if (this.myJudgement === `ShouldRevert` && !this.isOverriden()) {
           const version = await this.$axios.$get(`/api/version`);
-          let url = `${this.getUrlBaseByWiki(this.revision.wiki)}/w/index.php?title=${this.revision.title}&action=edit&undoafter=${this.revision.parentid}&undo=${this.revision.revid}&summary=Identified as test/vandalism using [[:m:WikiLoop Battlefield]](version ${version}) at battlefield.wikiloop.org.`;
-          window.open(url, '_blank');
+          let revertUrl = `${this.getUrlBaseByWiki(this.revision.wiki)}/w/index.php?title=${this.revision.title}&action=edit&undoafter=${this.revision.parentid}&undo=${this.revision.revid}&summary=Identified as test/vandalism using [[:m:WikiLoop Battlefield]](version ${version}) at battlefield.wikiloop.org.`;
+          let historyUrl = `${this.getUrlBaseByWiki(this.revision.wiki)}/w/index.php?title=${this.revision.title}action=history`;
+          let result = await this.$axios.$get(`/api/mediawiki`, {params: {
+            wiki: this.revision.wiki,
+            apiQuery: {
+              action: "query",
+              format: "json",
+              prop: "revisions",
+              titles: this.revision.title,
+              rvlimit: 10,
+            }
+          }});
+          let revisions = Object.values(result.query.pages)[0].revisions;
+          if (revisions[1].user === revisions[0].user) {
+            window.open(historyUrl, '_blank');
+          } else {
+            window.open(revertUrl, '_blank');
+          }
         }
       },
       interactionBtn: async function (myJudgement) {
         this.myJudgement = myJudgement;
         let revision = this.revision;
-        let gaId = this.$cookies.get("_ga");
+        let gaId = this.$cookiez.get("_ga");
         let postBody = {
           gaId: gaId, // Deprecated
           userGaId: gaId,
@@ -300,8 +334,10 @@
       this.interaction = this.interactionProp || await this.$axios.$get(`/api/interaction/${this.wikiRevId}`);
       this.revision = this.revisionProp || await this.$axios.$get(`/api/revision/${this.wikiRevId}`);
       this.ores = this.oresProp || await this.$axios.$get(`/api/ores/${this.wikiRevId}`);
-      await this.loadStiki();
-      await this.loadCbng();
+      if (this.$store.state.flags && this.$store.state.flags.useStiki) {
+        await this.loadStiki();
+        await this.loadCbng();
+      }
       if (!this.diff) {
         this.diff = await this.$axios.$get(`/api/diff/${this.wikiRevId}`);
       }

diff --git a/layouts/default.vue b/layouts/default.vue
@@ -44,8 +44,8 @@
           </b-navbar-nav>
           <b-navbar-nav class="ml-auto">
             <b-nav-item right href="#"><i class="fas fa-users"></i> Online ({{ liveUserCount }})</b-nav-item>
-            <b-nav-item :href="`/marked/?userGaId=${$cookies.get('_ga')}`" right>
-                <object class="avatar-navbar" v-bind:data="`/api/avatar/${$cookies.get('_ga')}`" ></object>Me
+            <b-nav-item :href="`/marked/?userGaId=${$cookiez.get('_ga')}`" right>
+                <object class="avatar-navbar" v-bind:data="`/api/avatar/${$cookiez.get('_ga')}`" ></object>Me
             </b-nav-item>
           </b-navbar-nav>
         </b-collapse>
@@ -80,7 +80,7 @@
         this.stats = await this.$axios.$get(`/api/stats`);
       });
       socket.on('interaction', async (interaction) => {
-        if (interaction.newJudgement.userGaId === this.$cookies.get('_ga')) {
+        if (interaction.newJudgement.userGaId === this.$cookiez.get('_ga')) {
           this.$bvToast.toast(
               `Your judgement for ${interaction.recentChange.title} for revision ${interaction.wikiRevId} is logged.`, {
                 title: 'Your Judgement',

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -71,10 +71,7 @@ module.exports = {
     ['@nuxtjs/google-analytics', {
       id: process.env.GA_ID
     }],
-    {
-      src: 'nuxt-universal-cookies',
-      options: {}
-    }
+    ['cookie-universal-nuxt', { alias: 'cookiez' }],
   ],
   /*
    ** Axios module configuration

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "bootstrap": "^4.1.3",
     "bootstrap-vue": "^2.0.0-rc.24",
     "cookie-parser": "^1.4.4",
+    "cookie-universal-nuxt": "^2.0.17",
     "cross-env": "^5.2.0",
     "csv-stringify": "^5.3.0",
     "dotenv": "^7.0.0",
@@ -38,7 +39,6 @@
     "mongodb": "^3.2.3",
     "mysql2": "^1.6.5",
     "nuxt": "^2.8.1",
-    "nuxt-universal-cookies": "0.0.5",
     "querystring": "^0.2.0",
     "request": "^2.88.0",
     "request-promise": "^4.2.4",

diff --git a/pages/leaderboard.vue b/pages/leaderboard.vue
@@ -29,14 +29,14 @@
         </thead>
         <tbody>
           <template  v-for="(leader, index) in leaderboard">
-          <tr v-bind:class="{ 'table-success': $cookies.get('_ga') == leader.userGaId }">
+          <tr v-bind:class="{ 'table-success': $cookiez.get('_ga') == leader.userGaId }">
             <td scope="col">
               {{index + 1}}
             </td>
             <td scope="col">
               <router-link :to="`/marked/?userGaId=${leader.userGaId}`" replace>
                 <object class="avatar-object" v-bind:data="`/api/avatar/${leader.userGaId}`" ></object>
-                <span v-if="$cookies.get('_ga') === leader.userGaId ">Me</span>
+                <span v-if="$cookiez.get('_ga') === leader.userGaId ">Me</span>
                 <span v-else>Someone</span>
               </router-link>
             </td>

diff --git a/pages/marked.vue b/pages/marked.vue
@@ -18,7 +18,7 @@
 
   <section>
     <div class="container small-screen-padding" style="margin-top:80px">
-      <h4 v-if="$router.history.current.query.userGaId === $cookies.get('_ga')">My History</h4>
+      <h4 v-if="$router.history.current.query.userGaId === $cookiez.get('_ga')">My History</h4>
       <h4 v-else >History</h4>
       <div v-for="wikiRevId of wikiRevIds"
            v-bind:key="wikiRevId"

diff --git a/server/index.js b/server/index.js
@@ -33,10 +33,10 @@ const config = require('../nuxt.config.js');
 config.dev = !(process.env.NODE_ENV === 'production');
 
 function computeOresField(oresJson, wiki, revId) {
-  let damagingScore = oresJson.damagingScore || oresJson[wiki].scores[revId].damaging.score.probability.true;
-  let badfaithScore = oresJson.badfaithScore || oresJson[wiki].scores[revId].goodfaith.score.probability.false;
-  let damaging = oresJson.damaging || oresJson[wiki].scores[revId].damaging.score.prediction;
-  let badfaith = oresJson.badfaith || !oresJson[wiki].scores[revId].goodfaith.score.prediction;
+  let damagingScore = oresJson.damagingScore || (oresJson[wiki].scores[revId].damaging.score && oresJson[wiki].scores[revId].damaging.score.probability.true);
+  let badfaithScore = oresJson.badfaithScore || (oresJson[wiki].scores[revId].goodfaith.score && oresJson[wiki].scores[revId].goodfaith.score.probability.false);
+  let damaging = oresJson.damaging || (oresJson[wiki].scores[revId].damaging.score && oresJson[wiki].scores[revId].damaging.score.prediction);
+  let badfaith = oresJson.badfaith || (oresJson[wiki].scores[revId].goodfaith.score && !oresJson[wiki].scores[revId].goodfaith.score.prediction);
   return {
     wikiRevId: `${wiki}:${revId}`,
     damagingScore: damagingScore,
@@ -1166,6 +1166,33 @@ function setupApiRequestListener(db, io, app) {
 
   }));
 
+  apiRouter.get('/flags', (req, res, next) => {
+    let useStiki = (process.env.STIKI_MYSQL && process.env.STIKI_MYSQL.length > 0) || false;
+    res.send({
+      useStiki: useStiki
+    });
+    req.visitor
+        .event({ec: "api", ea: "/"})
+        .send();
+  });
+
+  apiRouter.get('/mediawiki', asyncHandler(async (req, res) => {
+    // TODO add sanitize if we see abuse.
+    apiLogger.debug('req.params:', req.params);
+    apiLogger.debug('req.query:', req.query);
+    const fetchUrl = new URL(`${getUrlBaseByWiki(req.query.wiki)}/w/api.php`);
+    let params = JSON.parse(req.query.apiQuery);
+
+    Object.keys(params).forEach(key => {
+      fetchUrl.searchParams.set(key, params[key]);
+    });
+    let retJson = await rp.get(fetchUrl, {json: true});
+    res.send(retJson);
+    req.visitor
+        .event({ec: "mediawiki", ea: "/"})
+        .send();
+  }));
+
   apiRouter.get('/version', (req, res, next) => {
     var packageson = require('./../package.json');
     res.send(packageson.version);
@@ -1306,7 +1333,9 @@ async function start() {
   setupIoSocketListener(io);
   setupMediaWikiListener(db, io);
   setupApiRequestListener(db, io, app);
-  await setupSTikiApiLisenter(app);
+  if (process.env.STIKI_MYSQL) {
+    await setupSTikiApiLisenter(app);
+  }
 
   // Give nuxt middleware to express
   app.use(nuxt.render);

diff --git a/store/flags.js b/store/flags.js
@@ -0,0 +1,20 @@
+export const state = () => ({
+  flags: null
+});
+
+export const mutations = {
+  setFlags (state, flagObject) {
+    state.flags = flagObject;
+  },
+  clearFlags (state, ) {
+    state.flags = null
+  },
+
+};
+
+export const actions = {
+  async nuxtServerInit({ commit, state }) {
+    const flags = await this.$axios.$get(`/api/flags`);
+    commit('setFlags', flags);
+  }
+};
diff --git a/template.env b/template.env
@@ -0,0 +1,12 @@
+# this file was created automatically by heroku-config
+AXIOS_BASE_URL="http://localhost:3000"
+# This is our GAID for dev
+GA_ID=UA-122681777-3
+HOST="0.0.0.0"
+NPM_CONFIG_PRODUCTION=false
+
+# This can be automatically filled in when you have a mlab add-on enabled for Heroku
+# MONGODB_URI=
+
+# We will work with STIKI Author to work out a public solution
+# STIKI_MYSQL=