summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/web/views
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-03-24 11:53:52 +0000
committerdakkar <dakkar@thenautilus.net>2024-03-24 11:53:52 +0000
commitbc531ac414deab044d18ce41da1863138b2906a5 (patch)
tree500d323a47044216c4505695d4732d7dad3b08b2 /packages/backend/src/server/web/views
parentMerge branch 'develop' into future-2024-03-23 (diff)
parenttest(backend): fix streaming test error when replying to followers-only note ... (diff)
downloadsharkey-bc531ac414deab044d18ce41da1863138b2906a5.tar.gz
sharkey-bc531ac414deab044d18ce41da1863138b2906a5.tar.bz2
sharkey-bc531ac414deab044d18ce41da1863138b2906a5.zip
Merge remote-tracking branch 'misskey/develop' into future-2024-03-23
Diffstat (limited to 'packages/backend/src/server/web/views')
-rw-r--r--packages/backend/src/server/web/views/note.pug4
-rw-r--r--packages/backend/src/server/web/views/user.pug2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index 9bc652b6a1..fb659ce171 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -2,7 +2,7 @@ extends ./base
block vars
- const user = note.user;
- - const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`;
+ - const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`;
- 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)
@@ -28,7 +28,7 @@ block og
// FIXME: add embed player for Twitter
if images.length
meta(property='twitter:card' content='summary_large_image')
- each image in images
+ each image in images
meta(property='og:image' content= image.url)
else
meta(property='twitter:card' content='summary')
diff --git a/packages/backend/src/server/web/views/user.pug b/packages/backend/src/server/web/views/user.pug
index 83d57349a6..2b0a7bab5c 100644
--- a/packages/backend/src/server/web/views/user.pug
+++ b/packages/backend/src/server/web/views/user.pug
@@ -1,7 +1,7 @@
extends ./base
block vars
- - const title = user.name ? `${user.name} (@${user.username})` : `@${user.username}`;
+ - const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`;
- const url = `${config.url}/@${(user.host ? `${user.username}@${user.host}` : user.username)}`;
block title