Merge branch 'app' into app-publish

Author: chriscant

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:14-alpine3.15
+
+WORKDIR /app
+
+ENV IZNIK_API=http://apiv1.localhost \
+	API=http://apiv1.localhost/api \
+	IMAGE_SITE=http://apiv1.localhost
+
+RUN apk update && apk add git python2 \
+    && git clone https://github.com/Freegle/iznik-nuxt.git
+
+CMD cd iznik-nuxt \
+    && git pull \
+    && yes | npm install -y --legacy-peer-deps \
+    && export NODE_OPTIONS=--max-old-space-size=8192;export HOST=0; npm run dev

components/LoginModal.vue

@@ -59,6 +59,10 @@
           <b-img src="~/static/signinbuttons/yahoo-logo.svg" class="social-button__image" />
           <span class="p-2 text--medium font-weight-bold">Continue with Yahoo</span>
         </b-btn>
+        <p v-if="modtools" class="text-center">
+          You can't log in to ModTools using Facebook, I'm afraid.  If that's how you log in to Freegle, use email/password
+          and trigger a lost password request.
+        </p>
         <notice-message v-if="socialblocked" variant="warning">
           Social log in blocked - check your privacy settings, including any ad blockers such as
           Adblock Plus.
@@ -255,6 +259,10 @@ export default {
     // Use of this.bump means we will recompute when we need to, i.e. when the modal is shown.  This is overriding
     // normal reactivity but that's because the SDKs we use aren't written in Vue.
     facebookDisabled() {
+      if (process.env.IS_MTAPP) {
+        console.log("facebookDisabled true")
+        return true // MT app disabled
+      }
       if (process.env.IS_APP) { // CC
         console.log("facebookDisabled false")
         return false // MT app enabled now

components/ModAdmin.vue

@@ -129,7 +129,7 @@
         <b-btn v-if="!admin.heldby" variant="warning" @click="deleteIt">
           <v-icon name="trash-alt" /> Delete
         </b-btn>
-        <b-btn v-if="!admin.heldby" variant="white" @click="save">
+        <b-btn v-if="!admin.heldby || admin.heldby === myid" variant="white" @click="save">
           <v-icon v-if="saving" name="sync" class="text-success fa-spin" />
           <v-icon v-else-if="saved" name="check" class="text-success" />
           <v-icon v-else name="save" />

components/ModLog.vue

@@ -19,6 +19,14 @@
             <span v-if="log.user && log.byuser && log.byuser.id !== log.user.id">
               (added by <ModLogUser :user="log.byuser" />)
             </span>
+            <span v-if="log.text">
+              <span v-if="log.text === 'Manual'">
+                Clicked on Join button
+              </span>
+              <span v-else>
+                Joined automatically when posting/replying
+              </span>
+            </span>
           </span>
           <span v-else-if="log.subtype === 'Applied'">
             Applied to <ModLogGroup :log="log" />

components/ModMessage.vue

@@ -171,7 +171,15 @@
                 </span>
               </div>
               <div v-if="attachments.length" class="w-100 d-flex flex-wrap">
-                <ModPhoto v-for="attachment in attachments" :key="'attachment-' + attachment.id" :message="message" :attachment="attachment" class="d-inline pr-1" />
+                <div v-for="attachment in attachments" :key="'attachment-' + attachment.id" :class="{'d-inline':true, 'pr-1': true, addedImage: imageAdded(attachment.id), removeImage: imageRemoved(attachment.id)}">
+                  <div class="addedMessage pl-2 font-weight-bold text-success">
+                    Added
+                  </div>
+                  <div class="removedMessage pl-2 font-weight-bold text-warning">
+                    Removed
+                  </div>
+                  <ModPhoto :message="message" :attachment="attachment" />
+                </div>
               </div>
               <MessageReplyInfo v-if="!pending || message.replies && message.replies.length" :message="message" class="d-inline" />
             </div>
@@ -194,7 +202,7 @@
                   Sender only available to mods.
                 </NoticeMessage>
                 <NoticeMessage v-else variant="danger">
-                  Can't identify sender.  Could have been purged but probably a bug.
+                  Can't identify sender.  Could have been purged but perhaps a bug.
                 </NoticeMessage>
               </div>
             </div>
@@ -641,6 +649,36 @@ export default {
     this.$emit('destroy', this.message.id, this.next)
   },
   methods: {
+    imageAdded(id) {
+      let ret = false
+
+      if (this.editreview && this.message && this.message.edits) {
+        this.message.edits.forEach(edit => {
+          const n = edit.newimages ? JSON.parse(edit.newimages) : []
+          const o = edit.oldimages ? JSON.parse(edit.oldimages) : []
+          if (n.includes(id) && !o.includes(id)) {
+            ret = true
+          }
+        })
+      }
+
+      return ret
+    },
+    imageRemoved(id) {
+      let ret = false
+
+      if (this.editreview && this.message && this.message.edits) {
+        this.message.edits.forEach(edit => {
+          const n = edit.newimages ? JSON.parse(edit.newimages) : []
+          const o = edit.oldimages ? JSON.parse(edit.oldimages) : []
+          if (!n.includes(id) && o.includes(id)) {
+            ret = true
+          }
+        })
+      }
+
+      return ret
+    },
     hasCollection(coll) {
       let ret = false
 
@@ -850,6 +888,7 @@ export default {
 @import '~bootstrap/scss/functions';
 @import '~bootstrap/scss/variables';
 @import '~bootstrap/scss/mixins/_breakpoints';
+@import 'color-vars';
 
 .type {
   max-width: 150px;
@@ -873,4 +912,25 @@ export default {
     grid-template-columns: 1fr;
   }
 }
+
+.addedMessage,
+.removedMessage {
+  display: none;
+}
+
+.addedImage {
+  border: 1px solid $color-green--dark !important;
+
+  .addedMessage {
+    display: block !important;
+  }
+}
+
+.removedImage {
+  border: 1px solid $color-red--dark !important;
+
+  .removedMessage {
+    display: block !important;
+  }
+}
 </style>

components/ModRelatedMember.vue

@@ -166,6 +166,9 @@ export default {
     },
     findLongest(s1, s2) {
       // From https://codereview.stackexchange.com/questions/210940/find-longest-common-string-subsequence
+      s1 = s1 + ''
+      s2 = s2 + ''
+
       const removeDistinct = (s1, s2) =>
         s1
           .split('')

components/ModSupportUser.vue

@@ -60,7 +60,7 @@
           target="_blank"
           rel="noopener noreferrer"
         >
-          <v-icon name="user" /> Impersonate (localhost:3000)
+          <v-icon name="user" /> Impersonate (localhost:3002)
         </b-btn>
         <ModMergeButton class="mr-2 mb-1" />
         <b-btn variant="white" class="mr-2 mb-1" @click="logs">
@@ -194,6 +194,9 @@
             <SpinButton variant="white" name="save" label="Add Email" :handler="addEmail" />
           </b-input-group-append>
         </b-input-group>
+        <NoticeMessage v-if="emailAddError" variant="danger" class="mt-2">
+          {{ emailAddError }}
+        </NoticeMessage>
       </div>
       <h3 class="mt-2">
         Notifications
@@ -408,7 +411,8 @@ export default {
       newpassword: null,
       newemail: null,
       newEmailAs: 1,
-      addComment: false
+      addComment: false,
+      emailAddError: null
     }
   },
   computed: {
@@ -569,12 +573,18 @@ export default {
       }
     },
     async addEmail() {
+      this.emailAddError = null
+
       if (this.newemail) {
-        await this.$store.dispatch('user/addEmail', {
-          id: this.user.id,
-          email: this.newemail,
-          primary: parseInt(this.newEmailAs) === 1
-        })
+        try {
+          await this.$store.dispatch('user/addEmail', {
+            id: this.user.id,
+            email: this.newemail,
+            primary: parseInt(this.newEmailAs) === 1
+          })
+        } catch (e) {
+          this.emailAddError = e.message
+        }
       }
     },
     maybeExpand() {

mobile/modtools/android/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="407" id="org.ilovefreegle.modtools" version="0.3.96" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="408" id="org.ilovefreegle.modtools" version="0.3.97" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <name>ModTools</name>
   <description>Tool to help moderators of Freegle groups</description>
   <author email="geeks@ilovefreegle.org" href="https://ilovefreegle.org">Chris Cant, Freegle Ltd</author>

mobile/modtools/ios/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.ilovefreegle.modtools" ios-CFBundleVersion="401" version="0.3.96" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.ilovefreegle.modtools" ios-CFBundleVersion="402" version="0.3.97" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>ModTools</name>
     <description>Tool to help moderators of Freegle and similar groups</description>
     <author email="geeks@ilovefreegle.org" href="https://ilovefreegle.org">

nuxt.config.js

@@ -8,7 +8,7 @@ const SENTRY_DSN = 'https://b68903e730034a4ba3b8b2358331389e@o118493.ingest.sent
 const YAHOO_CLIENTID =
   'dj0yJmk9N245WTRqaDd2dnA4JmQ9WVdrOWIzTlZNMU01TjJjbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWRh'
 const MOBILE_VERSION = '2.0.120'
-const MODTOOLS_VERSION = '0.3.96'
+const MODTOOLS_VERSION = '0.3.97'
 
 require('dotenv').config()
 
@@ -39,7 +39,7 @@ const IZNIK_API = process.env.IZNIK_API || 'https://fdapilive.ilovefreegle.org'
 const USER_SITE = 'https://www.ilovefreegle.org'
 
 // This is where images are served from.
-const IMAGE_SITE = 'https://images.ilovefreegle.org'
+const IMAGE_SITE = process.env.IMAGE_SITE || 'https://images.ilovefreegle.org'
 
 // Long polls interact badly with per-host connection limits so send to here instead.
 const CHAT_HOST = 'https://users.ilovefreegle.org:555'