diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-05-09 20:28:58 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-05-09 20:28:58 +0000 |
| commit | 3d6eb18e2a909be37f2e47fb645edda18d9a889f (patch) | |
| tree | fc3e7f55467c6f266b8bd6b328d16057600a4851 /packages/backend/src/server/web | |
| parent | merge: release 2024.3.2 (!485) (diff) | |
| parent | pin to node 20 (diff) | |
| download | sharkey-3d6eb18e2a909be37f2e47fb645edda18d9a889f.tar.gz sharkey-3d6eb18e2a909be37f2e47fb645edda18d9a889f.tar.bz2 sharkey-3d6eb18e2a909be37f2e47fb645edda18d9a889f.zip | |
merge: Release 2024.3.3 (!501)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/501
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
Diffstat (limited to 'packages/backend/src/server/web')
| -rw-r--r-- | packages/backend/src/server/web/views/base.pug | 2 | ||||
| -rw-r--r-- | packages/backend/src/server/web/views/note.pug | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index 2210e65e7d..0f555e0637 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -43,7 +43,6 @@ html link(rel='stylesheet' href='/assets/phosphor-icons/bold/style.css') link(rel='stylesheet' href='/static-assets/fonts/sharkey-icons/style.css') link(rel='modulepreload' href=`/vite/${clientEntry.file}`) - script(src='/client-assets/libopenmpt.js') if !config.clientManifestExists script(type="module" src="/vite/@vite/client") @@ -73,7 +72,6 @@ html script. var VERSION = "#{version}"; var CLIENT_ENTRY = "#{clientEntry.file}"; - window.libopenmpt = window.Module; script(type='application/json' id='misskey_meta' data-generated-at=now) != metaJson diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug index 9bc652b6a1..47c89ae2d7 100644 --- a/packages/backend/src/server/web/views/note.pug +++ b/packages/backend/src/server/web/views/note.pug @@ -5,8 +5,8 @@ block vars - const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`; - const url = `${config.url}/notes/${note.id}`; - const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null; - - const images = (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive) - - const videos = (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive) + - const images = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive) + - const videos = note.cw ? [] : (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive) block title = `${title} | ${instanceName}` |