Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 09:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

We now use a central function to fetch the importer (#5636)

Browse source
This commit is contained in:
Michael Vogel 2018-08-19 15:37:56 +02:00 • committed by Hypolite Petovan
parent 7f3fb34c24
commit c1da44b7dc
4 changed files with 88 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Worker/Delivery.php
View file

@ -263,29 +263,12 @@ class Delivery extends BaseObject
}
}
// We now have some contact, so we fetch it
$target_importer = DBA::fetchFirst("SELECT *, `name` as `senderName`
FROM `contact`
WHERE NOT `blocked` AND `id` = ? LIMIT 1",
$cid);
// This should never fail
if (!DBA::isResult($target_importer)) {
$target_importer = DFRN::getImporter($cid, $target_uid);
if (empty($target_importer)) {
// This should never happen
return;
}
$user = DBA::selectFirst('user', [], ['uid' => $target_uid]);
// This should also never fail
if (!DBA::isResult($user)) {
logger('No user found for uid ' . $target_uid);
return;
}
$target_importer = array_merge($target_importer, $user);
// Set the user id. This is important if this is a public contact
$target_importer['importer_uid'] = $target_uid;
DFRN::import($atom, $target_importer);
return;
}