Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-03 03:04:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

New "fcontact" model class

Browse source
This commit is contained in:
Michael 2020-08-06 10:27:06 +00:00
parent 307af4a4fd
commit d4f7bfa676
4 changed files with 152 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Worker/Delivery.php
View file

@ -33,6 +33,7 @@ use Friendica\Protocol\Activity;
use Friendica\Util\Strings;
use Friendica\Util\Network;
use Friendica\Core\Worker;
use Friendica\Model\FContact;
class Delivery
{
@ -267,7 +268,7 @@ class Delivery
private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
{
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
if (Diaspora::isReshare($target_item['body']) && !empty(Diaspora::personByHandle($contact['addr'], false))) {
if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByUrl($contact['addr'], false))) {
Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;