strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Posts from Diaspora are always accepted for the global contact

Browse source
This commit is contained in:
Michael Vogel 2015-08-09 14:28:59 +02:00
parent 8974c147e0
commit 65921bf2e7
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/diaspora.php
View file

@ -34,8 +34,13 @@ function diaspora_dispatch_public($msg) {
diaspora_dispatch($rr,$msg); diaspora_dispatch($rr,$msg);
} }
} }
else else {
logger('diaspora_public: no subscribers'); logger('diaspora_public: no subscribers '.print_r($msg, true));
// Use a dummy importer
$importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
diaspora_dispatch($importer,$msg);
}
} }
@ -782,6 +787,11 @@ function diaspora_post_allow($importer,$contact) {
if($contact['rel'] == CONTACT_IS_FOLLOWER) if($contact['rel'] == CONTACT_IS_FOLLOWER)
if($importer['page-flags'] == PAGE_COMMUNITY) if($importer['page-flags'] == PAGE_COMMUNITY)
return true; return true;
// Messages for the global users are always accepted
if ($importer['uid'] == 0)
return true;
return false; return false;
} }
@ -1605,7 +1615,7 @@ function diaspora_conversation($importer,$xml,$msg) {
$created_at = datetime_convert('UTC','UTC',notags(unxmlify($xml->created_at))); $created_at = datetime_convert('UTC','UTC',notags(unxmlify($xml->created_at)));
$parent_uri = $diaspora_handle . ':' . $guid; $parent_uri = $diaspora_handle . ':' . $guid;
$messages = $xml->message; $messages = $xml->message;
if(! count($messages)) { if(! count($messages)) {
@ -1619,7 +1629,7 @@ function diaspora_conversation($importer,$xml,$msg) {
return; return;
} }
if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) {
logger('diaspora_conversation: Ignoring this author.'); logger('diaspora_conversation: Ignoring this author.');
return 202; return 202;
} }
@ -1776,14 +1786,14 @@ function diaspora_message($importer,$xml,$msg) {
$msg_conversation_guid = notags(unxmlify($xml->conversation_guid)); $msg_conversation_guid = notags(unxmlify($xml->conversation_guid));
$parent_uri = $diaspora_handle . ':' . $msg_parent_guid; $parent_uri = $diaspora_handle . ':' . $msg_parent_guid;
$contact = diaspora_get_contact_by_handle($importer['uid'],$msg_diaspora_handle); $contact = diaspora_get_contact_by_handle($importer['uid'],$msg_diaspora_handle);
if(! $contact) { if(! $contact) {
logger('diaspora_message: cannot find contact: ' . $msg_diaspora_handle); logger('diaspora_message: cannot find contact: ' . $msg_diaspora_handle);
return; return;
} }
if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) {
logger('diaspora_message: Ignoring this author.'); logger('diaspora_message: Ignoring this author.');
return 202; return 202;
} }