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

Merge remote-tracking branch 'upstream/develop' into logging

Browse source
This commit is contained in:
Michael 2021-10-22 06:06:39 +00:00
commit a497bd3a3d
36 changed files with 1144 additions and 754 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Protocol/DFRN.php
View file

@ -1352,7 +1352,7 @@ class DFRN
}
// Quit if we already have an introduction for this person
if (DBA::exists('intro', ['uid' => $uid, 'suggest-cid' => $cid])) {
if (DI::intro()->suggestionExistsForUser($cid, $uid)) {
return false;
}
@ -1366,10 +1366,13 @@ class DFRN
$suggest['title'] = '';
$suggest['body'] = $note;
$hash = Strings::getRandomHex();
$fields = ['uid' => $suggest['uid'], 'suggest-cid' => $cid, 'contact-id' => $suggest['cid'],
'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
DBA::insert('intro', $fields);
DI::intro()->save(DI::introFactory()->createNew(
$suggest['uid'],
$suggest['cid'],
$suggest['body'],
null,
$cid
));
DI::notify()->createFromArray([
'type' => Notification\Type::SUGGEST,