From 064093c6709eaad1b69781148b9df17344f07ac3 Mon Sep 17 00:00:00 2001
From: luce <lucy@cirno.systems>
Date: Mon, 21 Jul 2025 00:32:49 +0200
Subject: [PATCH] more stuff added

---
 .../settings_modal/admin_tabs/admin_card.js   | 16 ++++++++--
 .../settings_modal/admin_tabs/admin_card.vue  | 18 ++++++++---
 .../settings_modal/admin_tabs/users_tab.js    | 23 +++++++++++---
 .../settings_modal/admin_tabs/users_tab.vue   | 21 +++++++++++--
 src/modules/adminSettings.js                  | 12 +++++--
 src/services/api/api.service.js               | 31 +++++++++++++++++--
 6 files changed, 101 insertions(+), 20 deletions(-)

diff --git a/src/components/settings_modal/admin_tabs/admin_card.js b/src/components/settings_modal/admin_tabs/admin_card.js
index ea145c0c6..b82ec6866 100644
--- a/src/components/settings_modal/admin_tabs/admin_card.js
+++ b/src/components/settings_modal/admin_tabs/admin_card.js
@@ -54,10 +54,12 @@ const AdminCard = {
          return false
       },
       is_confirmed () {
-         return (this.userDetails.is_confirmed === false) || (this.just_confirmed === true)
+         const u = this.$store.getters.findUser(this.userDetails.id)
+         return (u._original.pleroma.is_confirmed === false) || (this.just_confirmed === true)
       },
       is_approved () {
-         return (this.userDetails.is_approved === false) || (this.just_approved === true)
+         const u = this.$store.getters.findUser(this.userDetails.id)
+         return (u._original.pleroma.is_approved === false) || (this.just_approved === true)
       }
    },
    components: {
@@ -90,7 +92,15 @@ const AdminCard = {
             this.$store.dispatch('adminDeactivateUser', u)
          }
       },
-      toggle_confirmation () {},
+      confirm_user () {
+         const u = this.$store.getters.findUser(this.userDetails.id)
+         this.$store.dispatch('adminConfirmUser', u)
+         this.just_confirmed = true
+      },
+      resend_confirmation_email () {
+         const u = this.$store.getters.findUser(this.userDetails.id)
+         this.$store.dispatch('adminResendConfirmationEmail', u)
+      },
       toggle_approval () {},
       force_update_user () {
          this.$store.dispatch('fetchUser', this.userDetails.id)
diff --git a/src/components/settings_modal/admin_tabs/admin_card.vue b/src/components/settings_modal/admin_tabs/admin_card.vue
index d2d434b3d..0875c50f5 100644
--- a/src/components/settings_modal/admin_tabs/admin_card.vue
+++ b/src/components/settings_modal/admin_tabs/admin_card.vue
@@ -70,12 +70,20 @@
                     >
                     is moderator
                 </Checkbox><br>
-                <Checkbox
-                    :model-value="is_confirmed"
-                    @update:model-value="v => toggle_confirmation(v)"
-                    >
+                <div v-if="!just_confirmed && !is_confirmed">
+                  <button class="button button-default btn"
+                        type="button"
+                        @click="confirm_user()"
+                        >
                     is confirmed
-                </Checkbox><br>
+                  </button><br>
+                  <button class="button button-default btn"
+                          type="button"
+                          @click="resend_confirmation_email()"
+                          >
+                          resend confirmation email
+                  </button><br>
+                </div>
                <Checkbox
                   :model-value="is_approved"
                   @update:model-value="v => toggle_approval(v)"
diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js
index 5a59f308d..9bbaadfd3 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.js
+++ b/src/components/settings_modal/admin_tabs/users_tab.js
@@ -22,6 +22,9 @@ const UsersTab = {
          filters_origin: "local",
          filters_activity: "all",
          filters_permission: "all",
+         filters_query: '',
+         filters_name: '',
+         filters_email: '',
          filters: {
             local: true,
             external: false,
@@ -30,7 +33,7 @@ const UsersTab = {
             unconfirmed: false,
             deactivated: false,
             is_admin: false,
-            is_moderator: false
+            is_moderator: false,
          },
          expandedUser: null,
          loading: false
@@ -106,14 +109,26 @@ const UsersTab = {
          }
          this.reset()
       },
+      update_query (v) {
+         this.filters_query = v
+         this.reset()
+      },
+      update_name (v) {
+         this.filters_name = v
+         this.reset()
+      },
+      update_email (v) {
+         this.filters_email = v
+         this.reset()
+      },
       delete_selection () {
       },
       delete_user () {},
       fetch_page (store, opts) {
-         opts.query = ""
+         opts.query = this.filters_query
          opts.filters = this.filters
-         opts.name = ""
-         opts.email = ""
+         opts.name = this.filters_name
+         opts.email = this.filters_email
          const users = store.dispatch('fetchAdminUsers', opts)
          return users
       },
diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue
index a5f42af9a..ed6f2e743 100644
--- a/src/components/settings_modal/admin_tabs/users_tab.vue
+++ b/src/components/settings_modal/admin_tabs/users_tab.vue
@@ -8,9 +8,24 @@
         <div class="setting-item">
           <h2> filter user search </h2>
           todo: query, name and email input<br>
+          <input
+              :model-value="filters_query"
+              placeholder="query"
+              @input="v => update_query(v.target.value)"
+              /><br>
+          <input
+              :model-value="filters_name"
+              placeholder="name"
+              @input="v => update_name(v.target.value)"
+              /><br>
+          <input
+              :model-value="filters_email"
+              placeholder="email"
+              @input="v => update_email(v.target.value)"
+              /><br>
           <Select
               :model-value="filters_origin"
-              @update:model-value="v => update_origin(v) "
+              @update:model-value="v => update_origin(v)"
               >
               <option
                   value="all"
@@ -30,7 +45,7 @@
           </Select>
           <Select
               :model-value="filters_activity"
-              @update:model-value="v => update_activity(v) "
+              @update:model-value="v => update_activity(v)"
               >
               <option
                   value="all"
@@ -50,7 +65,7 @@
           </Select>
           <Select
               :model-value="filters_permission"
-              @update:model-value="v => update_permission(v) "
+              @update:model-value="v => update_permission(v)"
               >
               <option
                   value="all"
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index 05aa030aa..1a4e541af 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -85,15 +85,21 @@ const adminSettingsStorage = {
     },
     adminActivateUser (store, user) {
        return store.rootState.api.backendInteractor.activateUser({ user })
-         .then(res => console.log(res))
+         .then(res => { const deactivated = !res.is_active; store.commit('updateActivationStatus', { user, deactivated })})
     },
     adminDeactivateUser (store, user) {
        return store.rootState.api.backendInteractor.deactivateUser({ user })
-         .then(res => console.log(res))
+         .then(res => { const deactivated = !res.is_active; store.commit('updateActivationStatus', { user, deactivated })})
     },
     adminDeleteUser (store, user) {
        return store.rootState.api.backendInteractor.deleteUser({ user })
-         .then(res => console.log(res))
+    },
+    adminConfirmUser (store, user) {
+       return store.rootState.api.backendInteractor.adminConfirmUser({ user })
+         .then(res => store.dispatch('fetchUser', user.id))
+    },
+    adminResendConfirmationEmail (store, user) {
+       return store.rootState.api.backendInteractor.adminResendConfirmationEmail({ user })
     },
     loadFrontendsStuff ({ rootState, commit }) {
       rootState.api.backendInteractor.fetchAvailableFrontends()
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 94cb9966a..397583c4f 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -137,9 +137,11 @@ const PLEROMA_ADMIN_USERS_URL = ({page, pageSize, filters = {}, query = '', name
    return `/api/v1/pleroma/admin/users?page=${page}&page_size=${pageSize}&filters=${filters_str}&query=${query}&name=${name}&email=${email}`
 }
 const PLEROMA_ADMIN_MODIFY_GROUP_URL = (nickname, group) => `/api/v1/pleroma/admin/users/${nickname}/permission_group/${group}`
-const PLEROMA_ADMIN_DELETE_USERS_URL = '/api/v1/pleroma/admin/users'
+/*const PLEROMA_ADMIN_DELETE_USERS_URL = '/api/v1/pleroma/admin/users'
 const PLEROMA_ADMIN_ACTIVATE_USER_URL = '/api/v1/pleroma/admin/users/activate'
-const PLEROMA_ADMIN_DEACTIVATE_USER_URL = '/api/v1/pleroma/admin/users/deactivate'
+const PLEROMA_ADMIN_DEACTIVATE_USER_URL = '/api/v1/pleroma/admin/users/deactivate'*/
+const PLEROMA_ADMIN_CONFIRM_USER_URL = '/api/v1/pleroma/admin/users/confirm_email'
+const PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL = '/api/v1/pleroma/admin/users/resend_confirmation_email'
 
 const PLEROMA_EMOJI_RELOAD_URL = '/api/pleroma/admin/reload_emoji'
 const PLEROMA_EMOJI_IMPORT_FS_URL = '/api/pleroma/emoji/packs/import'
@@ -1508,6 +1510,29 @@ const adminRemoveUserFromModeratorGroup = ({ user, credentials }) => {
    })
 }
 
+const adminConfirmUser = ({user: { screen_name: nickname }, credentials }) => {
+   const url = PLEROMA_ADMIN_CONFIRM_USER_URL
+   console.log('confirming')
+   return promisedRequest({url: url,
+      credentials,
+      method: 'PATCH',
+      payload: {
+         nicknames: [nickname]
+      }
+   }).then(res => console.log('response', res))
+}
+
+const adminResendConfirmationEmail = ({user: { screen_name: nickname }, credentials }) => {
+   const url = PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL
+   return promisedRequest({url: url,
+      credentials,
+      method: 'PATCH',
+      payload: {
+         nicknames: [nickname]
+      }
+   })
+}
+
 const announcementToPayload = ({ content, startsAt, endsAt, allDay }) => {
   const payload = { content }
 
@@ -2185,6 +2210,8 @@ const apiService = {
   adminRemoveUserFromAdminGroup,
   adminAddUserToModeratorGroup,
   adminRemoveUserFromModeratorGroup,
+  adminConfirmUser,
+  adminResendConfirmationEmail,
 }
 
 export default apiService