diff --git a/locales/index.d.ts b/locales/index.d.ts index 04cd022ad4..73a58fcac0 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -11134,6 +11134,44 @@ export interface Locale extends ILocale { * Show warning when opening external URLs */ "warnExternalUrl": string; + /** + * Flash + */ + "flash": string; + "_flash": { + /** + * Flash Content Hidden + */ + "contentHidden": string; + /** + * Powered by Ruffle. + */ + "poweredByRuffle": string; + /** + * Always be wary of arbitrary code execution! + */ + "arbitraryCodeExecutionWarning": string; + /** + * Flash Content Failed To Load: + */ + "failedToLoad": string; + /** + * Flash Content Is Loading + */ + "isLoading": string; + /** + * Loading Ruffle player + */ + "loadingRufflePlayer": string; + /** + * Loading Flash file + */ + "loadingFlashFile": string; + /** + * raw.esm.sh could not be accessed, meaning this instance's Content Security Policy is likely out of date. Please contact your instance administrators. + */ + "cspError": string; + }; "_mfm": { /** * This is not a widespread feature, it may not display properly on most other fedi software, including other Misskey forks diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index a2cb50ee9f..28c2353976 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -886,7 +886,7 @@ export class ClientServerService { }); if (note == null) return; - if (note.visibility !== 'public') return; + if (['specified', 'followers'].includes(note.visibility)) return; if (note.userHost != null) return; const _note = await this.noteEntityService.pack(note, null, { detail: true }); diff --git a/packages/frontend-embed/@types/global.d.ts b/packages/frontend-embed/@types/global.d.ts index 15373cbd2d..c8a9bf4323 100644 --- a/packages/frontend-embed/@types/global.d.ts +++ b/packages/frontend-embed/@types/global.d.ts @@ -14,6 +14,7 @@ declare const _PERF_PREFIX_: string; declare const _DATA_TRANSFER_DRIVE_FILE_: string; declare const _DATA_TRANSFER_DRIVE_FOLDER_: string; declare const _DATA_TRANSFER_DECK_COLUMN_: string; +declare const _RUFFLE_VERSION_: string; // for dev-mode declare const _LANGS_FULL_: string[][]; diff --git a/packages/frontend-embed/src/components/EmAvatar.vue b/packages/frontend-embed/src/components/EmAvatar.vue index 58c35c8ef0..50d46781d9 100644 --- a/packages/frontend-embed/src/components/EmAvatar.vue +++ b/packages/frontend-embed/src/components/EmAvatar.vue @@ -30,6 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only rotate: getDecorationAngle(decoration), scale: getDecorationScale(decoration), translate: getDecorationOffset(decoration), + zIndex: getDecorationZIndex(decoration), }" alt="" > @@ -86,6 +87,10 @@ function getDecorationOffset(decoration: Omit) { + return decoration.showBelow ? '-1' : undefined; +} diff --git a/packages/frontend/src/components/SkModPlayer.vue b/packages/frontend/src/components/SkModPlayer.vue index f44c4ae7f9..0933806109 100644 --- a/packages/frontend/src/components/SkModPlayer.vue +++ b/packages/frontend/src/components/SkModPlayer.vue @@ -4,44 +4,44 @@ SPDX-License-Identifier: AGPL-3.0-only --> -