-import * as express from 'express'
import 'multer'
+import * as express from 'express'
+import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
+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 {
asyncMiddleware,
asyncRetryTransactionMiddleware,
paginationValidator,
setDefaultPagination,
setDefaultSort,
+ setDefaultVideosSort,
userSubscriptionAddValidator,
userSubscriptionGetValidator
} from '../../../middlewares'
-import { areSubscriptionsExistValidator, userSubscriptionsSortValidator, videosSortValidator } from '../../../middlewares/validators'
-import { VideoModel } from '../../../models/video/video'
-import { buildNSFWFilter } from '../../../helpers/express-utils'
-import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
+import {
+ areSubscriptionsExistValidator,
+ userSubscriptionListValidator,
+ userSubscriptionsSortValidator,
+ videosSortValidator
+} from '../../../middlewares/validators'
import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { JobQueue } from '../../../lib/job-queue'
-import { logger } from '../../../helpers/logger'
-import { sequelizeTypescript } from '../../../initializers/database'
+import { VideoModel } from '../../../models/video/video'
+import { sendUndoFollow } from '@server/lib/activitypub/send'
const mySubscriptionsRouter = express.Router()
authenticate,
paginationValidator,
videosSortValidator,
- setDefaultSort,
+ setDefaultVideosSort,
setDefaultPagination,
commonVideosFiltersValidator,
asyncMiddleware(getUserSubscriptionVideos)
userSubscriptionsSortValidator,
setDefaultSort,
setDefaultPagination,
+ userSubscriptionListValidator,
asyncMiddleware(getUserSubscriptions)
)
mySubscriptionsRouter.post('/me/subscriptions',
authenticate,
userSubscriptionAddValidator,
- asyncMiddleware(addUserSubscription)
+ addUserSubscription
)
mySubscriptionsRouter.get('/me/subscriptions/:uri',
return res.json(existObject)
}
-async function addUserSubscription (req: express.Request, res: express.Response) {
+function addUserSubscription (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.User
const [ name, host ] = req.body.uri.split('@')
const payload = {
name,
host,
+ assertIsChannel: true,
followerActorId: user.Account.Actor.id
}
JobQueue.Instance.createJob({ type: 'activitypub-follow', payload })
- .catch(err => logger.error('Cannot create follow job for subscription %s.', req.body.uri, err))
return res.status(204).end()
}
const subscription = res.locals.subscription
await sequelizeTypescript.transaction(async t => {
+ if (subscription.state === 'accepted') await sendUndoFollow(subscription, t)
+
return subscription.destroy({ transaction: t })
})
const user = res.locals.oauth.token.User
const actorId = user.Account.Actor.id
- const resultList = await ActorFollowModel.listSubscriptionsForApi(actorId, req.query.start, req.query.count, req.query.sort)
+ const resultList = await ActorFollowModel.listSubscriptionsForApi({
+ actorId,
+ start: req.query.start,
+ count: req.query.count,
+ sort: req.query.sort,
+ search: req.query.search
+ })
return res.json(getFormattedObjects(resultList.data, resultList.total))
}
async function getUserSubscriptionVideos (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.User
+ const countVideos = getCountVideos(req)
+
const resultList = await VideoModel.listForApi({
start: req.query.start,
count: req.query.count,
filter: req.query.filter as VideoFilter,
withFiles: false,
followerActorId: user.Account.Actor.id,
- user
+ user,
+ countVideos
})
return res.json(getFormattedObjects(resultList.data, resultList.total))