miklo
/
soapbox
sforkowany z mirror/soapbox
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

Followers/Following: unavailable --> isUnavailable, move useEffect's down

compose
Alex Gleason 2022-09-12 10:17:49 -05:00
rodzic 3f04d0a049
commit d221897cd0
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
2 zmienionych plików z 16 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
app/soapbox/features/followers/index.tsx
Wyświetl plik

@ -44,11 +44,17 @@ const Followers: React.FC<IFollowers> = (props) => {
const accountIds = useAppSelector(state => state.user_lists.followers.get(account!?.id)?.items || ImmutableOrderedSet<string>());
const hasMore = useAppSelector(state => !!state.user_lists.followers.get(account!?.id)?.next);
const unavailable = useAppSelector(state => {
const isUnavailable = useAppSelector(state => {
const blockedBy = state.relationships.getIn([account?.id, 'blocked_by']) === true;
return isOwnAccount ? false : (blockedBy && !features.blockersVisible);
});
const handleLoadMore = useCallback(debounce(() => {
if (account) {
dispatch(expandFollowers(account.id));
}
}, 300, { leading: true }), [account?.id]);
useEffect(() => {
let promises = [];
@ -69,12 +75,6 @@ const Followers: React.FC<IFollowers> = (props) => {
}, [account?.id, username]);
const handleLoadMore = useCallback(debounce(() => {
if (account) {
dispatch(expandFollowers(account.id));
}
}, 300, { leading: true }), [account?.id]);
if (loading && accountIds.isEmpty()) {
return (
<Spinner />
@ -87,7 +87,7 @@ const Followers: React.FC<IFollowers> = (props) => {
);
}
if (unavailable) {
if (isUnavailable) {
return (
<div className='empty-column-indicator'>
<FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />

16
app/soapbox/features/following/index.tsx
Wyświetl plik

@ -44,11 +44,17 @@ const Following: React.FC<IFollowing> = (props) => {
const accountIds = useAppSelector(state => state.user_lists.following.get(account!?.id)?.items || ImmutableOrderedSet<string>());
const hasMore = useAppSelector(state => !!state.user_lists.following.get(account!?.id)?.next);
const unavailable = useAppSelector(state => {
const isUnavailable = useAppSelector(state => {
const blockedBy = state.relationships.getIn([account?.id, 'blocked_by']) === true;
return isOwnAccount ? false : (blockedBy && !features.blockersVisible);
});
const handleLoadMore = useCallback(debounce(() => {
if (account) {
dispatch(expandFollowing(account.id));
}
}, 300, { leading: true }), [account?.id]);
useEffect(() => {
let promises = [];
@ -69,12 +75,6 @@ const Following: React.FC<IFollowing> = (props) => {
}, [account?.id, username]);
const handleLoadMore = useCallback(debounce(() => {
if (account) {
dispatch(expandFollowing(account.id));
}
}, 300, { leading: true }), [account?.id]);
if (loading && accountIds.isEmpty()) {
return (
<Spinner />
@ -87,7 +87,7 @@ const Following: React.FC<IFollowing> = (props) => {
);
}
if (unavailable) {
if (isUnavailable) {
return (
<div className='empty-column-indicator'>
<FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />