bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up me usage

Browse source
This commit is contained in:
Alex Gleason 2022-04-04 14:24:42 -05:00
parent fdb44d615d
commit e88fe4a707
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/soapbox/api.ts
View file

@ -83,7 +83,7 @@ export default (getState: () => RootState, authType: string = 'user'): AxiosInst
const state = getState(); const state = getState();
const accessToken = getToken(state, authType); const accessToken = getToken(state, authType);
const me = state.me; const me = state.me;
const baseURL = getAuthBaseURL(state, me); const baseURL = me ? getAuthBaseURL(state, me) : '';
return baseClient(accessToken, baseURL); return baseClient(accessToken, baseURL);
}; };

2
app/soapbox/features/status/components/action-bar.tsx
View file

@ -66,7 +66,7 @@ const messages = defineMessages({
const mapStateToProps = (state: RootState) => { const mapStateToProps = (state: RootState) => {
const me = state.me; const me = state.me;
const account = state.accounts.get(me as any); const account = state.accounts.get(me);
const instance = state.instance; const instance = state.instance;
return { return {

5
app/soapbox/features/ui/components/profile-dropdown.tsx
View file

@ -7,7 +7,7 @@ import { Link } from 'react-router-dom';
import { logOut, switchAccount } from 'soapbox/actions/auth'; import { logOut, switchAccount } from 'soapbox/actions/auth';
import { fetchOwnAccounts } from 'soapbox/actions/auth'; import { fetchOwnAccounts } from 'soapbox/actions/auth';
import { Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList } from 'soapbox/components/ui'; import { Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList } from 'soapbox/components/ui';
import { useAppSelector } from 'soapbox/hooks'; import { useAppSelector, useOwnAccount } from 'soapbox/hooks';
import { makeGetAccount } from 'soapbox/selectors'; import { makeGetAccount } from 'soapbox/selectors';
import Account from '../../../components/account'; import Account from '../../../components/account';
@ -36,8 +36,7 @@ const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const intl = useIntl(); const intl = useIntl();
const me = useAppSelector((state) => state.me); const currentAccount = useOwnAccount();
const currentAccount = useAppSelector((state) => getAccount(state, me));
const authUsers = useAppSelector((state) => state.auth.get('users')); const authUsers = useAppSelector((state) => state.auth.get('users'));
const isCurrentAccountStaff = Boolean(currentAccount?.staff); const isCurrentAccountStaff = Boolean(currentAccount?.staff);
const otherAccounts = useAppSelector((state) => authUsers.map((authUser: any) => getAccount(state, authUser.get('id')))); const otherAccounts = useAppSelector((state) => authUsers.map((authUser: any) => getAccount(state, authUser.get('id'))));

10
app/soapbox/features/ui/components/sign_up_panel.tsx
View file

@ -1,15 +1,13 @@
import React from 'react'; import React from 'react';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import { getSoapboxConfig } from 'soapbox/actions/soapbox';
import { Button, Stack, Text } from 'soapbox/components/ui'; import { Button, Stack, Text } from 'soapbox/components/ui';
import { useAppSelector } from 'soapbox/hooks'; import { useAppSelector, useSoapboxConfig } from 'soapbox/hooks';
const SignUpPanel = () => { const SignUpPanel = () => {
const soapboxConfig = useAppSelector((state) => getSoapboxConfig(state)); const { singleUserMode } = useSoapboxConfig();
const siteTitle: string = useAppSelector((state) => state.instance.title); const siteTitle = useAppSelector((state) => state.instance.title);
const me: boolean | null = useAppSelector((state) => state.me); const me = useAppSelector((state) => state.me);
const singleUserMode: boolean = soapboxConfig.get('singleUserMode');
if (me || singleUserMode) return null; if (me || singleUserMode) return null;

2
app/soapbox/reducers/accounts.ts
View file

@ -49,7 +49,7 @@ export interface ReducerAccount extends AccountRecord {
moved: string | null, moved: string | null,
} }
type State = ImmutableMap<string | number, ReducerAccount>; type State = ImmutableMap<any, ReducerAccount>;
const initialState: State = ImmutableMap(); const initialState: State = ImmutableMap();