Fix notification video state

This commit is contained in:
Chocobozzz 2025-01-17 14:12:31 +01:00
parent dbf9fce351
commit f3607593a3
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 8 additions and 4 deletions

View File

@ -21,12 +21,12 @@ import { LoginLinkComponent } from '@app/shared/shared-main/users/login-link.com
import { SignupLabelComponent } from '@app/shared/shared-main/users/signup-label.component'
import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
import { ServerConfig } from '@peertube/peertube-models'
import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
import { isAndroid } from '@root-helpers/web-browser'
import { Subscription } from 'rxjs'
import { GlobalIconComponent } from '../shared/shared-icons/global-icon.component'
import { ButtonComponent } from '../shared/shared-main/buttons/button.component'
import { SearchTypeaheadComponent } from './search-typeahead.component'
import { isAndroid, isIOS, isIphone } from '@root-helpers/web-browser'
import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
@Component({
selector: 'my-header',

View File

@ -189,7 +189,11 @@ describe('Test resumable upload', function () {
it('Should not accept more chunks than expected with an invalid content length/content range', async function () {
const uploadId = await prepareUpload({ size: 1500 })
await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409, contentLength: 1000 })
try {
await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.CONFLICT_409, contentLength: 1000 })
} catch (err) {
await sendChunks({ pathUploadId: uploadId, expectedStatus: HttpStatusCode.BAD_REQUEST_400, contentLength: 1000 })
}
await checkFileSize(uploadId, 0)
})

View File

@ -142,7 +142,7 @@ export class UserNotificationListQueryBuilder extends AbstractRunQuery {
"VideoBlacklist->Video"."id" AS "VideoBlacklist.Video.id",
"VideoBlacklist->Video"."uuid" AS "VideoBlacklist.Video.uuid",
"VideoBlacklist->Video"."name" AS "VideoBlacklist.Video.name",
"VideoBlacklist->Video"."state" AS "VideoBlacklist.Video.name",
"VideoBlacklist->Video"."state" AS "VideoBlacklist.Video.state",
"VideoImport"."id" AS "VideoImport.id",
"VideoImport"."magnetUri" AS "VideoImport.magnetUri",
"VideoImport"."targetUrl" AS "VideoImport.targetUrl",