From 2c16f5ad5efc11ab47151107d74f2db22af6ff90 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 21 Jun 2023 10:44:40 +0200
Subject: [PATCH] Fix undefined actor image

---
 server/controllers/feeds/shared/common-feed-utils.ts | 8 ++++----
 server/controllers/feeds/video-podcast-feeds.ts      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/controllers/feeds/shared/common-feed-utils.ts b/server/controllers/feeds/shared/common-feed-utils.ts
index 8f35a8b35..9e2f8adbb 100644
--- a/server/controllers/feeds/shared/common-feed-utils.ts
+++ b/server/controllers/feeds/shared/common-feed-utils.ts
@@ -1,10 +1,10 @@
 import express from 'express'
-import { maxBy } from 'lodash'
 import { Feed } from '@peertube/feed'
 import { CustomTag, CustomXMLNS, Person } from '@peertube/feed/lib/typings'
 import { mdToOneLinePlainText } from '@server/helpers/markdown'
 import { CONFIG } from '@server/initializers/config'
 import { WEBSERVER } from '@server/initializers/constants'
+import { getBiggestActorImage } from '@server/lib/actor-image'
 import { UserModel } from '@server/models/user/user'
 import { MAccountDefault, MChannelBannerAccountDefault, MUser, MVideoFullLight } from '@server/types/models'
 import { pick } from '@shared/core-utils'
@@ -105,12 +105,12 @@ export async function buildFeedMetadata (options: {
     accountLink = videoChannel.Account.getClientUrl()
 
     if (videoChannel.Actor.hasImage(ActorImageType.AVATAR)) {
-      const videoChannelAvatar = maxBy(videoChannel.Actor.Avatars, 'width')
+      const videoChannelAvatar = getBiggestActorImage(videoChannel.Actor.Avatars)
       imageUrl = WEBSERVER.URL + videoChannelAvatar.getStaticPath()
     }
 
     if (videoChannel.Account.Actor.hasImage(ActorImageType.AVATAR)) {
-      const accountAvatar = maxBy(videoChannel.Account.Actor.Avatars, 'width')
+      const accountAvatar = getBiggestActorImage(videoChannel.Account.Actor.Avatars)
       accountImageUrl = WEBSERVER.URL + accountAvatar.getStaticPath()
     }
 
@@ -123,7 +123,7 @@ export async function buildFeedMetadata (options: {
     accountLink = link
 
     if (account.Actor.hasImage(ActorImageType.AVATAR)) {
-      const accountAvatar = maxBy(account.Actor.Avatars, 'width')
+      const accountAvatar = getBiggestActorImage(account.Actor.Avatars)
       imageUrl = WEBSERVER.URL + accountAvatar?.getStaticPath()
       accountImageUrl = imageUrl
     }
diff --git a/server/controllers/feeds/video-podcast-feeds.ts b/server/controllers/feeds/video-podcast-feeds.ts
index f63f6ee63..5afb51594 100644
--- a/server/controllers/feeds/video-podcast-feeds.ts
+++ b/server/controllers/feeds/video-podcast-feeds.ts
@@ -1,8 +1,8 @@
 import express from 'express'
-import { maxBy } from 'lodash'
 import { extname } from 'path'
 import { Feed } from '@peertube/feed'
 import { CustomTag, CustomXMLNS, LiveItemStatus } from '@peertube/feed/lib/typings'
+import { getBiggestActorImage } from '@server/lib/actor-image'
 import { InternalEventEmitter } from '@server/lib/internal-event-emitter'
 import { Hooks } from '@server/lib/plugins/hooks'
 import { buildPodcastGroupsCache, cacheRouteFactory, videoFeedsPodcastSetCacheKey } from '@server/middlewares'
@@ -150,7 +150,7 @@ async function generatePodcastItem (options: {
   let personImage: string
 
   if (account.Actor.hasImage(ActorImageType.AVATAR)) {
-    const avatar = maxBy(account.Actor.Avatars, 'width')
+    const avatar = getBiggestActorImage(account.Actor.Avatars, 'width')
     personImage = WEBSERVER.URL + avatar.getStaticPath()
   }