// 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 && p.indexOf(' ') === -1)
if (isURISearch || isWebfingerSearch) return searchVideoChannelURI(search, isWebfingerSearch, res)
+ // @username -> username to search in DB
+ if (query.search.startsWith('@')) query.search = query.search.replace(/^@/, '')
return searchVideoChannelsDB(query, res)
}
let videoChannel: VideoChannelModel
let uri = search
- if (isWebfingerSearch) uri = await loadActorUrlOrGetFromWebfinger(search)
+ if (isWebfingerSearch) {
+ try {
+ uri = await loadActorUrlOrGetFromWebfinger(search)
+ } catch (err) {
+ logger.warn('Cannot load actor URL or get from webfinger.', { search, err })
+
+ return res.json({ total: 0, data: [] })
+ }
+ }
if (isUserAbleToSearchRemoteURI(res)) {
try {
- const actor = await getOrCreateActorAndServerAndModel(uri, true, true)
+ const actor = await getOrCreateActorAndServerAndModel(uri, 'all', true, true)
videoChannel = actor.VideoChannel
} catch (err) {
logger.info('Cannot search remote video channel %s.', uri, { err })
async function searchVideosDB (query: VideosSearchQuery, res: express.Response) {
const options = Object.assign(query, {
includeLocalVideos: true,
- nsfw: buildNSFWFilter(res, query.nsfw)
+ nsfw: buildNSFWFilter(res, query.nsfw),
+ filter: query.filter,
+ user: res.locals.oauth ? res.locals.oauth.token.User : undefined
})
const resultList = await VideoModel.searchAndPopulateAccountAndServer(options)