Fix sitemap URL for accounts and channels

server/core/controllers/sitemap.ts

@@ -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 => ({
+  return rows.map(channel => ({ url: channel.getClientUrl() }))
-    url: WEBSERVER.URL + '/video-channels/' + channel.Actor.preferredUsername
-  }))
 }
 
 async function getSitemapAccountUrls () {
   const rows = await AccountModel.listLocalsForSitemap('createdAt')
 
-  return rows.map(channel => ({
+  return rows.map(account => ({ url: account.getClientUrl() }))
-    url: WEBSERVER.URL + '/accounts/' + channel.Actor.preferredUsername
-  }))
 }
 
 async function getSitemapLocalVideoUrls () {

server/core/models/account/account.ts

@@ -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,
+  MAccount, MAccountAP,
-  MAccountActor,
-  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,

server/core/models/video/video-channel.ts

@@ -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,