diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-10-12 15:26:04 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-10-16 16:41:36 +0200 |
| commit | 7ad9b9846c44d198a736183fb186c2039f5236b5 (patch) | |
| tree | 9c8456882a261c0522efb507f20e323c2741a0f8 /server/helpers | |
| parent | dffd5d127f49eb63d2b2b3133aec75ec1d7e4dcb (diff) | |
| download | PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.tar.gz PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.tar.zst PeerTube-7ad9b9846c44d198a736183fb186c2039f5236b5.zip | |
Add ability for users to block an account/instance on server side
Diffstat (limited to 'server/helpers')
| -rw-r--r-- | server/helpers/utils.ts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts index 39afb4e7b..049c3f8bc 100644 --- a/server/helpers/utils.ts +++ b/server/helpers/utils.ts | |||
| @@ -40,7 +40,10 @@ const getServerActor = memoizee(async function () { | |||
| 40 | const application = await ApplicationModel.load() | 40 | const application = await ApplicationModel.load() |
| 41 | if (!application) throw Error('Could not load Application from database.') | 41 | if (!application) throw Error('Could not load Application from database.') |
| 42 | 42 | ||
| 43 | return application.Account.Actor | 43 | const actor = application.Account.Actor |
| 44 | actor.Account = application.Account | ||
| 45 | |||
| 46 | return actor | ||
| 44 | }) | 47 | }) |
| 45 | 48 | ||
| 46 | function generateVideoTmpPath (target: string | ParseTorrent) { | 49 | function generateVideoTmpPath (target: string | ParseTorrent) { |