post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Add ability for admins to force grouped notifications in web UI (#31610)

Browse source
This commit is contained in:
Claire 2024-08-27 16:55:51 +02:00 • committed by GitHub
parent da42e9d446
commit c73868cd78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 33 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/actions/markers.ts
View file

@ -2,6 +2,7 @@ import { debounce } from 'lodash';
import type { MarkerJSON } from 'mastodon/api_types/markers';
import { getAccessToken } from 'mastodon/initial_state';
import { selectUseGroupedNotifications } from 'mastodon/selectors/settings';
import type { AppDispatch, RootState } from 'mastodon/store';
import { createAppAsyncThunk } from 'mastodon/store/typed_functions';
@ -75,13 +76,8 @@ interface MarkerParam {
}
function getLastNotificationId(state: RootState): string | undefined {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
const enableBeta = state.settings.getIn(
['notifications', 'groupingBeta'],
false,
) as boolean;
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
return enableBeta
return selectUseGroupedNotifications(state)
? state.notificationGroups.lastReadId
: // @ts-expect-error state.notifications is not yet typed
// eslint-disable-next-line @typescript-eslint/no-unsafe-call