} 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 obj = results.find(r => {
const server = r.ActorFollowing.Server
- return r.ActorFollowing.preferredUsername === sanitizedHandle.name &&
+ return r.ActorFollowing.preferredUsername.toLowerCase() === sanitizedHandle.name.toLowerCase() &&
(
(!server && !sanitizedHandle.host) ||
(server.host === sanitizedHandle.host)
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 })
})
const countVideos = getCountVideos(req)
const query = pickCommonVideoQuery(req.query)
- const resultList = await VideoModel.listForApi({
+ const apiOptions = await Hooks.wrapObject({
...query,
displayOnlyForFollower: {
nsfw: buildNSFWFilter(res, query.nsfw),
user,
countVideos
- })
+ }, 'filter:api.user.me.subscription-videos.list.params')
+
+ 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)))
}