From 65dbf7b85d680f0855e9f6706a4437d2f4a52227 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 12 Jan 2021 14:43:21 +0200
Subject: Add report button to status ellipsis menu

---
 src/modules/reports.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/modules/reports.js')

diff --git a/src/modules/reports.js b/src/modules/reports.js
index 904022f1..c6026f38 100644
--- a/src/modules/reports.js
+++ b/src/modules/reports.js
@@ -4,12 +4,14 @@ const reports = {
   state: {
     userId: null,
     statuses: [],
+    preTicked: [],
     modalActivated: false
   },
   mutations: {
-    openUserReportingModal (state, { userId, statuses }) {
+    openUserReportingModal (state, { userId, statuses, preTickedIds }) {
       state.userId = userId
       state.statuses = statuses
+      state.preTickedIds = preTickedIds
       state.modalActivated = true
     },
     closeUserReportingModal (state) {
@@ -17,9 +19,15 @@ const reports = {
     }
   },
   actions: {
-    openUserReportingModal ({ rootState, commit }, userId) {
-      const statuses = filter(rootState.statuses.allStatuses, status => status.user.id === userId)
-      commit('openUserReportingModal', { userId, statuses })
+    openUserReportingModal ({ rootState, commit }, { userId, statusIds = [] }) {
+      const preTickedStatuses = statusIds.map(id => rootState.statuses.allStatusesObject[id])
+      const preTickedIds = statusIds
+      const statuses = preTickedStatuses.concat(
+        filter(rootState.statuses.allStatuses,
+          status => status.user.id === userId && !preTickedIds.includes(status.id)
+        )
+      )
+      commit('openUserReportingModal', { userId, statuses, preTickedIds })
     },
     closeUserReportingModal ({ commit }) {
       commit('closeUserReportingModal')
-- 
cgit v1.2.3-70-g09d2


From 0ee0551a471266066050e059876ee24a4637c1ad Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 12 Jan 2021 14:55:31 +0200
Subject: fix changing reported status on same user

---
 src/components/user_reporting_modal/user_reporting_modal.js | 10 ++++++++--
 src/modules/reports.js                                      |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/modules/reports.js')

diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 5ec4a5df..8d171b2d 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -38,17 +38,23 @@ const UserReportingModal = {
     },
     statuses () {
       return this.$store.state.reports.statuses
+    },
+    preTickedIds () {
+      return this.$store.state.reports.preTickedIds
     }
   },
   watch: {
-    userId: 'resetState'
+    userId: 'resetState',
+    preTickedIds (newValue) {
+      this.statusIdsToReport = newValue
+    }
   },
   methods: {
     resetState () {
       // Reset state
       this.comment = ''
       this.forward = false
-      this.statusIdsToReport = this.$store.state.reports.preTickedIds
+      this.statusIdsToReport = this.preTickedIds
       this.processing = false
       this.error = false
     },
diff --git a/src/modules/reports.js b/src/modules/reports.js
index c6026f38..fea83e5f 100644
--- a/src/modules/reports.js
+++ b/src/modules/reports.js
@@ -4,7 +4,7 @@ const reports = {
   state: {
     userId: null,
     statuses: [],
-    preTicked: [],
+    preTickedIds: [],
     modalActivated: false
   },
   mutations: {
-- 
cgit v1.2.3-70-g09d2