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

Merge remote-tracking branch 'parent/main' into upstream-20240403

Browse source
This commit is contained in:
KMY 2024-04-03 12:12:09 +09:00
commit 479c4fecc1
63 changed files with 831 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/store/middlewares/errors.ts
View file

@ -30,7 +30,8 @@ function isActionWithmaybeAlertParams(
return isAction(action);
}
export const errorsMiddleware: Middleware<Record<string, never>, RootState> =
// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
export const errorsMiddleware: Middleware<{}, RootState> =
({ dispatch }) =>
(next) =>
(action) => {

3
app/javascript/mastodon/store/middlewares/sounds.ts
View file

@ -51,7 +51,8 @@ const play = (audio: HTMLAudioElement) => {
};
export const soundsMiddleware = (): Middleware<
Record<string, never>,
// eslint-disable-next-line @typescript-eslint/ban-types -- we need to use `{}` here to ensure the dispatch types can be merged
{},
RootState
> => {
const soundCache: Record<string, HTMLAudioElement> = {};