ActivityPub-federated video streaming platform using P2P directly in your web browser
Prefer "shared"
Chocobozzzff758863cfba
diff --git a/client/src/app/+admin/moderation/watched-words-list/watched-words-list-admin.component.ts b/client/src/app/+admin/moderation/watched-words-list/watched-words-list-admin.component.tsindex 7d1ccb1d48..09f7d298c4 100644--- a/client/src/app/+admin/moderation/watched-words-list/watched-words-list-admin.component.ts+++ b/client/src/app/+admin/moderation/watched-words-list/watched-words-list-admin.component.ts@@ -1,6 +1,6 @@import { Component } from '@angular/core'-import { WatchedWordsListAdminOwnerComponent } from '@app/shared/standalone-watched-words/watched-words-list-admin-owner.component'+import { WatchedWordsListAdminOwnerComponent } from '@app/shared/shared-watched-words/watched-words-list-admin-owner.component'@Component({templateUrl: './watched-words-list-admin.component.html',diff --git a/client/src/app/+admin/routes.ts b/client/src/app/+admin/routes.tsindex e864d96cc8..43abebf708 100644--- a/client/src/app/+admin/routes.ts+++ b/client/src/app/+admin/routes.ts@@ -16,7 +16,7 @@ import { SearchService } from '@app/shared/shared-search/search.service'import { TwoFactorService } from '@app/shared/shared-users/two-factor.service'import { UserAdminService } from '@app/shared/shared-users/user-admin.service'import { VideoCommentService } from '@app/shared/shared-video-comment/video-comment.service'-import { WatchedWordsListService } from '@app/shared/standalone-watched-words/watched-words-list.service'+import { WatchedWordsListService } from '@app/shared/shared-watched-words/watched-words-list.service'import { AdminModerationComponent } from './admin-moderation.component'import { AdminOverviewComponent } from './admin-overview.component'import { AdminSettingsComponent } from './admin-settings.component'diff --git a/client/src/app/+my-account/my-account-import-export/my-account-import.component.ts b/client/src/app/+my-account/my-account-import-export/my-account-import.component.tsindex 5c32936798..72ba345adb 100644--- a/client/src/app/+my-account/my-account-import-export/my-account-import.component.ts+++ b/client/src/app/+my-account/my-account-import-export/my-account-import.component.ts@@ -10,7 +10,7 @@ import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'import { HttpStatusCode, UserImport, UserImportState } from '@peertube/peertube-models'import { UploadState, UploaderX, UploadxService } from 'ngx-uploadx'import { Subscription } from 'rxjs'-import { UploadProgressComponent } from '../../shared/standalone-upload/upload-progress.component'+import { UploadProgressComponent } from '../../shared/shared-upload/upload-progress.component'import { UserImportExportService } from './user-import-export.service'@Component({diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.tsindex b113282232..25ac6c596b 100644--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.ts@@ -1,5 +1,5 @@import { Component, viewChild } from '@angular/core'-import { UserNotificationsComponent } from '@app/shared/standalone-notifications/user-notifications.component'+import { UserNotificationsComponent } from '@app/shared/shared-notifications/user-notifications.component'import { NgIf } from '@angular/common'import { FormsModule } from '@angular/forms'import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'diff --git a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.tsindex 515d123624..cc6e9d8c5f 100644--- a/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts+++ b/client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts@@ -23,7 +23,7 @@ import { PTDatePipe } from '../../shared/shared-main/common/date.pipe'import { NumberFormatterPipe } from '../../shared/shared-main/common/number-formatter.pipe'import { VideoPlaylistMiniatureComponent } from '../../shared/shared-video-playlist/video-playlist-miniature.component'import { PrivacyBadgeComponent } from '../../shared/shared-video/privacy-badge.component'-import { ChannelToggleComponent } from '../../shared/standalone-channels/channel-toggle.component'+import { ChannelToggleComponent } from '../../shared/shared-channels/channel-toggle.component'type ColumnName = 'videoChannelPosition' | 'videos' | 'name' | 'privacy' | 'updatedAt'diff --git a/client/src/app/+my-library/my-videos/my-videos.component.ts b/client/src/app/+my-library/my-videos/my-videos.component.tsindex c08c7c17ca..07e600a6a2 100644--- a/client/src/app/+my-library/my-videos/my-videos.component.ts+++ b/client/src/app/+my-library/my-videos/my-videos.component.ts@@ -9,7 +9,7 @@ import { Video } from '@app/shared/shared-main/video/video.model'import { VideoService } from '@app/shared/shared-main/video/video.service'import { TableColumnInfo, TableComponent, TableQueryParams } from '@app/shared/shared-tables/table.component'import { VideoPlaylistService } from '@app/shared/shared-video-playlist/video-playlist.service'-import { ChannelToggleComponent } from '@app/shared/standalone-channels/channel-toggle.component'+import { ChannelToggleComponent } from '@app/shared/shared-channels/channel-toggle.component'import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'import { arrayify, pick } from '@peertube/peertube-core-utils'import { VideoChannel, VideoExistInPlaylist, VideoPrivacy, VideoPrivacyType, VideosExistInPlaylists } from '@peertube/peertube-models'diff --git a/client/src/app/+my-library/my-watched-words-list/my-watched-words-list.component.ts b/client/src/app/+my-library/my-watched-words-list/my-watched-words-list.component.tsindex 437e63330f..4599cbe197 100644--- a/client/src/app/+my-library/my-watched-words-list/my-watched-words-list.component.ts+++ b/client/src/app/+my-library/my-watched-words-list/my-watched-words-list.component.ts@@ -1,7 +1,7 @@import { Component } from '@angular/core'import { RouterLink } from '@angular/router'-import { WatchedWordsListAdminOwnerComponent } from '@app/shared/standalone-watched-words/watched-words-list-admin-owner.component'+import { WatchedWordsListAdminOwnerComponent } from '@app/shared/shared-watched-words/watched-words-list-admin-owner.component'@Component({templateUrl: './my-watched-words-list.component.html',diff --git a/client/src/app/+my-library/routes.ts b/client/src/app/+my-library/routes.tsindex ffcdcd87fa..5671ac2990 100644--- a/client/src/app/+my-library/routes.ts+++ b/client/src/app/+my-library/routes.ts@@ -7,7 +7,7 @@ import { VideoBlockService } from '@app/shared/shared-moderation/video-block.serimport { UserSubscriptionService } from '@app/shared/shared-user-subscription/user-subscription.service'import { VideoCommentService } from '@app/shared/shared-video-comment/video-comment.service'import { LiveVideoService } from '@app/shared/shared-video-live/live-video.service'-import { WatchedWordsListService } from '@app/shared/standalone-watched-words/watched-words-list.service'+import { WatchedWordsListService } from '@app/shared/shared-watched-words/watched-words-list.service'import { LoginGuard } from '../core'import { CommentsOnMyVideosComponent } from './comments-on-my-videos/comments-on-my-videos.component'import { AutomaticTagService } from './my-auto-tag-policies/automatic-tag.service'diff --git a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.tsindex a9eda8be3a..548338d3bc 100644--- a/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts+++ b/client/src/app/+videos-publish-manage/shared-manage/video-manage-container.component.ts@@ -9,7 +9,7 @@ import { Video } from '@app/shared/shared-main/video/video.model'import { VideoStateMessageService } from '@app/shared/shared-video/video-state-message.service'import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'-import { UploadProgressComponent } from '../../shared/standalone-upload/upload-progress.component'+import { UploadProgressComponent } from '../../shared/shared-upload/upload-progress.component'import { ManageErrorsComponent } from './common/manage-errors.component'import { VideoEdit } from './common/video-edit.model'import { VideoManageController } from './video-manage-controller.service'diff --git a/client/src/app/header/notification-dropdown.component.ts b/client/src/app/header/notification-dropdown.component.tsindex 46233d1bc5..5ccd9694d7 100644--- a/client/src/app/header/notification-dropdown.component.ts+++ b/client/src/app/header/notification-dropdown.component.ts@@ -6,7 +6,7 @@ import { GlobalIconComponent } from '@app/shared/shared-icons/global-icon.componimport { ButtonComponent } from '@app/shared/shared-main/buttons/button.component'import { LoaderComponent } from '@app/shared/shared-main/common/loader.component'import { UserNotificationService } from '@app/shared/shared-main/users/user-notification.service'-import { UserNotificationsComponent } from '@app/shared/standalone-notifications/user-notifications.component'+import { UserNotificationsComponent } from '@app/shared/shared-notifications/user-notifications.component'import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'import { Subject, Subscription } from 'rxjs'import { filter } from 'rxjs/operators'diff --git a/client/src/app/shared/standalone-actor/actor-host.component.html b/client/src/app/shared/shared-actor/actor-host.component.htmlsimilarity index 100%rename from client/src/app/shared/standalone-actor/actor-host.component.htmlrename to client/src/app/shared/shared-actor/actor-host.component.htmldiff --git a/client/src/app/shared/standalone-actor/actor-host.component.scss b/client/src/app/shared/shared-actor/actor-host.component.scsssimilarity index 100%rename from client/src/app/shared/standalone-actor/actor-host.component.scssrename to client/src/app/shared/shared-actor/actor-host.component.scssdiff --git a/client/src/app/shared/standalone-actor/actor-host.component.ts b/client/src/app/shared/shared-actor/actor-host.component.tssimilarity index 100%rename from client/src/app/shared/standalone-actor/actor-host.component.tsrename to client/src/app/shared/shared-actor/actor-host.component.tsdiff --git a/client/src/app/shared/standalone-channels/channel-toggle.component.html b/client/src/app/shared/shared-channels/channel-toggle.component.htmlsimilarity index 100%rename from client/src/app/shared/standalone-channels/channel-toggle.component.htmlrename to client/src/app/shared/shared-channels/channel-toggle.component.htmldiff --git a/client/src/app/shared/standalone-channels/channel-toggle.component.scss b/client/src/app/shared/shared-channels/channel-toggle.component.scsssimilarity index 100%rename from client/src/app/shared/standalone-channels/channel-toggle.component.scssrename to client/src/app/shared/shared-channels/channel-toggle.component.scssdiff --git a/client/src/app/shared/standalone-channels/channel-toggle.component.ts b/client/src/app/shared/shared-channels/channel-toggle.component.tssimilarity index 100%rename from client/src/app/shared/standalone-channels/channel-toggle.component.tsrename to client/src/app/shared/shared-channels/channel-toggle.component.tsdiff --git a/client/src/app/shared/standalone-notifications/user-notification-content.component.html b/client/src/app/shared/shared-notifications/user-notification-content.component.htmlsimilarity index 100%rename from client/src/app/shared/standalone-notifications/user-notification-content.component.htmlrename to client/src/app/shared/shared-notifications/user-notification-content.component.htmldiff --git a/client/src/app/shared/standalone-notifications/user-notification-content.component.scss b/client/src/app/shared/shared-notifications/user-notification-content.component.scsssimilarity index 100%rename from client/src/app/shared/standalone-notifications/user-notification-content.component.scssrename to client/src/app/shared/shared-notifications/user-notification-content.component.scssdiff --git a/client/src/app/shared/standalone-notifications/user-notification-content.component.ts b/client/src/app/shared/shared-notifications/user-notification-content.component.tssimilarity index 100%rename from client/src/app/shared/standalone-notifications/user-notification-content.component.tsrename to client/src/app/shared/shared-notifications/user-notification-content.component.tsdiff --git a/client/src/app/shared/standalone-notifications/user-notifications.component.html b/client/src/app/shared/shared-notifications/user-notifications.component.htmlsimilarity index 100%rename from client/src/app/shared/standalone-notifications/user-notifications.component.htmlrename to client/src/app/shared/shared-notifications/user-notifications.component.htmldiff --git a/client/src/app/shared/standalone-notifications/user-notifications.component.scss b/client/src/app/shared/shared-notifications/user-notifications.component.scsssimilarity index 100%rename from client/src/app/shared/standalone-notifications/user-notifications.component.scssrename to client/src/app/shared/shared-notifications/user-notifications.component.scssdiff --git a/client/src/app/shared/standalone-notifications/user-notifications.component.ts b/client/src/app/shared/shared-notifications/user-notifications.component.tssimilarity index 100%rename from client/src/app/shared/standalone-notifications/user-notifications.component.tsrename to client/src/app/shared/shared-notifications/user-notifications.component.tsdiff --git a/client/src/app/shared/standalone-upload/upload-progress.component.html b/client/src/app/shared/shared-upload/upload-progress.component.htmlsimilarity index 100%rename from client/src/app/shared/standalone-upload/upload-progress.component.htmlrename to client/src/app/shared/shared-upload/upload-progress.component.htmldiff --git a/client/src/app/shared/standalone-upload/upload-progress.component.scss b/client/src/app/shared/shared-upload/upload-progress.component.scsssimilarity index 100%rename from client/src/app/shared/standalone-upload/upload-progress.component.scssrename to client/src/app/shared/shared-upload/upload-progress.component.scssdiff --git a/client/src/app/shared/standalone-upload/upload-progress.component.ts b/client/src/app/shared/shared-upload/upload-progress.component.tssimilarity index 100%rename from client/src/app/shared/standalone-upload/upload-progress.component.tsrename to client/src/app/shared/shared-upload/upload-progress.component.tsdiff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.tsindex a03c3f0c5d..7c3976d384 100644--- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts+++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts@@ -24,7 +24,7 @@ import { VideoService } from '../shared-main/video/video.service'import { VideoThumbnailComponent } from '../shared-thumbnail/video-thumbnail.component'import { VideoPlaylistService } from '../shared-video-playlist/video-playlist.service'import { VideoViewsCounterComponent } from '../shared-video/video-views-counter.component'-import { ActorHostComponent } from '../standalone-actor/actor-host.component'+import { ActorHostComponent } from '../shared-actor/actor-host.component'import { VideoActionsDisplayType, VideoActionsDropdownComponent } from './video-actions-dropdown.component'export type MiniatureDisplayOptions = {diff --git a/client/src/app/shared/standalone-watched-words/watched-words-list-admin-owner.component.html b/client/src/app/shared/shared-watched-words/watched-words-list-admin-owner.component.htmlsimilarity index 100%rename from client/src/app/shared/standalone-watched-words/watched-words-list-admin-owner.component.htmlrename to client/src/app/shared/shared-watched-words/watched-words-list-admin-owner.component.htmldiff --git a/client/src/app/shared/standalone-watched-words/watched-words-list-admin-owner.component.ts b/client/src/app/shared/shared-watched-words/watched-words-list-admin-owner.component.tssimilarity index 100%rename from client/src/app/shared/standalone-watched-words/watched-words-list-admin-owner.component.tsrename to client/src/app/shared/shared-watched-words/watched-words-list-admin-owner.component.tsdiff --git a/client/src/app/shared/standalone-watched-words/watched-words-list-save-modal.component.html b/client/src/app/shared/shared-watched-words/watched-words-list-save-modal.component.htmlsimilarity index 100%rename from client/src/app/shared/standalone-watched-words/watched-words-list-save-modal.component.htmlrename to client/src/app/shared/shared-watched-words/watched-words-list-save-modal.component.htmldiff --git a/client/src/app/shared/standalone-watched-words/watched-words-list-save-modal.component.scss b/client/src/app/shared/shared-watched-words/watched-words-list-save-modal.component.scsssimilarity index 100%rename from client/src/app/shared/standalone-watched-words/watched-words-list-save-modal.component.scssrename to client/src/app/shared/shared-watched-words/watched-words-list-save-modal.component.scssdiff --git a/client/src/app/shared/standalone-watched-words/watched-words-list-save-modal.component.ts b/client/src/app/shared/shared-watched-words/watched-words-list-save-modal.component.tssimilarity index 100%rename from client/src/app/shared/standalone-watched-words/watched-words-list-save-modal.component.tsrename to client/src/app/shared/shared-watched-words/watched-words-list-save-modal.component.tsdiff --git a/client/src/app/shared/standalone-watched-words/watched-words-list.service.ts b/client/src/app/shared/shared-watched-words/watched-words-list.service.tssimilarity index 100%rename from client/src/app/shared/standalone-watched-words/watched-words-list.service.tsrename to client/src/app/shared/shared-watched-words/watched-words-list.service.tsdiff --git a/server/core/controllers/api/video-channels/index.ts b/server/core/controllers/api/video-channels/index.tsindex 7433c5f3ec..3ecbbfd46d 100644--- a/server/core/controllers/api/video-channels/index.ts+++ b/server/core/controllers/api/video-channels/index.ts@@ -444,6 +444,8 @@ async function listVideoChannelActivities (req: express.Request, res: express.Reasync function importVideosInChannel (req: express.Request, res: express.Response) {const { externalChannelUrl } = req.body as VideosImportInChannelCreate+ // TODO: add channel activity for this endpoint+await JobQueue.Instance.createJob({type: 'video-channel-import',payload: {