diff options
author | Florent <florent.git@zeteo.me> | 2022-08-10 09:53:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-10 09:53:39 +0200 |
commit | 2a491182e483b97afb1b65c908b23cb48d591807 (patch) | |
tree | ec13503216ad72a3ea8f1ce3b659899f8167fb47 /server/controllers/api/accounts.ts | |
parent | 06ac128958c489efe1008eeca1df683819bd2f18 (diff) | |
download | PeerTube-2a491182e483b97afb1b65c908b23cb48d591807.tar.gz PeerTube-2a491182e483b97afb1b65c908b23cb48d591807.tar.zst PeerTube-2a491182e483b97afb1b65c908b23cb48d591807.zip |
Channel sync (#5135)
* Add external channel URL for channel update / creation (#754)
* Disallow synchronisation if user has no video quota (#754)
* More constraints serverside (#754)
* Disable sync if server configuration does not allow HTTP import (#754)
* Working version synchronizing videos with a job (#754)
TODO: refactoring, too much code duplication
* More logs and try/catch (#754)
* Fix eslint error (#754)
* WIP: support synchronization time change (#754)
* New frontend #754
* WIP: Create sync front (#754)
* Enhance UI, sync creation form (#754)
* Warning message when HTTP upload is disallowed
* More consistent names (#754)
* Binding Front with API (#754)
* Add a /me API (#754)
* Improve list UI (#754)
* Implement creation and deletion routes (#754)
* Lint (#754)
* Lint again (#754)
* WIP: UI for triggering import existing videos (#754)
* Implement jobs for syncing and importing channels
* Don't sync videos before sync creation + avoid concurrency issue (#754)
* Cleanup (#754)
* Cleanup: OpenAPI + API rework (#754)
* Remove dead code (#754)
* Eslint (#754)
* Revert the mess with whitespaces in constants.ts (#754)
* Some fixes after rebase (#754)
* Several fixes after PR remarks (#754)
* Front + API: Rename video-channels-sync to video-channel-syncs (#754)
* Allow enabling channel sync through UI (#754)
* getChannelInfo (#754)
* Minor fixes: openapi + model + sql (#754)
* Simplified API validators (#754)
* Rename MChannelSync to MChannelSyncChannel (#754)
* Add command for VideoChannelSync (#754)
* Use synchronization.enabled config (#754)
* Check parameters test + some fixes (#754)
* Fix conflict mistake (#754)
* Restrict access to video channel sync list API (#754)
* Start adding unit test for synchronization (#754)
* Continue testing (#754)
* Tests finished + convertion of job to scheduler (#754)
* Add lastSyncAt field (#754)
* Fix externalRemoteUrl sort + creation date not well formatted (#754)
* Small fix (#754)
* Factorize addYoutubeDLImport and buildVideo (#754)
* Check duplicates on channel not on users (#754)
* factorize thumbnail generation (#754)
* Fetch error should return status 400 (#754)
* Separate video-channel-import and video-channel-sync-latest (#754)
* Bump DB migration version after rebase (#754)
* Prettier states in UI table (#754)
* Add DefaultScope in VideoChannelSyncModel (#754)
* Fix audit logs (#754)
* Ensure user can upload when importing channel + minor fixes (#754)
* Mark synchronization as failed on exception + typos (#754)
* Change REST API for importing videos into channel (#754)
* Add option for fully synchronize a chnanel (#754)
* Return a whole sync object on creation to avoid tricks in Front (#754)
* Various remarks (#754)
* Single quotes by default (#754)
* Rename synchronization to video_channel_synchronization
* Add check.latest_videos_count and max_per_user options (#754)
* Better channel rendering in list #754
* Allow sorting with channel name and state (#754)
* Add missing tests for channel imports (#754)
* Prefer using a parent job for channel sync
* Styling
* Client styling
Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'server/controllers/api/accounts.ts')
-rw-r--r-- | server/controllers/api/accounts.ts | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts index 66cdaab82..7a530cde5 100644 --- a/server/controllers/api/accounts.ts +++ b/server/controllers/api/accounts.ts | |||
@@ -25,8 +25,10 @@ import { | |||
25 | accountsFollowersSortValidator, | 25 | accountsFollowersSortValidator, |
26 | accountsSortValidator, | 26 | accountsSortValidator, |
27 | ensureAuthUserOwnsAccountValidator, | 27 | ensureAuthUserOwnsAccountValidator, |
28 | ensureCanManageUser, | ||
28 | videoChannelsSortValidator, | 29 | videoChannelsSortValidator, |
29 | videoChannelStatsValidator, | 30 | videoChannelStatsValidator, |
31 | videoChannelSyncsSortValidator, | ||
30 | videosSortValidator | 32 | videosSortValidator |
31 | } from '../../middlewares/validators' | 33 | } from '../../middlewares/validators' |
32 | import { commonVideoPlaylistFiltersValidator, videoPlaylistsSearchValidator } from '../../middlewares/validators/videos/video-playlists' | 34 | import { commonVideoPlaylistFiltersValidator, videoPlaylistsSearchValidator } from '../../middlewares/validators/videos/video-playlists' |
@@ -35,6 +37,7 @@ import { AccountVideoRateModel } from '../../models/account/account-video-rate' | |||
35 | import { VideoModel } from '../../models/video/video' | 37 | import { VideoModel } from '../../models/video/video' |
36 | import { VideoChannelModel } from '../../models/video/video-channel' | 38 | import { VideoChannelModel } from '../../models/video/video-channel' |
37 | import { VideoPlaylistModel } from '../../models/video/video-playlist' | 39 | import { VideoPlaylistModel } from '../../models/video/video-playlist' |
40 | import { VideoChannelSyncModel } from '@server/models/video/video-channel-sync' | ||
38 | 41 | ||
39 | const accountsRouter = express.Router() | 42 | const accountsRouter = express.Router() |
40 | 43 | ||
@@ -72,6 +75,17 @@ accountsRouter.get('/:accountName/video-channels', | |||
72 | asyncMiddleware(listAccountChannels) | 75 | asyncMiddleware(listAccountChannels) |
73 | ) | 76 | ) |
74 | 77 | ||
78 | accountsRouter.get('/:accountName/video-channel-syncs', | ||
79 | authenticate, | ||
80 | asyncMiddleware(accountNameWithHostGetValidator), | ||
81 | ensureCanManageUser, | ||
82 | paginationValidator, | ||
83 | videoChannelSyncsSortValidator, | ||
84 | setDefaultSort, | ||
85 | setDefaultPagination, | ||
86 | asyncMiddleware(listAccountChannelsSync) | ||
87 | ) | ||
88 | |||
75 | accountsRouter.get('/:accountName/video-playlists', | 89 | accountsRouter.get('/:accountName/video-playlists', |
76 | optionalAuthenticate, | 90 | optionalAuthenticate, |
77 | asyncMiddleware(accountNameWithHostGetValidator), | 91 | asyncMiddleware(accountNameWithHostGetValidator), |
@@ -146,6 +160,20 @@ async function listAccountChannels (req: express.Request, res: express.Response) | |||
146 | return res.json(getFormattedObjects(resultList.data, resultList.total)) | 160 | return res.json(getFormattedObjects(resultList.data, resultList.total)) |
147 | } | 161 | } |
148 | 162 | ||
163 | async function listAccountChannelsSync (req: express.Request, res: express.Response) { | ||
164 | const options = { | ||
165 | accountId: res.locals.account.id, | ||
166 | start: req.query.start, | ||
167 | count: req.query.count, | ||
168 | sort: req.query.sort, | ||
169 | search: req.query.search | ||
170 | } | ||
171 | |||
172 | const resultList = await VideoChannelSyncModel.listByAccountForAPI(options) | ||
173 | |||
174 | return res.json(getFormattedObjects(resultList.data, resultList.total)) | ||
175 | } | ||
176 | |||
149 | async function listAccountPlaylists (req: express.Request, res: express.Response) { | 177 | async function listAccountPlaylists (req: express.Request, res: express.Response) { |
150 | const serverActor = await getServerActor() | 178 | const serverActor = await getServerActor() |
151 | 179 | ||