bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #7026 from annando/reshare-2

Browse source 
Improved reshare check
This commit is contained in:
Hypolite Petovan 2019-04-21 15:13:09 -04:00 committed by GitHub
parent 7c140a9865 d8ed5482aa
commit fad8ff84b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/conversation.php
View file

@ -800,20 +800,16 @@ function conversation_fetch_comments($thread_items) {
$lineno = 0;
$actor = [];
$created = '';
$knownauthor = false;
while ($row = Item::fetch($thread_items)) {
if (($row['verb'] == ACTIVITY2_ANNOUNCE) && !empty($row['contact-uid']) && ($row['created'] > $created) && ($row['thr-parent'] == $row['parent-uri'])) {
$actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
$created = $row['created'];
}
if ($row['gravity'] == GRAVITY_PARENT) {
$parentlines[] = $lineno;
// We could have several parents, so it has to be done this way.
if (!empty($row['contact-uid']) && in_array($row['network'], Protocol::NATIVE_SUPPORT)) {
$knownauthor = true;
}
if ((($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && !in_array($row['network'], [Protocol::DIASPORA])) &&
(empty($row['contact-uid']) || !in_array($row['network'], Protocol::NATIVE_SUPPORT))) {
$parentlines[] = $lineno;
}
$comments[] = $row;
@ -822,13 +818,11 @@ function conversation_fetch_comments($thread_items) {
DBA::close($thread_items);
if (!$knownauthor && !empty($actor)) {
if (!empty($actor)) {
foreach ($parentlines as $line) {
if (!in_array($comments[$line]['network'], [Protocol::DIASPORA]) && !$comments[$line]['origin']) {
$comments[$line]['owner-link'] = $actor['link'];
$comments[$line]['owner-avatar'] = $actor['avatar'];
$comments[$line]['owner-name'] = $actor['name'];
}
$comments[$line]['owner-link'] = $actor['link'];
$comments[$line]['owner-avatar'] = $actor['avatar'];
$comments[$line]['owner-name'] = $actor['name'];
}
}
return $comments;