TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong attribution in unseen like notifications

Browse Source
This commit is contained in:
Mario Vavti
2022-08-04 12:13:00 +02:00
parent 2e9211cf41
commit 0679cb8e00
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/conversation.php
View File

@@ -1,6 +1,7 @@
<?php /** @file */ <?php /** @file */
use Zotlabs\Lib\Apps; use Zotlabs\Lib\Apps;
use Zotlabs\Lib\Activity;
require_once('include/items.php'); require_once('include/items.php');
@@ -90,7 +91,6 @@ function item_redir_and_replace_images($body, $images, $cid) {
function localize_item(&$item){ function localize_item(&$item){
if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){ if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
if(! $item['obj']) if(! $item['obj'])
return; return;
@@ -106,6 +106,8 @@ function localize_item(&$item){
$author_link = get_rel_link($obj['author']['link'],'alternate'); $author_link = get_rel_link($obj['author']['link'],'alternate');
elseif(is_array($obj['actor']) && $obj['actor']['url']) elseif(is_array($obj['actor']) && $obj['actor']['url'])
$author_link = ((is_array($obj['actor']['url'])) ? $obj['actor']['url'][0]['href'] : $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 else
$author_link = ''; $author_link = '';
@@ -114,6 +116,13 @@ function localize_item(&$item){
if(!$author_name) if(!$author_name)
$author_name = ((is_array($obj['actor']) && $obj['actor']['name']) ? $obj['actor']['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'])) if(is_array($obj['link']))
$item_url = get_rel_link($obj['link'],'alternate'); $item_url = get_rel_link($obj['link'],'alternate');