diff options
author | mira.bat <97340105+irafire@users.noreply.github.com> | 2023-07-27 17:01:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-27 17:01:15 +0200 |
commit | f862be2749b4f2d8dee99128d7e3064a69920e11 (patch) | |
tree | 20643166e07cb31ca3e0d05b4490000150b2f1c4 /server/controllers/api/search/search-video-channels.ts | |
parent | 787d822cd471d1e4bd5a37c687c78cd5f69d8645 (diff) | |
download | PeerTube-f862be2749b4f2d8dee99128d7e3064a69920e11.tar.gz PeerTube-f862be2749b4f2d8dee99128d7e3064a69920e11.tar.zst PeerTube-f862be2749b4f2d8dee99128d7e3064a69920e11.zip |
Add an option to sign federated fetches for mastodon compatibility (#5898)
* Fix player error modal
Not hidden when we change the video
* Correctly dispose player components
* Sign cross-server fetch requests for mastodon AUTHORIZED_FETCH compatibilty
* Add a remote fetch sign configuration knob
* Federated fetches refactoring
---------
Co-authored-by: Chocobozzz <me@florianbigard.com>
Co-authored-by: ira <ira@foxgirl.space>
Diffstat (limited to 'server/controllers/api/search/search-video-channels.ts')
-rw-r--r-- | server/controllers/api/search/search-video-channels.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/controllers/api/search/search-video-channels.ts b/server/controllers/api/search/search-video-channels.ts index d615ff9ed..1d2a9d235 100644 --- a/server/controllers/api/search/search-video-channels.ts +++ b/server/controllers/api/search/search-video-channels.ts | |||
@@ -1,9 +1,10 @@ | |||
1 | import express from 'express' | 1 | import express from 'express' |
2 | import { sanitizeUrl } from '@server/helpers/core-utils' | 2 | import { sanitizeUrl } from '@server/helpers/core-utils' |
3 | import { pickSearchChannelQuery } from '@server/helpers/query' | 3 | import { pickSearchChannelQuery } from '@server/helpers/query' |
4 | import { doJSONRequest, findLatestRedirection } from '@server/helpers/requests' | 4 | import { doJSONRequest } from '@server/helpers/requests' |
5 | import { CONFIG } from '@server/initializers/config' | 5 | import { CONFIG } from '@server/initializers/config' |
6 | import { WEBSERVER } from '@server/initializers/constants' | 6 | import { WEBSERVER } from '@server/initializers/constants' |
7 | import { findLatestAPRedirection } from '@server/lib/activitypub/activity' | ||
7 | import { Hooks } from '@server/lib/plugins/hooks' | 8 | import { Hooks } from '@server/lib/plugins/hooks' |
8 | import { buildMutedForSearchIndex, isSearchIndexSearch, isURISearch } from '@server/lib/search' | 9 | import { buildMutedForSearchIndex, isSearchIndexSearch, isURISearch } from '@server/lib/search' |
9 | import { getServerActor } from '@server/models/application/application' | 10 | import { getServerActor } from '@server/models/application/application' |
@@ -126,7 +127,7 @@ async function searchVideoChannelURI (search: string, res: express.Response) { | |||
126 | 127 | ||
127 | if (isUserAbleToSearchRemoteURI(res)) { | 128 | if (isUserAbleToSearchRemoteURI(res)) { |
128 | try { | 129 | try { |
129 | const latestUri = await findLatestRedirection(uri, { activityPub: true }) | 130 | const latestUri = await findLatestAPRedirection(uri) |
130 | 131 | ||
131 | const actor = await getOrCreateAPActor(latestUri, 'all', true, true) | 132 | const actor = await getOrCreateAPActor(latestUri, 'all', true, true) |
132 | videoChannel = actor.VideoChannel | 133 | videoChannel = actor.VideoChannel |