From 0679cb8e00daee2f3d863b5ec2ccb22163f2b955 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 4 Aug 2022 12:13:00 +0200
Subject: fix wrong attribution in unseen like notifications

---
 include/conversation.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index d509342d4..685e6b15b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,6 +1,7 @@
 <?php /** @file */
 
 use Zotlabs\Lib\Apps;
+use Zotlabs\Lib\Activity;
 
 require_once('include/items.php');
 
@@ -90,7 +91,6 @@ function item_redir_and_replace_images($body, $images, $cid) {
 function localize_item(&$item){
 
 	if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
-
 		if(! $item['obj'])
 			return;
 
@@ -106,6 +106,8 @@ function localize_item(&$item){
 			$author_link = get_rel_link($obj['author']['link'],'alternate');
 		elseif(is_array($obj['actor']) && $obj['actor']['url'])
 			$author_link = ((is_array($obj['actor']['url'])) ? $obj['actor']['url'][0]['href'] : $obj['actor']['url']);
+		elseif (is_string($obj['actor']))
+			$author_link = $obj['actor'];
 		else
 			$author_link = '';
 
@@ -114,6 +116,13 @@ function localize_item(&$item){
 		if(!$author_name)
 			$author_name = ((is_array($obj['actor']) && $obj['actor']['name']) ? $obj['actor']['name'] : '');
 
+		if(!$author_name && is_string($obj['actor'])) {
+			$cached_actor = Activity::get_cached_actor($obj['actor']);
+			if (is_array($cached_actor)) {
+				$author_name = (($cached_actor['name']) ? $cached_actor['name'] : $cached_actor['preferredUsername']);
+			}
+		}
+
 		if(is_array($obj['link']))
 			$item_url = get_rel_link($obj['link'],'alternate');
 
-- 
cgit v1.2.3