Merge branch 'admin-users' into shigusegubu-themes3

changelog.d/user-management.add

@@ -1 +1 @@
-user management (view and modify user info, view and modify user statuses)
+User administration + post scope/sensitivity admin change support

src/App.scss

@@ -418,45 +418,6 @@ nav {
   }
 }
 
-.list-item {
-  border-color: var(--border);
-  border-style: solid;
-  border-width: 0;
-  border-top-width: 1px;
-
-  &.-active,
-  &:hover {
-    border-top-width: 1px;
-    border-bottom-width: 1px;
-  }
-
-  &.-active + &,
-  &:hover + & {
-    border-top-width: 0;
-  }
-
-  &:hover + .menu-item-collapsible:not(.-expanded) + &,
-  &.-active + .menu-item-collapsible:not(.-expanded) + & {
-    border-top-width: 0;
-  }
-
-  &[aria-expanded="true"] {
-    border-bottom-width: 1px;
-  }
-
-  &:first-child {
-    border-top-right-radius: var(--roundness);
-    border-top-left-radius: var(--roundness);
-    border-top-width: 0;
-  }
-
-  &:last-child {
-    border-bottom-right-radius: var(--roundness);
-    border-bottom-left-radius: var(--roundness);
-    border-bottom-width: 0;
-  }
-}
-
 .menu-item,
 .list-item {
   display: block;
@@ -480,8 +441,8 @@ nav {
     cursor: auto;
   }
 
-  a,
+  > a,
-  button:not(.button-default) {
+  > button:not(.button-default) {
     text-align: initial;
     padding: 0;
     background: none;

src/components/list/list.css

@@ -14,6 +14,22 @@
     display: flex;
     align-items: center;
 
+    &[aria-expanded="true"] {
+      border-bottom-width: 1px;
+    }
+
+    &:first-child {
+      border-top-right-radius: var(--roundness);
+      border-top-left-radius: var(--roundness);
+      border-top-width: 0;
+    }
+
+    &:last-child {
+      border-bottom-right-radius: var(--roundness);
+      border-bottom-left-radius: var(--roundness);
+      border-bottom-width: 0;
+    }
+
     &:not(:last-child) {
       border-bottom: 1px dotted var(--border);
     }

src/components/settings_modal/tabs/notifications_tab.js

@@ -21,7 +21,7 @@ const NotificationsTab = {
       if (!this.user) {
         return false
       }
-      return this.user.privileges.includes('reports_manage_reports')
+      return this.user.privileges.has('reports_manage_reports')
     },
     ...SharedComputedObject(),
   },

src/services/api/api.service.js

@@ -188,11 +188,12 @@ const PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL =
   '/api/v1/pleroma/admin/users/resend_confirmation_email'
 const PLEROMA_ADMIN_LIST_STATUSES_URL = ({
   id,
+  page,
   pageSize,
   godmode,
   withReblogs,
 }) =>
-  `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&godmode=${godmode}&with_reblogs=${withReblogs}`
+  `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&page=${page}&godmode=${godmode}&with_reblogs=${withReblogs}`
 const PLEROMA_ADMIN_CHANGE_STATUS_SCOPE_URL = (id) =>
   `/api/v1/pleroma/admin/statuses/${id}`
 const PLEROMA_ADMIN_REQUIRE_PASSWORD_CHANGE_URL =