+import { SortMeta } from 'primeng/api'
import { catchError, map, tap } from 'rxjs/operators'
-import { HttpClient, HttpParams } from '@angular/common/http'
+import { HttpClient, HttpContext, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
-import { ComponentPaginationLight, RestExtractor, RestService, User, UserNotificationSocket, AuthService } from '@app/core'
+import { AuthService, ComponentPaginationLight, PeerTubeSocket, RestExtractor, RestService } from '@app/core'
+import { NGX_LOADING_BAR_IGNORED } from '@ngx-loading-bar/http-client'
import { ResultList, UserNotification as UserNotificationServer, UserNotificationSetting } from '@shared/models'
import { environment } from '../../../../environments/environment'
import { UserNotification } from './user-notification.model'
-import { SortMeta } from 'primeng/api'
@Injectable()
export class UserNotificationService {
private auth: AuthService,
private restExtractor: RestExtractor,
private restService: RestService,
- private userNotificationSocket: UserNotificationSocket
+ private peertubeSocket: PeerTubeSocket
) {}
listMyNotifications (parameters: {
pagination: ComponentPaginationLight
ignoreLoadingBar?: boolean
- unread?: boolean,
+ unread?: boolean
sort?: SortMeta
}) {
const { pagination, ignoreLoadingBar, unread, sort } = parameters
let params = new HttpParams()
- params = this.restService.addRestGetParams(params, this.restService.componentPaginationToRestPagination(pagination), sort)
+ params = this.restService.addRestGetParams(params, this.restService.componentToRestPagination(pagination), sort)
if (unread) params = params.append('unread', `${unread}`)
- const headers = ignoreLoadingBar ? { ignoreLoadingBar: '' } : undefined
+ const context = ignoreLoadingBar
+ ? new HttpContext().set(NGX_LOADING_BAR_IGNORED, true)
+ : undefined
- return this.authHttp.get<ResultList<UserNotification>>(UserNotificationService.BASE_NOTIFICATIONS_URL, { params, headers })
+ return this.authHttp.get<ResultList<UserNotification>>(UserNotificationService.BASE_NOTIFICATIONS_URL, { params, context })
.pipe(
map(res => this.restExtractor.convertResultListDateToHuman(res)),
map(res => this.restExtractor.applyToResultListData(res, this.formatNotification.bind(this))),
const url = UserNotificationService.BASE_NOTIFICATIONS_URL + '/read'
const body = { ids: [ notification.id ] }
- const headers = { ignoreLoadingBar: '' }
+ const context = new HttpContext().set(NGX_LOADING_BAR_IGNORED, true)
- return this.authHttp.post(url, body, { headers })
+ return this.authHttp.post(url, body, { context })
.pipe(
- map(this.restExtractor.extractDataBool),
- tap(() => this.userNotificationSocket.dispatch('read')),
+ tap(() => this.peertubeSocket.dispatchNotificationEvent('read')),
catchError(res => this.restExtractor.handleError(res))
)
}
markAllAsRead () {
const url = UserNotificationService.BASE_NOTIFICATIONS_URL + '/read-all'
- const headers = { ignoreLoadingBar: '' }
+ const context = new HttpContext().set(NGX_LOADING_BAR_IGNORED, true)
- return this.authHttp.post(url, {}, { headers })
+ return this.authHttp.post(url, {}, { context })
.pipe(
- map(this.restExtractor.extractDataBool),
- tap(() => this.userNotificationSocket.dispatch('read-all')),
+ tap(() => this.peertubeSocket.dispatchNotificationEvent('read-all')),
catchError(res => this.restExtractor.handleError(res))
)
}
- updateNotificationSettings (user: User, settings: UserNotificationSetting) {
+ updateNotificationSettings (settings: UserNotificationSetting) {
const url = UserNotificationService.BASE_NOTIFICATION_SETTINGS
return this.authHttp.put(url, settings)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
- )
+ .pipe(catchError(res => this.restExtractor.handleError(res)))
}
private formatNotification (notification: UserNotificationServer) {