.actor-owner {
@include actor-owner;
}
-
- my-subscribe-button {
- /deep/ span[role=button] {
- padding: 7px 12px;
- font-size: 16px;
- }
- }
}
ngOnInit () {
this.userSubscriptionService.listSubscriptions()
.subscribe(
- res => { console.log(res); this.videoChannels = res.data },
+ res => this.videoChannels = res.data,
error => this.notificationsService.error(this.i18n('Error'), error.message)
)
color: $grey-actor-name;
margin-left: 5px;
}
+
+ .video-channel-followers {
+
+ }
}
}
</div>
</div>
- <div i18n *ngIf="pagination.totalItems === 0" class="no-result">
+ <div i18n *ngIf="pagination.totalItems === 0 && videoChannels.length === 0" class="no-result">
No results found
</div>
+ <div *ngFor="let videoChannel of videoChannels" class="entry video-channel">
+ <a [routerLink]="[ '/video-channels', videoChannel.name ]">
+ <img [src]="videoChannel.avatarUrl" alt="Avatar" />
+ </a>
+
+ <div class="video-channel-info">
+ <a [routerLink]="[ '/video-channels', videoChannel.name ]" class="video-channel-names">
+ <div class="video-channel-display-name">{{ videoChannel.displayName }}</div>
+ <div class="video-channel-name">{{ videoChannel.name }}</div>
+ </a>
+
+ <div i18n class="video-channel-followers">{{ videoChannel.followersCount }} subscribers</div>
+ </div>
+
+ <my-subscribe-button [videoChannel]="videoChannel"></my-subscribe-button>
+ </div>
+
<div *ngFor="let video of videos" class="entry video">
<my-video-thumbnail [video]="video"></my-video-thumbnail>
}
}
}
+
+ &.video-channel {
+
+ img {
+ @include avatar(120px);
+
+ margin: 0 50px 0 40px;
+ }
+
+ .video-channel-info {
+
+
+ flex-grow: 1;
+ width: fit-content;
+
+ .video-channel-names {
+ @include disable-default-a-behaviour;
+
+ display: flex;
+ align-items: baseline;
+ color: #000;
+ width: fit-content;
+
+ .video-channel-display-name {
+ font-weight: $font-semibold;
+ font-size: 18px;
+ }
+
+ .video-channel-name {
+ font-size: 14px;
+ color: $grey-actor-name;
+ margin-left: 5px;
+ }
+ }
+ }
+ }
}
}
import { ActivatedRoute, Router } from '@angular/router'
import { RedirectService } from '@app/core'
import { NotificationsService } from 'angular2-notifications'
-import { Subscription } from 'rxjs'
+import { forkJoin, Subscription } from 'rxjs'
import { SearchService } from '@app/search/search.service'
import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
import { I18n } from '@ngx-translate/i18n-polyfill'
import { Video } from '../../../../shared'
import { MetaService } from '@ngx-meta/core'
import { AdvancedSearch } from '@app/search/advanced-search.model'
+import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
+import { immutableAssign } from '@app/shared/misc/utils'
@Component({
selector: 'my-search',
})
export class SearchComponent implements OnInit, OnDestroy {
videos: Video[] = []
+ videoChannels: VideoChannel[] = []
+
pagination: ComponentPagination = {
currentPage: 1,
- itemsPerPage: 10, // It's per object type (so 10 videos, 10 video channels etc)
+ itemsPerPage: 10, // Only for videos, use another variable for channels
totalItems: null
}
advancedSearch: AdvancedSearch = new AdvancedSearch()
isSearchFilterCollapsed = true
+ currentSearch: string
private subActivatedRoute: Subscription
- private currentSearch: string
private isInitialLoad = true
+ private channelsPerPage = 2
+
constructor (
private i18n: I18n,
private route: ActivatedRoute,
}
search () {
- return this.searchService.searchVideos(this.currentSearch, this.pagination, this.advancedSearch)
+ forkJoin([
+ this.searchService.searchVideos(this.currentSearch, this.pagination, this.advancedSearch),
+ this.searchService.searchVideoChannels(this.currentSearch, immutableAssign(this.pagination, { itemsPerPage: this.channelsPerPage }))
+ ])
.subscribe(
- ({ videos, totalVideos }) => {
- this.videos = this.videos.concat(videos)
- this.pagination.totalItems = totalVideos
+ ([ videosResult, videoChannelsResult ]) => {
+ this.videos = this.videos.concat(videosResult.videos)
+ this.pagination.totalItems = videosResult.totalVideos
+
+ this.videoChannels = videoChannelsResult.data
},
error => {
this.notificationsService.error(this.i18n('Error'), error.message)
}
)
+
}
onNearOfBottom () {
-import { catchError, switchMap } from 'rxjs/operators'
+import { catchError, map, switchMap } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { Observable } from 'rxjs'
import { VideoService } from '@app/shared/video/video.service'
import { RestExtractor, RestService } from '@app/shared'
import { environment } from 'environments/environment'
-import { ResultList, Video } from '../../../../shared'
-import { Video as VideoServerModel } from '@app/shared/video/video.model'
+import { ResultList, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '../../../../shared'
+import { Video } from '@app/shared/video/video.model'
import { AdvancedSearch } from '@app/search/advanced-search.model'
-
-export type SearchResult = {
- videosResult: { totalVideos: number, videos: Video[] }
-}
+import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
+import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
@Injectable()
export class SearchService {
if (search) params = params.append('search', search)
const advancedSearchObject = advancedSearch.toAPIObject()
-
- for (const name of Object.keys(advancedSearchObject)) {
- const value = advancedSearchObject[name]
- if (!value) continue
-
- if (Array.isArray(value) && value.length !== 0) {
- for (const v of value) params = params.append(name, v)
- } else {
- params = params.append(name, value)
- }
- }
+ params = this.restService.addObjectParams(params, advancedSearchObject)
return this.authHttp
.get<ResultList<VideoServerModel>>(url, { params })
catchError(err => this.restExtractor.handleError(err))
)
}
+
+ searchVideoChannels (
+ search: string,
+ componentPagination: ComponentPagination
+ ): Observable<{ data: VideoChannel[], total: number }> {
+ const url = SearchService.BASE_SEARCH_URL + 'video-channels'
+
+ const pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+
+ let params = new HttpParams()
+ params = this.restService.addRestGetParams(params, pagination)
+ params = params.append('search', search)
+
+ return this.authHttp
+ .get<ResultList<VideoChannelServerModel>>(url, { params })
+ .pipe(
+ map(res => VideoChannelService.extractVideoChannels(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
}
return newParams
}
+ addObjectParams (params: HttpParams, object: object) {
+ for (const name of Object.keys(object)) {
+ const value = object[name]
+ if (!value) continue
+
+ if (Array.isArray(value) && value.length !== 0) {
+ for (const v of value) params = params.append(name, v)
+ } else {
+ params = params.append(name, value)
+ }
+ }
+
+ return params
+ }
+
componentPaginationToRestPagination (componentPagination: ComponentPagination): RestPagination {
const start: number = (componentPagination.currentPage - 1) * componentPagination.itemsPerPage
const count: number = componentPagination.itemsPerPage
-<span i18n *ngIf="subscribed === false" class="subscribe-button" role="button" (click)="subscribe()">
+<span i18n *ngIf="subscribed === false" class="subscribe-button" [ngClass]="size" role="button" (click)="subscribe()">
<span>Subscribe</span>
<span *ngIf="displayFollowers && videoChannel.followersCount !== 0" class="followers-count">
{{ videoChannel.followersCount | myNumberFormatter }}
</span>
</span>
-<span *ngIf="subscribed === true" class="unsubscribe-button" role="button" (click)="unsubscribe()">
+<span *ngIf="subscribed === true" class="unsubscribe-button" [ngClass]="size" role="button" (click)="unsubscribe()">
<span class="subscribed" i18n>Subscribed</span>
<span class="unsubscribe" i18n>Unsubscribe</span>
.subscribe-button,
.unsubscribe-button {
- padding: 3px 7px;
+ display: inline-block;
+
+ &.small {
+ min-width: 75px;
+ height: 20px;
+ line-height: 20px;
+ font-size: 13px;
+ }
+
+ &.normal {
+ min-width: 120px;
+ height: 30px;
+ line-height: 30px;
+ font-size: 16px;
+ }
}
.unsubscribe-button {
export class SubscribeButtonComponent implements OnInit {
@Input() videoChannel: VideoChannel
@Input() displayFollowers = false
+ @Input() size: 'small' | 'normal' = 'normal'
subscribed: boolean
ngOnInit () {
this.userSubscriptionService.isSubscriptionExists(this.uri)
.subscribe(
- exists => this.subscribed = exists,
+ res => this.subscribed = res[this.uri],
err => this.notificationsService.error(this.i18n('Error'), err.message)
)
-import { catchError, map } from 'rxjs/operators'
-import { HttpClient } from '@angular/common/http'
+import { bufferTime, catchError, filter, map, share, switchMap, tap } from 'rxjs/operators'
+import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { ResultList } from '../../../../../shared'
import { environment } from '../../../environments/environment'
-import { RestExtractor } from '../rest'
-import { Observable, of } from 'rxjs'
+import { RestExtractor, RestService } from '../rest'
+import { Observable, ReplaySubject, Subject } from 'rxjs'
import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
import { VideoChannel as VideoChannelServer } from '../../../../../shared/models/videos'
+type SubscriptionExistResult = { [ uri: string ]: boolean }
+
@Injectable()
export class UserSubscriptionService {
static BASE_USER_SUBSCRIPTIONS_URL = environment.apiUrl + '/api/v1/users/me/subscriptions'
+ // Use a replay subject because we "next" a value before subscribing
+ private existsSubject: Subject<string> = new ReplaySubject(1)
+ private existsObservable: Observable<SubscriptionExistResult>
+
constructor (
private authHttp: HttpClient,
- private restExtractor: RestExtractor
+ private restExtractor: RestExtractor,
+ private restService: RestService
) {
+ this.existsObservable = this.existsSubject.pipe(
+ tap(u => console.log(u)),
+ bufferTime(500),
+ filter(uris => uris.length !== 0),
+ switchMap(uris => this.areSubscriptionExist(uris)),
+ share()
+ )
}
deleteSubscription (nameWithHost: string) {
)
}
- isSubscriptionExists (nameWithHost: string): Observable<boolean> {
- const url = UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/' + nameWithHost
+ isSubscriptionExists (nameWithHost: string) {
+ this.existsSubject.next(nameWithHost)
- return this.authHttp.get(url)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => {
- if (err.status === 404) return of(false)
+ return this.existsObservable
+ }
- return this.restExtractor.handleError(err)
- })
- )
+ private areSubscriptionExist (uris: string[]): Observable<SubscriptionExistResult> {
+ console.log(uris)
+ const url = UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/exist'
+ let params = new HttpParams()
+
+ params = this.restService.addObjectParams(params, { uris })
+
+ return this.authHttp.get<SubscriptionExistResult>(url, { params })
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
}
<img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
</a>
- <my-subscribe-button [videoChannel]="video.channel"></my-subscribe-button>
+ <my-subscribe-button [videoChannel]="video.channel" size="small"></my-subscribe-button>
</div>
<div class="video-info-by">
}
my-subscribe-button {
- /deep/ span[role=button] {
- font-size: 13px !important;
- }
-
margin-left: 5px;
}
}
hostname: 'localhost'
port: 9000
-# Correspond to your reverse proxy "listen" configuration
+# Correspond to your reverse proxy server_name/listen configuration
webserver:
https: true
hostname: 'example.com'
import * as express from 'express'
import { buildNSFWFilter } from '../../helpers/express-utils'
-import { getFormattedObjects } from '../../helpers/utils'
+import { getFormattedObjects, getServerActor } from '../../helpers/utils'
import { VideoModel } from '../../models/video/video'
import {
asyncMiddleware,
commonVideosFiltersValidator,
optionalAuthenticate,
paginationValidator,
- searchValidator,
setDefaultPagination,
setDefaultSearchSort,
- videosSearchSortValidator
+ videoChannelsSearchSortValidator,
+ videoChannelsSearchValidator,
+ videosSearchSortValidator,
+ videosSearchValidator
} from '../../middlewares'
-import { VideosSearchQuery } from '../../../shared/models/search'
-import { getOrCreateVideoAndAccountAndChannel } from '../../lib/activitypub'
+import { VideoChannelsSearchQuery, VideosSearchQuery } from '../../../shared/models/search'
+import { getOrCreateActorAndServerAndModel, getOrCreateVideoAndAccountAndChannel } from '../../lib/activitypub'
import { logger } from '../../helpers/logger'
import { User } from '../../../shared/models/users'
import { CONFIG } from '../../initializers/constants'
+import { VideoChannelModel } from '../../models/video/video-channel'
+import { loadActorUrlOrGetFromWebfinger } from '../../helpers/webfinger'
const searchRouter = express.Router()
setDefaultSearchSort,
optionalAuthenticate,
commonVideosFiltersValidator,
- searchValidator,
+ videosSearchValidator,
asyncMiddleware(searchVideos)
)
+searchRouter.get('/video-channels',
+ paginationValidator,
+ setDefaultPagination,
+ videoChannelsSearchSortValidator,
+ setDefaultSearchSort,
+ optionalAuthenticate,
+ commonVideosFiltersValidator,
+ videoChannelsSearchValidator,
+ asyncMiddleware(searchVideoChannels)
+)
+
// ---------------------------------------------------------------------------
export { searchRouter }
// ---------------------------------------------------------------------------
+function searchVideoChannels (req: express.Request, res: express.Response) {
+ const query: VideoChannelsSearchQuery = req.query
+ const search = query.search
+
+ const isURISearch = search.startsWith('http://') || search.startsWith('https://')
+
+ const parts = search.split('@')
+ const isHandleSearch = parts.length === 2 && parts.every(p => p.indexOf(' ') === -1)
+
+ if (isURISearch || isHandleSearch) return searchVideoChannelURI(search, isHandleSearch, res)
+
+ return searchVideoChannelsDB(query, res)
+}
+
+async function searchVideoChannelsDB (query: VideoChannelsSearchQuery, res: express.Response) {
+ const serverActor = await getServerActor()
+
+ const options = {
+ actorId: serverActor.id,
+ search: query.search,
+ start: query.start,
+ count: query.count,
+ sort: query.sort
+ }
+ const resultList = await VideoChannelModel.searchForApi(options)
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total))
+}
+
+async function searchVideoChannelURI (search: string, isHandleSearch: boolean, res: express.Response) {
+ let videoChannel: VideoChannelModel
+
+ if (isUserAbleToSearchRemoteURI(res)) {
+ let uri = search
+ if (isHandleSearch) uri = await loadActorUrlOrGetFromWebfinger(search)
+
+ const actor = await getOrCreateActorAndServerAndModel(uri)
+ videoChannel = actor.VideoChannel
+ } else {
+ videoChannel = await VideoChannelModel.loadByUrlAndPopulateAccount(search)
+ }
+
+ return res.json({
+ total: videoChannel ? 1 : 0,
+ data: videoChannel ? [ videoChannel.toFormattedJSON() ] : []
+ })
+}
+
function searchVideos (req: express.Request, res: express.Response) {
const query: VideosSearchQuery = req.query
const search = query.search
if (search && (search.startsWith('http://') || search.startsWith('https://'))) {
- return searchVideoUrl(search, res)
+ return searchVideoURI(search, res)
}
return searchVideosDB(query, res)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
-async function searchVideoUrl (url: string, res: express.Response) {
+async function searchVideoURI (url: string, res: express.Response) {
let video: VideoModel
- const user: User = res.locals.oauth ? res.locals.oauth.token.User : undefined
// Check if we can fetch a remote video with the URL
- if (
- CONFIG.SEARCH.REMOTE_URI.ANONYMOUS === true ||
- (CONFIG.SEARCH.REMOTE_URI.USERS === true && user !== undefined)
- ) {
+ if (isUserAbleToSearchRemoteURI(res)) {
try {
const syncParam = {
likes: false,
refreshVideo: false
}
- const res = await getOrCreateVideoAndAccountAndChannel(url, syncParam)
- video = res ? res.video : undefined
+ const result = await getOrCreateVideoAndAccountAndChannel(url, syncParam)
+ video = result ? result.video : undefined
} catch (err) {
logger.info('Cannot search remote video %s.', url)
}
data: video ? [ video.toFormattedJSON() ] : []
})
}
+
+function isUserAbleToSearchRemoteURI (res: express.Response) {
+ const user: User = res.locals.oauth ? res.locals.oauth.token.User : undefined
+
+ return CONFIG.SEARCH.REMOTE_URI.ANONYMOUS === true ||
+ (CONFIG.SEARCH.REMOTE_URI.USERS === true && user !== undefined)
+}
deleteMeValidator,
userSubscriptionsSortValidator,
videoImportsSortValidator,
- videosSortValidator
+ videosSortValidator,
+ areSubscriptionsExistValidator
} from '../../../middlewares/validators'
import { AccountVideoRateModel } from '../../../models/account/account-video-rate'
import { UserModel } from '../../../models/account/user'
// ##### Subscriptions part #####
meRouter.get('/me/subscriptions/videos',
- authenticate,
authenticate,
paginationValidator,
videosSortValidator,
asyncMiddleware(getUserSubscriptionVideos)
)
+meRouter.get('/me/subscriptions/exist',
+ authenticate,
+ areSubscriptionsExistValidator,
+ asyncMiddleware(areSubscriptionsExist)
+)
+
meRouter.get('/me/subscriptions',
authenticate,
paginationValidator,
// ---------------------------------------------------------------------------
+async function areSubscriptionsExist (req: express.Request, res: express.Response) {
+ const uris = req.query.uris as string[]
+ const user = res.locals.oauth.token.User as UserModel
+
+ const handles = uris.map(u => {
+ let [ name, host ] = u.split('@')
+ if (host === CONFIG.WEBSERVER.HOST) host = null
+
+ return { name, host, uri: u }
+ })
+
+ const results = await ActorFollowModel.listSubscribedIn(user.Account.Actor.id, handles)
+
+ const existObject: { [id: string ]: boolean } = {}
+ for (const handle of handles) {
+ const obj = results.find(r => {
+ const server = r.ActorFollowing.Server
+
+ return r.ActorFollowing.preferredUsername === handle.name &&
+ (
+ (!server && !handle.host) ||
+ (server.host === handle.host)
+ )
+ })
+
+ existObject[handle.uri] = obj !== undefined
+ }
+
+ return res.json(existObject)
+}
+
async function addUserSubscription (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.User as UserModel
const [ name, host ] = req.body.uri.split('@')
import * as express from 'express'
-import { getFormattedObjects } from '../../helpers/utils'
+import { getFormattedObjects, getServerActor } from '../../helpers/utils'
import {
asyncMiddleware,
asyncRetryTransactionMiddleware,
// ---------------------------------------------------------------------------
async function listVideoChannels (req: express.Request, res: express.Response, next: express.NextFunction) {
- const resultList = await VideoChannelModel.listForApi(req.query.start, req.query.count, req.query.sort)
+ const serverActor = await getServerActor()
+ const resultList = await VideoChannelModel.listForApi(serverActor.id, req.query.start, req.query.count, req.query.sort)
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
import * as validator from 'validator'
import { CONSTRAINTS_FIELDS } from '../../../initializers'
-import { exists } from '../misc'
+import { exists, isArray } from '../misc'
import { truncate } from 'lodash'
import { isActivityPubUrlValid, isBaseActivityValid, setValidAttributedTo } from './misc'
import { isHostValid } from '../servers'
return isHostValid(parts[1])
}
+function areValidActorHandles (handles: string[]) {
+ return isArray(handles) && handles.every(h => isValidActorHandle(h))
+}
+
// ---------------------------------------------------------------------------
export {
normalizeActor,
+ areValidActorHandles,
isActorEndpointsObjectValid,
isActorPublicKeyObjectValid,
isActorTypeValid,
FOLLOWERS: [ 'createdAt' ],
FOLLOWING: [ 'createdAt' ],
- VIDEOS_SEARCH: [ 'match', 'name', 'duration', 'createdAt', 'publishedAt', 'views', 'likes' ]
+ VIDEOS_SEARCH: [ 'match', 'name', 'duration', 'createdAt', 'publishedAt', 'views', 'likes' ],
+ VIDEO_CHANNELS_SEARCH: [ 'match', 'displayName' ]
}
const OAUTH_LIFETIME = {
import { ActorModel } from '../../../models/activitypub/actor'
import { VideoChannelModel } from '../../../models/video/video-channel'
import { fetchAvatarIfExists, getOrCreateActorAndServerAndModel, updateActorAvatarInstance, updateActorInstance } from '../actor'
-import { getOrCreateVideoAndAccountAndChannel, getOrCreateVideoChannel, updateVideoFromAP } from '../videos'
+import { getOrCreateVideoAndAccountAndChannel, getOrCreateVideoChannelFromVideoObject, updateVideoFromAP } from '../videos'
import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos'
async function processUpdateActivity (activity: ActivityUpdate) {
}
const { video } = await getOrCreateVideoAndAccountAndChannel(videoObject.id)
- const channelActor = await getOrCreateVideoChannel(videoObject)
+ const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject)
return updateVideoFromAP(video, videoObject, actor, channelActor, activity.to)
}
return attributes
}
-function getOrCreateVideoChannel (videoObject: VideoTorrentObject) {
+function getOrCreateVideoChannelFromVideoObject (videoObject: VideoTorrentObject) {
const channel = videoObject.attributedTo.find(a => a.type === 'Group')
if (!channel) throw new Error('Cannot find associated video channel to video ' + videoObject.url)
const { videoObject: fetchedVideo } = await fetchRemoteVideo(videoUrl)
if (!fetchedVideo) throw new Error('Cannot fetch remote video with url: ' + videoUrl)
- const channelActor = await getOrCreateVideoChannel(fetchedVideo)
+ const channelActor = await getOrCreateVideoChannelFromVideoObject(fetchedVideo)
const video = await retryTransactionWrapper(createVideo, fetchedVideo, channelActor, syncParam.thumbnail)
// Process outside the transaction because we could fetch remote data
return video
}
- const channelActor = await getOrCreateVideoChannel(videoObject)
+ const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject)
const account = await AccountModel.load(channelActor.VideoChannel.accountId)
return updateVideoFromAP(video, videoObject, account.Actor, channelActor)
videoActivityObjectToDBAttributes,
videoFileActivityUrlToDBAttributes,
createVideo,
- getOrCreateVideoChannel,
+ getOrCreateVideoChannelFromVideoObject,
addVideoShares,
createRates
}
if (areValidationErrors(req, res)) return
const serverActor = await getServerActor()
- const follow = await ActorFollowModel.loadByActorAndTargetNameAndHost(serverActor.id, SERVER_ACTOR_NAME, req.params.host)
+ const follow = await ActorFollowModel.loadByActorAndTargetNameAndHostForAPI(serverActor.id, SERVER_ACTOR_NAME, req.params.host)
if (!follow) {
return res
import { isNumberArray, isStringArray, isNSFWQueryValid } from '../../helpers/custom-validators/search'
import { isBooleanValid, isDateValid, toArray } from '../../helpers/custom-validators/misc'
-const searchValidator = [
+const videosSearchValidator = [
query('search').optional().not().isEmpty().withMessage('Should have a valid search'),
query('startDate').optional().custom(isDateValid).withMessage('Should have a valid start date'),
query('durationMax').optional().isInt().withMessage('Should have a valid max duration'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking search query', { parameters: req.query })
+ logger.debug('Checking videos search query', { parameters: req.query })
+
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
+
+const videoChannelsSearchValidator = [
+ query('search').not().isEmpty().withMessage('Should have a valid search'),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking video channels search query', { parameters: req.query })
if (areValidationErrors(req, res)) return
export {
commonVideosFiltersValidator,
- searchValidator
+ videoChannelsSearchValidator,
+ videosSearchValidator
}
const SORTABLE_VIDEO_ABUSES_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_ABUSES)
const SORTABLE_VIDEOS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS)
const SORTABLE_VIDEOS_SEARCH_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEOS_SEARCH)
+const SORTABLE_VIDEO_CHANNELS_SEARCH_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_CHANNELS_SEARCH)
const SORTABLE_VIDEO_IMPORTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_IMPORTS)
const SORTABLE_VIDEO_COMMENT_THREADS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.VIDEO_COMMENT_THREADS)
const SORTABLE_BLACKLISTS_COLUMNS = createSortableColumns(SORTABLE_COLUMNS.BLACKLISTS)
const videosSortValidator = checkSort(SORTABLE_VIDEOS_COLUMNS)
const videoImportsSortValidator = checkSort(SORTABLE_VIDEO_IMPORTS_COLUMNS)
const videosSearchSortValidator = checkSort(SORTABLE_VIDEOS_SEARCH_COLUMNS)
+const videoChannelsSearchSortValidator = checkSort(SORTABLE_VIDEO_CHANNELS_SEARCH_COLUMNS)
const videoCommentThreadsSortValidator = checkSort(SORTABLE_VIDEO_COMMENT_THREADS_COLUMNS)
const blacklistSortValidator = checkSort(SORTABLE_BLACKLISTS_COLUMNS)
const videoChannelsSortValidator = checkSort(SORTABLE_VIDEO_CHANNELS_COLUMNS)
followingSortValidator,
jobsSortValidator,
videoCommentThreadsSortValidator,
- userSubscriptionsSortValidator
+ userSubscriptionsSortValidator,
+ videoChannelsSearchSortValidator
}
import * as express from 'express'
import 'express-validator'
-import { body, param } from 'express-validator/check'
+import { body, param, query } from 'express-validator/check'
import { logger } from '../../helpers/logger'
import { areValidationErrors } from './utils'
import { ActorFollowModel } from '../../models/activitypub/actor-follow'
-import { isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor'
+import { areValidActorHandles, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor'
import { UserModel } from '../../models/account/user'
import { CONFIG } from '../../initializers'
+import { toArray } from '../../helpers/custom-validators/misc'
const userSubscriptionAddValidator = [
body('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to follow (username@domain)'),
}
]
+const areSubscriptionsExistValidator = [
+ query('uris')
+ .customSanitizer(toArray)
+ .custom(areValidActorHandles).withMessage('Should have a valid uri array'),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking areSubscriptionsExistValidator parameters', { parameters: req.query })
+
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
+
const userSubscriptionGetValidator = [
param('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to unfollow'),
if (host === CONFIG.WEBSERVER.HOST) host = null
const user: UserModel = res.locals.oauth.token.User
- const subscription = await ActorFollowModel.loadByActorAndTargetNameAndHost(user.Account.Actor.id, name, host)
+ const subscription = await ActorFollowModel.loadByActorAndTargetNameAndHostForAPI(user.Account.Actor.id, name, host)
if (!subscription || !subscription.ActorFollowing.VideoChannel) {
return res
// ---------------------------------------------------------------------------
export {
+ areSubscriptionsExistValidator,
userSubscriptionAddValidator,
userSubscriptionGetValidator
}
-
-// ---------------------------------------------------------------------------
@DefaultScope({
include: [
{
- model: () => ActorModel,
- required: true,
- include: [
- {
- model: () => ServerModel,
- required: false
- },
- {
- model: () => AvatarModel,
- required: false
- }
- ]
+ model: () => ActorModel, // Default scope includes avatar and server
+ required: true
}
]
})
import { FOLLOW_STATES } from '../../initializers/constants'
import { ServerModel } from '../server/server'
import { getSort } from '../utils'
-import { ActorModel } from './actor'
+import { ActorModel, unusedActorAttributesForAPI } from './actor'
import { VideoChannelModel } from '../video/video-channel'
import { IIncludeOptions } from '../../../node_modules/sequelize-typescript/lib/interfaces/IIncludeOptions'
import { AccountModel } from '../account/account'
return ActorFollowModel.findOne(query)
}
- static loadByActorAndTargetNameAndHost (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) {
+ static loadByActorAndTargetNameAndHostForAPI (actorId: number, targetName: string, targetHost: string, t?: Sequelize.Transaction) {
const actorFollowingPartInclude: IIncludeOptions = {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
model: ActorModel,
required: true,
as: 'ActorFollowing',
},
include: [
{
- model: VideoChannelModel,
+ model: VideoChannelModel.unscoped(),
required: false
}
]
actorId
},
include: [
- {
- model: ActorModel,
- required: true,
- as: 'ActorFollower'
- },
actorFollowingPartInclude
],
transaction: t
}
return ActorFollowModel.findOne(query)
+ .then(result => {
+ if (result && result.ActorFollowing.VideoChannel) {
+ result.ActorFollowing.VideoChannel.Actor = result.ActorFollowing
+ }
+
+ return result
+ })
+ }
+
+ static listSubscribedIn (actorId: number, targets: { name: string, host?: string }[]) {
+ const whereTab = targets
+ .map(t => {
+ if (t.host) {
+ return {
+ [ Sequelize.Op.and ]: [
+ {
+ '$preferredUsername$': t.name
+ },
+ {
+ '$host$': t.host
+ }
+ ]
+ }
+ }
+
+ return {
+ [ Sequelize.Op.and ]: [
+ {
+ '$preferredUsername$': t.name
+ },
+ {
+ '$serverId$': null
+ }
+ ]
+ }
+ })
+
+ const query = {
+ attributes: [],
+ where: {
+ [ Sequelize.Op.and ]: [
+ {
+ [ Sequelize.Op.or ]: whereTab
+ },
+ {
+ actorId
+ }
+ ]
+ },
+ include: [
+ {
+ attributes: [ 'preferredUsername' ],
+ model: ActorModel.unscoped(),
+ required: true,
+ as: 'ActorFollowing',
+ include: [
+ {
+ attributes: [ 'host' ],
+ model: ServerModel.unscoped(),
+ required: false
+ }
+ ]
+ }
+ ]
+ }
+
+ return ActorFollowModel.findAll(query)
}
static listFollowingForApi (id: number, start: number, count: number, sort: string) {
static listSubscriptionsForApi (id: number, start: number, count: number, sort: string) {
const query = {
+ attributes: [],
distinct: true,
offset: start,
limit: count,
},
include: [
{
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
model: ActorModel,
as: 'ActorFollowing',
required: true,
required: true,
include: [
{
- model: AccountModel,
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel,
required: true
+ },
+ {
+ model: AccountModel,
+ required: true,
+ include: [
+ {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel,
+ required: true
+ }
+ ]
}
]
}
FULL = 'FULL'
}
+export const unusedActorAttributesForAPI = [
+ 'publicKey',
+ 'privateKey',
+ 'inboxUrl',
+ 'outboxUrl',
+ 'sharedInboxUrl',
+ 'followersUrl',
+ 'followingUrl'
+]
+
@DefaultScope({
include: [
{
Is,
Model,
Scopes,
+ Sequelize,
Table,
UpdatedAt
} from 'sequelize-typescript'
} from '../../helpers/custom-validators/video-channels'
import { sendDeleteActor } from '../../lib/activitypub/send'
import { AccountModel } from '../account/account'
-import { ActorModel } from '../activitypub/actor'
-import { getSort, throwIfNotValid } from '../utils'
+import { ActorModel, unusedActorAttributesForAPI } from '../activitypub/actor'
+import { buildTrigramSearchIndex, createSimilarityAttribute, getSort, throwIfNotValid } from '../utils'
import { VideoModel } from './video'
import { CONSTRAINTS_FIELDS } from '../../initializers'
-import { AvatarModel } from '../avatar/avatar'
import { ServerModel } from '../server/server'
+import { DefineIndexesOptions } from 'sequelize'
+
+// FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation
+const indexes: DefineIndexesOptions[] = [
+ buildTrigramSearchIndex('video_channel_name_trigram', 'name'),
+
+ {
+ fields: [ 'accountId' ]
+ },
+ {
+ fields: [ 'actorId' ]
+ }
+]
enum ScopeNames {
+ AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST',
WITH_ACCOUNT = 'WITH_ACCOUNT',
WITH_ACTOR = 'WITH_ACTOR',
WITH_VIDEOS = 'WITH_VIDEOS'
}
+type AvailableForListOptions = {
+ actorId: number
+}
+
@DefaultScope({
include: [
{
]
})
@Scopes({
- [ScopeNames.WITH_ACCOUNT]: {
- include: [
- {
- model: () => AccountModel.unscoped(),
- required: true,
- include: [
- {
- model: () => ActorModel.unscoped(),
- required: true,
- include: [
+ [ScopeNames.AVAILABLE_FOR_LIST]: (options: AvailableForListOptions) => {
+ const actorIdNumber = parseInt(options.actorId + '', 10)
+
+ // Only list local channels OR channels that are on an instance followed by actorId
+ const inQueryInstanceFollow = '(' +
+ 'SELECT "actor"."serverId" FROM "actor" ' +
+ 'INNER JOIN "actorFollow" ON "actorFollow"."targetActorId" = actor.id ' +
+ 'WHERE "actorFollow"."actorId" = ' + actorIdNumber +
+ ')'
+
+ return {
+ include: [
+ {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel,
+ where: {
+ [Sequelize.Op.or]: [
+ {
+ serverId: null
+ },
{
- model: () => AvatarModel.unscoped(),
- required: false
+ serverId: {
+ [ Sequelize.Op.in ]: Sequelize.literal(inQueryInstanceFollow)
+ }
}
]
}
- ]
+ },
+ {
+ model: AccountModel,
+ required: true,
+ include: [
+ {
+ attributes: {
+ exclude: unusedActorAttributesForAPI
+ },
+ model: ActorModel, // Default scope includes avatar and server
+ required: true
+ }
+ ]
+ }
+ ]
+ }
+ },
+ [ScopeNames.WITH_ACCOUNT]: {
+ include: [
+ {
+ model: () => AccountModel,
+ required: true
}
]
},
})
@Table({
tableName: 'videoChannel',
- indexes: [
- {
- fields: [ 'accountId' ]
- },
- {
- fields: [ 'actorId' ]
- }
- ]
+ indexes
})
export class VideoChannelModel extends Model<VideoChannelModel> {
return VideoChannelModel.count(query)
}
- static listForApi (start: number, count: number, sort: string) {
+ static listForApi (actorId: number, start: number, count: number, sort: string) {
const query = {
offset: start,
limit: count,
order: getSort(sort)
}
+ const scopes = {
+ method: [ ScopeNames.AVAILABLE_FOR_LIST, { actorId } as AvailableForListOptions ]
+ }
return VideoChannelModel
- .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ])
+ .scope(scopes)
+ .findAndCountAll(query)
+ .then(({ rows, count }) => {
+ return { total: count, data: rows }
+ })
+ }
+
+ static searchForApi (options: {
+ actorId: number
+ search: string
+ start: number
+ count: number
+ sort: string
+ }) {
+ const attributesInclude = []
+ const escapedSearch = VideoModel.sequelize.escape(options.search)
+ const escapedLikeSearch = VideoModel.sequelize.escape('%' + options.search + '%')
+ attributesInclude.push(createSimilarityAttribute('VideoChannelModel.name', options.search))
+
+ const query = {
+ attributes: {
+ include: attributesInclude
+ },
+ offset: options.start,
+ limit: options.count,
+ order: getSort(options.sort),
+ where: {
+ id: {
+ [ Sequelize.Op.in ]: Sequelize.literal(
+ '(' +
+ 'SELECT id FROM "videoChannel" WHERE ' +
+ 'lower(immutable_unaccent("name")) % lower(immutable_unaccent(' + escapedSearch + ')) OR ' +
+ 'lower(immutable_unaccent("name")) LIKE lower(immutable_unaccent(' + escapedLikeSearch + '))' +
+ ')'
+ )
+ }
+ }
+ }
+
+ const scopes = {
+ method: [ ScopeNames.AVAILABLE_FOR_LIST, { actorId: options.actorId } as AvailableForListOptions ]
+ }
+ return VideoChannelModel
+ .scope(scopes)
.findAndCountAll(query)
.then(({ rows, count }) => {
return { total: count, data: rows }
}
return VideoChannelModel
- .scope([ ScopeNames.WITH_ACTOR, ScopeNames.WITH_ACCOUNT ])
+ .scope([ ScopeNames.WITH_ACCOUNT ])
+ .findOne(query)
+ }
+
+ static loadByUrlAndPopulateAccount (url: string) {
+ const query = {
+ include: [
+ {
+ model: ActorModel,
+ required: true,
+ where: {
+ url
+ }
+ }
+ ]
+ }
+
+ return VideoChannelModel
+ .scope([ ScopeNames.WITH_ACCOUNT ])
.findOne(query)
}
})
})
+ describe('When checking if subscriptions exist', async function () {
+ const existPath = path + '/exist'
+
+ it('Should fail with a non authenticated user', async function () {
+ await makeGetRequest({
+ url: server.url,
+ path: existPath,
+ statusCodeExpected: 401
+ })
+ })
+
+ it('Should fail with bad URIs', async function () {
+ await makeGetRequest({
+ url: server.url,
+ path: existPath,
+ query: { uris: 'toto' },
+ token: server.accessToken,
+ statusCodeExpected: 400
+ })
+
+ await makeGetRequest({
+ url: server.url,
+ path: existPath,
+ query: { 'uris[]': 1 },
+ token: server.accessToken,
+ statusCodeExpected: 400
+ })
+ })
+
+ it('Should succeed with the correct parameters', async function () {
+ await makeGetRequest({
+ url: server.url,
+ path: existPath,
+ query: { 'uris[]': 'coucou@localhost:9001' },
+ token: server.accessToken,
+ statusCodeExpected: 200
+ })
+ })
+ })
+
describe('When removing a subscription', function () {
it('Should fail with a non authenticated user', async function () {
await makeDeleteRequest({
listUserSubscriptions,
listUserSubscriptionVideos,
removeUserSubscription,
- getUserSubscription
+ getUserSubscription, areSubscriptionsExist
} from '../../utils/users/user-subscriptions'
const expect = chai.expect
}
})
+ it('Should return the existing subscriptions', async function () {
+ const uris = [
+ 'user3_channel@localhost:9003',
+ 'root2_channel@localhost:9001',
+ 'root_channel@localhost:9001',
+ 'user3_channel@localhost:9001'
+ ]
+
+ const res = await areSubscriptionsExist(servers[ 0 ].url, users[ 0 ].accessToken, uris)
+ const body = res.body
+
+ expect(body['user3_channel@localhost:9003']).to.be.true
+ expect(body['root2_channel@localhost:9001']).to.be.false
+ expect(body['root_channel@localhost:9001']).to.be.true
+ expect(body['user3_channel@localhost:9001']).to.be.false
+ })
+
it('Should list subscription videos', async function () {
{
const res = await listUserSubscriptionVideos(servers[0].url, servers[0].accessToken)
})
}
+function areSubscriptionsExist (url: string, token: string, uris: string[], statusCodeExpected = 200) {
+ const path = '/api/v1/users/me/subscriptions/exist'
+
+ return makeGetRequest({
+ url,
+ path,
+ query: { 'uris[]': uris },
+ token,
+ statusCodeExpected
+ })
+}
+
// ---------------------------------------------------------------------------
export {
+ areSubscriptionsExist,
addUserSubscription,
listUserSubscriptions,
getUserSubscription,
export * from './nsfw-query.model'
export * from './videos-search-query.model'
+export * from './video-channels-search-query.model'
--- /dev/null
+export interface VideoChannelsSearchQuery {
+ search: string
+
+ start?: number
+ count?: number
+ sort?: string
+}
projects / github / Chocobozzz / PeerTube.git / commitdiff
