diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/lib/job-queue/handlers/activitypub-follow.ts | 2 | ||||
-rw-r--r-- | server/middlewares/validators/users.ts | 2 | ||||
-rw-r--r-- | server/tests/api/check-params/users.ts | 2 | ||||
-rw-r--r-- | server/tools/README.md | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/job-queue/handlers/activitypub-follow.ts b/server/lib/job-queue/handlers/activitypub-follow.ts index af7c8a838..4a7cda0a2 100644 --- a/server/lib/job-queue/handlers/activitypub-follow.ts +++ b/server/lib/job-queue/handlers/activitypub-follow.ts | |||
@@ -48,7 +48,7 @@ export { | |||
48 | 48 | ||
49 | async function follow (fromActor: MActor, targetActor: MActorFull, isAutoFollow = false) { | 49 | async function follow (fromActor: MActor, targetActor: MActorFull, isAutoFollow = false) { |
50 | if (fromActor.id === targetActor.id) { | 50 | if (fromActor.id === targetActor.id) { |
51 | throw new Error('Follower is the same than target actor.') | 51 | throw new Error('Follower is the same as target actor.') |
52 | } | 52 | } |
53 | 53 | ||
54 | // Same server, direct accept | 54 | // Same server, direct accept |
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts index 544db76d7..871233afe 100644 --- a/server/middlewares/validators/users.ts +++ b/server/middlewares/validators/users.ts | |||
@@ -91,7 +91,7 @@ const usersRegisterValidator = [ | |||
91 | 91 | ||
92 | if (body.channel.name === body.username) { | 92 | if (body.channel.name === body.username) { |
93 | return res.status(400) | 93 | return res.status(400) |
94 | .json({ error: 'Channel name cannot be the same than user username.' }) | 94 | .json({ error: 'Channel name cannot be the same as user username.' }) |
95 | } | 95 | } |
96 | 96 | ||
97 | const existing = await ActorModel.loadLocalByName(body.channel.name) | 97 | const existing = await ActorModel.loadLocalByName(body.channel.name) |
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index 55094795c..9d7ff8984 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts | |||
@@ -901,7 +901,7 @@ describe('Test users API validators', function () { | |||
901 | await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) | 901 | await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) |
902 | }) | 902 | }) |
903 | 903 | ||
904 | it('Should fail with a channel name that is the same than user username', async function () { | 904 | it('Should fail with a channel name that is the same as username', async function () { |
905 | const source = { username: 'super_user', channel: { name: 'super_user', displayName: 'display name' } } | 905 | const source = { username: 'super_user', channel: { name: 'super_user', displayName: 'display name' } } |
906 | const fields = immutableAssign(baseCorrectParams, source) | 906 | const fields = immutableAssign(baseCorrectParams, source) |
907 | 907 | ||
diff --git a/server/tools/README.md b/server/tools/README.md index 6b94d74e5..e86df3bfc 100644 --- a/server/tools/README.md +++ b/server/tools/README.md | |||
@@ -18,7 +18,7 @@ COMMANDS | |||
18 | 18 | ||
19 | Unless otherwise specified, every command can be queried for its own help or manual by passing its name to the `help` command, or by using the `--help` option. | 19 | Unless otherwise specified, every command can be queried for its own help or manual by passing its name to the `help` command, or by using the `--help` option. |
20 | 20 | ||
21 | `auth [action]`: stores credentials for your accounts on remote instances so that you don't need to pass them at every command | 21 | `auth [action]`: stores credentials for your accounts on remote instances, so that you don't need to pass them at every command |
22 | 22 | ||
23 | `upload|up`: upload a video to a remote instance | 23 | `upload|up`: upload a video to a remote instance |
24 | 24 | ||