harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

public scope delivery issues

Browse Source
This commit is contained in:
friendica
2014-08-06 21:16:24 -07:00
parent 86bccf35a2
commit 2cff122d6f
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/zot.php
View File

@@ -1200,6 +1200,12 @@ function zot_import($arr, $sender_url) {
continue;
}
// It's a specifically targetted post. If we were sent a public_scope hint (likely),
// get rid of it so that it doesn't get stored and cause trouble.
if(array_key_exists('message',$i) && array_key_exists('public_scope',$i['message']))
unset($i['message']['public_scope']);
$deliveries = $r;
// We found somebody on this site that's in the recipient list.
@@ -1207,9 +1213,11 @@ function zot_import($arr, $sender_url) {
}
else {
if(($i['message']) && (array_key_exists('flags',$i['message'])) && (in_array('private',$i['message']['flags']))) {
// This should not happen but until we can stop it...
logger('private message was delivered with no recipients.');
continue;
if(array_key_exists('public_scope',$i['message']) && $i['message']['public_scope'] === 'public') {
// This should not happen but until we can stop it...
logger('private message was delivered with no recipients.');
continue;
}
}
logger('public post');