diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2025-05-22 12:02:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-22 12:02:01 +0900 |
| commit | c7318f58032b848ebfdacb2c00979b6eca932d4f (patch) | |
| tree | 7d9c850f3754e4d28a29eb8442bc4fdf063b8b35 /packages | |
| parent | fix(frontend): UIのアニメーションをオフにするとページネー... (diff) | |
| download | misskey-c7318f58032b848ebfdacb2c00979b6eca932d4f.tar.gz misskey-c7318f58032b848ebfdacb2c00979b6eca932d4f.tar.bz2 misskey-c7318f58032b848ebfdacb2c00979b6eca932d4f.zip | |
fix(backend): 連合モードが「なし」の場合はactivity jsonへのリンクタグを省略するように (#16074)
* fix(backend): 連合モードが「なし」の場合はactivity jsonへのリンクタグを省略するように
* Update Changelog
* flip condition
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/backend/src/server/web/ClientServerService.ts | 1 | ||||
| -rw-r--r-- | packages/backend/src/server/web/views/note.pug | 9 | ||||
| -rw-r--r-- | packages/backend/src/server/web/views/user.pug | 13 |
3 files changed, 13 insertions, 10 deletions
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index 9a33d27d86..8ca61a497d 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -212,6 +212,7 @@ export class ClientServerService { instanceUrl: this.config.url, metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(meta)), now: Date.now(), + federationEnabled: this.meta.federation !== 'none', }; } diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug index fb659ce171..ea1993aed0 100644 --- a/packages/backend/src/server/web/views/note.pug +++ b/packages/backend/src/server/web/views/note.pug @@ -55,7 +55,8 @@ block meta if note.next link(rel='next' href=`${config.url}/notes/${note.next}`) - if !user.host - link(rel='alternate' href=url type='application/activity+json') - if note.uri - link(rel='alternate' href=note.uri type='application/activity+json') + if federationEnabled + if !user.host + link(rel='alternate' href=url type='application/activity+json') + if note.uri + link(rel='alternate' href=note.uri type='application/activity+json') diff --git a/packages/backend/src/server/web/views/user.pug b/packages/backend/src/server/web/views/user.pug index 2b0a7bab5c..b9f740f5b6 100644 --- a/packages/backend/src/server/web/views/user.pug +++ b/packages/backend/src/server/web/views/user.pug @@ -32,12 +32,13 @@ block meta meta(name='twitter:creator' content=`@${profile.twitter.screenName}`) if !sub - if !user.host - link(rel='alternate' href=`${config.url}/users/${user.id}` type='application/activity+json') - if user.uri - link(rel='alternate' href=user.uri type='application/activity+json') - if profile.url - link(rel='alternate' href=profile.url type='text/html') + if federationEnabled + if !user.host + link(rel='alternate' href=`${config.url}/users/${user.id}` type='application/activity+json') + if user.uri + link(rel='alternate' href=user.uri type='application/activity+json') + if profile.url + link(rel='alternate' href=profile.url type='text/html') each m in me link(rel='me' href=`${m}`) |