matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #751: Peertube v8.0.0 compatibility.

Browse Source
This commit is contained in:
John Livingston
2025-12-12 15:12:24 +01:00
parent 5ef5b86b39
commit ef78658f4c
4 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
server/lib/database/channel.ts
View File

@ -3,6 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0-only
import type { RegisterServerOptions } from '@peertube/peertube-types'
import { getPeertubeVersion } from '../helpers'
async function getChannelNameById (options: RegisterServerOptions, channelId: number): Promise<string | null> {
if (!channelId) {
@ -12,10 +13,18 @@ async function getChannelNameById (options: RegisterServerOptions, channelId: nu
throw new Error('Invalid channelId: not an integer')
}
const [results] = await options.peertubeHelpers.database.query(
'SELECT "actor"."preferredUsername"' +
' FROM "videoChannel"' +
' RIGHT JOIN "actor" ON "actor"."id" = "videoChannel"."actorId"' +
' WHERE "videoChannel"."id" = ' + channelId.toString()
getPeertubeVersion().major >= 8
? (
'SELECT "actor"."preferredUsername"' +
' FROM "actor"' +
' WHERE "videoChannelId" = ' + channelId.toString()
)
: (
'SELECT "actor"."preferredUsername"' +
' FROM "videoChannel"' +
' RIGHT JOIN "actor" ON "actor"."id" = "videoChannel"."actorId"' +
' WHERE "videoChannel"."id" = ' + channelId.toString()
)
)
if (!Array.isArray(results)) {
throw new Error('getChannelNameById: query result is not an array.')
@ -70,18 +79,35 @@ async function getChannelInfosById (
throw new Error('Invalid channelId: not an integer')
}
const [results] = await options.peertubeHelpers.database.query(
'SELECT' +
' "actor"."preferredUsername" as "channelName",' +
' "videoChannel"."id" as "channelId",' +
' "videoChannel"."name" as "channelDisplayName",' +
' "videoChannel"."accountId" as "ownerAccountId"' +
' FROM "videoChannel"' +
' RIGHT JOIN "actor" ON "actor"."id" = "videoChannel"."actorId"' +
' WHERE "videoChannel"."id" = ' + channelId.toString() +
(restrictToLocalChannels
? ' AND "serverId" is null '
: ''
)
getPeertubeVersion().major >= 8
? (
'SELECT' +
' "actor"."preferredUsername" as "channelName",' +
' "videoChannel"."id" as "channelId",' +
' "videoChannel"."name" as "channelDisplayName",' +
' "videoChannel"."accountId" as "ownerAccountId"' +
' FROM "videoChannel"' +
' INNER JOIN "actor" ON "actor"."videoChannelId" = "videoChannel"."id"' +
' WHERE "videoChannel"."id" = ' + channelId.toString() +
(restrictToLocalChannels
? ' AND "serverId" is null '
: ''
)
)
: (
'SELECT' +
' "actor"."preferredUsername" as "channelName",' +
' "videoChannel"."id" as "channelId",' +
' "videoChannel"."name" as "channelDisplayName",' +
' "videoChannel"."accountId" as "ownerAccountId"' +
' FROM "videoChannel"' +
' RIGHT JOIN "actor" ON "actor"."id" = "videoChannel"."actorId"' +
' WHERE "videoChannel"."id" = ' + channelId.toString() +
(restrictToLocalChannels
? ' AND "serverId" is null '
: ''
)
)
)
if (!Array.isArray(results)) {
throw new Error('getChannelInfosById: query result is not an array.')