OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix sitemap URL for accounts and channels

pull/6026/head
Chocobozzz 2023-10-19 16:13:22 +02:00
parent 58daa2d97b
commit e731f4b724
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/controllers/sitemap.ts
View File

@ -61,17 +61,13 @@ async function getSitemap (req: express.Request, res: express.Response) {
async function getSitemapVideoChannelUrls () {
const rows = await VideoChannelModel.listLocalsForSitemap('createdAt')
return rows.map(channel => ({
url: WEBSERVER.URL + '/video-channels/' + channel.Actor.preferredUsername
}))
return rows.map(channel => ({ url: channel.getClientUrl() }))
}
async function getSitemapAccountUrls () {
const rows = await AccountModel.listLocalsForSitemap('createdAt')
return rows.map(channel => ({
url: WEBSERVER.URL + '/accounts/' + channel.Actor.preferredUsername
}))
return rows.map(account => ({ url: account.getClientUrl() }))
}
async function getSitemapLocalVideoUrls () {

6
server/core/models/account/account.ts
View File

@ -23,9 +23,7 @@ import { isAccountDescriptionValid } from '../../helpers/custom-validators/accou
import { CONSTRAINTS_FIELDS, SERVER_ACTOR_NAME, WEBSERVER } from '../../initializers/constants.js'
import { sendDeleteActor } from '../../lib/activitypub/send/send-delete.js'
import {
MAccount,
MAccountActor,
MAccountAP,
MAccount, MAccountAP,
MAccountDefault,
MAccountFormattable,
MAccountHost,
@ -390,7 +388,7 @@ export class AccountModel extends Model<Partial<AttributesOnly<AccountModel>>> {
return AccountModel.findOne(query)
}
static listLocalsForSitemap (sort: string): Promise<MAccountActor[]> {
static listLocalsForSitemap (sort: string): Promise<MAccountHost[]> {
const query = {
attributes: [ ],
offset: 0,

3
server/core/models/video/video-channel.ts
View File

@ -34,7 +34,6 @@ import {
import { CONSTRAINTS_FIELDS, WEBSERVER } from '../../initializers/constants.js'
import { sendDeleteActor } from '../../lib/activitypub/send/index.js'
import {
MChannelActor,
MChannelAP,
MChannelBannerAccountDefault,
MChannelFormattable,
@ -500,7 +499,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
}
}
static listLocalsForSitemap (sort: string): Promise<MChannelActor[]> {
static listLocalsForSitemap (sort: string): Promise<MChannelHost[]> {
const query = {
attributes: [ ],
offset: 0,