From 7fd202dbc93f9e0914067337cf3ea4163f066399 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 24 Oct 2021 11:33:35 +0000
Subject: [PATCH] Handle invalid avatar pictures

---
 src/Module/Photo.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index b43add0ebc..0b03f4a799 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -36,6 +36,7 @@ use Friendica\Network\HTTPException;
 use Friendica\Object\Image;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
+use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy;
 
 /**
@@ -284,14 +285,26 @@ class Photo extends BaseModule
 					$url = $contact['avatar'];
 				} elseif (!empty($contact['avatar'])) {
 					$url = $contact['avatar'];
-				} elseif ($customsize <= Proxy::PIXEL_MICRO) {
-					$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
-				} elseif ($customsize <= Proxy::PIXEL_THUMB) {
-					$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
-				} else {
-					$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
 				}
-				return MPhoto::createPhotoForExternalResource($url);
+				$mimetext = '';
+				if (!empty($url)) {
+					$mime = ParseUrl::getContentType($url);
+					if (empty($mime) || ($mime[0] != 'image')) {
+						$url = '';
+					} else {
+						$mimetext = $mime[0] . '/' . $mime[1];
+					}
+				}
+				if (empty($url)) {
+					if ($customsize <= Proxy::PIXEL_MICRO) {
+						$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
+					} elseif ($customsize <= Proxy::PIXEL_THUMB) {
+						$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
+					} else {
+						$url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
+					}
+				}
+				return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);
 			case "header":
 				$contact = Contact::getById($id, ['uid', 'url', 'header']);
 				if (empty($contact)) {