keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4612 from annando/dfrn-batch-notify

Browse source 
Fix: Private transmission via Diaspora to Friendica servers
This commit is contained in:
Hypolite Petovan 2018-03-16 16:52:38 -04:00 committed by GitHub
commit e2f5350e61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Protocol/Diaspora.php
View file

@ -3217,13 +3217,14 @@ class Diaspora
} }
$logid = random_string(4); $logid = random_string(4);
$dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
// Fetch the fcontact entry when there is missing data // We always try to use the data from the fcontact table.
// Will possibly happen when data is transmitted to a DFRN contact // This is important for transmitting data to Friendica servers.
if (empty($dest_url) && !empty($contact['addr'])) { if (!empty($contact['addr'])) {
$fcontact = self::personByHandle($contact['addr']); $fcontact = self::personByHandle($contact['addr']);
$dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]); $dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
} else {
$dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
} }
if (!$dest_url) { if (!$dest_url) {