diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-11 11:33:44 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-11 13:45:39 +0200 |
commit | 6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0 (patch) | |
tree | b47de7efb8c6c611c63a15a971c6125a278f547a /server/models/activitypub | |
parent | 2c3abc4fa796555eb7d25f416c4f41ab3e3ad8ca (diff) | |
download | PeerTube-6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0.tar.gz PeerTube-6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0.tar.zst PeerTube-6dd9de95dfa39bd5c1faed00d1dbd52cd112bae0.zip |
Move config in its own file
Diffstat (limited to 'server/models/activitypub')
-rw-r--r-- | server/models/activitypub/actor.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/models/activitypub/actor.ts b/server/models/activitypub/actor.ts index 7d91e8a4a..5472c8b92 100644 --- a/server/models/activitypub/actor.ts +++ b/server/models/activitypub/actor.ts | |||
@@ -30,7 +30,7 @@ import { | |||
30 | isActorPublicKeyValid | 30 | isActorPublicKeyValid |
31 | } from '../../helpers/custom-validators/activitypub/actor' | 31 | } from '../../helpers/custom-validators/activitypub/actor' |
32 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' | 32 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' |
33 | import { ACTIVITY_PUB, ACTIVITY_PUB_ACTOR_TYPES, CONFIG, CONSTRAINTS_FIELDS } from '../../initializers' | 33 | import { ACTIVITY_PUB, ACTIVITY_PUB_ACTOR_TYPES, CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers' |
34 | import { AccountModel } from '../account/account' | 34 | import { AccountModel } from '../account/account' |
35 | import { AvatarModel } from '../avatar/avatar' | 35 | import { AvatarModel } from '../avatar/avatar' |
36 | import { ServerModel } from '../server/server' | 36 | import { ServerModel } from '../server/server' |
@@ -516,7 +516,7 @@ export class ActorModel extends Model<ActorModel> { | |||
516 | } | 516 | } |
517 | 517 | ||
518 | getHost () { | 518 | getHost () { |
519 | return this.Server ? this.Server.host : CONFIG.WEBSERVER.HOST | 519 | return this.Server ? this.Server.host : WEBSERVER.HOST |
520 | } | 520 | } |
521 | 521 | ||
522 | getRedundancyAllowed () { | 522 | getRedundancyAllowed () { |
@@ -526,7 +526,7 @@ export class ActorModel extends Model<ActorModel> { | |||
526 | getAvatarUrl () { | 526 | getAvatarUrl () { |
527 | if (!this.avatarId) return undefined | 527 | if (!this.avatarId) return undefined |
528 | 528 | ||
529 | return CONFIG.WEBSERVER.URL + this.Avatar.getWebserverPath() | 529 | return WEBSERVER.URL + this.Avatar.getWebserverPath() |
530 | } | 530 | } |
531 | 531 | ||
532 | isOutdated () { | 532 | isOutdated () { |