From 0879222aa23816bad8428da75f57870f36cf60c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 19 Dec 2022 14:10:13 +0100
Subject: [PATCH] Improve permissions check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/features/groups/index.tsx                     | 6 +++---
 .../features/ui/components/panels/new-group-panel.tsx     | 7 ++++---
 app/soapbox/normalizers/account.ts                        | 1 -
 app/soapbox/reducers/accounts-meta.ts                     | 4 +++-
 app/soapbox/utils/permissions.ts                          | 8 +++++---
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/features/groups/index.tsx b/app/soapbox/features/groups/index.tsx
index 393dcf66b..5fb621b7f 100644
--- a/app/soapbox/features/groups/index.tsx
+++ b/app/soapbox/features/groups/index.tsx
@@ -9,7 +9,7 @@ import { openModal } from 'soapbox/actions/modals';
 import GroupCard from 'soapbox/components/group-card';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Button, Column, Spinner, Stack, Text } from 'soapbox/components/ui';
-import { useAppSelector, useOwnAccount } from 'soapbox/hooks';
+import { useAppSelector } from 'soapbox/hooks';
 import { PERMISSION_CREATE_GROUPS, hasPermission } from 'soapbox/utils/permissions';
 
 import PlaceholderGroupCard from '../placeholder/components/placeholder-group-card';
@@ -32,9 +32,9 @@ const getOrderedGroups = createSelector([
 
 const Groups: React.FC = () => {
   const dispatch = useDispatch();
-  const account = useOwnAccount();
 
   const { groups, isLoading } = useAppSelector((state) => getOrderedGroups(state));
+  const canCreateGroup = useAppSelector((state) => hasPermission(state, PERMISSION_CREATE_GROUPS));
 
   useEffect(() => {
     dispatch(fetchGroups());
@@ -74,7 +74,7 @@ const Groups: React.FC = () => {
 
   return (
     <Stack className='gap-4'>
-      {hasPermission(account, PERMISSION_CREATE_GROUPS) && (
+      {canCreateGroup && (
         <Button
           className='sm:w-fit sm:self-end xl:hidden'
           icon={require('@tabler/icons/circles.svg')}
diff --git a/app/soapbox/features/ui/components/panels/new-group-panel.tsx b/app/soapbox/features/ui/components/panels/new-group-panel.tsx
index 2ede2191e..9710eeb82 100644
--- a/app/soapbox/features/ui/components/panels/new-group-panel.tsx
+++ b/app/soapbox/features/ui/components/panels/new-group-panel.tsx
@@ -3,18 +3,19 @@ import { FormattedMessage } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals';
 import { Button, Stack, Text } from 'soapbox/components/ui';
-import { useAppDispatch, useOwnAccount } from 'soapbox/hooks';
+import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 import { PERMISSION_CREATE_GROUPS, hasPermission } from 'soapbox/utils/permissions';
 
 const NewGroupPanel = () => {
   const dispatch = useAppDispatch();
-  const account = useOwnAccount();
+
+  const canCreateGroup = useAppSelector((state) => hasPermission(state, PERMISSION_CREATE_GROUPS));
 
   const createGroup = () => {
     dispatch(openModal('MANAGE_GROUP'));
   };
 
-  if (!hasPermission(account, PERMISSION_CREATE_GROUPS)) return null;
+  if (!canCreateGroup) return null;
 
   return (
     <Stack space={2}>
diff --git a/app/soapbox/normalizers/account.ts b/app/soapbox/normalizers/account.ts
index 14255d762..fb6a04255 100644
--- a/app/soapbox/normalizers/account.ts
+++ b/app/soapbox/normalizers/account.ts
@@ -47,7 +47,6 @@ export const AccountRecord = ImmutableRecord({
   mute_expires_at: null as string | null,
   note: '',
   pleroma: ImmutableMap<string, any>(),
-  role: ImmutableMap<string, any>(),
   source: ImmutableMap<string, any>(),
   statuses_count: 0,
   uri: '',
diff --git a/app/soapbox/reducers/accounts-meta.ts b/app/soapbox/reducers/accounts-meta.ts
index 001213e0e..9410fc5cd 100644
--- a/app/soapbox/reducers/accounts-meta.ts
+++ b/app/soapbox/reducers/accounts-meta.ts
@@ -12,10 +12,11 @@ import type { AnyAction } from 'redux';
 
 const MetaRecord = ImmutableRecord({
   pleroma: ImmutableMap<string, any>(),
+  role: null as ImmutableMap<string, any> | null,
   source: ImmutableMap<string, any>(),
 });
 
-type Meta = ReturnType<typeof MetaRecord>;
+export type Meta = ReturnType<typeof MetaRecord>;
 type State = ImmutableMap<string, Meta>;
 
 const importAccount = (state: State, account: ImmutableMap<string, any>) => {
@@ -23,6 +24,7 @@ const importAccount = (state: State, account: ImmutableMap<string, any>) => {
 
   return state.set(accountId, MetaRecord({
     pleroma: account.get('pleroma', ImmutableMap()).delete('settings_store'),
+    role: account.get('role', null),
     source: account.get('source', ImmutableMap()),
   }));
 };
diff --git a/app/soapbox/utils/permissions.ts b/app/soapbox/utils/permissions.ts
index 3ceed1b4a..607f751eb 100644
--- a/app/soapbox/utils/permissions.ts
+++ b/app/soapbox/utils/permissions.ts
@@ -1,4 +1,4 @@
-import type { Account } from 'soapbox/types/entities';
+import type { RootState } from 'soapbox/store';
 
 export const PERMISSION_CREATE_GROUPS  = 0x0000000000100000;
 export const PERMISSION_INVITE_USERS   = 0x0000000000010000;
@@ -7,8 +7,10 @@ export const PERMISSION_MANAGE_REPORTS = 0x0000000000000010;
 
 type Permission = typeof PERMISSION_CREATE_GROUPS | typeof PERMISSION_INVITE_USERS | typeof PERMISSION_MANAGE_USERS | typeof PERMISSION_MANAGE_REPORTS
 
-export const hasPermission = (account: Account | null, permission: Permission) => {
-  if (!account) return false;
+export const hasPermission = (state: RootState, permission: Permission) => {
+  const account = state.accounts_meta.get(state.me as string)!;
+
+  if (!account?.role) return false;
 
   const permissions = account.getIn(['role', 'permissions']) as number;