forks/peertube
1
0
Fork 0
Code Releases Activity

Remove banner/avatar fields from channel/account

Browse source 
Deprecated since 4.2
This commit is contained in:
Chocobozzz 2023-07-28 11:28:07 +02:00
parent 89aa333110
commit f932957b2e
No known key found for this signature in database
GPG key ID: 583A612D890159BE
15 changed files with 8 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/src/app/shared/shared-main/account/actor.model.ts
View file

@ -13,9 +13,6 @@ export abstract class Actor implements ServerActor {
createdAt: Date | string
// TODO: remove, deprecated in 4.2
avatar: never
avatars: ActorImage[]
isLocal: boolean

3
client/src/app/shared/shared-main/video-channel/video-channel.model.ts
View file

@ -12,9 +12,6 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
nameWithHost: string
nameWithHostForced: string
// TODO: remove, deprecated in 4.2
banner: never
banners: ActorImage[]
bannerUrl: string

6
client/src/app/shared/shared-main/video/video.model.ts
View file

@ -86,9 +86,6 @@ export class Video implements VideoServerModel {
url: string
host: string
// TODO: remove, deprecated in 4.2
avatar: ActorImage
avatars: ActorImage[]
}
@ -99,9 +96,6 @@ export class Video implements VideoServerModel {
url: string
host: string
// TODO: remove, deprecated in 4.2
avatar: ActorImage
avatars: ActorImage[]
}

3
server/controllers/api/users/me.ts
View file

@ -1,7 +1,6 @@
import 'multer'
import express from 'express'
import { auditLoggerFactory, getAuditIdFromRes, UserAuditView } from '@server/helpers/audit-logger'
import { getBiggestActorImage } from '@server/lib/actor-image'
import { Hooks } from '@server/lib/plugins/hooks'
import { pick } from '@shared/core-utils'
import { ActorImageType, HttpStatusCode, UserUpdateMe, UserVideoQuota, UserVideoRate as FormattedUserVideoRate } from '@shared/models'
@ -264,8 +263,6 @@ async function updateMyAvatar (req: express.Request, res: express.Response) {
)
return res.json({
// TODO: remove, deprecated in 4.2
avatar: getBiggestActorImage(avatars).toFormattedJSON(),
avatars: avatars.map(avatar => avatar.toFormattedJSON())
})
}

5
server/controllers/api/video-channel.ts
View file

@ -1,6 +1,5 @@
import express from 'express'
import { pickCommonVideoQuery } from '@server/helpers/query'
import { getBiggestActorImage } from '@server/lib/actor-image'
import { Hooks } from '@server/lib/plugins/hooks'
import { ActorFollowModel } from '@server/models/actor/actor-follow'
import { getServerActor } from '@server/models/application/application'
@ -213,8 +212,6 @@ async function updateVideoChannelBanner (req: express.Request, res: express.Resp
auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys)
return res.json({
// TODO: remove, deprecated in 4.2
banner: getBiggestActorImage(banners).toFormattedJSON(),
banners: banners.map(b => b.toFormattedJSON())
})
}
@ -228,8 +225,6 @@ async function updateVideoChannelAvatar (req: express.Request, res: express.Resp
auditLogger.update(getAuditIdFromRes(res), new VideoChannelAuditView(videoChannel.toFormattedJSON()), oldVideoChannelAuditKeys)
return res.json({
// TODO: remove, deprecated in 4.2
avatar: getBiggestActorImage(avatars).toFormattedJSON(),
avatars: avatars.map(a => a.toFormattedJSON())
})
}

2
server/lib/activitypub/actors/shared/object-to-model-attributes.ts
View file

@ -32,7 +32,7 @@ function getActorAttributesFromObject (
function getImagesInfoFromObject (actorObject: ActivityPubActor, type: ActorImageType) {
const iconsOrImages = type === ActorImageType.AVATAR
? actorObject.icons || actorObject.icon
? actorObject.icon
: actorObject.image
return normalizeIconOrImage(iconsOrImages)

3
server/lib/activitypub/context.ts
View file

@ -27,9 +27,6 @@ const contextStore: { [ id in ContextType ]: (string | { [ id: string ]: string
language: 'sc:inLanguage',
identifier: 'sc:identifier',
// TODO: remove in a few versions, introduced in 4.2
icons: 'as:icon',
isLiveBroadcast: 'sc:isLiveBroadcast',
liveSaveReplay: {
'@type': 'sc:Boolean',

5
server/models/account/account.ts
View file

@ -433,10 +433,7 @@ export class AccountModel extends Model<Partial<AttributesOnly<AccountModel>>> {
name: actor.name,
url: actor.url,
host: actor.host,
avatars: actor.avatars,
// TODO: remove, deprecated in 4.2
avatar: actor.avatar
avatars: actor.avatars
}
}

21
server/models/actor/actor.ts
View file

@ -540,12 +540,7 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
url: this.url,
name: this.preferredUsername,
host: this.getHost(),
avatars: (this.Avatars || []).map(a => a.toFormattedJSON()),
// TODO: remove, deprecated in 4.2
avatar: this.hasImage(ActorImageType.AVATAR)
? this.Avatars[0].toFormattedJSON()
: undefined
avatars: (this.Avatars || []).map(a => a.toFormattedJSON())
}
}
@ -559,23 +554,16 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
followersCount: this.followersCount,
createdAt: this.getCreatedAt(),
banners: (this.Banners || []).map(b => b.toFormattedJSON()),
// TODO: remove, deprecated in 4.2
banner: this.hasImage(ActorImageType.BANNER)
? this.Banners[0].toFormattedJSON()
: undefined
banners: (this.Banners || []).map(b => b.toFormattedJSON())
}
}
toActivityPubObject (this: MActorAPChannel | MActorAPAccount, name: string) {
let icon: ActivityIconObject
let icons: ActivityIconObject[]
let icon: ActivityIconObject[]
let image: ActivityIconObject
if (this.hasImage(ActorImageType.AVATAR)) {
icon = getBiggestActorImage(this.Avatars).toActivityPubObject()
icons = this.Avatars.map(a => a.toActivityPubObject())
icon = this.Avatars.map(a => a.toActivityPubObject())
}
if (this.hasImage(ActorImageType.BANNER)) {
@ -613,7 +601,6 @@ export class ActorModel extends Model<Partial<AttributesOnly<ActorModel>>> {
published: this.getCreatedAt().toISOString(),
icon,
icons,
image
}

10
server/models/video/video-channel.ts
View file

@ -779,10 +779,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
displayName: this.getDisplayName(),
url: actor.url,
host: actor.host,
avatars: actor.avatars,
// TODO: remove, deprecated in 4.2
avatar: actor.avatar
avatars: actor.avatars
}
}
@ -821,10 +818,7 @@ export class VideoChannelModel extends Model<Partial<AttributesOnly<VideoChannel
viewsPerDay,
totalViews,
avatars: actor.avatars,
// TODO: remove, deprecated in 4.2
avatar: actor.avatar
avatars: actor.avatars
}
if (this.Account) videoChannel.ownerAccount = this.Account.toFormattedJSON()

12
server/tests/api/search/search-index.ts
View file

@ -107,15 +107,11 @@ describe('Test index search', function () {
expect(video.account.host).to.equal('framatube.org')
expect(video.account.name).to.equal('framasoft')
expect(video.account.url).to.equal('https://framatube.org/accounts/framasoft')
// TODO: remove, deprecated in 4.2
expect(video.account.avatar).to.exist
expect(video.account.avatars.length).to.equal(2, 'Account should have one avatar image')
expect(video.channel.host).to.equal('framatube.org')
expect(video.channel.name).to.equal('joinpeertube')
expect(video.channel.url).to.equal('https://framatube.org/video-channels/joinpeertube')
// TODO: remove, deprecated in 4.2
expect(video.channel.avatar).to.exist
expect(video.channel.avatars.length).to.equal(2, 'Channel should have one avatar image')
}
@ -293,16 +289,12 @@ describe('Test index search', function () {
const videoChannel = body.data[0]
expect(videoChannel.url).to.equal('https://framatube.org/video-channels/bf54d359-cfad-4935-9d45-9d6be93f63e8')
expect(videoChannel.host).to.equal('framatube.org')
// TODO: remove, deprecated in 4.2
expect(videoChannel.avatar).to.exist
expect(videoChannel.avatars.length).to.equal(2, 'Channel should have two avatar images')
expect(videoChannel.displayName).to.exist
expect(videoChannel.ownerAccount.url).to.equal('https://framatube.org/accounts/framasoft')
expect(videoChannel.ownerAccount.name).to.equal('framasoft')
expect(videoChannel.ownerAccount.host).to.equal('framatube.org')
// TODO: remove, deprecated in 4.2
expect(videoChannel.ownerAccount.avatar).to.exist
expect(videoChannel.ownerAccount.avatars.length).to.equal(2, 'Account should have two avatar images')
}
@ -369,15 +361,11 @@ describe('Test index search', function () {
expect(videoPlaylist.ownerAccount.url).to.equal('https://peertube2.cpy.re/accounts/chocobozzz')
expect(videoPlaylist.ownerAccount.name).to.equal('chocobozzz')
expect(videoPlaylist.ownerAccount.host).to.equal('peertube2.cpy.re')
// TODO: remove, deprecated in 4.2
expect(videoPlaylist.ownerAccount.avatar).to.exist
expect(videoPlaylist.ownerAccount.avatars.length).to.equal(2, 'Account should have two avatar images')
expect(videoPlaylist.videoChannel.url).to.equal('https://peertube2.cpy.re/video-channels/chocobozzz_channel')
expect(videoPlaylist.videoChannel.name).to.equal('chocobozzz_channel')
expect(videoPlaylist.videoChannel.host).to.equal('peertube2.cpy.re')
// TODO: remove, deprecated in 4.2
expect(videoPlaylist.videoChannel.avatar).to.exist
expect(videoPlaylist.videoChannel.avatars.length).to.equal(2, 'Channel should have two avatar images')
}

3
shared/models/activitypub/activitypub-actor.ts
View file

@ -28,10 +28,7 @@ export interface ActivityPubActor {
}
image?: ActivityIconObject | ActivityIconObject[]
icon?: ActivityIconObject | ActivityIconObject[]
// TODO: migrate to `icon`, introduced in 4.2
icons?: ActivityIconObject[]
published?: string
}

3
shared/models/actors/account.model.ts
View file

@ -19,7 +19,4 @@ export interface AccountSummary {
host: string
avatars: ActorImage[]
// TODO: remove, deprecated in 4.2
avatar: ActorImage
}

3
shared/models/actors/actor.model.ts
View file

@ -10,7 +10,4 @@ export interface Actor {
createdAt: Date | string
avatars: ActorImage[]
// TODO: remove, deprecated in 4.2
avatar: ActorImage
}

6
shared/models/videos/channel/video-channel.model.ts
View file

@ -21,9 +21,6 @@ export interface VideoChannel extends Actor {
totalViews?: number
banners: ActorImage[]
// TODO: remove, deprecated in 4.2
banner: ActorImage
}
export interface VideoChannelSummary {
@ -34,7 +31,4 @@ export interface VideoChannelSummary {
host: string
avatars: ActorImage[]
// TODO: remove, deprecated in 4.2
avatar: ActorImage
}