diff options
author | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
---|---|---|
committer | buoyantair <buoyantair@protonmail.com> | 2018-11-20 12:28:13 +0530 |
commit | bc22d60899e14631cba0fb6450f4e85fc9528293 (patch) | |
tree | 285fa55033bc065df803adc2e4e3142fdfdd7309 /shared/utils/users | |
parent | b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13 (diff) | |
parent | d216b5387fb774d1355df3ace002f7be469bd450 (diff) | |
download | PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.gz PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.tar.zst PeerTube-bc22d60899e14631cba0fb6450f4e85fc9528293.zip |
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
Diffstat (limited to 'shared/utils/users')
-rw-r--r-- | shared/utils/users/accounts.ts | 2 | ||||
-rw-r--r-- | shared/utils/users/blocklist.ts | 2 | ||||
-rw-r--r-- | shared/utils/users/user-subscriptions.ts | 2 | ||||
-rw-r--r-- | shared/utils/users/users.ts | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/shared/utils/users/accounts.ts b/shared/utils/users/accounts.ts index 5601f2a77..388eb6973 100644 --- a/shared/utils/users/accounts.ts +++ b/shared/utils/users/accounts.ts | |||
@@ -4,7 +4,7 @@ import { expect } from 'chai' | |||
4 | import { existsSync, readdir } from 'fs-extra' | 4 | import { existsSync, readdir } from 'fs-extra' |
5 | import { join } from 'path' | 5 | import { join } from 'path' |
6 | import { Account } from '../../models/actors' | 6 | import { Account } from '../../models/actors' |
7 | import { root } from '../index' | 7 | import { root } from '../miscs/miscs' |
8 | import { makeGetRequest } from '../requests/requests' | 8 | import { makeGetRequest } from '../requests/requests' |
9 | 9 | ||
10 | function getAccountsList (url: string, sort = '-createdAt', statusCodeExpected = 200) { | 10 | function getAccountsList (url: string, sort = '-createdAt', statusCodeExpected = 200) { |
diff --git a/shared/utils/users/blocklist.ts b/shared/utils/users/blocklist.ts index 35b537571..0ead5e5f6 100644 --- a/shared/utils/users/blocklist.ts +++ b/shared/utils/users/blocklist.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | /* tslint:disable:no-unused-expression */ | 1 | /* tslint:disable:no-unused-expression */ |
2 | 2 | ||
3 | import { makeDeleteRequest, makePostBodyRequest } from '../index' | 3 | import { makeDeleteRequest, makePostBodyRequest } from '../requests/requests' |
4 | import { makeGetRequest } from '../requests/requests' | 4 | import { makeGetRequest } from '../requests/requests' |
5 | 5 | ||
6 | function getAccountBlocklistByAccount ( | 6 | function getAccountBlocklistByAccount ( |
diff --git a/shared/utils/users/user-subscriptions.ts b/shared/utils/users/user-subscriptions.ts index b0e7da7cc..7148fbfca 100644 --- a/shared/utils/users/user-subscriptions.ts +++ b/shared/utils/users/user-subscriptions.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { makeDeleteRequest, makeGetRequest, makePostBodyRequest } from '../' | 1 | import { makeDeleteRequest, makeGetRequest, makePostBodyRequest } from '../requests/requests' |
2 | 2 | ||
3 | function addUserSubscription (url: string, token: string, targetUri: string, statusCodeExpected = 204) { | 3 | function addUserSubscription (url: string, token: string, targetUri: string, statusCodeExpected = 204) { |
4 | const path = '/api/v1/users/me/subscriptions' | 4 | const path = '/api/v1/users/me/subscriptions' |
diff --git a/shared/utils/users/users.ts b/shared/utils/users/users.ts index 1b385aaf7..d5d62a507 100644 --- a/shared/utils/users/users.ts +++ b/shared/utils/users/users.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import * as request from 'supertest' | 1 | import * as request from 'supertest' |
2 | import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../' | 2 | import { makePostBodyRequest, makePutBodyRequest, updateAvatarRequest } from '../requests/requests' |
3 | 3 | ||
4 | import { UserRole } from '../../index' | 4 | import { UserRole } from '../../index' |
5 | import { NSFWPolicyType } from '../../models/videos/nsfw-policy.type' | 5 | import { NSFWPolicyType } from '../../models/videos/nsfw-policy.type' |