mirror of
https://github.com/cheeaun/phanpy.git
synced 2025-02-24 16:58:47 +01:00
Fix noob mistake
And also make announcements and follow requests fetch more non-blocking
This commit is contained in:
parent
678fc100c8
commit
540b9a15a4
1 changed files with 17 additions and 12 deletions
|
@ -134,20 +134,25 @@ function Notifications({ columnMode }) {
|
|||
(async () => {
|
||||
try {
|
||||
const fetchNotificationsPromise = fetchNotifications(firstLoad);
|
||||
const fetchFollowRequestsPromise = fetchFollowRequests();
|
||||
const fetchAnnouncementsPromise = fetchAnnouncements();
|
||||
|
||||
if (firstLoad) {
|
||||
const announcements = await fetchAnnouncementsPromise;
|
||||
announcements.sort((a, b) => {
|
||||
// Sort by updatedAt first, then createdAt
|
||||
const aDate = new Date(a.updatedAt || a.createdAt);
|
||||
const bDate = new Date(b.updatedAt || b.createdAt);
|
||||
return bDate - aDate;
|
||||
});
|
||||
setAnnouncements(announcements);
|
||||
const requests = await fetchFollowRequestsPromise;
|
||||
setFollowRequests(requests);
|
||||
fetchAnnouncements()
|
||||
.then((announcements) => {
|
||||
announcements.sort((a, b) => {
|
||||
// Sort by updatedAt first, then createdAt
|
||||
const aDate = new Date(a.updatedAt || a.createdAt);
|
||||
const bDate = new Date(b.updatedAt || b.createdAt);
|
||||
return bDate - aDate;
|
||||
});
|
||||
setAnnouncements(announcements);
|
||||
})
|
||||
.catch(() => {});
|
||||
|
||||
fetchFollowRequests()
|
||||
.then((requests) => {
|
||||
setFollowRequests(requests);
|
||||
})
|
||||
.catch(() => {});
|
||||
}
|
||||
|
||||
const { done } = await fetchNotificationsPromise;
|
||||
|
|
Loading…
Reference in a new issue