import { minBy } from 'lodash'
import { join } from 'path'
-import { processImage } from '@server/helpers/image-utils'
+import { getImageSize, processImage } from '@server/helpers/image-utils'
import { CONFIG } from '@server/initializers/config'
import { ACTOR_IMAGES_SIZE } from '@server/initializers/constants'
import { updateActorImages } from '@server/lib/activitypub/actors'
for (const account of accounts) {
try {
+ await fillAvatarSizeIfNeeded(account)
await generateSmallerAvatarIfNeeded(account)
} catch (err) {
console.error(`Cannot process account avatar ${account.name}`, err)
console.log('Generation finished!')
}
+async function fillAvatarSizeIfNeeded (accountOrChannel: MAccountDefault | MChannelDefault) {
+ const avatars = accountOrChannel.Actor.Avatars
+
+ for (const avatar of avatars) {
+ if (avatar.width && avatar.height) continue
+
+ console.log('Filling size of avatars of %s.', accountOrChannel.name)
+
+ const { width, height } = await getImageSize(join(CONFIG.STORAGE.ACTOR_IMAGES, avatar.filename))
+ avatar.width = width
+ avatar.height = height
+
+ await avatar.save()
+ }
+}
+
async function generateSmallerAvatarIfNeeded (accountOrChannel: MAccountDefault | MChannelDefault) {
const avatars = accountOrChannel.Actor.Avatars
if (avatars.length !== 1) {
import { copy, readFile, remove, rename } from 'fs-extra'
-import Jimp, { read } from 'jimp'
+import Jimp, { read as jimpRead } from 'jimp'
import { join } from 'path'
import { getLowercaseExtension } from '@shared/core-utils'
import { buildUUID } from '@shared/extra-utils'
}
}
+async function getImageSize (path: string) {
+ const inputBuffer = await readFile(path)
+
+ const image = await jimpRead(inputBuffer)
+
+ return {
+ width: image.getWidth(),
+ height: image.getHeight()
+ }
+}
+
// ---------------------------------------------------------------------------
export {
generateImageFilename,
generateImageFromVideoFile,
- processImage
+
+ processImage,
+
+ getImageSize
}
// ---------------------------------------------------------------------------
const inputBuffer = await readFile(path)
try {
- sourceImage = await read(inputBuffer)
+ sourceImage = await jimpRead(inputBuffer)
} catch (err) {
logger.debug('Cannot read %s with jimp. Try to convert the image using ffmpeg first.', path, { err })
await convertWebPToJPG(path, newName)
await rename(newName, path)
- sourceImage = await read(path)
+ sourceImage = await jimpRead(path)
}
await remove(destination)