From 462f76352ef017a30c76a397a7e15c621d1c2e3b Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Wed, 15 Sep 2021 00:31:33 +0200
Subject: [PATCH] Add feedback :-)

---
 src/Database/Database.php |  4 ++--
 src/Model/Contact.php     |  2 +-
 src/Model/Item.php        |  6 +++---
 src/Module/Contact.php    | 14 ++++++++++----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/Database/Database.php b/src/Database/Database.php
index c11e04936b..e4a4a0f571 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -1461,8 +1461,8 @@ class Database
 
 		$row = $this->fetchFirst($sql, $condition);
 
-		if (empty($row['count'])) {
-			$this->logger->notice('Invalid count.', ['table' => $table, 'expression' => $expression, 'condition' => $condition_string]);
+		if (!isset($row['count'])) {
+			$this->logger->notice('Invalid count.', ['table' => $table, 'expression' => $expression, 'condition' => $condition_string, 'callstack' => System::callstack()]);
 			return 0;
 		} else {
 			// Ensure to always return either a "null" or a numeric value
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 51d162ae22..7f72b38d61 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -2759,7 +2759,7 @@ class Contact
 
 	public static function removeFollower(array $contact)
 	{
-		if (!empty($contact['rel']) && (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING))) {
+		if (in_array($contact['rel'] ?? [], [self::FRIEND, self::SHARING])) {
 			DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
 		} elseif (!empty($contact['id'])) {
 			self::remove($contact['id']);
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 992c8d4710..83cbcbb01a 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2259,7 +2259,7 @@ class Item
 		$condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY";
 		$condition[] = $days;
 
-		$items = Post::select(['resource-id', 'starred', 'id', 'post-type', 'uid', 'uri-id'], $condition);
+		$items = Post::select(['resource-id', 'starred', 'id', 'post-type', 'uid', 'uri-id', 'post-type'], $condition);
 
 		if (!DBA::isResult($items)) {
 			return;
@@ -2292,9 +2292,9 @@ class Item
 				continue;
 			} elseif (!$expire_starred && intval($item['starred'])) {
 				continue;
-			} elseif (!$expire_notes && (($item['post-type'] ?? null) == self::PT_PERSONAL_NOTE)) {
+			} elseif (!$expire_notes && ($item['post-type'] == self::PT_PERSONAL_NOTE)) {
 				continue;
-			} elseif (!$expire_items && (($item['post-type'] ?? null) != self::PT_PERSONAL_NOTE)) {
+			} elseif (!$expire_items && ($item['post-type'] != self::PT_PERSONAL_NOTE)) {
 				continue;
 			}
 
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 0260e90f1f..7d323c7a3e 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -290,11 +290,17 @@ class Contact extends BaseModule
 				$contact_id = $data['user'];
 			}
 
-			$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'deleted' => false]);
+			if (empty($data)) {
+				$contact = DBA::selectFirst('contact', [], [
+					'id'      => $contact_id,
+					'uid'     => [0, local_user()],
+					'deleted' => false
+				]);
 
-			// Don't display contacts that are about to be deleted
-			if (DBA::isResult($contact) && !empty($contact['network']) && $contact['network'] == Protocol::PHANTOM) {
-				$contact = false;
+				// Don't display contacts that are about to be deleted
+				if (DBA::isResult($contact) && !empty($contact['network']) && $contact['network'] == Protocol::PHANTOM) {
+					$contact = false;
+				}
 			}
 		}