Fix wrong logic, need to revisit this for Pixelfed

pull/1145/head
Lim Chee Aun 2025-05-10 16:25:26 +08:00
rodzic 231a824a03
commit 452b03692b
2 zmienionych plików z 35 dodań i 36 usunięć

68
src/locales/en.po wygenerowano
Wyświetl plik

@ -469,7 +469,7 @@ msgstr ""
#: src/pages/catchup.jsx:1585 #: src/pages/catchup.jsx:1585
#: src/pages/filters.jsx:225 #: src/pages/filters.jsx:225
#: src/pages/list.jsx:280 #: src/pages/list.jsx:280
#: src/pages/notifications.jsx:940 #: src/pages/notifications.jsx:939
#: src/pages/scheduled-posts.jsx:259 #: src/pages/scheduled-posts.jsx:259
#: src/pages/settings.jsx:87 #: src/pages/settings.jsx:87
#: src/pages/status.jsx:1326 #: src/pages/status.jsx:1326
@ -558,7 +558,7 @@ msgstr ""
#: src/components/list-add-edit.jsx:150 #: src/components/list-add-edit.jsx:150
#: src/components/shortcuts-settings.jsx:715 #: src/components/shortcuts-settings.jsx:715
#: src/pages/filters.jsx:570 #: src/pages/filters.jsx:570
#: src/pages/notifications.jsx:1006 #: src/pages/notifications.jsx:1005
msgid "Save" msgid "Save"
msgstr "" msgstr ""
@ -586,7 +586,7 @@ msgstr ""
#: src/pages/filters.jsx:90 #: src/pages/filters.jsx:90
#: src/pages/followed-hashtags.jsx:41 #: src/pages/followed-hashtags.jsx:41
#: src/pages/home.jsx:54 #: src/pages/home.jsx:54
#: src/pages/notifications.jsx:585 #: src/pages/notifications.jsx:584
#: src/pages/scheduled-posts.jsx:74 #: src/pages/scheduled-posts.jsx:74
msgid "Home" msgid "Home"
msgstr "" msgstr ""
@ -1044,7 +1044,7 @@ msgid "Open in new window"
msgstr "" msgstr ""
#: src/components/follow-request-buttons.jsx:43 #: src/components/follow-request-buttons.jsx:43
#: src/pages/notifications.jsx:990 #: src/pages/notifications.jsx:989
msgid "Accept" msgid "Accept"
msgstr "" msgstr ""
@ -1053,7 +1053,7 @@ msgid "Reject"
msgstr "" msgstr ""
#: src/components/follow-request-buttons.jsx:76 #: src/components/follow-request-buttons.jsx:76
#: src/pages/notifications.jsx:1274 #: src/pages/notifications.jsx:1273
msgid "Accepted" msgid "Accepted"
msgstr "" msgstr ""
@ -1072,7 +1072,7 @@ msgstr ""
#: src/components/generic-accounts.jsx:206 #: src/components/generic-accounts.jsx:206
#: src/components/timeline.jsx:547 #: src/components/timeline.jsx:547
#: src/pages/list.jsx:299 #: src/pages/list.jsx:299
#: src/pages/notifications.jsx:920 #: src/pages/notifications.jsx:919
#: src/pages/search.jsx:558 #: src/pages/search.jsx:558
#: src/pages/status.jsx:1359 #: src/pages/status.jsx:1359
msgid "Show more…" msgid "Show more…"
@ -1405,7 +1405,7 @@ msgstr ""
#: src/pages/home.jsx:86 #: src/pages/home.jsx:86
#: src/pages/home.jsx:186 #: src/pages/home.jsx:186
#: src/pages/notifications.jsx:117 #: src/pages/notifications.jsx:117
#: src/pages/notifications.jsx:589 #: src/pages/notifications.jsx:588
msgid "Notifications" msgid "Notifications"
msgstr "" msgstr ""
@ -2500,7 +2500,7 @@ msgstr ""
#: src/components/timeline.jsx:582 #: src/components/timeline.jsx:582
#: src/pages/home.jsx:216 #: src/pages/home.jsx:216
#: src/pages/notifications.jsx:896 #: src/pages/notifications.jsx:895
#: src/pages/status.jsx:1015 #: src/pages/status.jsx:1015
#: src/pages/status.jsx:1388 #: src/pages/status.jsx:1388
msgid "Try again" msgid "Try again"
@ -3352,113 +3352,113 @@ msgstr ""
msgid "Who are limited by server moderators" msgid "Who are limited by server moderators"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:603 #: src/pages/notifications.jsx:602
#: src/pages/notifications.jsx:944 #: src/pages/notifications.jsx:943
msgid "Notifications settings" msgid "Notifications settings"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:621 #: src/pages/notifications.jsx:620
msgid "New notifications" msgid "New notifications"
msgstr "" msgstr ""
#. placeholder {0}: announcements.length #. placeholder {0}: announcements.length
#: src/pages/notifications.jsx:632 #: src/pages/notifications.jsx:631
msgid "{0, plural, one {Announcement} other {Announcements}}" msgid "{0, plural, one {Announcement} other {Announcements}}"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:679 #: src/pages/notifications.jsx:678
#: src/pages/settings.jsx:1167 #: src/pages/settings.jsx:1167
msgid "Follow requests" msgid "Follow requests"
msgstr "" msgstr ""
#. placeholder {0}: followRequests.length #. placeholder {0}: followRequests.length
#: src/pages/notifications.jsx:684 #: src/pages/notifications.jsx:683
msgid "{0, plural, one {# follow request} other {# follow requests}}" msgid "{0, plural, one {# follow request} other {# follow requests}}"
msgstr "" msgstr ""
#. placeholder {0}: notificationsPolicy.summary.pendingRequestsCount #. placeholder {0}: notificationsPolicy.summary.pendingRequestsCount
#: src/pages/notifications.jsx:739 #: src/pages/notifications.jsx:738
msgid "{0, plural, one {Filtered notifications from # person} other {Filtered notifications from # people}}" msgid "{0, plural, one {Filtered notifications from # person} other {Filtered notifications from # people}}"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:812 #: src/pages/notifications.jsx:811
msgid "Only mentions" msgid "Only mentions"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:816 #: src/pages/notifications.jsx:815
msgid "Today" msgid "Today"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:821 #: src/pages/notifications.jsx:820
msgid "You're all caught up." msgid "You're all caught up."
msgstr "" msgstr ""
#: src/pages/notifications.jsx:844 #: src/pages/notifications.jsx:843
msgid "Yesterday" msgid "Yesterday"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:892 #: src/pages/notifications.jsx:891
msgid "Unable to load notifications" msgid "Unable to load notifications"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:971 #: src/pages/notifications.jsx:970
msgid "Notifications settings updated" msgid "Notifications settings updated"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:979 #: src/pages/notifications.jsx:978
msgid "Filter out notifications from people:" msgid "Filter out notifications from people:"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:993 #: src/pages/notifications.jsx:992
msgid "Filter" msgid "Filter"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:996 #: src/pages/notifications.jsx:995
msgid "Ignore" msgid "Ignore"
msgstr "" msgstr ""
#. placeholder {0}: niceDateTime(updatedAtDate) #. placeholder {0}: niceDateTime(updatedAtDate)
#: src/pages/notifications.jsx:1069 #: src/pages/notifications.jsx:1068
msgid "Updated <0>{0}</0>" msgid "Updated <0>{0}</0>"
msgstr "" msgstr ""
#. placeholder {0}: account.username #. placeholder {0}: account.username
#: src/pages/notifications.jsx:1137 #: src/pages/notifications.jsx:1136
msgid "View notifications from <0>@{0}</0>" msgid "View notifications from <0>@{0}</0>"
msgstr "" msgstr ""
#. placeholder {0}: account.username #. placeholder {0}: account.username
#: src/pages/notifications.jsx:1158 #: src/pages/notifications.jsx:1157
msgid "Notifications from <0>@{0}</0>" msgid "Notifications from <0>@{0}</0>"
msgstr "" msgstr ""
#. placeholder {0}: request.account.username #. placeholder {0}: request.account.username
#: src/pages/notifications.jsx:1226 #: src/pages/notifications.jsx:1225
msgid "Notifications from @{0} will not be filtered from now on." msgid "Notifications from @{0} will not be filtered from now on."
msgstr "" msgstr ""
#: src/pages/notifications.jsx:1231 #: src/pages/notifications.jsx:1230
msgid "Unable to accept notification request" msgid "Unable to accept notification request"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:1236 #: src/pages/notifications.jsx:1235
msgid "Allow" msgid "Allow"
msgstr "" msgstr ""
#. placeholder {0}: request.account.username #. placeholder {0}: request.account.username
#: src/pages/notifications.jsx:1256 #: src/pages/notifications.jsx:1255
msgid "Notifications from @{0} will not show up in Filtered notifications from now on." msgid "Notifications from @{0} will not show up in Filtered notifications from now on."
msgstr "Notifications from @{0} will not show up in Filtered notifications from now on." msgstr "Notifications from @{0} will not show up in Filtered notifications from now on."
#: src/pages/notifications.jsx:1261 #: src/pages/notifications.jsx:1260
msgid "Unable to dismiss notification request" msgid "Unable to dismiss notification request"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:1266 #: src/pages/notifications.jsx:1265
msgid "Dismiss" msgid "Dismiss"
msgstr "" msgstr ""
#: src/pages/notifications.jsx:1281 #: src/pages/notifications.jsx:1280
msgid "Dismissed" msgid "Dismissed"
msgstr "" msgstr ""

Wyświetl plik

@ -144,8 +144,7 @@ function Notifications({ columnMode }) {
}); });
notificationsIterator.current = notificationsIterable.current.values(); notificationsIterator.current = notificationsIterable.current.values();
} }
// if (/max_id=($|&)/i.test(notificationsIterator.current?.nextParams)) { if (/max_id=($|&)/i.test(notificationsIterator.current?.nextParams)) {
if (!notificationsIterable.current?.params?.max_id) {
// Pixelfed returns next paginationed link with empty max_id // Pixelfed returns next paginationed link with empty max_id
// I assume, it's done (end of list) // I assume, it's done (end of list)
return { return {