clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7169 from annando/send-suggest 

Sending contact suggestions does work again
This commit is contained in:
Hypolite Petovan 2019-05-19 14:59:28 -04:00 committed by GitHub
parent 58d5c6610c a6cf036db2
commit 3ca64185a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
mod/fsuggest.php
View File

@ -22,54 +22,39 @@ function fsuggest_post(App $a)
} }
$contact_id = intval($a->argv[1]); $contact_id = intval($a->argv[1]);
if (empty($contact_id)) {
return;
}
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]); // We do query the "uid" as well to ensure that it is our contact
if (! DBA::isResult($contact)) { if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
notice(L10n::t('Contact not found.') . EOL); notice(L10n::t('Contact not found.') . EOL);
return; return;
} }
$new_contact = intval($_POST['suggest']); $suggest_contact_id = intval($_POST['suggest']);
if (empty($suggest_contact_id)) {
return;
}
$hash = Strings::getRandomHex(); // 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', ''))); $note = Strings::escapeHtml(trim(defaults($_POST, 'note', '')));
if ($new_contact) { $fields = ['uid' => local_user(),'cid' => $contact_id, 'name' => $contact['name'],
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", 'url' => $contact['url'], 'request' => $contact['request'],
intval($new_contact), 'photo' => $contact['avatar'], 'note' => $note, 'created' => DateTimeFormat::utcNow()];
intval(local_user()) DBA::insert('fsuggest', $fields);
);
if (DBA::isResult($r)) { Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', DBA::lastInsertId());
q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`)
VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
intval(local_user()),
intval($contact_id),
DBA::escape($contact['name']),
DBA::escape($contact['url']),
DBA::escape($contact['request']),
DBA::escape($contact['photo']),
DBA::escape($hash),
DBA::escape(DateTimeFormat::utcNow())
);
$r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1",
DBA::escape($hash),
intval(local_user())
);
if (DBA::isResult($r)) {
$fsuggest_id = $contact['id'];
q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
DBA::escape($note),
intval($fsuggest_id),
intval(local_user())
);
Worker::add(PRIORITY_HIGH, 'Notifier', 'suggest', $fsuggest_id);
}
info(L10n::t('Friend suggestion sent.') . EOL); info(L10n::t('Friend suggestion sent.') . EOL);
} }
}
}
function fsuggest_content(App $a) function fsuggest_content(App $a)
{ {

2
src/Worker/Delivery.php
View File

@ -319,7 +319,7 @@ class Delivery extends BaseObject
$deliver_status = DFRN::deliver($owner, $contact, $atom, false, true); $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) { if ($deliver_status < 0) {
Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]); Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);