From 2a0ca80630e5f649d89addf21225aa8487e53899 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 22 Aug 2022 07:54:48 +0000
Subject: [PATCH] The contact-id of a wall posting is always the owner contact

---
 src/Model/Item.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 5ab98f2069..c00bd06de4 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -451,6 +451,12 @@ class Item
 		if ($item['uid'] == 0) {
 			return $item['author-id'];
 		}
+
+		if ($item['origin']) {
+			$owner = User::getOwnerDataById($item['uid']);
+			return $owner['id'];
+		}
+
 		if (!empty($item['causer-id']) && Contact::isSharing($item['causer-id'], $item['uid'], true)) {
 			$cdata = Contact::getPublicAndUserContactID($item['causer-id'], $item['uid']);
 			if (!empty($cdata['user'])) {
@@ -930,9 +936,7 @@ class Item
 		Contact::checkAvatarCache($item['author-id']);
 		Contact::checkAvatarCache($item['owner-id']);
 
-		if (!Contact::isSharing($item['contact-id'], $item['uid'])) {
-			$item['contact-id'] = self::contactId($item);
-		}
+		$item['contact-id'] = self::contactId($item);
 
 		if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) &&
 			empty($item['origin']) && self::isTooOld($item)) {