From 818a7fb451a2f2604899d97859b996999a4662d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 9 Jun 2023 22:19:48 +0200
Subject: [PATCH] Fixed some stuff from PR #13208 feedback: - HTTPException is
 already imported - same-value-assignment not needed

---
 src/Network/Probe.php     |  2 --
 src/Protocol/Diaspora.php | 18 ++++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index bd98f3910..2b5cc3cff 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -341,12 +341,10 @@ class Probe
 	 * @param string  $uri     Address that should be probed
 	 * @param string  $network Test for this specific network
 	 * @param integer $uid     User ID for the probe (only used for mails)
-	 * @param boolean $cache   Use cached values?
 	 *
 	 * @return array uri data
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
-	 * @todo Choice: implement $cache parameter or remove documentation
 	 */
 	public static function uri(string $uri, string $network = '', int $uid = -1): array
 	{
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 4549ba643..abe56cb9a 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -42,7 +42,6 @@ use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException;
-use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Delivery;
 use Friendica\Util\Crypto;
@@ -268,7 +267,7 @@ class Diaspora
 				if ($no_exit) {
 					return false;
 				} else {
-					throw new BadRequestException();
+					throw new HTTPException\BadRequestException();
 				}
 			}
 		} else {
@@ -282,7 +281,7 @@ class Diaspora
 			if ($no_exit) {
 				return false;
 			} else {
-				throw new BadRequestException();
+				throw new HTTPException\BadRequestException();
 			}
 		}
 
@@ -308,7 +307,7 @@ class Diaspora
 			if ($no_exit) {
 				return false;
 			} else {
-				throw new BadRequestException();
+				throw new HTTPException\BadRequestException();
 			}
 		}
 
@@ -323,7 +322,7 @@ class Diaspora
 			if ($no_exit) {
 				return false;
 			} else {
-				throw new BadRequestException();
+				throw new HTTPException\BadRequestException();
 			}
 		}
 
@@ -333,7 +332,7 @@ class Diaspora
 			if ($no_exit) {
 				return false;
 			} else {
-				throw new BadRequestException();
+				throw new HTTPException\BadRequestException();
 			}
 		}
 
@@ -425,7 +424,7 @@ class Diaspora
 
 		if (!$base) {
 			Logger::notice('unable to locate salmon data in xml');
-			throw new BadRequestException();
+			throw new HTTPException\BadRequestException();
 		}
 
 
@@ -465,14 +464,14 @@ class Diaspora
 		$key = self::key($author);
 		if (!$key) {
 			Logger::notice('Could not retrieve author key.');
-			throw new BadRequestException();
+			throw new HTTPException\BadRequestException();
 		}
 
 		$verify = Crypto::rsaVerify($signed_data, $signature, $key);
 
 		if (!$verify) {
 			Logger::notice('Message did not verify. Discarding.');
-			throw new BadRequestException();
+			throw new HTTPException\BadRequestException();
 		}
 
 		Logger::info('Message verified.');
@@ -2686,7 +2685,6 @@ class Diaspora
 			$datarray['object-type'] = Activity\ObjectType::IMAGE;
 			$datarray['post-type'] = Item::PT_IMAGE;
 		} elseif ($data->poll) {
-			$datarray['object-type'] = Activity\ObjectType::NOTE;
 			$datarray['post-type'] = Item::PT_POLL;
 		}