diff options
author | Chocobozzz <me@florianbigard.com> | 2019-03-19 10:35:15 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-03-19 10:35:15 +0100 |
commit | dae86118ed5d4026d04acb9d0e36829b9ad8eb4e (patch) | |
tree | a5bf9c4487240bf75a9b328cad459a0587f90dea /server/controllers/activitypub/inbox.ts | |
parent | e65c0c5b1fab9c3d93f51721b2458cf5cf471f20 (diff) | |
download | PeerTube-dae86118ed5d4026d04acb9d0e36829b9ad8eb4e.tar.gz PeerTube-dae86118ed5d4026d04acb9d0e36829b9ad8eb4e.tar.zst PeerTube-dae86118ed5d4026d04acb9d0e36829b9ad8eb4e.zip |
Cleanup express locals typings
Diffstat (limited to 'server/controllers/activitypub/inbox.ts')
-rw-r--r-- | server/controllers/activitypub/inbox.ts | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/server/controllers/activitypub/inbox.ts b/server/controllers/activitypub/inbox.ts index f0e65015b..38d5c51df 100644 --- a/server/controllers/activitypub/inbox.ts +++ b/server/controllers/activitypub/inbox.ts | |||
@@ -5,8 +5,6 @@ import { logger } from '../../helpers/logger' | |||
5 | import { processActivities } from '../../lib/activitypub/process/process' | 5 | import { processActivities } from '../../lib/activitypub/process/process' |
6 | import { asyncMiddleware, checkSignature, localAccountValidator, localVideoChannelValidator, signatureValidator } from '../../middlewares' | 6 | import { asyncMiddleware, checkSignature, localAccountValidator, localVideoChannelValidator, signatureValidator } from '../../middlewares' |
7 | import { activityPubValidator } from '../../middlewares/validators/activitypub/activity' | 7 | import { activityPubValidator } from '../../middlewares/validators/activitypub/activity' |
8 | import { VideoChannelModel } from '../../models/video/video-channel' | ||
9 | import { AccountModel } from '../../models/account/account' | ||
10 | import { queue } from 'async' | 8 | import { queue } from 'async' |
11 | import { ActorModel } from '../../models/activitypub/actor' | 9 | import { ActorModel } from '../../models/activitypub/actor' |
12 | 10 | ||
@@ -66,12 +64,7 @@ function inboxController (req: express.Request, res: express.Response) { | |||
66 | activities = activities.filter(a => isActivityValid(a)) | 64 | activities = activities.filter(a => isActivityValid(a)) |
67 | logger.debug('We keep %d activities.', activities.length, { activities }) | 65 | logger.debug('We keep %d activities.', activities.length, { activities }) |
68 | 66 | ||
69 | let accountOrChannel: VideoChannelModel | AccountModel | 67 | const accountOrChannel = res.locals.account || res.locals.videoChannel |
70 | if (res.locals.account) { | ||
71 | accountOrChannel = res.locals.account | ||
72 | } else if (res.locals.videoChannel) { | ||
73 | accountOrChannel = res.locals.videoChannel | ||
74 | } | ||
75 | 68 | ||
76 | logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url) | 69 | logger.info('Receiving inbox requests for %d activities by %s.', activities.length, res.locals.signature.actor.url) |
77 | 70 | ||