bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Added logging, fixed indentation, call it from DFRN as well

Browse source
This commit is contained in:
Michael 2019-12-05 05:28:28 +00:00
parent abf841ff79
commit e435102089
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Model/Item.php
View file

@ -3778,10 +3778,10 @@ class Item extends BaseObject
$attribute_string = $matches[2]; $attribute_string = $matches[2];
$attributes = ['comment' => trim($matches[1]), 'shared' => trim($matches[3])]; $attributes = ['comment' => trim($matches[1]), 'shared' => trim($matches[3])];
foreach(['author', 'profile', 'avatar', 'guid', 'posted', 'link'] as $field) { foreach (['author', 'profile', 'avatar', 'guid', 'posted', 'link'] as $field) {
if (preg_match("/$field=(['\"])(.+?)\\1/ism", $attribute_string, $matches)) { if (preg_match("/$field=(['\"])(.+?)\\1/ism", $attribute_string, $matches)) {
$attributes[$field] = trim(html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8')); $attributes[$field] = trim(html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8'));
} }
} }
return $attributes; return $attributes;
} }
@ -3813,6 +3813,7 @@ class Item extends BaseObject
// Otherwhise try to find (and possibly fetch) the item via the link. This should work for Diaspora and ActivityPub posts // Otherwhise try to find (and possibly fetch) the item via the link. This should work for Diaspora and ActivityPub posts
$id = self::fetchByLink($shared['link'], $uid); $id = self::fetchByLink($shared['link'], $uid);
if (empty($id)) { if (empty($id)) {
Logger::info('Original item not found', ['url' => $shared['link'], 'callstack' => System::callstack()]);
return $item; return $item;
} }
@ -3820,6 +3821,9 @@ class Item extends BaseObject
if (!DBA::isResult($shared_item)) { if (!DBA::isResult($shared_item)) {
return $item; return $item;
} }
Logger::info('Got shared data from url', ['url' => $shared['link'], 'callstack' => System::callstack()]);
} else {
Logger::info('Got shared data from guid', ['guid' => $shared['guid'], 'callstack' => System::callstack()]);
} }
if (!empty($shared_item['title'])) { if (!empty($shared_item['title'])) {

3
src/Protocol/DFRN.php
View file

@ -2537,6 +2537,9 @@ class DFRN
} }
} }
// Ensure to have the correct share data
$item = Item::addShareDataFromOriginal($item);
if ($entrytype == DFRN::REPLY_RC) { if ($entrytype == DFRN::REPLY_RC) {
$item["wall"] = 1; $item["wall"] = 1;
} elseif ($entrytype == DFRN::TOP_LEVEL) { } elseif ($entrytype == DFRN::TOP_LEVEL) {