interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle actors search beginning with '@' 

Something like @toto@example.com
This commit is contained in:
Chocobozzz 2018-09-17 10:12:30 +02:00
parent 743164fed1
commit 2ff83ae292
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/controllers/api/search.ts
View File

@ -56,6 +56,9 @@ function searchVideoChannels (req: express.Request, res: express.Response) {
const isURISearch = search.startsWith('http://') || search.startsWith('https://') const isURISearch = search.startsWith('http://') || search.startsWith('https://')
const parts = search.split('@') const parts = search.split('@')
// Handle strings like @toto@example.com
if (parts.length === 3 && parts[0].length === 0) parts.shift()
const isWebfingerSearch = parts.length === 2 && parts.every(p => p.indexOf(' ') === -1) const isWebfingerSearch = parts.length === 2 && parts.every(p => p.indexOf(' ') === -1)
if (isURISearch || isWebfingerSearch) return searchVideoChannelURI(search, isWebfingerSearch, res) if (isURISearch || isWebfingerSearch) return searchVideoChannelURI(search, isWebfingerSearch, res)

5
server/helpers/webfinger.ts
View File

@ -12,7 +12,10 @@ const webfinger = new WebFinger({
request_timeout: 3000 request_timeout: 3000
}) })
async function loadActorUrlOrGetFromWebfinger (uri: string) { async function loadActorUrlOrGetFromWebfinger (uriArg: string) {
// Handle strings like @toto@example.com
const uri = uriArg.startsWith('@') ? uriArg.slice(1) : uriArg
const [ name, host ] = uri.split('@') const [ name, host ] = uri.split('@')
let actor: ActorModel let actor: ActorModel