Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 07:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue 11853/11867: Fix reshare of public posts

Browse source
This commit is contained in:
Michael 2022-08-27 21:22:49 +00:00
parent 1e4e7d5b58
commit 2173fb38e0
5 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Model/FContact.php
View file

@ -24,6 +24,7 @@ namespace Friendica\Model;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Network\Probe;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
@ -125,6 +126,7 @@ class FContact
$condition = ['url' => $arr['url'], 'network' => $arr['network']];
$fields = DI::dbaDefinition()->truncateFieldsForTable('fcontact', $fields);
DBA::update('fcontact', $fields, $condition, true);
}

13
src/Model/Item.php
View file

@ -33,7 +33,6 @@ use Friendica\Model\Tag;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Post;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
@ -2545,7 +2544,7 @@ class Item
}
// Retrieve the current logged in user's public contact
$author_id = Contact::getIdForURL($owner['url']);
$author_id = Contact::getPublicIdByUserId($uid);
if (empty($author_id)) {
Logger::info('Empty public contact');
return false;
@ -2652,7 +2651,7 @@ class Item
$new_item = [
'guid' => System::createUUID(),
'uri' => self::newURI(),
'uid' => $item['uid'],
'uid' => $uid,
'contact-id' => $owner['id'],
'wall' => $item['wall'],
'origin' => 1,
@ -2680,17 +2679,13 @@ class Item
$new_item['diaspora_signed_text'] = json_encode($signed);
}
$new_item_id = self::insert($new_item);
self::insert($new_item, true);
// If the parent item isn't visible then set it to visible
// @todo Check if this is still needed
if (!$item['visible']) {
self::update(['visible' => true], ['id' => $item['id']]);
}
$new_item['id'] = $new_item_id;
Hook::callAll('post_local_end', $new_item);
return true;
}