diff options
-rw-r--r-- | server/models/activitypub/actor-follow.ts | 3 | ||||
-rw-r--r-- | server/tests/api/activitypub/security.ts | 3 | ||||
-rw-r--r-- | shared/utils/index.ts | 1 |
3 files changed, 2 insertions, 5 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' | |||
22 | import { ActorFollow } from '../../../shared/models/actors/follow.model' | 22 | import { ActorFollow } from '../../../shared/models/actors/follow.model' |
23 | import { logger } from '../../helpers/logger' | 23 | import { logger } from '../../helpers/logger' |
24 | import { getServerActor } from '../../helpers/utils' | 24 | import { getServerActor } from '../../helpers/utils' |
25 | import { ACTOR_FOLLOW_SCORE } from '../../initializers/constants' | 25 | import { ACTOR_FOLLOW_SCORE, FOLLOW_STATES } from '../../initializers/constants' |
26 | import { FOLLOW_STATES } from '../../initializers/constants' | ||
27 | import { ServerModel } from '../server/server' | 26 | import { ServerModel } from '../server/server' |
28 | import { getSort } from '../utils' | 27 | import { getSort } from '../utils' |
29 | import { ActorModel, unusedActorAttributesForAPI } from './actor' | 28 | import { 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' | |||
16 | import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils' | 14 | import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils' |
17 | import * as chai from 'chai' | 15 | import * as chai from 'chai' |
18 | import { activityPubContextify, buildSignedActivity } from '../../../helpers/activitypub' | 16 | import { activityPubContextify, buildSignedActivity } from '../../../helpers/activitypub' |
17 | import { makeFollowRequest, makePOSTAPRequest } from '../../../../shared/utils/requests/activitypub' | ||
19 | 18 | ||
20 | const expect = chai.expect | 19 | const expect = chai.expect |
21 | 20 | ||
diff --git a/shared/utils/index.ts b/shared/utils/index.ts index 469546872..9d0bbaa38 100644 --- a/shared/utils/index.ts +++ b/shared/utils/index.ts | |||
@@ -8,7 +8,6 @@ export * from './miscs/miscs' | |||
8 | export * from './miscs/stubs' | 8 | export * from './miscs/stubs' |
9 | export * from './miscs/sql' | 9 | export * from './miscs/sql' |
10 | export * from './server/follows' | 10 | export * from './server/follows' |
11 | export * from './requests/activitypub' | ||
12 | export * from './requests/requests' | 11 | export * from './requests/requests' |
13 | export * from './requests/check-api-params' | 12 | export * from './requests/check-api-params' |
14 | export * from './server/servers' | 13 | export * from './server/servers' |