forks
/
peertube
1
0
Fork 0
Code Releases Activity

Avoid follow SQL conflicts

This commit is contained in:
Chocobozzz 2020-01-10 11:15:07 +01:00
parent db84cf89bc
commit ab4d4db44a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/src/app/shared/user-subscription/subscribe-button.component.ts
View File

@ -7,7 +7,8 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
import { VideoService } from '@app/shared/video/video.service'
import { FeedFormat } from '../../../../../shared/models/feeds'
import { Account } from '@app/shared/account/account.model'
import { forkJoin, merge } from 'rxjs'
import { concat, forkJoin, merge } from 'rxjs'
import { toArray } from 'rxjs/operators'
@Component({
selector: 'my-subscribe-button',
@ -82,12 +83,14 @@ export class SubscribeButtonComponent implements OnInit {
}
localSubscribe () {
const subscribedStatus = this.subscribeStatus(false)
const observableBatch = this.videoChannels
.map(videoChannel => this.getChannelHandler(videoChannel))
.filter(handle => this.subscribeStatus(false).includes(handle))
.filter(handle => subscribedStatus.includes(handle))
.map(handle => this.userSubscriptionService.addSubscription(handle))
merge(observableBatch, 2)
forkJoin(observableBatch)
.subscribe(
() => {
this.notifier.success(
@ -116,25 +119,27 @@ export class SubscribeButtonComponent implements OnInit {
}
localUnsubscribe () {
const subscribeStatus = this.subscribeStatus(true)
const observableBatch = this.videoChannels
.map(videoChannel => this.getChannelHandler(videoChannel))
.filter(handle => this.subscribeStatus(true).includes(handle))
.filter(handle => subscribeStatus.includes(handle))
.map(handle => this.userSubscriptionService.deleteSubscription(handle))
forkJoin(observableBatch)
.subscribe(
() => {
concat(...observableBatch)
.subscribe({
complete: () => {
this.notifier.success(
this.account
? this.i18n('Unsubscribed from all channels of {{nameWithHost}}', { nameWithHost: this.account.nameWithHost })
: this.i18n('Unsubscribed from {{nameWithHost}}', { nameWithHost: this.videoChannels[0].nameWithHost })
: this.i18n('Unsubscribed from {{nameWithHost}}', { nameWithHost: this.videoChannels[ 0 ].nameWithHost })
,
this.i18n('Unsubscribed')
)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
isUserLoggedIn () {
@ -176,11 +181,11 @@ export class SubscribeButtonComponent implements OnInit {
for (const videoChannel of this.videoChannels) {
const handle = this.getChannelHandler(videoChannel)
this.subscribed.set(handle, false)
merge(
this.userSubscriptionService.listenToSubscriptionCacheChange(handle),
this.userSubscriptionService.doesSubscriptionExist(handle)
)
.subscribe(
).subscribe(
res => this.subscribed.set(handle, res),
err => this.notifier.error(err.message)

2
server/initializers/constants.ts
View File

@ -135,7 +135,7 @@ const JOB_CONCURRENCY: { [id in (JobType | 'video-file')]: number } = {
'activitypub-http-broadcast': 1,
'activitypub-http-unicast': 5,
'activitypub-http-fetcher': 1,
'activitypub-follow': 3,
'activitypub-follow': 1,
'video-file-import': 1,
'video-transcoding': 1,
'video-file': 1,