friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Sending contact suggestions does work again

This commit is contained in:
Michael 2019-05-19 17:59:37 +00:00
parent 35c7a61620
commit a6cf036db2
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mod/fsuggest.php
View File

@ -26,26 +26,29 @@ function fsuggest_post(App $a)
return;
}
$contact = DBA::selectFirst('contact', ['name', 'url', 'request', 'photo'], ['id' => $contact_id, 'uid' => local_user()]);
if (!DBA::isResult($contact)) {
// We do query the "uid" as well to ensure that it is our contact
if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
notice(L10n::t('Contact not found.') . EOL);
return;
}
$suggest_contact_id = intval($_POST['suggest']);
if (empty($suggest_contact_id)) {
return;
}
// We do query the "uid" as well to ensure that it is our contact
$contact = DBA::selectFirst('contact', ['name', 'url', 'request', 'avatar'], ['id' => $suggest_contact_id, 'uid' => local_user()]);
if (!DBA::isResult($contact)) {
notice(L10n::t('Suggested contact not found.') . EOL);
return;
}
$note = Strings::escapeHtml(trim(defaults($_POST, 'note', '')));
$new_contact = intval($_POST['suggest']);
if (empty($new_contact)) {
return;
}
if (!DBA::exists('contact', ['id' => $new_contact])) {
return;
}
$fields = ['uid' => local_user(),'cid' => $contact_id, 'name' => $contact['name'],
'url' => $contact['url'], 'request' => $contact['request'],
'photo' => $contact['photo'], 'note' => $note, 'created' => DateTimeFormat::utcNow()];
'photo' => $contact['avatar'], 'note' => $note, 'created' => DateTimeFormat::utcNow()];
DBA::insert('fsuggest', $fields);
Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', DBA::lastInsertId());

2
src/Worker/Delivery.php
View File

@ -319,7 +319,7 @@ class Delivery extends BaseObject
$deliver_status = DFRN::deliver($owner, $contact, $atom, false, true);
}
Logger::log('Delivery to ' . $contact['url'] . ' with guid ' . defaults($target_item, 'guid', $target_item['id']) . ' returns ' . $deliver_status);
Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => defaults($target_item, 'guid', $target_item['id']), 'return' => $deliver_status]);
if ($deliver_status < 0) {
Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);