import 'multer'
-import * as express from 'express'
+import express from 'express'
+import { handlesToNameAndHost } from '@server/helpers/actors'
+import { pickCommonVideoQuery } from '@server/helpers/query'
import { sendUndoFollow } from '@server/lib/activitypub/send'
+import { guessAdditionalAttributesFromQuery } from '@server/models/video/formatter/video-format-utils'
import { VideoChannelModel } from '@server/models/video/video-channel'
-import { VideosCommonQuery } from '@shared/models'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+import { HttpStatusCode } from '../../../../shared/models/http/http-error-codes'
import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils'
import { getFormattedObjects } from '../../../helpers/utils'
-import { WEBSERVER } from '../../../initializers/constants'
import { sequelizeTypescript } from '../../../initializers/database'
import { JobQueue } from '../../../lib/job-queue'
import {
} from '../../../middlewares/validators'
import { ActorFollowModel } from '../../../models/actor/actor-follow'
import { VideoModel } from '../../../models/video/video'
+import { Hooks } from '@server/lib/plugins/hooks'
const mySubscriptionsRouter = express.Router()
const uris = req.query.uris as string[]
const user = res.locals.oauth.token.User
- const handles = uris.map(u => {
- let [ name, host ] = u.split('@')
- if (host === WEBSERVER.HOST) host = null
+ const sanitizedHandles = handlesToNameAndHost(uris)
- return { name, host, uri: u }
- })
-
- const results = await ActorFollowModel.listSubscribedIn(user.Account.Actor.id, handles)
+ const results = await ActorFollowModel.listSubscriptionsOf(user.Account.Actor.id, sanitizedHandles)
const existObject: { [id: string ]: boolean } = {}
- for (const handle of handles) {
+ for (const sanitizedHandle of sanitizedHandles) {
const obj = results.find(r => {
const server = r.ActorFollowing.Server
- return r.ActorFollowing.preferredUsername === handle.name &&
+ return r.ActorFollowing.preferredUsername.toLowerCase() === sanitizedHandle.name.toLowerCase() &&
(
- (!server && !handle.host) ||
- (server.host === handle.host)
+ (!server && !sanitizedHandle.host) ||
+ (server.host === sanitizedHandle.host)
)
})
- existObject[handle.uri] = obj !== undefined
+ existObject[sanitizedHandle.handle] = obj !== undefined
}
return res.json(existObject)
followerActorId: user.Account.Actor.id
}
- JobQueue.Instance.createJob({ type: 'activitypub-follow', payload })
+ JobQueue.Instance.createJobAsync({ type: 'activitypub-follow', payload })
return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
const subscription = res.locals.subscription
await sequelizeTypescript.transaction(async t => {
- if (subscription.state === 'accepted') await sendUndoFollow(subscription, t)
+ if (subscription.state === 'accepted') {
+ sendUndoFollow(subscription, t)
+ }
return subscription.destroy({ transaction: t })
})
async function getUserSubscriptionVideos (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.User
const countVideos = getCountVideos(req)
- const query = req.query as VideosCommonQuery
-
- const resultList = await VideoModel.listForApi({
- start: query.start,
- count: query.count,
- sort: query.sort,
- includeLocalVideos: false,
- categoryOneOf: query.categoryOneOf,
- licenceOneOf: query.licenceOneOf,
- languageOneOf: query.languageOneOf,
- tagsOneOf: query.tagsOneOf,
- tagsAllOf: query.tagsAllOf,
+ const query = pickCommonVideoQuery(req.query)
+
+ const apiOptions = await Hooks.wrapObject({
+ ...query,
+
+ displayOnlyForFollower: {
+ actorId: user.Account.Actor.id,
+ orLocalVideos: false
+ },
nsfw: buildNSFWFilter(res, query.nsfw),
- filter: query.filter,
- withFiles: false,
- followerActorId: user.Account.Actor.id,
user,
countVideos
- })
+ }, 'filter:api.user.me.subscription-videos.list.params')
- return res.json(getFormattedObjects(resultList.data, resultList.total))
+ const resultList = await Hooks.wrapPromiseFun(
+ VideoModel.listForApi,
+ apiOptions,
+ 'filter:api.user.me.subscription-videos.list.result'
+ )
+
+ return res.json(getFormattedObjects(resultList.data, resultList.total, guessAdditionalAttributesFromQuery(query)))
}