diff options
author | Chocobozzz <me@florianbigard.com> | 2023-02-17 10:28:33 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-02-17 10:28:33 +0100 |
commit | efaf3797897533ebaac6d96110c4c56af9fc1628 (patch) | |
tree | fc050302e7104a76e4eb620415dc91e7f122e876 /server | |
parent | 03902b00994a03e333acd7662d26782e3dc52e07 (diff) | |
download | PeerTube-efaf3797897533ebaac6d96110c4c56af9fc1628.tar.gz PeerTube-efaf3797897533ebaac6d96110c4c56af9fc1628.tar.zst PeerTube-efaf3797897533ebaac6d96110c4c56af9fc1628.zip |
Fix dev instance following test instances
Diffstat (limited to 'server')
-rw-r--r-- | server/helpers/custom-validators/activitypub/misc.ts | 2 | ||||
-rw-r--r-- | server/helpers/custom-validators/servers.ts | 2 | ||||
-rw-r--r-- | server/models/actor/sql/shared/actor-follow-table-attributes.ts | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts index 4619f0eb5..279ad83dc 100644 --- a/server/helpers/custom-validators/activitypub/misc.ts +++ b/server/helpers/custom-validators/activitypub/misc.ts | |||
@@ -13,7 +13,7 @@ function isUrlValid (url: string) { | |||
13 | } | 13 | } |
14 | 14 | ||
15 | // We validate 'localhost', so we don't have the top level domain | 15 | // We validate 'localhost', so we don't have the top level domain |
16 | if (CONFIG.WEBSERVER.HOSTNAME === 'localhost') { | 16 | if (CONFIG.WEBSERVER.HOSTNAME === 'localhost' || CONFIG.WEBSERVER.HOSTNAME === '127.0.0.1') { |
17 | isURLOptions.require_tld = false | 17 | isURLOptions.require_tld = false |
18 | } | 18 | } |
19 | 19 | ||
diff --git a/server/helpers/custom-validators/servers.ts b/server/helpers/custom-validators/servers.ts index 94fda05aa..b2aa03b77 100644 --- a/server/helpers/custom-validators/servers.ts +++ b/server/helpers/custom-validators/servers.ts | |||
@@ -10,7 +10,7 @@ function isHostValid (host: string) { | |||
10 | } | 10 | } |
11 | 11 | ||
12 | // We validate 'localhost', so we don't have the top level domain | 12 | // We validate 'localhost', so we don't have the top level domain |
13 | if (CONFIG.WEBSERVER.HOSTNAME === 'localhost') { | 13 | if (CONFIG.WEBSERVER.HOSTNAME === 'localhost' || CONFIG.WEBSERVER.HOSTNAME === '127.0.0.1') { |
14 | isURLOptions.require_tld = false | 14 | isURLOptions.require_tld = false |
15 | } | 15 | } |
16 | 16 | ||
diff --git a/server/models/actor/sql/shared/actor-follow-table-attributes.ts b/server/models/actor/sql/shared/actor-follow-table-attributes.ts index 7dd908ece..4431aa6d1 100644 --- a/server/models/actor/sql/shared/actor-follow-table-attributes.ts +++ b/server/models/actor/sql/shared/actor-follow-table-attributes.ts | |||
@@ -1,4 +1,3 @@ | |||
1 | import { logger } from '@server/helpers/logger' | ||
2 | import { Memoize } from '@server/helpers/memoize' | 1 | import { Memoize } from '@server/helpers/memoize' |
3 | import { ServerModel } from '@server/models/server/server' | 2 | import { ServerModel } from '@server/models/server/server' |
4 | import { ActorModel } from '../../actor' | 3 | import { ActorModel } from '../../actor' |
@@ -9,8 +8,6 @@ export class ActorFollowTableAttributes { | |||
9 | 8 | ||
10 | @Memoize() | 9 | @Memoize() |
11 | getFollowAttributes () { | 10 | getFollowAttributes () { |
12 | logger.error('coucou') | ||
13 | |||
14 | return ActorFollowModel.getSQLAttributes('ActorFollowModel').join(', ') | 11 | return ActorFollowModel.getSQLAttributes('ActorFollowModel').join(', ') |
15 | } | 12 | } |
16 | 13 | ||