moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'initial-home-feed' into 'develop' 

UI: fix the way initial data is loaded

See merge request soapbox-pub/soapbox-fe!918
This commit is contained in:
Alex Gleason 2021-12-15 15:51:56 +00:00
parent 52b94d05f4 e283afe191
commit ec00f23d7e
1 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/soapbox/features/ui/index.js
View File

@ -470,9 +470,40 @@ class UI extends React.PureComponent {
trailing: true,
});
// Load initial data when a user is logged in
loadAccountData = () => {
const { account, features, dispatch } = this.props;
dispatch(expandHomeTimeline());
dispatch(expandNotifications())
.then(() => dispatch(fetchMarker(['notifications'])))
.catch(console.error);
if (features.chats) {
dispatch(fetchChats());
}
if (isStaff(account)) {
dispatch(fetchReports({ state: 'open' }));
dispatch(fetchUsers(['local', 'need_approval']));
}
if (isAdmin(account)) {
dispatch(fetchConfig());
}
setTimeout(() => dispatch(fetchFilters()), 500);
if (account.get('locked')) {
setTimeout(() => dispatch(fetchFollowRequests()), 700);
}
setTimeout(() => dispatch(fetchScheduledStatuses()), 900);
}
componentDidMount() {
const { account, features, vapidKey, dispatch } = this.props;
if (!account) return;
const { account, vapidKey, dispatch } = this.props;
window.addEventListener('resize', this.handleResize, { passive: true });
document.addEventListener('dragenter', this.handleDragEnter, false);
@ -490,32 +521,7 @@ class UI extends React.PureComponent {
}
if (account) {
dispatch(expandHomeTimeline());
dispatch(expandNotifications())
.then(() => dispatch(fetchMarker(['notifications'])))
.catch(console.error);
if (features.chats) {
dispatch(fetchChats());
}
if (isStaff(account)) {
dispatch(fetchReports({ state: 'open' }));
dispatch(fetchUsers(['local', 'need_approval']));
}
if (isAdmin(account)) {
dispatch(fetchConfig());
}
setTimeout(() => dispatch(fetchFilters()), 500);
if (account.get('locked')) {
setTimeout(() => dispatch(fetchFollowRequests()), 700);
}
setTimeout(() => dispatch(fetchScheduledStatuses()), 900);
this.loadAccountData();
}
dispatch(fetchCustomEmojis());
@ -531,7 +537,11 @@ class UI extends React.PureComponent {
const { dispatch, account, features, vapidKey } = this.props;
if (features.chats && account && !prevProps.features.chats) {
// The user has logged in
if (account && !prevProps.account) {
this.loadAccountData();
// The instance has loaded
} else if (account && features.chats && !prevProps.features.chats) {
dispatch(fetchChats());
}