From 3ddb1ec5553167b0b1cb852e906a691ea65522a4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 7 Jun 2019 10:56:59 +0200 Subject: Try to fix remote mastodon interactions --- .../user-subscription/remote-subscribe.component.ts | 15 ++++++++------- .../user-subscription/subscribe-button.component.html | 4 ++-- .../user-subscription/subscribe-button.component.ts | 14 +++++++------- .../+video-watch/comment/video-comment-add.component.html | 2 +- .../+video-watch/comment/video-comment-add.component.ts | 6 ++---- server/controllers/static.ts | 13 +++++++++++++ 6 files changed, 33 insertions(+), 21 deletions(-) diff --git a/client/src/app/shared/user-subscription/remote-subscribe.component.ts b/client/src/app/shared/user-subscription/remote-subscribe.component.ts index ba2a45df1..63e7cd5d9 100644 --- a/client/src/app/shared/user-subscription/remote-subscribe.component.ts +++ b/client/src/app/shared/user-subscription/remote-subscribe.component.ts @@ -11,7 +11,7 @@ import { styleUrls: ['./remote-subscribe.component.scss'] }) export class RemoteSubscribeComponent extends FormReactive implements OnInit { - @Input() account: string + @Input() uri: string @Input() interact = false @Input() showHelp = false @@ -42,19 +42,20 @@ export class RemoteSubscribeComponent extends FormReactive implements OnInit { fetch(`https://${hostname}/.well-known/webfinger?resource=acct:${username}@${hostname}`) .then(response => response.json()) .then(data => new Promise((resolve, reject) => { + console.log(data) + if (data && Array.isArray(data.links)) { - const link: { - template: string - } = data.links.find((link: any) => - link && typeof link.template === 'string' && link.rel === 'http://ostatus.org/schema/1.0/subscribe') + const link: { template: string } = data.links.find((link: any) => { + return link && typeof link.template === 'string' && link.rel === 'http://ostatus.org/schema/1.0/subscribe' + }) if (link && link.template.includes('{uri}')) { - resolve(link.template.replace('{uri}', `acct:${this.account}`)) + resolve(link.template.replace('{uri}', encodeURIComponent(this.uri))) } } reject() })) .then(window.open) - .catch(() => window.open(`https://${hostname}/authorize_interaction?acct=${this.account}`)) + .catch(err => console.error(err)) } } diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.html b/client/src/app/shared/user-subscription/subscribe-button.component.html index dbf6a34f0..d32647b42 100644 --- a/client/src/app/shared/user-subscription/subscribe-button.component.html +++ b/client/src/app/shared/user-subscription/subscribe-button.component.html @@ -41,7 +41,7 @@ - +
@@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.ts b/client/src/app/shared/user-subscription/subscribe-button.component.ts index ef470ee44..25515f6ea 100644 --- a/client/src/app/shared/user-subscription/subscribe-button.component.ts +++ b/client/src/app/shared/user-subscription/subscribe-button.component.ts @@ -28,19 +28,19 @@ export class SubscribeButtonComponent implements OnInit { private videoService: VideoService ) { } - get uri () { + get channelHandle () { return this.videoChannel.name + '@' + this.videoChannel.host } - get uriAccount () { - return this.videoChannel.ownerAccount.name + '@' + this.videoChannel.host + get channelUri () { + return this.videoChannel.url } ngOnInit () { if (this.isUserLoggedIn()) { - this.userSubscriptionService.doesSubscriptionExist(this.uri) + this.userSubscriptionService.doesSubscriptionExist(this.channelHandle) .subscribe( - res => this.subscribed = res[this.uri], + res => this.subscribed = res[this.channelHandle], err => this.notifier.error(err.message) ) @@ -56,7 +56,7 @@ export class SubscribeButtonComponent implements OnInit { } localSubscribe () { - this.userSubscriptionService.addSubscription(this.uri) + this.userSubscriptionService.addSubscription(this.channelHandle) .subscribe( () => { this.subscribed = true @@ -78,7 +78,7 @@ export class SubscribeButtonComponent implements OnInit { } localUnsubscribe () { - this.userSubscriptionService.deleteSubscription(this.uri) + this.userSubscriptionService.deleteSubscription(this.channelHandle) .subscribe( () => { this.subscribed = false diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html index d8a7a78c4..916f5d0ff 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.html +++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.html @@ -41,7 +41,7 @@ If you have an account on Mastodon or Pleroma, you can open it directly in their interface: - +
diff --git a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts index fd85c28f2..ac1d02d94 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment-add.component.ts @@ -8,7 +8,6 @@ import { User } from '../../../shared/users' import { Video } from '../../../shared/video/video.model' import { VideoComment } from './video-comment.model' import { VideoCommentService } from './video-comment.service' -import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { VideoCommentValidatorsService } from '@app/shared/forms/form-validators/video-comment-validators.service' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' @@ -40,8 +39,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { private videoCommentService: VideoCommentService, private authService: AuthService, private modalService: NgbModal, - private router: Router, - private i18n: I18n + private router: Router ) { super() } @@ -124,7 +122,7 @@ export class VideoCommentAddComponent extends FormReactive implements OnInit { return this.form.value['text'] } - getUrl () { + getUri () { return window.location.href } diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 05019fcc2..73951be2d 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -156,6 +156,19 @@ staticRouter.use('/.well-known/change-password', } ) +staticRouter.use('/.well-known/host-meta', + (_, res: express.Response) => { + res.type('application/xml'); + + const xml = '\n' + + '\n' + + ` \n` + + '' + + res.send(xml).end() + } +) + // --------------------------------------------------------------------------- export { -- cgit v1.2.3 From f238aec54f93bf6ef73ef17be23159ecd1d83f96 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 7 Jun 2019 11:08:56 +0200 Subject: Fix video action dropdown --- .../shared/buttons/action-dropdown.component.ts | 6 ---- .../video/video-actions-dropdown.component.ts | 32 ++++++++++------------ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/client/src/app/shared/buttons/action-dropdown.component.ts b/client/src/app/shared/buttons/action-dropdown.component.ts index f5345831b..c9dbbfda2 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.ts +++ b/client/src/app/shared/buttons/action-dropdown.component.ts @@ -41,10 +41,4 @@ export class ActionDropdownComponent { areActionsDisplayed (actions: DropdownAction[], entry: T) { return actions.some(a => a.isDisplayed === undefined || a.isDisplayed(entry)) } - - handleClick (event: Event, action: DropdownAction) { - event.preventDefault() - - // action.handler(entry) - } } diff --git a/client/src/app/shared/video/video-actions-dropdown.component.ts b/client/src/app/shared/video/video-actions-dropdown.component.ts index 0bbc783c1..8d4e33697 100644 --- a/client/src/app/shared/video/video-actions-dropdown.component.ts +++ b/client/src/app/shared/video/video-actions-dropdown.component.ts @@ -188,19 +188,16 @@ export class VideoActionsDropdownComponent implements OnChanges { } private buildActions () { - this.videoActions = [] - - if (this.authService.isLoggedIn()) { - this.videoActions.push([ + this.videoActions = [ + [ { label: this.i18n('Save to playlist'), handler: () => this.playlistDropdown.toggle(), - isDisplayed: () => this.displayOptions.playlist, + isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.playlist, iconName: 'playlist-add' } - ]) - - this.videoActions.push([ + ], + [ { label: this.i18n('Download'), handler: () => this.showDownloadModal(), @@ -211,36 +208,35 @@ export class VideoActionsDropdownComponent implements OnChanges { label: this.i18n('Update'), linkBuilder: ({ video }) => [ '/videos/update', video.uuid ], iconName: 'edit', - isDisplayed: () => this.displayOptions.update && this.isVideoUpdatable() + isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.update && this.isVideoUpdatable() }, { label: this.i18n('Blacklist'), handler: () => this.showBlacklistModal(), iconName: 'no', - isDisplayed: () => this.displayOptions.blacklist && this.isVideoBlacklistable() + isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoBlacklistable() }, { label: this.i18n('Unblacklist'), handler: () => this.unblacklistVideo(), iconName: 'undo', - isDisplayed: () => this.displayOptions.blacklist && this.isVideoUnblacklistable() + isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoUnblacklistable() }, { label: this.i18n('Delete'), handler: () => this.removeVideo(), - isDisplayed: () => this.displayOptions.delete && this.isVideoRemovable(), + isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.delete && this.isVideoRemovable(), iconName: 'delete' } - ]) - - this.videoActions.push([ + ], + [ { label: this.i18n('Report'), handler: () => this.showReportModal(), - isDisplayed: () => this.displayOptions.report, + isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.report, iconName: 'alert' } - ]) - } + ] + ] } } -- cgit v1.2.3 From 4adf26735fae8caeb8172c909afd0f3ca32d695f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 7 Jun 2019 11:35:06 +0200 Subject: Fix error in form when scheduling video publication --- client/src/app/shared/forms/form-reactive.ts | 2 +- client/src/app/videos/+video-edit/shared/video-edit.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/app/shared/forms/form-reactive.ts b/client/src/app/shared/forms/form-reactive.ts index 0d40b6f4a..6aec2937d 100644 --- a/client/src/app/shared/forms/form-reactive.ts +++ b/client/src/app/shared/forms/form-reactive.ts @@ -57,7 +57,7 @@ export abstract class FormReactive { // Don't care if dirty on force check const isDirty = control.dirty || forceCheck === true - if (control && isDirty && !control.valid) { + if (control && isDirty && control.enabled && !control.valid) { const messages = validationMessages[ field ] for (const key of Object.keys(control.errors)) { formErrors[ field ] += messages[ key ] + ' ' diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts index c80efd802..8345645f6 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts @@ -189,7 +189,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { } private trackPrivacyChange () { - // We will update the "support" field depending on the channel + // We will update the schedule input and the wait transcoding checkbox validators this.form.controls[ 'privacy' ] .valueChanges .pipe(map(res => parseInt(res.toString(), 10))) -- cgit v1.2.3 From e5b432e04e6aa967fdea38ce38de959cdcc22b4d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 7 Jun 2019 11:44:43 +0200 Subject: Fix black theme on some screens --- client/src/app/menu/menu.component.scss | 10 +++++----- client/src/app/shared/buttons/action-dropdown.component.scss | 4 ++++ .../app/shared/instance/instance-features-table.component.scss | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index fa9a006af..06baa52d3 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss @@ -75,22 +75,22 @@ menu { .logged-in-more { margin-right: 20px; - my-global-icon { - @include apply-svg-color(var(--mainBackgroundColor)); - + my-global-icon.dropdown-toggle { cursor: pointer; &::after { border: none; } + + /deep/ { + @include apply-svg-color(var(--menuForegroundColor)); + } } .dropdown-item { @include dropdown-with-icon-item; my-global-icon { - @include apply-svg-color(var(--mainForegroundColor)); - width: 22px; height: 22px; diff --git a/client/src/app/shared/buttons/action-dropdown.component.scss b/client/src/app/shared/buttons/action-dropdown.component.scss index 5073190b0..7c2b0db71 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.scss +++ b/client/src/app/shared/buttons/action-dropdown.component.scss @@ -32,6 +32,10 @@ .more-icon { width: 21px; + + /deep/ { + @include apply-svg-color(var(--mainForegroundColor)); + } } &.small { diff --git a/client/src/app/shared/instance/instance-features-table.component.scss b/client/src/app/shared/instance/instance-features-table.component.scss index 90fbb5c94..f9bec038d 100644 --- a/client/src/app/shared/instance/instance-features-table.component.scss +++ b/client/src/app/shared/instance/instance-features-table.component.scss @@ -3,6 +3,7 @@ table { font-size: 14px; + color: var(--mainForegroundColor); .label { font-weight: $font-semibold; @@ -16,4 +17,4 @@ table { .glyphicon-remove { color: $red; } -} \ No newline at end of file +} -- cgit v1.2.3 From 03371ad9d049bab79445a1b35da44cb1272f6c28 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 7 Jun 2019 14:34:11 +0200 Subject: Fix video import if autoblacklist is enabled --- server/controllers/api/videos/import.ts | 16 +++++---- server/controllers/static.ts | 2 +- server/tests/api/videos/video-blacklist.ts | 58 ++++++++++++++++++++++++++---- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/server/controllers/api/videos/import.ts b/server/controllers/api/videos/import.ts index bfb690906..dcba0e08f 100644 --- a/server/controllers/api/videos/import.ts +++ b/server/controllers/api/videos/import.ts @@ -26,6 +26,7 @@ import { sequelizeTypescript } from '../../../initializers/database' import { createVideoMiniatureFromExisting } from '../../../lib/thumbnail' import { ThumbnailType } from '../../../../shared/models/videos/thumbnail.type' import { ThumbnailModel } from '../../../models/video/thumbnail' +import { UserModel } from '../../../models/account/user' const auditLogger = auditLoggerFactory('video-imports') const videoImportsRouter = express.Router() @@ -107,7 +108,8 @@ async function addTorrentImport (req: express.Request, res: express.Response, to previewModel, videoChannel: res.locals.videoChannel, tags, - videoImportAttributes + videoImportAttributes, + user }) // Create job to import the video @@ -151,12 +153,13 @@ async function addYoutubeDLImport (req: express.Request, res: express.Response) userId: user.id } const videoImport = await insertIntoDB({ - video: video, + video, thumbnailModel, previewModel, videoChannel: res.locals.videoChannel, tags, - videoImportAttributes + videoImportAttributes, + user }) // Create job to import the video @@ -227,9 +230,10 @@ function insertIntoDB (parameters: { previewModel: ThumbnailModel, videoChannel: VideoChannelModel, tags: string[], - videoImportAttributes: Partial + videoImportAttributes: Partial, + user: UserModel }): Bluebird { - let { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes } = parameters + const { video, thumbnailModel, previewModel, videoChannel, tags, videoImportAttributes, user } = parameters return sequelizeTypescript.transaction(async t => { const sequelizeOptions = { transaction: t } @@ -241,7 +245,7 @@ function insertIntoDB (parameters: { if (thumbnailModel) await videoCreated.addAndSaveThumbnail(thumbnailModel, t) if (previewModel) await videoCreated.addAndSaveThumbnail(previewModel, t) - await autoBlacklistVideoIfNeeded(video, videoChannel.Account.User, t) + await autoBlacklistVideoIfNeeded(video, user, t) // Set tags to the video if (tags) { diff --git a/server/controllers/static.ts b/server/controllers/static.ts index 73951be2d..fb2e7742a 100644 --- a/server/controllers/static.ts +++ b/server/controllers/static.ts @@ -158,7 +158,7 @@ staticRouter.use('/.well-known/change-password', staticRouter.use('/.well-known/host-meta', (_, res: express.Response) => { - res.type('application/xml'); + res.type('application/xml') const xml = '\n' + '\n' + diff --git a/server/tests/api/videos/video-blacklist.ts b/server/tests/api/videos/video-blacklist.ts index e907bbdc0..8760a4787 100644 --- a/server/tests/api/videos/video-blacklist.ts +++ b/server/tests/api/videos/video-blacklist.ts @@ -4,10 +4,11 @@ import * as chai from 'chai' import { orderBy } from 'lodash' import 'mocha' import { - addVideoToBlacklist, cleanupTests, + addVideoToBlacklist, + cleanupTests, createUser, flushAndRunMultipleServers, - getBlacklistedVideosList, + getBlacklistedVideosList, getMyUserInformation, getMyVideos, getVideosList, killallServers, @@ -16,6 +17,7 @@ import { searchVideo, ServerInfo, setAccessTokensToServers, + setDefaultVideoChannel, updateVideo, updateVideoBlacklist, uploadVideo, @@ -25,7 +27,8 @@ import { doubleFollow } from '../../../../shared/extra-utils/server/follows' import { waitJobs } from '../../../../shared/extra-utils/server/jobs' import { VideoBlacklist, VideoBlacklistType } from '../../../../shared/models/videos' import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model' -import { UserRole } from '../../../../shared/models/users' +import { User, UserRole, UserUpdateMe } from '../../../../shared/models/users' +import { getMagnetURI, getYoutubeVideoUrl, importVideo } from '../../../../shared/extra-utils/videos/video-imports' const expect = chai.expect @@ -351,6 +354,7 @@ describe('Test video blacklist', function () { describe('When auto blacklist videos', function () { let userWithoutFlag: string let userWithFlag: string + let channelOfUserWithoutFlag: number before(async function () { this.timeout(20000) @@ -380,6 +384,10 @@ describe('Test video blacklist', function () { }) userWithoutFlag = await userLogin(servers[0], user) + + const res = await getMyUserInformation(servers[0].url, userWithoutFlag) + const body: User = res.body + channelOfUserWithoutFlag = body.videoChannels[0].id } { @@ -399,7 +407,7 @@ describe('Test video blacklist', function () { await waitJobs(servers) }) - it('Should auto blacklist a video', async function () { + it('Should auto blacklist a video on upload', async function () { await uploadVideo(servers[0].url, userWithoutFlag, { name: 'blacklisted' }) const res = await getBlacklistedVideosList({ @@ -412,7 +420,45 @@ describe('Test video blacklist', function () { expect(res.body.data[0].video.name).to.equal('blacklisted') }) - it('Should not auto blacklist a video', async function () { + it('Should auto blacklist a video on URL import', async function () { + const attributes = { + targetUrl: getYoutubeVideoUrl(), + name: 'URL import', + channelId: channelOfUserWithoutFlag + } + await importVideo(servers[ 0 ].url, userWithoutFlag, attributes) + + const res = await getBlacklistedVideosList({ + url: servers[ 0 ].url, + token: servers[ 0 ].accessToken, + sort: 'createdAt', + type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED + }) + + expect(res.body.total).to.equal(2) + expect(res.body.data[1].video.name).to.equal('URL import') + }) + + it('Should auto blacklist a video on torrent import', async function () { + const attributes = { + magnetUri: getMagnetURI(), + name: 'Torrent import', + channelId: channelOfUserWithoutFlag + } + await importVideo(servers[ 0 ].url, userWithoutFlag, attributes) + + const res = await getBlacklistedVideosList({ + url: servers[ 0 ].url, + token: servers[ 0 ].accessToken, + sort: 'createdAt', + type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED + }) + + expect(res.body.total).to.equal(3) + expect(res.body.data[2].video.name).to.equal('Torrent import') + }) + + it('Should not auto blacklist a video on upload if the user has the bypass blacklist flag', async function () { await uploadVideo(servers[0].url, userWithFlag, { name: 'not blacklisted' }) const res = await getBlacklistedVideosList({ @@ -421,7 +467,7 @@ describe('Test video blacklist', function () { type: VideoBlacklistType.AUTO_BEFORE_PUBLISHED }) - expect(res.body.total).to.equal(1) + expect(res.body.total).to.equal(3) }) }) -- cgit v1.2.3