Chocobozzz/PeerTube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-09-20 18:07:28 +03:00
Code Issues Projects Releases Wiki Activity

Fix client lint

Browse Source
This commit is contained in:
Chocobozzz 2021-08-17 11:27:47 +02:00
parent c186a67f90
commit 1378c0d343
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
102 changed files with 1053 additions and 1031 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/app/+about/about-follows/about-follows.component.ts
View File

@ -91,8 +91,8 @@ export class AboutFollowsComponent implements OnInit {
const pagination = this.restService.componentPaginationToRestPagination(this.followersPagination)
this.followService.getFollowers({ pagination: pagination, sort: this.sort, state: 'accepted' })
.subscribe(
resultList => {
.subscribe({
next: resultList => {
if (reset) this.followers = []
const newFollowers = resultList.data.map(r => r.follower.host)
@ -101,16 +101,16 @@ export class AboutFollowsComponent implements OnInit {
this.followersPagination.totalItems = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private loadMoreFollowings (reset = false) {
const pagination = this.restService.componentPaginationToRestPagination(this.followingsPagination)
this.followService.getFollowing({ pagination, sort: this.sort, state: 'accepted' })
.subscribe(
resultList => {
.subscribe({
next: resultList => {
if (reset) this.followings = []
const newFollowings = resultList.data.map(r => r.following.host)
@ -119,8 +119,8 @@ export class AboutFollowsComponent implements OnInit {
this.followingsPagination.totalItems = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+about/about-instance/contact-admin-modal.component.ts
View File

@ -83,18 +83,18 @@ export class ContactAdminModalComponent extends FormReactive implements OnInit {
const body = this.form.value[ 'body' ]
this.instanceService.contactAdministrator(fromEmail, fromName, subject, body)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Your message has been sent.`)
this.hide()
},
err => {
error: err => {
this.error = err.status === HttpStatusCode.FORBIDDEN_403
? $localize`You already sent this form recently`
: err.message
}
)
})
}
private prefillForm (prefill: Prefill) {

17
client/src/app/+accounts/accounts.component.ts
View File

@ -71,11 +71,11 @@ export class AccountsComponent implements OnInit, OnDestroy {
HttpStatusCode.NOT_FOUND_404
]))
)
.subscribe(
videoChannels => this.videoChannels = videoChannels.data,
.subscribe({
next: videoChannels => this.videoChannels = videoChannels.data,
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
this.links = [
{ label: $localize`CHANNELS`, routerLink: 'video-channels' },
@ -174,11 +174,12 @@ export class AccountsComponent implements OnInit, OnDestroy {
const user = this.authService.getUser()
if (user.hasRight(UserRight.MANAGE_USERS)) {
this.userService.getUser(account.userId).subscribe(
accountUser => this.accountUser = accountUser,
this.userService.getUser(account.userId)
.subscribe({
next: accountUser => this.accountUser = accountUser,
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

24
client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
View File

@ -267,8 +267,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
this.configService.updateCustomConfig(omit(value, 'instanceCustomHomepage')),
this.customPage.updateInstanceHomepage(value.instanceCustomHomepage.content)
])
.subscribe(
([ resConfig ]) => {
.subscribe({
next: ([ resConfig ]) => {
const instanceCustomHomepage = {
content: value.instanceCustomHomepage.content
}
@ -284,8 +284,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
this.notifier.success($localize`Configuration updated.`)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
hasConsistentOptions () {
@ -339,8 +339,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
forkJoin([
this.configService.getCustomConfig(),
this.customPage.getInstanceHomepage()
])
.subscribe(([ config, homepage ]) => {
]).subscribe({
next: ([ config, homepage ]) => {
this.customConfig = { ...config, instanceCustomHomepage: homepage }
this.updateForm()
@ -348,21 +348,21 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
this.forceCheck()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private loadCategoriesAndLanguages () {
forkJoin([
this.serverService.getVideoLanguages(),
this.serverService.getVideoCategories()
]).subscribe(
([ languages, categories ]) => {
]).subscribe({
next: ([ languages, categories ]) => {
this.languageItems = languages.map(l => ({ label: l.label, id: l.id }))
this.categoryItems = categories.map(l => ({ label: l.label, id: l.id + '' }))
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

32
client/src/app/+admin/follows/followers-list/followers-list.component.ts
View File

@ -35,17 +35,17 @@ export class FollowersListComponent extends RestTable implements OnInit {
follow.state = 'accepted'
this.followService.acceptFollower(follow)
.subscribe(
() => {
.subscribe({
next: () => {
const handle = follow.follower.name + '@' + follow.follower.host
this.notifier.success($localize`${handle} accepted in instance followers`)
},
err => {
error: err => {
follow.state = 'pending'
this.notifier.error(err.message)
}
)
})
}
async rejectFollower (follow: ActorFollow) {
@ -54,19 +54,19 @@ export class FollowersListComponent extends RestTable implements OnInit {
if (res === false) return
this.followService.rejectFollower(follow)
.subscribe(
() => {
.subscribe({
next: () => {
const handle = follow.follower.name + '@' + follow.follower.host
this.notifier.success($localize`${handle} rejected from instance followers`)
this.reloadData()
},
err => {
error: err => {
follow.state = 'pending'
this.notifier.error(err.message)
}
)
})
}
async deleteFollower (follow: ActorFollow) {
@ -75,27 +75,27 @@ export class FollowersListComponent extends RestTable implements OnInit {
if (res === false) return
this.followService.removeFollower(follow)
.subscribe(
() => {
.subscribe({
next: () => {
const handle = follow.follower.name + '@' + follow.follower.host
this.notifier.success($localize`${handle} removed from instance followers`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
protected reloadData () {
this.followService.getFollowers({ pagination: this.pagination, sort: this.sort, search: this.search })
.subscribe(
resultList => {
.subscribe({
next: resultList => {
this.followers = resultList.data
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

9
client/src/app/+admin/follows/following-list/follow-modal.component.ts
View File

@ -57,13 +57,14 @@ export class FollowModalComponent extends FormReactive implements OnInit {
private async addFollowing () {
const hostsOrHandles = splitAndGetNotEmpty(this.form.value['hostsOrHandles'])
this.followService.follow(hostsOrHandles).subscribe(
() => {
this.followService.follow(hostsOrHandles)
.subscribe({
next: () => {
this.notifier.success($localize`Follow request(s) sent!`)
this.newFollow.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

17
client/src/app/+admin/follows/following-list/following-list.component.ts
View File

@ -49,25 +49,26 @@ export class FollowingListComponent extends RestTable implements OnInit {
)
if (res === false) return
this.followService.unfollow(follow).subscribe(
() => {
this.followService.unfollow(follow)
.subscribe({
next: () => {
this.notifier.success($localize`You are not following ${follow.following.host} anymore.`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
protected reloadData () {
this.followService.getFollowing({ pagination: this.pagination, sort: this.sort, search: this.search })
.subscribe(
resultList => {
.subscribe({
next: resultList => {
this.following = resultList.data
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts
View File

@ -18,14 +18,14 @@ export class RedundancyCheckboxComponent {
updateRedundancyState () {
this.redundancyService.updateRedundancy(this.host, this.redundancyAllowed)
.subscribe(
() => {
.subscribe({
next: () => {
const stateLabel = this.redundancyAllowed ? $localize`enabled` : $localize`disabled`
this.notifier.success($localize`Redundancy for ${this.host} is ${stateLabel}`)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

16
client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.ts
View File

@ -142,14 +142,14 @@ export class VideoRedundanciesListComponent extends RestTable implements OnInit
if (res === false) return
this.redundancyService.removeVideoRedundancies(redundancy)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video redundancies removed!`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
@ -161,14 +161,14 @@ export class VideoRedundanciesListComponent extends RestTable implements OnInit
}
this.redundancyService.listVideoRedundancies(options)
.subscribe(
resultList => {
.subscribe({
next: resultList => {
this.videoRedundancies = resultList.data
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private loadSelectLocalStorage () {

35
client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
View File

@ -62,14 +62,14 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
handler: videoBlock => {
this.videoBlocklistService.unblockVideo(videoBlock.video.id).pipe(
switchMap(_ => this.videoBlocklistService.blockVideo(videoBlock.video.id, undefined, true))
).subscribe(
() => {
).subscribe({
next: () => {
this.notifier.success($localize`Video ${videoBlock.video.name} switched to manual block.`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
},
isDisplayed: videoBlock => videoBlock.type === VideoBlacklistType.AUTO_BEFORE_PUBLISHED
}
@ -94,13 +94,11 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
if (res === false) return
this.videoService.removeVideo(videoBlock.video.id)
.subscribe(
() => {
this.notifier.success($localize`Video deleted.`)
},
.subscribe({
next: () => this.notifier.success($localize`Video deleted.`),
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}
]
@ -136,14 +134,15 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
const res = await this.confirmService.confirm(confirmMessage, $localize`Unblock`)
if (res === false) return
this.videoBlocklistService.unblockVideo(entry.video.id).subscribe(
() => {
this.videoBlocklistService.unblockVideo(entry.video.id)
.subscribe({
next: () => {
this.notifier.success($localize`Video ${entry.video.name} unblocked.`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
getVideoEmbed (entry: VideoBlacklist) {
@ -164,8 +163,8 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
sort: this.sort,
search: this.search
})
.subscribe(
async resultList => {
.subscribe({
next: async resultList => {
this.totalRecords = resultList.total
this.blocklist = resultList.data
@ -178,7 +177,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
}
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.html
View File

@ -34,13 +34,13 @@
<ng-template pTemplate="header">
<tr>
<th style="width: 40px">
<th style="width: 40px;">
<p-tableHeaderCheckbox ariaLabel="Select all rows" i18n-ariaLabel></p-tableHeaderCheckbox>
</th>
<th style="width: 40px"></th>
<th style="width: 40px;"></th>
<th style="width: 150px;"></th>
<th style="width: 300px" i18n>Account</th>
<th style="width: 300px" i18n>Video</th>
<th style="width: 300px;" i18n>Account</th>
<th style="width: 300px;" i18n>Video</th>
<th i18n>Comment</th>
<th style="width: 150px;" i18n pSortableColumn="createdAt">Date <p-sortIcon field="createdAt"></p-sortIcon></th>
</tr>

37
client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.ts
View File

@ -1,5 +1,5 @@
import { SortMeta } from 'primeng/api'
import { AfterViewInit, Component, OnInit } from '@angular/core'
import { Component, OnInit } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
import { AuthService, ConfirmService, MarkdownService, Notifier, RestPagination, RestTable } from '@app/core'
import { AdvancedInputFilter } from '@app/shared/shared-forms'
@ -117,8 +117,8 @@ export class VideoCommentListComponent extends RestTable implements OnInit {
pagination: this.pagination,
sort: this.sort,
search: this.search
}).subscribe(
async resultList => {
}).subscribe({
next: async resultList => {
this.totalRecords = resultList.total
this.comments = []
@ -130,32 +130,33 @@ export class VideoCommentListComponent extends RestTable implements OnInit {
}
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private async removeComments (comments: VideoCommentAdmin[]) {
const commentArgs = comments.map(c => ({ videoId: c.video.id, commentId: c.id }))
this.videoCommentService.deleteVideoComments(commentArgs).subscribe(
() => {
this.videoCommentService.deleteVideoComments(commentArgs)
.subscribe({
next: () => {
this.notifier.success($localize`${commentArgs.length} comments deleted.`)
this.reloadData()
},
err => this.notifier.error(err.message),
error: err => this.notifier.error(err.message),
() => this.selectedComments = []
)
complete: () => this.selectedComments = []
})
}
private deleteComment (comment: VideoCommentAdmin) {
this.videoCommentService.deleteVideoComment(comment.video.id, comment.id)
.subscribe(
() => this.reloadData(),
.subscribe({
next: () => this.reloadData(),
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private async deleteUserComments (comment: VideoCommentAdmin) {
@ -169,12 +170,12 @@ export class VideoCommentListComponent extends RestTable implements OnInit {
}
this.bulkService.removeCommentsOf(options)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Comments of ${options.accountName} will be deleted in a few minutes`)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

24
client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts
View File

@ -61,16 +61,16 @@ export class PluginListInstalledComponent implements OnInit {
loadMorePlugins () {
this.pluginApiService.getPlugins(this.pluginType, this.pagination, this.sort)
.subscribe(
res => {
.subscribe({
next: res => {
this.plugins = this.plugins.concat(res.data)
this.pagination.totalItems = res.total
this.onDataSubject.next(res.data)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
onNearOfBottom () {
@ -113,16 +113,16 @@ export class PluginListInstalledComponent implements OnInit {
if (res === false) return
this.pluginApiService.uninstall(plugin.name, plugin.type)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`${plugin.name} uninstalled.`)
this.plugins = this.plugins.filter(p => p.name !== plugin.name)
this.pagination.totalItems--
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
async update (plugin: PeerTubePlugin) {
@ -143,8 +143,8 @@ export class PluginListInstalledComponent implements OnInit {
this.pluginApiService.update(plugin.name, plugin.type)
.pipe()
.subscribe(
res => {
.subscribe({
next: res => {
this.updating[updatingKey] = false
this.notifier.success($localize`${plugin.name} updated.`)
@ -152,8 +152,8 @@ export class PluginListInstalledComponent implements OnInit {
Object.assign(plugin, res)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
getShowRouterLink (plugin: PeerTubePlugin) {

16
client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts
View File

@ -84,8 +84,8 @@ export class PluginSearchComponent implements OnInit {
this.isSearching = true
this.pluginApiService.searchAvailablePlugins(this.pluginType, this.pagination, this.sort, this.search)
.subscribe(
res => {
.subscribe({
next: res => {
this.isSearching = false
this.plugins = this.plugins.concat(res.data)
@ -94,13 +94,13 @@ export class PluginSearchComponent implements OnInit {
this.onDataSubject.next(res.data)
},
err => {
error: err => {
console.error(err)
const message = $localize`The plugin index is not available. Please retry later.`
this.notifier.error(message)
}
)
})
}
onNearOfBottom () {
@ -139,8 +139,8 @@ export class PluginSearchComponent implements OnInit {
this.installing[plugin.npmName] = true
this.pluginApiService.install(plugin.npmName)
.subscribe(
() => {
.subscribe({
next: () => {
this.installing[plugin.npmName] = false
this.pluginInstalled = true
@ -149,7 +149,7 @@ export class PluginSearchComponent implements OnInit {
plugin.installed = true
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

16
client/src/app/+admin/plugins/plugin-show-installed/plugin-show-installed.component.ts
View File

@ -50,13 +50,13 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit
const settings = this.form.value
this.pluginAPIService.updatePluginSettings(this.plugin.name, this.plugin.type, settings)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Settings updated.`)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
hasRegisteredSettings () {
@ -83,8 +83,8 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit
return this.pluginAPIService.getPluginRegisteredSettings(plugin.name, plugin.type)
.pipe(map(data => ({ plugin, registeredSettings: data.registeredSettings })))
}))
.subscribe(
async ({ plugin, registeredSettings }) => {
.subscribe({
next: async ({ plugin, registeredSettings }) => {
this.plugin = plugin
this.registeredSettings = await this.translateSettings(registeredSettings)
@ -94,8 +94,8 @@ export class PluginShowInstalledComponent extends FormReactive implements OnInit
this.buildSettingsForm()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private buildSettingsForm () {

8
client/src/app/+admin/system/debug/debug.component.ts
View File

@ -22,10 +22,10 @@ export class DebugComponent implements OnInit {
load () {
this.debugService.getDebug()
.subscribe(
debug => this.debug = debug,
.subscribe({
next: debug => this.debug = debug,
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+admin/system/jobs/jobs.component.ts
View File

@ -119,14 +119,14 @@ export class JobsComponent extends RestTable implements OnInit {
pagination: this.pagination,
sort: this.sort
})
.subscribe(
resultList => {
.subscribe({
next: resultList => {
this.jobs = resultList.data
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private loadJobStateAndType () {

10
client/src/app/+admin/system/logs/logs.component.ts
View File

@ -52,8 +52,8 @@ export class LogsComponent implements OnInit {
this.loading = true
this.logsService.getLogs({ isAuditLog: this.isAuditLog(), level: this.level, startDate: this.startDate })
.subscribe(
logs => {
.subscribe({
next: logs => {
this.logs = logs
setTimeout(() => {
@ -61,10 +61,10 @@ export class LogsComponent implements OnInit {
})
},
err => this.notifier.error(err.message),
error: err => this.notifier.error(err.message),
() => this.loading = false
)
complete: () => this.loading = false
})
}
isAuditLog () {

9
client/src/app/+admin/users/user-edit/user-create.component.ts
View File

@ -71,14 +71,15 @@ export class UserCreateComponent extends UserEdit implements OnInit {
userCreate.videoQuota = parseInt(this.form.value['videoQuota'], 10)
userCreate.videoQuotaDaily = parseInt(this.form.value['videoQuotaDaily'], 10)
this.userService.addUser(userCreate).subscribe(
() => {
this.userService.addUser(userCreate)
.subscribe({
next: () => {
this.notifier.success($localize`User ${userCreate.username} created.`)
this.router.navigate([ '/admin/users/list' ])
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
isCreation () {

11
client/src/app/+admin/users/user-edit/user-password.component.ts
View File

@ -35,13 +35,12 @@ export class UserPasswordComponent extends FormReactive implements OnInit {
const userUpdate: UserUpdate = this.form.value
this.userService.updateUser(this.userId, userUpdate).subscribe(
() => {
this.notifier.success($localize`Password changed for user ${this.username}.`)
},
this.userService.updateUser(this.userId, userUpdate)
.subscribe({
next: () => this.notifier.success($localize`Password changed for user ${this.username}.`),
err => this.error = err.message
)
error: err => this.error = err.message
})
}
togglePasswordVisibility () {

27
client/src/app/+admin/users/user-edit/user-update.component.ts
View File

@ -59,11 +59,12 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
this.paramsSub = this.route.params.subscribe(routeParams => {
const userId = routeParams['id']
this.userService.getUser(userId, true).subscribe(
user => this.onUserFetched(user),
this.userService.getUser(userId, true)
.subscribe({
next: user => this.onUserFetched(user),
err => this.error = err.message
)
error: err => this.error = err.message
})
})
}
@ -83,14 +84,15 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
if (userUpdate.pluginAuth === 'null') userUpdate.pluginAuth = null
this.userService.updateUser(this.user.id, userUpdate).subscribe(
() => {
this.userService.updateUser(this.user.id, userUpdate)
.subscribe({
next: () => {
this.notifier.success($localize`User ${this.user.username} updated.`)
this.router.navigate([ '/admin/users/list' ])
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
isCreation () {
@ -106,13 +108,14 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
}
resetPassword () {
this.userService.askResetPassword(this.user.email).subscribe(
() => {
this.userService.askResetPassword(this.user.email)
.subscribe({
next: () => {
this.notifier.success($localize`An email asking for password reset has been sent to ${this.user.username}.`)
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
private onUserFetched (userJson: UserType) {

34
client/src/app/+admin/users/user-list/user-list.component.ts
View File

@ -173,14 +173,14 @@ export class UserListComponent extends RestTable implements OnInit {
if (res === false) return
this.userService.unbanUsers(users)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`${users.length} users unbanned.`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
async removeUsers (users: User[]) {
@ -195,25 +195,27 @@ export class UserListComponent extends RestTable implements OnInit {
const res = await this.confirmService.confirm(message, $localize`Delete`)
if (res === false) return
this.userService.removeUser(users).subscribe(
() => {
this.userService.removeUser(users)
.subscribe({
next: () => {
this.notifier.success($localize`${users.length} users deleted.`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
async setEmailsAsVerified (users: User[]) {
this.userService.updateUsers(users, { emailVerified: true }).subscribe(
() => {
this.userService.updateUsers(users, { emailVerified: true })
.subscribe({
next: () => {
this.notifier.success($localize`${users.length} users email set as verified.`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
isInSelectionMode () {
@ -227,13 +229,13 @@ export class UserListComponent extends RestTable implements OnInit {
pagination: this.pagination,
sort: this.sort,
search: this.search
}).subscribe(
resultList => {
}).subscribe({
next: resultList => {
this.users = resultList.data
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

24
client/src/app/+login/login.component.ts
View File

@ -107,17 +107,17 @@ export class LoginComponent extends FormReactive implements OnInit, AfterViewIni
const { username, password } = this.form.value
this.authService.login(username, password)
.subscribe(
() => this.redirectService.redirectToPreviousRoute(),
.subscribe({
next: () => this.redirectService.redirectToPreviousRoute(),
err => this.handleError(err)
)
error: err => this.handleError(err)
})
}
askResetPassword () {
this.userService.askResetPassword(this.forgotPasswordEmail)
.subscribe(
() => {
.subscribe({
next: () => {
const message = $localize`An email with the reset password instructions will be sent to ${this.forgotPasswordEmail}.
The link will expire within 1 hour.`
@ -125,8 +125,8 @@ The link will expire within 1 hour.`
this.hideForgotPasswordModal()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
openForgotPasswordModal () {
@ -149,14 +149,14 @@ The link will expire within 1 hour.`
this.isAuthenticatedWithExternalAuth = true
this.authService.login(username, null, token)
.subscribe(
() => this.redirectService.redirectToPreviousRoute(),
.subscribe({
next: () => this.redirectService.redirectToPreviousRoute(),
err => {
error: err => {
this.handleError(err)
this.isAuthenticatedWithExternalAuth = false
}
)
})
}
private handleError (err: any) {

24
client/src/app/+my-account/my-account-applications/my-account-applications.component.ts
View File

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'
import { AuthService, Notifier, ConfirmService, ScopedTokensService } from '@app/core'
import { AuthService, ConfirmService, Notifier, ScopedTokensService } from '@app/core'
import { VideoService } from '@app/shared/shared-main'
import { FeedFormat } from '@shared/models'
import { ScopedToken } from '@shared/models/users/user-scoped-token'
@ -27,13 +27,11 @@ export class MyAccountApplicationsComponent implements OnInit {
ngOnInit () {
this.feedUrl = this.baseURL
this.scopedTokensService.getScopedTokens()
.subscribe(
tokens => this.regenApplications(tokens),
.subscribe({
next: tokens => this.regenApplications(tokens),
err => {
this.notifier.error(err.message)
}
)
error: err => this.notifier.error(err.message)
})
}
async renewToken () {
@ -43,17 +41,15 @@ export class MyAccountApplicationsComponent implements OnInit {
)
if (res === false) return
this.scopedTokensService.renewScopedTokens().subscribe(
tokens => {
this.scopedTokensService.renewScopedTokens()
.subscribe({
next: tokens => {
this.regenApplications(tokens)
this.notifier.success($localize`Token renewed. Update your client configuration accordingly.`)
},
err => {
this.notifier.error(err.message)
}
)
error: err => this.notifier.error(err.message)
})
}
private regenApplications (tokens: ScopedToken) {

8
client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts
View File

@ -45,8 +45,8 @@ export class MyAccountChangeEmailComponent extends FormReactive implements OnIni
this.serverService.getConfig(),
this.userService.changeEmail(password, email)
]).pipe(tap(() => this.authService.refreshUserInformation()))
.subscribe(
([ config ]) => {
.subscribe({
next: ([ config ]) => {
this.form.reset()
if (config.signup.requiresEmailVerification) {
@ -56,7 +56,7 @@ export class MyAccountChangeEmailComponent extends FormReactive implements OnIni
}
},
err => {
error: err => {
if (err.status === 401) {
this.error = $localize`You current password is invalid.`
return
@ -64,6 +64,6 @@ export class MyAccountChangeEmailComponent extends FormReactive implements OnIni
this.error = err.message
}
)
})
}
}

9
client/src/app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
View File

@ -43,15 +43,16 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
const currentPassword = this.form.value[ 'current-password' ]
const newPassword = this.form.value[ 'new-password' ]
this.userService.changePassword(currentPassword, newPassword).subscribe(
() => {
this.userService.changePassword(currentPassword, newPassword)
.subscribe({
next: () => {
this.notifier.success($localize`Password updated.`)
this.form.reset()
this.error = null
},
err => {
error: err => {
if (err.status === 401) {
this.error = $localize`You current password is invalid.`
return
@ -59,6 +60,6 @@ export class MyAccountChangePasswordComponent extends FormReactive implements On
this.error = err.message
}
)
})
}
}

9
client/src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts
View File

@ -27,15 +27,16 @@ export class MyAccountDangerZoneComponent {
)
if (res === false) return
this.userService.deleteMe().subscribe(
() => {
this.userService.deleteMe()
.subscribe({
next: () => {
this.notifier.success($localize`Your account is deleted.`)
this.authService.logout()
this.redirectService.redirectToHomepage()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
View File

@ -89,13 +89,13 @@ export class MyAccountNotificationPreferencesComponent implements OnInit {
private savePreferencesImpl () {
this.userNotificationService.updateNotificationSettings(this.user.notificationSettings)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Preferences saved`, undefined, 2000)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private loadNotificationSettings () {

9
client/src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts
View File

@ -50,15 +50,16 @@ export class MyAccountProfileComponent extends FormReactive implements OnInit {
this.error = null
this.userService.updateMyProfile({ displayName, description }).subscribe(
() => {
this.userService.updateMyProfile({ displayName, description })
.subscribe({
next: () => {
this.user.account.displayName = displayName
this.user.account.description = description
this.notifier.success($localize`Profile updated.`)
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
}

16
client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
View File

@ -39,31 +39,31 @@ export class MyAccountSettingsComponent implements OnInit, AfterViewChecked {
onAvatarChange (formData: FormData) {
this.userService.changeAvatar(formData)
.subscribe(
data => {
.subscribe({
next: data => {
this.notifier.success($localize`Avatar changed.`)
this.user.updateAccountAvatar(data.avatar)
},
(err: HttpErrorResponse) => genericUploadErrorHandler({
error: (err: HttpErrorResponse) => genericUploadErrorHandler({
err,
name: $localize`avatar`,
notifier: this.notifier
})
)
})
}
onAvatarDelete () {
this.userService.deleteAvatar()
.subscribe(
data => {
.subscribe({
next: data => {
this.notifier.success($localize`Avatar deleted.`)
this.user.updateAccountAvatar()
},
(err: HttpErrorResponse) => this.notifier.error(err.message)
)
error: (err: HttpErrorResponse) => this.notifier.error(err.message)
})
}
}

8
client/src/app/+my-library/+my-video-channels/my-video-channel-create.component.ts
View File

@ -59,15 +59,15 @@ export class MyVideoChannelCreateComponent extends MyVideoChannelEdit implements
.pipe(
switchMap(() => this.uploadAvatar()),
switchMap(() => this.uploadBanner())
).subscribe(
() => {
).subscribe({
next: () => {
this.authService.refreshUserInformation()
this.notifier.success($localize`Video channel ${videoChannelCreate.displayName} created.`)
this.router.navigate(['/my-library', 'video-channels'])
},
err => {
error: err => {
if (err.status === HttpStatusCode.CONFLICT_409) {
this.error = $localize`This name already exists on this instance.`
return
@ -75,7 +75,7 @@ export class MyVideoChannelCreateComponent extends MyVideoChannelEdit implements
this.error = err.message
}
)
})
}
onAvatarChange (formData: FormData) {

50
client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts
View File

@ -52,8 +52,9 @@ export class MyVideoChannelUpdateComponent extends MyVideoChannelEdit implements
this.paramsSub = this.route.params.subscribe(routeParams => {
const videoChannelId = routeParams['videoChannelId']
this.videoChannelService.getVideoChannel(videoChannelId).subscribe(
videoChannelToUpdate => {
this.videoChannelService.getVideoChannel(videoChannelId)
.subscribe({
next: videoChannelToUpdate => {
this.videoChannel = videoChannelToUpdate
this.oldSupportField = videoChannelToUpdate.support
@ -65,8 +66,8 @@ export class MyVideoChannelUpdateComponent extends MyVideoChannelEdit implements
})
},
err => this.error = err.message
)
error: err => this.error = err.message
})
})
}
@ -85,8 +86,9 @@ export class MyVideoChannelUpdateComponent extends MyVideoChannelEdit implements
bulkVideosSupportUpdate: body.bulkVideosSupportUpdate || false
}
this.videoChannelService.updateVideoChannel(this.videoChannel.name, videoChannelUpdate).subscribe(
() => {
this.videoChannelService.updateVideoChannel(this.videoChannel.name, videoChannelUpdate)
.subscribe({
next: () => {
this.authService.refreshUserInformation()
this.notifier.success($localize`Video channel ${videoChannelUpdate.displayName} updated.`)
@ -94,68 +96,68 @@ export class MyVideoChannelUpdateComponent extends MyVideoChannelEdit implements
this.router.navigate([ '/my-library', 'video-channels' ])
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
onAvatarChange (formData: FormData) {
this.videoChannelService.changeVideoChannelImage(this.videoChannel.name, formData, 'avatar')
.subscribe(
data => {
.subscribe({
next: data => {
this.notifier.success($localize`Avatar changed.`)
this.videoChannel.updateAvatar(data.avatar)
},
(err: HttpErrorResponse) => genericUploadErrorHandler({
error: (err: HttpErrorResponse) => genericUploadErrorHandler({
err,
name: $localize`avatar`,
notifier: this.notifier
})
)
})
}
onAvatarDelete () {
this.videoChannelService.deleteVideoChannelImage(this.videoChannel.name, 'avatar')
.subscribe(
data => {
.subscribe({
next: () => {
this.notifier.success($localize`Avatar deleted.`)
this.videoChannel.resetAvatar()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
onBannerChange (formData: FormData) {
this.videoChannelService.changeVideoChannelImage(this.videoChannel.name, formData, 'banner')
.subscribe(
data => {
.subscribe({
next: data => {
this.notifier.success($localize`Banner changed.`)
this.videoChannel.updateBanner(data.banner)
},
(err: HttpErrorResponse) => genericUploadErrorHandler({
error: (err: HttpErrorResponse) => genericUploadErrorHandler({
err,
name: $localize`banner`,
notifier: this.notifier
})
)
})
}
onBannerDelete () {
this.videoChannelService.deleteVideoChannelImage(this.videoChannel.name, 'banner')
.subscribe(
data => {
.subscribe({
next: () => {
this.notifier.success($localize`Banner deleted.`)
this.videoChannel.resetBanner()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
get maxAvatarSize () {

8
client/src/app/+my-library/+my-video-channels/my-video-channels.component.ts
View File

@ -54,14 +54,14 @@ channel with the same name (${videoChannel.name})!`,
if (res === false) return
this.videoChannelService.removeVideoChannel(videoChannel)
.subscribe(
() => {
.subscribe({
next: () => {
this.loadVideoChannels()
this.notifier.success($localize`Video channel ${videoChannel.displayName} deleted.`)
},
error => this.notifier.error(error.message)
)
error: err => this.notifier.error(err.message)
})
}
private loadVideoChannels () {

16
client/src/app/+my-library/my-history/my-history.component.ts
View File

@ -107,8 +107,8 @@ export class MyHistoryComponent implements OnInit, DisableForReuseHook {
onVideosHistoryChange () {
this.userService.updateMyProfile({ videosHistoryEnabled: this.videosHistoryEnabled })
.subscribe(
() => {
.subscribe({
next: () => {
const message = this.videosHistoryEnabled === true ?
$localize`Videos history is enabled` :
$localize`Videos history is disabled`
@ -118,8 +118,8 @@ export class MyHistoryComponent implements OnInit, DisableForReuseHook {
this.authService.refreshUserInformation()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
async deleteHistory () {
@ -130,14 +130,14 @@ export class MyHistoryComponent implements OnInit, DisableForReuseHook {
if (res !== true) return
this.userHistoryService.deleteUserVideosHistory()
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Videos history deleted`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+my-library/my-ownership/my-accept-ownership/my-accept-ownership.component.ts
View File

@ -64,14 +64,14 @@ export class MyAcceptOwnershipComponent extends FormReactive implements OnInit {
const videoChangeOwnership = this.videoChangeOwnership
this.videoOwnershipService
.acceptOwnership(videoChangeOwnership.id, { channelId: channel })
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Ownership accepted`)
if (this.accepted) this.accepted.emit()
this.videoChangeOwnership = undefined
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

16
client/src/app/+my-library/my-ownership/my-ownership.component.ts
View File

@ -53,16 +53,16 @@ export class MyOwnershipComponent extends RestTable implements OnInit {
refuse (videoChangeOwnership: VideoChangeOwnership) {
this.videoOwnershipService.refuseOwnership(videoChangeOwnership.id)
.subscribe(
() => this.reloadData(),
err => this.notifier.error(err.message)
)
.subscribe({
next: () => this.reloadData(),
error: err => this.notifier.error(err.message)
})
}
protected reloadData () {
return this.videoOwnershipService.getOwnershipChanges(this.pagination, this.sort)
.subscribe(
resultList => {
.subscribe({
next: resultList => {
this.videoChangeOwnerships = resultList.data.map(change => ({
...change,
initiatorAccount: new Account(change.initiatorAccount),
@ -71,7 +71,7 @@ export class MyOwnershipComponent extends RestTable implements OnInit {
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+my-library/my-subscriptions/my-subscriptions.component.ts
View File

@ -41,8 +41,8 @@ export class MySubscriptionsComponent {
private loadSubscriptions (more = true) {
this.userSubscriptionService.listSubscriptions({ pagination: this.pagination, search: this.search })
.subscribe(
res => {
.subscribe({
next: res => {
this.videoChannels = more
? this.videoChannels.concat(res.data)
: res.data
@ -51,7 +51,7 @@ export class MySubscriptionsComponent {
this.onDataSubject.next(res.data)
},
error => this.notifier.error(error.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+my-library/my-video-imports/my-video-imports.component.ts
View File

@ -64,13 +64,13 @@ export class MyVideoImportsComponent extends RestTable implements OnInit {
protected reloadData () {
this.videoImportService.getMyVideoImports(this.pagination, this.sort)
.subscribe(
resultList => {
.subscribe({
next: resultList => {
this.videoImports = resultList.data
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

9
client/src/app/+my-library/my-video-playlists/my-video-playlist-create.component.ts
View File

@ -71,14 +71,15 @@ export class MyVideoPlaylistCreateComponent extends MyVideoPlaylistEdit implemen
thumbnailfile: body.thumbnailfile || null
}
this.videoPlaylistService.createVideoPlaylist(videoPlaylistCreate).subscribe(
() => {
this.videoPlaylistService.createVideoPlaylist(videoPlaylistCreate)
.subscribe({
next: () => {
this.notifier.success($localize`Playlist ${videoPlaylistCreate.displayName} created.`)
this.router.navigate([ '/my-library', 'video-playlists' ])
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
isCreation () {

16
client/src/app/+my-library/my-video-playlists/my-video-playlist-elements.component.ts
View File

@ -85,13 +85,13 @@ export class MyVideoPlaylistElementsComponent implements OnInit, OnDestroy {
this.playlistElements.splice(newIndex, 0, element)
this.videoPlaylistService.reorderPlaylist(this.playlist.id, oldPosition, insertAfter)
.subscribe(
() => {
.subscribe({
next: () => {
this.reorderClientPositions()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
onElementRemoved (element: VideoPlaylistElement) {
@ -129,14 +129,14 @@ export class MyVideoPlaylistElementsComponent implements OnInit, OnDestroy {
if (res === false) return
this.videoPlaylistService.removeVideoPlaylist(videoPlaylist)
.subscribe(
() => {
.subscribe({
next: () => {
this.router.navigate([ '/my-library', 'video-playlists' ])
this.notifier.success($localize`Playlist ${videoPlaylist.displayName} deleted.`)
},
error => this.notifier.error(error.message)
)
error: err => this.notifier.error(err.message)
})
}
/**

17
client/src/app/+my-library/my-video-playlists/my-video-playlist-update.component.ts
View File

@ -64,16 +64,16 @@ export class MyVideoPlaylistUpdateComponent extends MyVideoPlaylistEdit implemen
])
})
)
.subscribe(
([ videoPlaylistToUpdate, videoPlaylistPrivacies]) => {
.subscribe({
next: ([ videoPlaylistToUpdate, videoPlaylistPrivacies]) => {
this.videoPlaylistToUpdate = videoPlaylistToUpdate
this.videoPlaylistPrivacies = videoPlaylistPrivacies
this.hydrateFormFromPlaylist()
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
ngOnDestroy () {
@ -92,14 +92,15 @@ export class MyVideoPlaylistUpdateComponent extends MyVideoPlaylistEdit implemen
thumbnailfile: body.thumbnailfile || undefined
}
this.videoPlaylistService.updateVideoPlaylist(this.videoPlaylistToUpdate, videoPlaylistUpdate).subscribe(
() => {
this.videoPlaylistService.updateVideoPlaylist(this.videoPlaylistToUpdate, videoPlaylistUpdate)
.subscribe({
next: () => {
this.notifier.success($localize`Playlist ${videoPlaylistUpdate.displayName} updated.`)
this.router.navigate([ '/my-library', 'video-playlists' ])
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
isCreation () {

8
client/src/app/+my-library/my-video-playlists/my-video-playlists.component.ts
View File

@ -37,16 +37,16 @@ export class MyVideoPlaylistsComponent {
if (res === false) return
this.videoPlaylistService.removeVideoPlaylist(videoPlaylist)
.subscribe(
() => {
.subscribe({
next: () => {
this.videoPlaylists = this.videoPlaylists
.filter(p => p.id !== videoPlaylist.id)
this.notifier.success($localize`Playlist ${videoPlaylist.displayName}} deleted.`)
},
error => this.notifier.error(error.message)
)
error: err => this.notifier.error(err.message)
})
}
isRegularPlaylist (playlist: VideoPlaylist) {

16
client/src/app/+my-library/my-videos/modals/video-change-ownership.component.ts
View File

@ -48,11 +48,11 @@ export class VideoChangeOwnershipComponent extends FormReactive implements OnIni
search (event: { query: string }) {
const query = event.query
this.userService.autocomplete(query)
.subscribe(
usernames => this.usernamePropositions = usernames,
.subscribe({
next: usernames => this.usernamePropositions = usernames,
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
changeOwnership () {
@ -60,10 +60,10 @@ export class VideoChangeOwnershipComponent extends FormReactive implements OnIni
this.videoOwnershipService
.changeOwnership(this.video.id, username)
.subscribe(
() => this.notifier.success($localize`Ownership change request sent.`),
.subscribe({
next: () => this.notifier.success($localize`Ownership change request sent.`),
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

16
client/src/app/+my-library/my-videos/my-videos.component.ts
View File

@ -126,14 +126,14 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook {
concat(...observables)
.pipe(toArray())
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`${toDeleteVideosIds.length} videos deleted.`)
this.selection = {}
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
async deleteVideo (video: Video) {
@ -144,14 +144,14 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook {
if (res === false) return
this.videoService.removeVideo(video.id)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video ${video.name} deleted.`)
this.removeVideoFromArray(video.id)
},
error => this.notifier.error(error.message)
)
error: err => this.notifier.error(err.message)
})
}
changeOwnership (video: Video) {

8
client/src/app/+reset-password/reset-password.component.ts
View File

@ -42,14 +42,14 @@ export class ResetPasswordComponent extends FormReactive implements OnInit {
resetPassword () {
this.userService.resetPassword(this.userId, this.verificationString, this.form.value.password)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Your password has been successfully reset!`)
this.router.navigate([ '/login' ])
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
isConfirmedPasswordValid () {

17
client/src/app/+search/search.component.ts
View File

@ -73,8 +73,9 @@ export class SearchComponent implements OnInit, OnDestroy {
ngOnInit () {
this.serverConfig = this.serverService.getHTMLConfig()
this.subActivatedRoute = this.route.queryParams.subscribe(
async queryParams => {
this.subActivatedRoute = this.route.queryParams
.subscribe({
next: async queryParams => {
const querySearch = queryParams['search']
const searchTarget = queryParams['searchTarget']
@ -101,8 +102,8 @@ export class SearchComponent implements OnInit, OnDestroy {
this.search()
},
err => this.notifier.error(err.text)
)
error: err => this.notifier.error(err.text)
})
this.userService.getAnonymousOrLoggedUser()
.subscribe(user => this.userMiniature = user)
@ -140,7 +141,8 @@ export class SearchComponent implements OnInit, OnDestroy {
this.getVideoChannelObs(),
this.getVideoPlaylistObs(),
this.getVideosObs()
]).subscribe(results => {
]).subscribe({
next: results => {
for (const result of results) {
this.results = this.results.concat(result.data)
}
@ -151,7 +153,7 @@ export class SearchComponent implements OnInit, OnDestroy {
this.hasMoreResults = this.results.length < this.pagination.totalItems
},
err => {
error: err => {
if (this.advancedSearch.searchTarget !== 'search-index') {
this.notifier.error(err.message)
return
@ -165,8 +167,9 @@ export class SearchComponent implements OnInit, OnDestroy {
this.search()
},
() => {
complete: () => {
this.isSearching = false
}
})
}

16
client/src/app/+signup/+register/register.component.ts
View File

@ -122,8 +122,8 @@ export class RegisterComponent implements OnInit {
'filter:api.signup.registration.create.params'
)
this.userService.signup(body).subscribe(
() => {
this.userService.signup(body).subscribe({
next: () => {
this.signupDone = true
if (this.requiresEmailVerification) {
@ -133,16 +133,16 @@ export class RegisterComponent implements OnInit {
// Auto login
this.authService.login(body.username, body.password)
.subscribe(
() => {
.subscribe({
next: () => {
this.success = $localize`You are now logged in as ${body.username}!`
},
err => this.error = err.message
)
error: err => this.error = err.message
})
},
err => this.error = err.message
)
error: err => this.error = err.message
})
}
}

10
client/src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.ts
View File

@ -34,15 +34,13 @@ export class VerifyAccountAskSendEmailComponent extends FormReactive implements
askSendVerifyEmail () {
const email = this.form.value['verify-email-email']
this.userService.askSendVerifyEmail(email)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`An email with verification link will be sent to ${email}.`)
this.redirectService.redirectToHomepage()
},
err => {
this.notifier.error(err.message)
}
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.ts
View File

@ -38,8 +38,8 @@ export class VerifyAccountEmailComponent implements OnInit {
verifyEmail () {
this.userService.verifyEmail(this.userId, this.verificationString, this.isPendingEmail)
.subscribe(
() => {
.subscribe({
next: () => {
if (this.authService.isLoggedIn()) {
this.authService.refreshUserInformation()
}
@ -47,11 +47,11 @@ export class VerifyAccountEmailComponent implements OnInit {
this.success = true
},
err => {
error: err => {
this.failed = true
this.notifier.error(err.message)
}
)
})
}
}

27
client/src/app/+videos/+video-edit/video-add-components/video-go-live.component.ts
View File

@ -8,7 +8,7 @@ import { FormValidatorService } from '@app/shared/shared-forms'
import { Video, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main'
import { LiveVideoService } from '@app/shared/shared-video-live'
import { LoadingBarService } from '@ngx-loading-bar/core'
import { LiveVideo, LiveVideoCreate, LiveVideoUpdate, PeerTubeProblemDocument, ServerErrorCode, VideoPrivacy } from '@shared/models'
import { LiveVideo, LiveVideoCreate, LiveVideoUpdate, PeerTubeProblemDocument, ServerErrorCode } from '@shared/models'
import { VideoSend } from './video-send'
@Component({
@ -74,8 +74,9 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
const toPatch = Object.assign({}, video, { privacy: this.firstStepPrivacyId })
this.form.patchValue(toPatch)
this.liveVideoService.goLive(video).subscribe(
res => {
this.liveVideoService.goLive(video)
.subscribe({
next: res => {
this.videoId = res.video.id
this.videoUUID = res.video.uuid
this.isInUpdateForm = true
@ -85,7 +86,7 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
this.fetchVideoLive()
},
err => {
error: err => {
this.firstStepError.emit()
let message = err.message
@ -100,7 +101,7 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
this.notifier.error(message)
}
)
})
}
updateSecondStep () {
@ -123,19 +124,19 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
this.updateVideoAndCaptions(video),
this.liveVideoService.updateLive(this.videoId, liveVideoUpdate)
]).subscribe(
() => {
]).subscribe({
next: () => {
this.notifier.success($localize`Live published.`)
this.router.navigateByUrl(Video.buildWatchUrl(video))
},
err => {
error: err => {
this.error = err.message
scrollToTop()
console.error(err)
}
)
})
}
getMaxLiveDuration () {
@ -148,15 +149,15 @@ export class VideoGoLiveComponent extends VideoSend implements OnInit, AfterView
private fetchVideoLive () {
this.liveVideoService.getVideoLive(this.videoId)
.subscribe(
liveVideo => {
.subscribe({
next: liveVideo => {
this.liveVideo = liveVideo
},
err => {
error: err => {
this.firstStepError.emit()
this.notifier.error(err.message)
}
)
})
}
}

17
client/src/app/+videos/+video-edit/video-add-components/video-import-torrent.component.ts
View File

@ -88,8 +88,9 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Af
this.loadingBar.useRef().start()
this.videoImportService.importVideoTorrent(torrentfile || this.magnetUri, videoUpdate).subscribe(
res => {
this.videoImportService.importVideoTorrent(torrentfile || this.magnetUri, videoUpdate)
.subscribe({
next: res => {
this.loadingBar.useRef().complete()
this.firstStepDone.emit(res.video.name)
this.isImportingVideo = false
@ -107,7 +108,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Af
hydrateFormFromVideo(this.form, this.video, false)
},
err => {
error: err => {
this.loadingBar.useRef().complete()
this.isImportingVideo = false
this.firstStepError.emit()
@ -121,7 +122,7 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Af
this.notifier.error(message)
}
)
})
}
updateSecondStep () {
@ -135,19 +136,19 @@ export class VideoImportTorrentComponent extends VideoSend implements OnInit, Af
// Update the video
this.updateVideoAndCaptions(this.video)
.subscribe(
() => {
.subscribe({
next: () => {
this.isUpdatingVideo = false
this.notifier.success($localize`Video to import updated.`)
this.router.navigate([ '/my-library', 'video-imports' ])
},
err => {
error: err => {
this.error = err.message
scrollToTop()
console.error(err)
}
)
})
}
}

18
client/src/app/+videos/+video-edit/video-add-components/video-import-url.component.ts
View File

@ -6,7 +6,7 @@ import { getAbsoluteAPIUrl, scrollToTop } from '@app/helpers'
import { FormValidatorService } from '@app/shared/shared-forms'
import { VideoCaptionService, VideoEdit, VideoImportService, VideoService } from '@app/shared/shared-main'
import { LoadingBarService } from '@ngx-loading-bar/core'
import { VideoPrivacy, VideoUpdate } from '@shared/models'
import { VideoUpdate } from '@shared/models'
import { hydrateFormFromVideo } from '../shared/video-edit-utils'
import { VideoSend } from './video-send'
@ -86,8 +86,8 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, AfterV
)
})
)
.subscribe(
({ video, videoCaptions }) => {
.subscribe({
next: ({ video, videoCaptions }) => {
this.loadingBar.useRef().complete()
this.firstStepDone.emit(video.name)
this.isImportingVideo = false
@ -117,13 +117,13 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, AfterV
hydrateFormFromVideo(this.form, this.video, true)
},
err => {
error: err => {
this.loadingBar.useRef().complete()
this.isImportingVideo = false
this.firstStepError.emit()
this.notifier.error(err.message)
}
)
})
}
updateSecondStep () {
@ -137,19 +137,19 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, AfterV
// Update the video
this.updateVideoAndCaptions(this.video)
.subscribe(
() => {
.subscribe({
next: () => {
this.isUpdatingVideo = false
this.notifier.success($localize`Video to import updated.`)
this.router.navigate([ '/my-library', 'video-imports' ])
},
err => {
error: err => {
this.error = err.message
scrollToTop()
console.error(err)
}
)
})
}
}

8
client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
View File

@ -240,8 +240,8 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
this.isUpdatingVideo = true
this.updateVideoAndCaptions(video)
.subscribe(
() => {
.subscribe({
next: () => {
this.isUpdatingVideo = false
this.isUploadingVideo = false
@ -249,12 +249,12 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
this.router.navigateByUrl(Video.buildWatchUrl(video))
},
err => {
error: err => {
this.error = err.message
scrollToTop()
console.error(err)
}
)
})
}
private getInputVideoFile () {

15
client/src/app/+videos/+video-edit/video-update.component.ts
View File

@ -47,7 +47,8 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
this.route.data
.pipe(map(data => data.videoData))
.subscribe(({ video, videoChannels, videoCaptions, liveVideo }) => {
.subscribe({
next: ({ video, videoChannels, videoCaptions, liveVideo }) => {
this.video = new VideoEdit(video)
this.videoDetails = video
@ -70,11 +71,11 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
})
},
err => {
error: err => {
console.error(err)
this.notifier.error(err.message)
}
)
})
}
@HostListener('window:beforeunload', [ '$event' ])
@ -150,8 +151,8 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
return this.liveVideoService.updateLive(this.video.id, liveVideoUpdate)
})
)
.subscribe(
() => {
.subscribe({
next: () => {
this.updateDone = true
this.isUpdatingVideo = false
this.loadingBar.useRef().complete()
@ -159,13 +160,13 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
this.router.navigateByUrl(Video.buildWatchUrl(this.video))
},
err => {
error: err => {
this.loadingBar.useRef().complete()
this.isUpdatingVideo = false
this.notifier.error(err.message)
console.error(err)
}
)
})
}
hydratePluginFieldsFromVideo () {

16
client/src/app/+videos/+video-watch/shared/action-buttons/video-rate.component.ts
View File

@ -90,16 +90,16 @@ export class VideoRateComponent implements OnInit, OnChanges, OnDestroy {
if (this.isUserLoggedIn === false) return
this.videoService.getUserVideoRating(this.video.id)
.subscribe(
ratingObject => {
.subscribe({
next: ratingObject => {
if (!ratingObject) return
this.userRating = ratingObject.rating
this.userRatingLoaded.emit(this.userRating)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private setRating (nextRating: UserVideoRateType) {
@ -110,16 +110,16 @@ export class VideoRateComponent implements OnInit, OnChanges, OnDestroy {
}
ratingMethods[nextRating].call(this.videoService, this.video.id)
.subscribe(
() => {
.subscribe({
next: () => {
// Update the video like attribute
this.updateVideoRating(this.userRating, nextRating)
this.userRating = nextRating
this.rateUpdated.emit(this.userRating)
},
(err: { message: string }) => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private updateVideoRating (oldRating: UserVideoRateType, newRating: UserVideoRateType) {

8
client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
View File

@ -137,19 +137,19 @@ export class VideoCommentAddComponent extends FormReactive implements OnChanges,
obs = this.addCommentThread(commentCreate)
}
obs.subscribe(
comment => {
obs.subscribe({
next: comment => {
this.addingComment = false
this.commentCreated.emit(comment)
this.form.reset()
},
err => {
error: err => {
this.addingComment = false
this.notifier.error(err.text)
}
)
})
}
isAddButtonDisplayed () {

8
client/src/app/+videos/+video-watch/shared/comment/video-comment.component.ts
View File

@ -149,11 +149,11 @@ export class VideoCommentComponent implements OnInit, OnChanges {
const user = this.authService.getUser()
if (user.hasRight(UserRight.MANAGE_USERS)) {
this.userService.getUserWithCache(account.userId)
.subscribe(
user => this.commentUser = user,
.subscribe({
next: user => this.commentUser = user,
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

24
client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
View File

@ -90,8 +90,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
'filter:api.video-watch.video-thread-replies.list.result'
)
obs.subscribe(
res => {
obs.subscribe({
next: res => {
this.threadComments[commentId] = res
this.threadLoading[commentId] = false
this.hooks.runAction('action:video-watch.video-thread-replies.loaded', 'video-watch', { data: res })
@ -104,8 +104,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
}
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
loadMoreThreads () {
@ -123,8 +123,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
'filter:api.video-watch.video-threads.list.result'
)
obs.subscribe(
res => {
obs.subscribe({
next: res => {
this.comments = this.comments.concat(res.data)
this.componentPagination.totalItems = res.total
this.totalNotDeletedComments = res.totalNotDeletedComments
@ -133,8 +133,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
this.hooks.runAction('action:video-watch.video-threads.loaded', 'video-watch', { data: this.componentPagination })
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
onCommentThreadCreated (comment: VideoComment) {
@ -181,8 +181,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
if (res === false) return false
this.videoCommentService.deleteVideoComment(commentToDelete.videoId, commentToDelete.id)
.subscribe(
() => {
.subscribe({
next: () => {
if (this.highlightedThread?.id === commentToDelete.id) {
commentToDelete = this.comments.find(c => c.id === commentToDelete.id)
@ -193,8 +193,8 @@ export class VideoCommentsComponent implements OnInit, OnChanges, OnDestroy {
this.softDeleteComment(commentToDelete)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
return true
}

10
client/src/app/+videos/+video-watch/shared/metadata/video-description.component.ts
View File

@ -50,8 +50,8 @@ export class VideoDescriptionComponent implements OnChanges {
this.descriptionLoading = true
this.videoService.loadCompleteDescription(this.video.descriptionPath)
.subscribe(
description => {
.subscribe({
next: description => {
this.completeDescriptionShown = true
this.descriptionLoading = false
@ -61,11 +61,11 @@ export class VideoDescriptionComponent implements OnChanges {
this.updateVideoDescription(this.completeVideoDescription)
},
error => {
error: err => {
this.descriptionLoading = false
this.notifier.error(error.message)
this.notifier.error(err.message)
}
)
})
}
onTimestampClicked (timestamp: number) {

11
client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
View File

@ -1,4 +1,3 @@
import { Component, EventEmitter, Input, Output } from '@angular/core'
import { Router } from '@angular/router'
import { AuthService, ComponentPagination, LocalStorageService, Notifier, SessionStorageService, UserService } from '@app/core'
@ -196,12 +195,14 @@ export class VideoWatchPlaylistComponent {
autoPlayNextVideoPlaylist: this.autoPlayNextVideoPlaylist
}
this.userService.updateMyProfile(details).subscribe(
() => {
this.userService.updateMyProfile(details)
.subscribe({
next: () => {
this.auth.refreshUserInformation()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

10
client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.ts
View File

@ -84,12 +84,14 @@ export class RecommendedVideosComponent implements OnInit, OnChanges {
autoPlayNextVideo: this.autoPlayNextVideo
}
this.userService.updateMyProfile(details).subscribe(
() => {
this.userService.updateMyProfile(details)
.subscribe({
next: () => {
this.authService.refreshUserInformation()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}
}

16
client/src/app/+videos/+video-watch/video-watch.component.ts
View File

@ -238,8 +238,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
)
forkJoin([ videoObs, this.videoCaptionService.listCaptions(videoId)])
.subscribe(
([ video, captionsResult ]) => {
.subscribe({
next: ([ video, captionsResult ]) => {
const queryParams = this.route.snapshot.queryParams
const urlOptions = {
@ -260,23 +260,23 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
.catch(err => this.handleGlobalError(err))
},
err => this.handleRequestError(err)
)
error: err => this.handleRequestError(err)
})
}
private loadPlaylist (playlistId: string) {
if (this.isSameElement(this.playlist, playlistId)) return
this.playlistService.getVideoPlaylist(playlistId)
.subscribe(
playlist => {
.subscribe({
next: playlist => {
this.playlist = playlist
this.videoWatchPlaylist.loadPlaylistElements(playlist, !this.playlistPosition, this.playlistPosition)
},
err => this.handleRequestError(err)
)
error: err => this.handleRequestError(err)
})
}
private isSameElement (element: VideoDetails | VideoPlaylist, newId: string) {

8
client/src/app/+videos/video-list/overview/video-overview.component.ts
View File

@ -68,8 +68,8 @@ export class VideoOverviewComponent implements OnInit {
this.isLoading = true
this.overviewService.getVideosOverview(this.currentPage)
.subscribe(
overview => {
.subscribe({
next: overview => {
this.isLoading = false
if (overview.tags.length === 0 && overview.channels.length === 0 && overview.categories.length === 0) {
@ -85,10 +85,10 @@ export class VideoOverviewComponent implements OnInit {
this.overviews.push(overview)
},
err => {
error: err => {
this.notifier.error(err.message)
this.isLoading = false
}
)
})
}
}

8
client/src/app/+videos/video-list/video-user-subscriptions.component.ts
View File

@ -56,8 +56,8 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement
this.authService.userInformationLoaded
.pipe(switchMap(() => this.scopedTokensService.getScopedTokens()))
.subscribe(
tokens => {
.subscribe({
next: tokens => {
const feeds = this.videoService.getVideoSubscriptionFeedUrls(user.account.id, tokens.feedToken)
feedUrl = feedUrl + feeds.find(f => f.format === FeedFormat.RSS).url
@ -74,10 +74,10 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement
})
},
err => {
error: err => {
this.notifier.error(err.message)
}
)
})
}
ngOnDestroy () {

32
client/src/app/core/auth/auth.service.ts
View File

@ -80,8 +80,8 @@ export class AuthService {
// Fetch the client_id/client_secret
this.http.get<OAuthClientLocal>(AuthService.BASE_CLIENT_URL)
.pipe(catchError(res => this.restExtractor.handleError(res)))
.subscribe(
res => {
.subscribe({
next: res => {
this.clientId = res.client_id
this.clientSecret = res.client_secret
@ -91,18 +91,18 @@ export class AuthService {
console.log('Client credentials loaded.')
},
error => {
let errorMessage = error.message
error: err => {
let errorMessage = err.message
if (error.status === HttpStatusCode.FORBIDDEN_403) {
errorMessage = $localize`Cannot retrieve OAuth Client credentials: ${error.text}.
if (err.status === HttpStatusCode.FORBIDDEN_403) {
errorMessage = $localize`Cannot retrieve OAuth Client credentials: ${err.text}.
Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.`
}
// We put a bigger timeout: this is an important message
this.notifier.error(errorMessage, $localize`Error`, 7000)
}
)
})
}
getRefreshToken () {
@ -168,15 +168,15 @@ Ensure you have correctly configured PeerTube (config/ directory), in particular
const headers = new HttpHeaders().set('Authorization', authHeaderValue)
this.http.post<{ redirectUrl?: string }>(AuthService.BASE_REVOKE_TOKEN_URL, {}, { headers })
.subscribe(
res => {
.subscribe({
next: res => {
if (res.redirectUrl) {
window.location.href = res.redirectUrl
}
},
err => console.error(err)
)
error: err => console.error(err)
})
this.user = null
@ -215,9 +215,9 @@ Ensure you have correctly configured PeerTube (config/ directory), in particular
this.logout()
this.router.navigate([ '/login' ])
return observableThrowError({
return observableThrowError(() => ({
error: $localize`You need to reconnect.`
})
}))
}),
share()
)
@ -234,14 +234,14 @@ Ensure you have correctly configured PeerTube (config/ directory), in particular
}
this.mergeUserInformation(obj)
.subscribe(
res => {
.subscribe({
next: res => {
this.user.patch(res)
this.user.save()
this.userInformationLoaded.next(true)
}
)
})
}
private mergeUserInformation (obj: UserLoginWithUsername): Observable<UserLoginWithUserInformation> {

11
client/src/app/core/confirm/confirm.service.ts
View File

@ -1,6 +1,5 @@
import { first } from 'rxjs/operators'
import { firstValueFrom, Subject } from 'rxjs'
import { Injectable } from '@angular/core'
import { Subject } from 'rxjs'
type ConfirmOptions = {
title: string
@ -18,16 +17,12 @@ export class ConfirmService {
confirm (message: string, title = '', confirmButtonText?: string) {
this.showConfirm.next({ title, message, confirmButtonText })
return this.confirmResponse.asObservable()
.pipe(first())
.toPromise()
return firstValueFrom(this.confirmResponse.asObservable())
}
confirmWithInput (message: string, inputLabel: string, expectedInputValue: string, title = '', confirmButtonText?: string) {
this.showConfirm.next({ title, message, inputLabel, expectedInputValue, confirmButtonText })
return this.confirmResponse.asObservable()
.pipe(first())
.toPromise()
return firstValueFrom(this.confirmResponse.asObservable())
}
}

17
client/src/app/core/plugins/plugin.service.ts
View File

@ -1,4 +1,4 @@
import { Observable, of } from 'rxjs'
import { firstValueFrom, Observable, of } from 'rxjs'
import { catchError, map, shareReplay } from 'rxjs/operators'
import { HttpClient } from '@angular/common/http'
import { Inject, Injectable, LOCALE_ID, NgZone } from '@angular/core'
@ -164,18 +164,20 @@ export class PluginService implements ClientHook {
getSettings: () => {
const path = PluginService.BASE_PLUGIN_API_URL + '/' + npmName + '/public-settings'
return this.authHttp.get<PublicServerSetting>(path)
const obs = this.authHttp.get<PublicServerSetting>(path)
.pipe(
map(p => p.publicSettings),
catchError(res => this.restExtractor.handleError(res))
)
.toPromise()
return firstValueFrom(obs)
},
getServerConfig: () => {
return this.server.getConfig()
const obs = this.server.getConfig()
.pipe(catchError(res => this.restExtractor.handleError(res)))
.toPromise()
return firstValueFrom(obs)
},
isLoggedIn: () => {
@ -216,10 +218,11 @@ export class PluginService implements ClientHook {
},
translate: (value: string) => {
return this.translationsObservable
const obs = this.translationsObservable
.pipe(map(allTranslations => allTranslations[npmName]))
.pipe(map(translations => peertubeTranslate(value, translations)))
.toPromise()
return firstValueFrom(obs)
}
}
}

4
client/src/app/core/rest/rest-extractor.service.ts
View File

@ -89,7 +89,7 @@ export class RestExtractor {
errorObj.body = err.error
}
return observableThrowError(errorObj)
return observableThrowError(() => errorObj)
}
redirectTo404IfNotFound (obj: { status: number }, type: 'video' | 'other', status = [ HttpStatusCode.NOT_FOUND_404 ]) {
@ -98,6 +98,6 @@ export class RestExtractor {
this.router.navigate([ '/404' ], { state: { type, obj }, skipLocationChange: true })
}
return observableThrowError(obj)
return observableThrowError(() => obj)
}
}

8
client/src/app/menu/notification.component.ts
View File

@ -36,14 +36,14 @@ export class NotificationComponent implements OnInit, OnDestroy {
ngOnInit () {
this.userNotificationService.countUnreadNotifications()
.subscribe(
result => {
.subscribe({
next: result => {
this.unreadNotifications = Math.min(result, 99) // Limit number to 99
this.subscribeToNotifications()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
this.routeSub = this.router.events
.pipe(filter(event => event instanceof NavigationEnd))

8
client/src/app/modal/instance-config-warning-modal.component.ts
View File

@ -50,10 +50,10 @@ export class InstanceConfigWarningModalComponent {
peertubeLocalStorage.setItem(this.LOCAL_STORAGE_KEYS.NO_INSTANCE_CONFIG_WARNING_MODAL, 'true')
this.userService.updateMyProfile({ noInstanceConfigWarningModal: true })
.subscribe(
() => console.log('We will not open the instance config warning modal again.'),
.subscribe({
next: () => console.log('We will not open the instance config warning modal again.'),
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

12
client/src/app/modal/quick-settings-modal.component.ts
View File

@ -31,20 +31,20 @@ export class QuickSettingsModalComponent extends FormReactive implements OnInit
ngOnInit () {
this.user = this.userService.getAnonymousUser()
this.localStorageService.watch()
.subscribe(
() => this.user = this.userService.getAnonymousUser()
)
.subscribe({
next: () => this.user = this.userService.getAnonymousUser()
})
this.userInformationLoaded.next(true)
this.authService.loginChangedSource
.pipe(filter(status => status !== AuthStatus.LoggedIn))
.subscribe(
() => {
.subscribe({
next: () => {
this.user = this.userService.getAnonymousUser()
this.userInformationLoaded.next(true)
}
)
})
}
isUserLoggedIn () {

8
client/src/app/modal/welcome-modal.component.ts
View File

@ -37,10 +37,10 @@ export class WelcomeModalComponent {
peertubeLocalStorage.setItem(this.LOCAL_STORAGE_KEYS.NO_WELCOME_MODAL, 'true')
this.userService.updateMyProfile({ noWelcomeModal: true })
.subscribe(
() => console.log('We will not open the welcome modal again.'),
.subscribe({
next: () => console.log('We will not open the welcome modal again.'),
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

73
client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
View File

@ -145,23 +145,24 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
const res = await this.confirmService.confirm($localize`Do you really want to delete this abuse report?`, $localize`Delete`)
if (res === false) return
this.abuseService.removeAbuse(abuse).subscribe(
() => {
this.abuseService.removeAbuse(abuse)
.subscribe({
next: () => {
this.notifier.success($localize`Abuse deleted.`)
this.reloadData()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
updateAbuseState (abuse: AdminAbuse, state: AbuseState) {
this.abuseService.updateAbuse(abuse, { state })
.subscribe(
() => this.reloadData(),
.subscribe({
next: () => this.reloadData(),
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
onCountMessagesUpdated (event: { abuseId: number, countMessages: number }) {
@ -198,8 +199,8 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
? this.abuseService.getAdminAbuses(options)
: this.abuseService.getUserAbuses(options)
return observable.subscribe(
async resultList => {
return observable.subscribe({
next: async resultList => {
this.totalRecords = resultList.total
this.abuses = []
@ -245,8 +246,8 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
}
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private buildInternalActions (): DropdownAction<ProcessedAbuse>[] {
@ -351,15 +352,15 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
isDisplayed: abuse => abuse.video && !abuse.video.deleted && !abuse.video.blacklisted,
handler: abuse => {
this.videoBlocklistService.blockVideo(abuse.video.id, undefined, abuse.video.channel.isLocal)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video blocked.`)
this.updateAbuseState(abuse, AbuseState.ACCEPTED)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
},
{
@ -367,15 +368,15 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
isDisplayed: abuse => abuse.video && !abuse.video.deleted && abuse.video.blacklisted,
handler: abuse => {
this.videoBlocklistService.unblockVideo(abuse.video.id)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video unblocked.`)
this.updateAbuseState(abuse, AbuseState.ACCEPTED)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
},
{
@ -389,15 +390,15 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
if (res === false) return
this.videoService.removeVideo(abuse.video.id)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video deleted.`)
this.updateAbuseState(abuse, AbuseState.ACCEPTED)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}
]
@ -424,15 +425,15 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
if (res === false) return
this.commentService.deleteVideoComment(abuse.comment.video.id, abuse.comment.id)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Comment deleted.`)
this.updateAbuseState(abuse, AbuseState.ACCEPTED)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}
]
@ -440,25 +441,25 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
private muteAccountHelper (account: Account) {
this.blocklistService.blockAccountByInstance(account)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Account ${account.nameWithHost} muted by the instance.`)
account.mutedByInstance = true
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private muteServerHelper (host: string) {
this.blocklistService.blockServerByInstance(host)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Server ${host} muted by the instance.`)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private toHtml (text: string) {

24
client/src/app/shared/shared-abuse-list/abuse-message-modal.component.ts
View File

@ -61,8 +61,8 @@ export class AbuseMessageModalComponent extends FormReactive implements OnInit {
this.sendingMessage = true
this.abuseService.addAbuseMessage(this.abuse, this.form.value['message'])
.subscribe(
() => {
.subscribe({
next: () => {
this.form.reset()
this.sendingMessage = false
this.countMessagesUpdated.emit({ abuseId: this.abuse.id, countMessages: this.abuseMessages.length + 1 })
@ -70,25 +70,25 @@ export class AbuseMessageModalComponent extends FormReactive implements OnInit {
this.loadMessages()
},
err => {
error: err => {
this.sendingMessage = false
console.error(err)
this.notifier.error('Sorry but you cannot send this message. Please retry later')
}
)
})
}
deleteMessage (abuseMessage: AbuseMessage) {
this.abuseService.deleteAbuseMessage(this.abuse, abuseMessage)
.subscribe(
() => {
.subscribe({
next: () => {
this.countMessagesUpdated.emit({ abuseId: this.abuse.id, countMessages: this.abuseMessages.length - 1 })
this.abuseMessages = this.abuseMessages.filter(m => m.id !== abuseMessage.id)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
isMessageByMe (abuseMessage: AbuseMessage) {
@ -105,8 +105,8 @@ export class AbuseMessageModalComponent extends FormReactive implements OnInit {
private loadMessages () {
this.abuseService.listAbuseMessages(this.abuse)
.subscribe(
async res => {
.subscribe({
next: async res => {
this.abuseMessages = []
for (const m of res.data) {
@ -124,8 +124,8 @@ export class AbuseMessageModalComponent extends FormReactive implements OnInit {
})
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/shared/shared-abuse-list/moderation-comment-modal.component.ts
View File

@ -53,16 +53,16 @@ export class ModerationCommentModalComponent extends FormReactive implements OnI
const moderationComment: string = this.form.value[ 'moderationComment' ]
this.abuseService.updateAbuse(this.abuseToComment, { moderationComment })
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Comment updated.`)
this.commentUpdated.emit(moderationComment)
this.hide()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

4
client/src/app/shared/shared-custom-markup/custom-markup.service.ts
View File

@ -1,4 +1,4 @@
import { first } from 'rxjs/operators'
import { firstValueFrom } from 'rxjs'
import { ComponentRef, Injectable } from '@angular/core'
import { MarkdownService } from '@app/core'
import {
@ -85,7 +85,7 @@ export class CustomMarkupService {
const component = this.execAngularBuilder(selector, e)
if (component.instance.loaded) {
const p = component.instance.loaded.pipe(first()).toPromise()
const p = firstValueFrom(component.instance.loaded)
loadedPromises.push(p)
}

8
client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts
View File

@ -44,14 +44,14 @@ export class ChannelMiniatureMarkupComponent implements CustomMarkupComponent, O
tap(html => this.descriptionHTML = html),
switchMap(() => this.loadVideosObservable()),
finalize(() => this.loaded.emit(true))
).subscribe(
({ total, data }) => {
).subscribe({
next: ({ total, data }) => {
this.totalVideos = total
this.video = data[0]
},
err => this.notifier.error($localize`Error in channel miniature component: ${err.message}`)
)
error: err => this.notifier.error($localize`Error in channel miniature component: ${err.message}`)
})
}
getVideoChannelLink () {

8
client/src/app/shared/shared-custom-markup/peertube-custom-tags/playlist-miniature-markup.component.ts
View File

@ -41,10 +41,10 @@ export class PlaylistMiniatureMarkupComponent implements CustomMarkupComponent,
ngOnInit () {
this.findInBulkService.getPlaylist(this.uuid)
.pipe(finalize(() => this.loaded.emit(true)))
.subscribe(
playlist => this.playlist = playlist,
.subscribe({
next: playlist => this.playlist = playlist,
err => this.notifier.error($localize`Error in playlist miniature component: ${err.message}`)
)
error: err => this.notifier.error($localize`Error in playlist miniature component: ${err.message}`)
})
}
}

8
client/src/app/shared/shared-custom-markup/peertube-custom-tags/video-miniature-markup.component.ts
View File

@ -53,10 +53,10 @@ export class VideoMiniatureMarkupComponent implements CustomMarkupComponent, OnI
this.findInBulk.getVideo(this.uuid)
.pipe(finalize(() => this.loaded.emit(true)))
.subscribe(
video => this.video = video,
.subscribe({
next: video => this.video = video,
err => this.notifier.error($localize`Error in video miniature component: ${err.message}`)
)
error: err => this.notifier.error($localize`Error in video miniature component: ${err.message}`)
})
}
}

8
client/src/app/shared/shared-custom-markup/peertube-custom-tags/videos-list-markup.component.ts
View File

@ -71,11 +71,11 @@ export class VideosListMarkupComponent implements CustomMarkupComponent, OnInit
return this.getVideosObservable()
.pipe(finalize(() => this.loaded.emit(true)))
.subscribe(
({ data }) => this.videos = data,
.subscribe({
next: ({ data }) => this.videos = data,
err => this.notifier.error($localize`Error in videos list component: ${err.message}`)
)
error: err => this.notifier.error($localize`Error in videos list component: ${err.message}`)
})
}
getVideosObservable () {

8
client/src/app/shared/shared-instance/instance-about-accordion.component.ts
View File

@ -36,8 +36,8 @@ export class InstanceAboutAccordionComponent implements OnInit {
ngOnInit (): void {
this.instanceService.getAbout()
.subscribe(
async about => {
.subscribe({
next: async about => {
this.about = about
this.aboutHtml = await this.instanceService.buildHtml(about)
@ -45,8 +45,8 @@ export class InstanceAboutAccordionComponent implements OnInit {
this.init.emit(this)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
getAdministratorsPanel () {

2
client/src/app/shared/shared-main/auth/auth-interceptor.service.ts
View File

@ -36,7 +36,7 @@ export class AuthInterceptor implements HttpInterceptor {
return this.handleNotAuthenticated(err)
}
return observableThrowError(err)
return observableThrowError(() => err)
})
)
}

24
client/src/app/shared/shared-main/users/user-notifications.component.ts
View File

@ -56,8 +56,8 @@ export class UserNotificationsComponent implements OnInit {
}
this.userNotificationService.listMyNotifications(options)
.subscribe(
result => {
.subscribe({
next: result => {
this.notifications = reset ? result.data : this.notifications.concat(result.data)
this.componentPagination.totalItems = result.total
@ -66,8 +66,8 @@ export class UserNotificationsComponent implements OnInit {
this.onDataSubject.next(result.data)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
onNearOfBottom () {
@ -84,26 +84,26 @@ export class UserNotificationsComponent implements OnInit {
if (notification.read) return
this.userNotificationService.markAsRead(notification)
.subscribe(
() => {
.subscribe({
next: () => {
notification.read = true
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
markAllAsRead () {
this.userNotificationService.markAllAsRead()
.subscribe(
() => {
.subscribe({
next: () => {
for (const notification of this.notifications) {
notification.read = true
}
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
changeSortColumn (column: string) {

8
client/src/app/shared/shared-moderation/account-blocklist.component.ts
View File

@ -62,13 +62,13 @@ export class GenericAccountBlocklistComponent extends RestTable implements OnIni
search: this.search
})
return operation.subscribe(
resultList => {
return operation.subscribe({
next: resultList => {
this.blockedAccounts = resultList.data
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/shared/shared-moderation/report-modals/account-report.component.ts
View File

@ -77,14 +77,14 @@ export class AccountReportComponent extends FormReactive implements OnInit {
account: {
id: this.account.id
}
}).subscribe(
() => {
}).subscribe({
next: () => {
this.notifier.success($localize`Account reported.`)
this.hide()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
isRemote () {

8
client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts
View File

@ -77,14 +77,14 @@ export class CommentReportComponent extends FormReactive implements OnInit {
comment: {
id: this.comment.id
}
}).subscribe(
() => {
}).subscribe({
next: () => {
this.notifier.success($localize`Comment reported.`)
this.hide()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
isRemote () {

8
client/src/app/shared/shared-moderation/report-modals/video-report.component.ts
View File

@ -108,14 +108,14 @@ export class VideoReportComponent extends FormReactive implements OnInit {
startAt: hasStart && startAt ? startAt : undefined,
endAt: hasEnd && endAt ? endAt : undefined
}
}).subscribe(
() => {
}).subscribe({
next: () => {
this.notifier.success($localize`Video reported.`)
this.hide()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
isRemote () {

8
client/src/app/shared/shared-moderation/server-blocklist.component.ts
View File

@ -88,13 +88,13 @@ export class GenericServerBlocklistComponent extends RestTable implements OnInit
search: this.search
})
return operation.subscribe(
resultList => {
return operation.subscribe({
next: resultList => {
this.blockedServers = resultList.data
this.totalRecords = resultList.total
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

8
client/src/app/shared/shared-moderation/user-ban-modal.component.ts
View File

@ -47,8 +47,8 @@ export class UserBanModalComponent extends FormReactive implements OnInit {
const reason = this.form.value['reason'] || undefined
this.userService.banUsers(this.usersToBan, reason)
.subscribe(
() => {
.subscribe({
next: () => {
const message = Array.isArray(this.usersToBan)
? $localize`${this.usersToBan.length} users banned.`
: $localize`User ${this.usersToBan.username} banned.`
@ -59,8 +59,8 @@ export class UserBanModalComponent extends FormReactive implements OnInit {
this.hide()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

98
client/src/app/shared/shared-moderation/user-moderation-dropdown.component.ts
View File

@ -67,14 +67,14 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
if (res === false) return
this.userService.unbanUsers(user)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`User ${user.username} unbanned.`)
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
async removeUser (user: User) {
@ -87,137 +87,139 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
const res = await this.confirmService.confirm(message, $localize`Delete`)
if (res === false) return
this.userService.removeUser(user).subscribe(
() => {
this.userService.removeUser(user)
.subscribe({
next: () => {
this.notifier.success($localize`User ${user.username} deleted.`)
this.userDeleted.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
setEmailAsVerified (user: User) {
this.userService.updateUser(user.id, { emailVerified: true }).subscribe(
() => {
this.userService.updateUser(user.id, { emailVerified: true })
.subscribe({
next: () => {
this.notifier.success($localize`User ${user.username} email set as verified`)
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
blockAccountByUser (account: Account) {
this.blocklistService.blockAccountByUser(account)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Account ${account.nameWithHost} muted.`)
this.account.mutedByUser = true
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
unblockAccountByUser (account: Account) {
this.blocklistService.unblockAccountByUser(account)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Account ${account.nameWithHost} unmuted.`)
this.account.mutedByUser = false
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
blockServerByUser (host: string) {
this.blocklistService.blockServerByUser(host)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Instance ${host} muted.`)
this.account.mutedServerByUser = true
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
unblockServerByUser (host: string) {
this.blocklistService.unblockServerByUser(host)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Instance ${host} unmuted.`)
this.account.mutedServerByUser = false
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
blockAccountByInstance (account: Account) {
this.blocklistService.blockAccountByInstance(account)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Account ${account.nameWithHost} muted by the instance.`)
this.account.mutedByInstance = true
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
unblockAccountByInstance (account: Account) {
this.blocklistService.unblockAccountByInstance(account)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Account ${account.nameWithHost} unmuted by the instance.`)
this.account.mutedByInstance = false
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
blockServerByInstance (host: string) {
this.blocklistService.blockServerByInstance(host)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Instance ${host} muted by the instance.`)
this.account.mutedServerByInstance = true
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
unblockServerByInstance (host: string) {
this.blocklistService.unblockServerByInstance(host)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Instance ${host} unmuted by the instance.`)
this.account.mutedServerByInstance = false
this.userChanged.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
async bulkRemoveCommentsOf (body: BulkRemoveCommentsOfBody) {
@ -226,13 +228,13 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
if (res === false) return
this.bulkService.removeCommentsOf(body)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Will remove comments of this account (may take several minutes).`)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
getRouterUserEditLink (user: User) {

8
client/src/app/shared/shared-moderation/video-block.component.ts
View File

@ -55,8 +55,8 @@ export class VideoBlockComponent extends FormReactive implements OnInit {
const unfederate = this.video.isLocal ? this.form.value[ 'unfederate' ] : undefined
this.videoBlocklistService.blockVideo(this.video.id, reason, unfederate)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video blocked.`)
this.hide()
@ -66,7 +66,7 @@ export class VideoBlockComponent extends FormReactive implements OnInit {
this.videoBlocked.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}

2
client/src/app/shared/shared-search/find-in-bulk.service.ts
View File

@ -1,5 +1,5 @@
import * as debug from 'debug'
import { Observable, Subject, throwError } from 'rxjs'
import { Observable, Subject } from 'rxjs'
import { first, map } from 'rxjs/operators'
import { Injectable, NgZone } from '@angular/core'
import { buildBulkObservable } from '@app/helpers'

15
client/src/app/shared/shared-user-settings/user-interface-settings.component.ts
View File

@ -65,18 +65,21 @@ export class UserInterfaceSettingsComponent extends FormReactive implements OnIn
}
if (this.authService.isLoggedIn()) {
this.userService.updateMyProfile(details).subscribe(
() => {
this.userService.updateMyProfile(details)
.subscribe({
next: () => {
this.authService.refreshUserInformation()
if (this.notifyOnUpdate) this.notifier.success($localize`Interface settings updated.`)
},
err => this.notifier.error(err.message)
)
} else {
error: err => this.notifier.error(err.message)
})
return
}
this.userService.updateMyAnonymousProfile(details)
if (this.notifyOnUpdate) this.notifier.success($localize`Interface settings updated.`)
}
}
}

9
client/src/app/shared/shared-user-settings/user-video-settings.component.ts
View File

@ -162,15 +162,16 @@ export class UserVideoSettingsComponent extends FormReactive implements OnInit,
}
private updateLoggedProfile (details: UserUpdateMe) {
this.userService.updateMyProfile(details).subscribe(
() => {
this.userService.updateMyProfile(details)
.subscribe({
next: () => {
this.authService.refreshUserInformation()
if (this.notifyOnUpdate) this.notifier.success($localize`Video settings updated.`)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
private updateAnonymousProfile (details: UserUpdateMe) {

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

@ -102,8 +102,8 @@ export class SubscribeButtonComponent implements OnInit, OnChanges {
.map(handle => this.userSubscriptionService.addSubscription(handle))
forkJoin(observableBatch)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success(
this.account
? $localize`Subscribed to all current channels of ${this.account.displayName}. You will be notified of all their new videos.`
@ -113,8 +113,8 @@ export class SubscribeButtonComponent implements OnInit, OnChanges {
)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
unsubscribe () {
@ -182,11 +182,11 @@ export class SubscribeButtonComponent implements OnInit, OnChanges {
merge(
this.userSubscriptionService.listenToSubscriptionCacheChange(handle),
this.userSubscriptionService.doesSubscriptionExist(handle)
).subscribe(
res => this.subscribed.set(handle, res),
).subscribe({
next: res => this.subscribed.set(handle, res),
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
}
}

11
client/src/app/shared/shared-video-miniature/abstract-video-list.ts
View File

@ -204,8 +204,9 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, AfterConte
}
loadMoreVideos (reset = false) {
this.getVideosObservable(this.pagination.currentPage).subscribe(
({ data }) => {
this.getVideosObservable(this.pagination.currentPage)
.subscribe({
next: ({ data }) => {
this.hasDoneFirstQuery = true
this.lastQueryLength = data.length
@ -219,13 +220,13 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, AfterConte
this.onDataSubject.next(data)
},
error => {
error: err => {
const message = $localize`Cannot load more videos. Try again later.`
console.error(message, { error })
console.error(message, { err })
this.notifier.error(message)
}
)
})
}
reloadVideos () {

32
client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts
View File

@ -183,8 +183,8 @@ export class VideoActionsDropdownComponent implements OnChanges {
if (res === false) return
this.videoBlocklistService.unblockVideo(this.video.id)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video ${this.video.name} unblocked.`)
this.video.blacklisted = false
@ -193,8 +193,8 @@ export class VideoActionsDropdownComponent implements OnChanges {
this.videoUnblocked.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
async removeVideo () {
@ -209,40 +209,40 @@ export class VideoActionsDropdownComponent implements OnChanges {
if (res === false) return
this.videoService.removeVideo(this.video.id)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video ${this.video.name} deleted.`)
this.videoRemoved.emit()
},
error => this.notifier.error(error.message)
)
error: err => this.notifier.error(err.message)
})
}
duplicateVideo () {
this.redundancyService.addVideoRedundancy(this.video)
.subscribe(
() => {
.subscribe({
next: () => {
const message = $localize`This video will be duplicated by your instance.`
this.notifier.success(message)
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
muteVideoAccount () {
const params = { nameWithHost: Actor.CREATE_BY_STRING(this.video.account.name, this.video.account.host) }
this.blocklistService.blockAccountByUser(params)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Account ${params.nameWithHost} muted.`)
this.videoAccountMuted.emit()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
onVideoBlocked () {

3
client/src/app/shared/shared-video-miniature/video-download.component.ts
View File

@ -1,4 +1,5 @@
import { mapValues, pick } from 'lodash-es'
import { firstValueFrom } from 'rxjs'
import { tap } from 'rxjs/operators'
import { Component, ElementRef, Inject, LOCALE_ID, ViewChild } from '@angular/core'
import { AuthService, HooksService, Notifier } from '@app/core'
@ -265,6 +266,6 @@ export class VideoDownloadComponent {
const observable = this.videoService.getVideoFileMetadata(file.metadataUrl)
.pipe(tap(res => file.metadata = res))
return observable.toPromise()
return firstValueFrom(observable)
}
}

3
client/src/app/shared/shared-video-miniature/video-miniature.component.ts
View File

@ -214,7 +214,8 @@ export class VideoMiniatureComponent implements OnInit {
addToWatchLater () {
const body = { videoId: this.video.id }
this.videoPlaylistService.addVideoInPlaylist(this.watchLaterPlaylist.id, body).subscribe(
this.videoPlaylistService.addVideoInPlaylist(this.watchLaterPlaylist.id, body)
.subscribe(
res => {
this.watchLaterPlaylist.playlistElementId = res.videoPlaylistElement.id
}

45
client/src/app/shared/shared-video-playlist/video-add-to-playlist.component.ts
View File

@ -198,15 +198,16 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
privacy: VideoPlaylistPrivacy.PRIVATE
}
this.videoPlaylistService.createVideoPlaylist(videoPlaylistCreate).subscribe(
() => {
this.videoPlaylistService.createVideoPlaylist(videoPlaylistCreate)
.subscribe({
next: () => {
this.isNewPlaylistBlockOpened = false
this.cd.markForCheck()
},
err => this.notifier.error(err.message)
)
error: err => this.notifier.error(err.message)
})
}
onVideoPlaylistSearchChanged () {
@ -268,17 +269,15 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
}
this.videoPlaylistService.updateVideoOfPlaylist(playlist.id, element.playlistElementId, body, this.video.id)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Timestamps updated`)
},
err => {
this.notifier.error(err.message)
},
error: err => this.notifier.error(err.message),
() => this.cd.markForCheck()
)
complete: () => this.cd.markForCheck()
})
}
private isOptionalRowDisplayed (playlist: PlaylistSummary) {
@ -302,17 +301,15 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
private removeVideoFromPlaylist (playlist: PlaylistSummary, elementId: number) {
this.videoPlaylistService.removeVideoFromPlaylist(playlist.id, elementId, this.video.id)
.subscribe(
() => {
.subscribe({
next: () => {
this.notifier.success($localize`Video removed from ${playlist.displayName}`)
},
err => {
this.notifier.error(err.message)
},
error: err => this.notifier.error(err.message),
() => this.cd.markForCheck()
)
complete: () => this.cd.markForCheck()
})
}
private listenToVideoPlaylistChange () {
@ -371,8 +368,8 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
if (element.stopTimestamp && element.stopTimestamp !== this.video.duration) body.stopTimestamp = element.stopTimestamp
this.videoPlaylistService.addVideoInPlaylist(playlist.id, body)
.subscribe(
res => {
.subscribe({
next: res => {
const message = body.startTimestamp || body.stopTimestamp
? $localize`Video added in ${playlist.displayName} at timestamps ${this.formatTimestamp(element)}`
: $localize`Video added in ${playlist.displayName}`
@ -382,12 +379,10 @@ export class VideoAddToPlaylistComponent extends FormReactive implements OnInit,
if (element) element.playlistElementId = res.videoPlaylistElement.id
},
err => {
this.notifier.error(err.message)
},
error: err => this.notifier.error(err.message),
() => this.cd.markForCheck()
)
complete: () => this.cd.markForCheck()
})
}
private formatTimestamp (element: PlaylistElement) {

Some files were not shown because too many files have changed in this diff Show More