diff options
author | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-05-27 16:12:41 +0200 |
commit | 8f608a4cb22ab232cfab20665050764b38bac9c7 (patch) | |
tree | 6a6785aae79bf5939ad7b7a50a1bd8031268d2b4 /server/types/plugins | |
parent | 030ccfce59a8cb8f2fee6ea8dd363ba635c5c5c2 (diff) | |
parent | c215e627b575d2c4085ccb222f4ca8d0237b7552 (diff) | |
download | PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.gz PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.zst PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.zip |
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to 'server/types/plugins')
-rw-r--r-- | server/types/plugins/register-server-option.model.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/types/plugins/register-server-option.model.ts b/server/types/plugins/register-server-option.model.ts index 4af476ed2..8774bcd8c 100644 --- a/server/types/plugins/register-server-option.model.ts +++ b/server/types/plugins/register-server-option.model.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Router, Response } from 'express' | 1 | import { Response, Router } from 'express' |
2 | import { Logger } from 'winston' | 2 | import { Logger } from 'winston' |
3 | import { ActorModel } from '@server/models/activitypub/actor' | 3 | import { ActorModel } from '@server/models/actor/actor' |
4 | import { | 4 | import { |
5 | PluginPlaylistPrivacyManager, | 5 | PluginPlaylistPrivacyManager, |
6 | PluginSettingsManager, | 6 | PluginSettingsManager, |
@@ -70,13 +70,13 @@ export type PeerTubeHelpers = { | |||
70 | 70 | ||
71 | user: { | 71 | user: { |
72 | // PeerTube >= 3.2 | 72 | // PeerTube >= 3.2 |
73 | getAuthUser: (response: Response) => { | 73 | getAuthUser: (response: Response) => Promise<{ |
74 | id?: string | 74 | id?: string |
75 | username: string | 75 | username: string |
76 | email: string | 76 | email: string |
77 | blocked: boolean | 77 | blocked: boolean |
78 | role: UserRole | 78 | role: UserRole |
79 | } | undefined | 79 | } | undefined> |
80 | } | 80 | } |
81 | } | 81 | } |
82 | 82 | ||