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

Cleanup actor image without width

pull/5271/head
Chocobozzz 2022-09-16 14:49:08 +02:00
parent 9a3a23a834
commit e0bfb72ce0
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/lib/activitypub/actors/image.ts
View File

@ -13,20 +13,31 @@ type ImageInfo = {
} }
async function updateActorImages (actor: MActorImages, type: ActorImageType, imagesInfo: ImageInfo[], t: Transaction) { async function updateActorImages (actor: MActorImages, type: ActorImageType, imagesInfo: ImageInfo[], t: Transaction) {
const avatarsOrBanners = type === ActorImageType.AVATAR const getAvatarsOrBanners = () => {
? actor.Avatars const result = type === ActorImageType.AVATAR
: actor.Banners ? actor.Avatars
: actor.Banners
return result || []
}
if (imagesInfo.length === 0) { if (imagesInfo.length === 0) {
await deleteActorImages(actor, type, t) await deleteActorImages(actor, type, t)
} }
// Cleanup old images that did not have a width
for (const oldImageModel of getAvatarsOrBanners()) {
if (oldImageModel.width) continue
await safeDeleteActorImage(actor, oldImageModel, type, t)
}
for (const imageInfo of imagesInfo) { for (const imageInfo of imagesInfo) {
const oldImageModel = (avatarsOrBanners || []).find(i => i.width === imageInfo.width) const oldImageModel = getAvatarsOrBanners().find(i => imageInfo.width && i.width === imageInfo.width)
if (oldImageModel) { if (oldImageModel) {
// Don't update the avatar if the file URL did not change // Don't update the avatar if the file URL did not change
if (imageInfo?.fileUrl && oldImageModel.fileUrl === imageInfo.fileUrl) { if (imageInfo.fileUrl && oldImageModel.fileUrl === imageInfo.fileUrl) {
continue continue
} }