From 084a2a705761f4a21d6e720c267600b92750b700 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 27 May 2024 04:45:17 +0000
Subject: [PATCH 1/3] "zrl" functionility is moved

---
 forumdirectory/forumdirectory.php | 5 ++---
 groupdirectory/groupdirectory.php | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 114da1da..9c99d63f 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -8,7 +8,6 @@
  * Note: Please use Group Directory instead
  */
 
-use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
@@ -16,8 +15,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Security\OpenWebAuth;
 
 global $forumdirectory_search;
 
@@ -82,7 +81,7 @@ function forumdirectory_content()
 	$gdirpath = '';
 	$dirurl = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = Profile::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::zrl($dirurl, true);
 	}
 
 	$sql_extra = '';
diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php
index 6d562cdc..df4bbb33 100644
--- a/groupdirectory/groupdirectory.php
+++ b/groupdirectory/groupdirectory.php
@@ -13,8 +13,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Security\OpenWebAuth;
 
 global $groupdirectory_search;
 
@@ -79,7 +79,7 @@ function groupdirectory_content()
 	$gdirpath = '';
 	$dirurl   = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = Profile::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::zrl($dirurl, true);
 	}
 
 	$sql_extra = '';

From 39247ca28f84ec25b49e41482b7e5ea91bdf8b21 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 29 May 2024 06:07:48 +0000
Subject: [PATCH 2/3] Function renamed

---
 forumdirectory/forumdirectory.php | 2 +-
 groupdirectory/groupdirectory.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 9c99d63f..9a155a00 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -81,7 +81,7 @@ function forumdirectory_content()
 	$gdirpath = '';
 	$dirurl = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = OpenWebAuth::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
 	}
 
 	$sql_extra = '';
diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php
index df4bbb33..615d7024 100644
--- a/groupdirectory/groupdirectory.php
+++ b/groupdirectory/groupdirectory.php
@@ -79,7 +79,7 @@ function groupdirectory_content()
 	$gdirpath = '';
 	$dirurl   = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = OpenWebAuth::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
 	}
 
 	$sql_extra = '';

From 21d73bc83a26e8c666e9dbc8c442e07a32a4aac3 Mon Sep 17 00:00:00 2001
From: Matthew Exon <mat.github@exon.name>
Date: Thu, 20 Jun 2024 20:34:14 +0100
Subject: [PATCH 3/3] handle failed image urls better

---
 mailstream/mailstream.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index b513cf36..4056aac6 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -220,6 +220,11 @@ function mailstream_do_images(array &$item, array &$attachments)
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
 		try {
 			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+			if (!$curlResult->isSuccess()) {
+				Logger::debug('mailstream: fetch image url failed', [
+					'url' => $url, 'item_id' => $item['id'], 'return_code' => $curlResult->getReturnCode()]);
+				continue;
+			}
 		} catch (InvalidArgumentException $e) {
 			Logger::error('mailstream_do_images exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;