Merge branch 'app' into app-publish

android/app/build.gradle

@@ -6,7 +6,7 @@ android {
         applicationId "org.ilovefreegle.direct"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1204
+        versionCode 1205
         versionName "3.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {

components/ChatHeader.vue

@@ -317,6 +317,13 @@ export default {
       return ret
     },
   },
+  watch: {
+    unseen() {
+      // Make sure the chat is up to date.  This helps in the case where pollForChatUpdates picks up a new
+      // message and so we show that the chat has unread messages, but we haven't yet
+      this.chatStore.fetchMessages(this.id)
+    },
+  },
   methods: {
     async hide() {
       console.log('Hide chat')

components/ChatMessageDateRead.vue

@@ -31,6 +31,7 @@
       <b-badge
         v-if="chatmessage?.replyexpected && !chatmessage?.replyreceived"
         variant="danger"
+        class="ml-1"
       >
         RSVP - reply expected
       </b-badge>
@@ -96,6 +97,7 @@
       <b-badge
         v-if="chatmessage?.replyexpected && !chatmessage?.replyreceived"
         variant="info"
+        class="ml-1"
       >
         RSVP - reply requested
       </b-badge>

components/LayoutCommon.vue

@@ -154,11 +154,14 @@ export default {
     },
     monitorTabVisibility() {
       if (process.client) {
+        // console.log('---monitorTabVisibility')
         document.addEventListener('visibilitychange', () => {
+          console.log('---visibilitychange')
           const miscStore = useMiscStore()
           miscStore.visible = !document.hidden
 
           if (this.me && !document.hidden) {
+            // console.log('---visibilitychange CHANGED')
             // We have become visible.  Refetch our notification count and chat count, which are the two key things which
             // produce red badges people should click on.
             const notificationStore = useNotificationStore()

components/OutcomeBy.vue

@@ -67,8 +67,7 @@
       />
     </div>
     <p class="mt-1 text-muted small">
-      We'll let anyone else who replied know, and it helps us identify reliable
-      freeglers.
+      This helps us identify reliable freeglers.
     </p>
   </div>
 </template>
@@ -222,7 +221,6 @@ export default {
         })
       } else if (userid > 0) {
         const user = this.availableUsers.find((u) => u.userid === userid)
-        console.log('Found', user)
         user.count = 1
         this.currentlySelectedUsers.push(user)
       }

components/OutcomeModal.vue

@@ -61,6 +61,27 @@
           />
         </div>
         <div v-if="showCompletion">
+          <div
+            v-if="
+              type === 'Taken' && tookUsers?.length && otherRepliers?.length
+            "
+          >
+            <label class="strong">
+              Message for other people who replied (optional):
+            </label>
+            <b-form-textarea
+              v-model="completionMessage"
+              :rows="3"
+              :max-rows="6"
+              class="mt-1"
+              placeholder="e.g. Thanks for the interest. Sorry, this went to someone else."
+            />
+            <p class="mt-1 text-muted small">
+              <v-icon icon="lock" /> We'll send this privately in Chat to each
+              other freegler who replied to your post.
+            </p>
+          </div>
+          <hr class="mb-0" />
           <div>
             <label class="mt-3 strong">
               How do you feel about freegling just now?
@@ -185,6 +206,7 @@
 </template>
 <script>
 import { useMessageStore } from '../stores/message'
+import { useChatStore } from '../stores/chat'
 import OutcomeBy from './OutcomeBy'
 import SpinButton from './SpinButton'
 import modal from '@/mixins/modal'
@@ -206,7 +228,9 @@ export default {
   },
   setup() {
     const messageStore = useMessageStore()
-    return { messageStore }
+    const chatStore = useChatStore()
+
+    return { messageStore, chatStore }
   },
   data() {
     return {
@@ -216,6 +240,7 @@ export default {
       tookUsers: [],
       selectedUser: null,
       chooseError: false,
+      completionMessage: null,
     }
   },
   computed: {
@@ -241,6 +266,33 @@ export default {
         this.left === 0
       )
     },
+    otherRepliers() {
+      const ret = []
+
+      if (this.message?.replies) {
+        this.message.replies.forEach((u) => {
+          if (u.userid > 0) {
+            let found = false
+
+            for (const t of this.tookUsers) {
+              if (t.userid === u.userid) {
+                found = true
+                break
+              }
+            }
+
+            if (!found) {
+              ret.push({
+                userid: u.userid,
+                displayname: u.displayname,
+              })
+            }
+          }
+        })
+      }
+
+      return ret
+    },
     submitDisabled() {
       const ret =
         this.type === 'Taken' &&
@@ -311,6 +363,18 @@ export default {
             comment: this.comments,
           })
 
+          if (this.type === 'Taken' && this.completionMessage) {
+            // Send a message to the other repliers.
+            this.otherRepliers.forEach(async (u) => {
+              const chatid = await this.chatStore.openChatToUser({
+                userid: u.userid,
+                chattype: 'User2User',
+              })
+
+              await this.chatStore.send(chatid, this.completionMessage)
+            })
+          }
+
           this.hide()
         } else {
           // We are recording some partial results for the post.
@@ -319,12 +383,10 @@ export default {
         }
       }
     },
-
     show(type) {
       this.showModal = true
       this.type = type
     },
-
     hide() {
       // We're having trouble capturing events from this modal, so use root as a bus.
       this.$bus.$emit('outcome', {

pages/unsubscribe/unsubscribed.vue

@@ -26,3 +26,15 @@
     </b-row>
   </client-only>
 </template>
+<script>
+export default {
+  mounted() {
+    try {
+      console.log('Disable Google autoselect')
+      window?.google?.accounts?.id?.disableAutoSelect()
+    } catch (e) {
+      console.log('Ignore Google autoselect error', e)
+    }
+  },
+}
+</script>

stores/auth.js

@@ -376,14 +376,6 @@ export const useAuthStore = defineStore({
       await this.fetchUser()
       return this.user
     },
-    async addRelatedUserUser(params) {
-      this.addRelatedUser(params.id)
-
-      if (this.userlist.length > 1) {
-        // Logged in as multiple users.  Let the server know.
-        await this.$api.session.related(this.userlist)
-      }
-    },
     async savePushId(){
       const mobileStore = useMobileStore()
       // Tell server our push notification id if logged in

stores/volunteering.js

@@ -76,10 +76,16 @@ export const useVolunteeringStore = defineStore({
         }
       }
 
-      for (const date of params.newdates) {
-        promises.push(
-          api(this.config).volunteering.addDate(params.id, date.start, date.end)
-        )
+      if (params.newdates) {
+        for (const date of params.newdates) {
+          promises.push(
+            api(this.config).volunteering.addDate(
+              params.id,
+              date.start,
+              date.end
+            )
+          )
+        }
       }
 
       await Promise.all(promises)