aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/models/activitypub/actor-follow.ts3
-rw-r--r--server/tests/api/activitypub/security.ts3
2 files changed, 2 insertions, 4 deletions
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts
index 1b272e1c8..f9b4f57f3 100644
--- a/server/models/activitypub/actor-follow.ts
+++ b/server/models/activitypub/actor-follow.ts
@@ -22,8 +22,7 @@ import { FollowState } from '../../../shared/models/actors'
22import { ActorFollow } from '../../../shared/models/actors/follow.model' 22import { ActorFollow } from '../../../shared/models/actors/follow.model'
23import { logger } from '../../helpers/logger' 23import { logger } from '../../helpers/logger'
24import { getServerActor } from '../../helpers/utils' 24import { getServerActor } from '../../helpers/utils'
25import { ACTOR_FOLLOW_SCORE } from '../../initializers/constants' 25import { ACTOR_FOLLOW_SCORE, FOLLOW_STATES } from '../../initializers/constants'
26import { FOLLOW_STATES } from '../../initializers/constants'
27import { ServerModel } from '../server/server' 26import { ServerModel } from '../server/server'
28import { getSort } from '../utils' 27import { getSort } from '../utils'
29import { ActorModel, unusedActorAttributesForAPI } from './actor' 28import { ActorModel, unusedActorAttributesForAPI } from './actor'
diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts
index a92326846..2c55876ba 100644
--- a/server/tests/api/activitypub/security.ts
+++ b/server/tests/api/activitypub/security.ts
@@ -7,8 +7,6 @@ import {
7 flushAndRunMultipleServers, 7 flushAndRunMultipleServers,
8 flushTests, 8 flushTests,
9 killallServers, 9 killallServers,
10 makeFollowRequest,
11 makePOSTAPRequest,
12 ServerInfo, 10 ServerInfo,
13 setActorField 11 setActorField
14} from '../../../../shared/utils' 12} from '../../../../shared/utils'
@@ -16,6 +14,7 @@ import { HTTP_SIGNATURE } from '../../../initializers/constants'
16import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils' 14import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils'
17import * as chai from 'chai' 15import * as chai from 'chai'
18import { activityPubContextify, buildSignedActivity } from '../../../helpers/activitypub' 16import { activityPubContextify, buildSignedActivity } from '../../../helpers/activitypub'
17import { makeFollowRequest, makePOSTAPRequest } from '../../../../shared/utils/requests/activitypub'
19 18
20const expect = chai.expect 19const expect = chai.expect
21 20