return;
}
+ // Use a dummy importer to import the data for the public copy
+ $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+ $result = diaspora_dispatch($importer,$msg);
+ logger("Dispatcher reported ".$result, LOGGER_DEBUG);
+
+ // Now distribute it to the followers
$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' )
AND `account_expired` = 0 AND `account_removed` = 0 ",
diaspora_dispatch($rr,$msg);
}
}
- else {
+ else
logger('diaspora_public: no subscribers for '.$msg["author"].' '.print_r($msg, true));
-
- // Use a dummy importer
- $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
- $result = diaspora_dispatch($importer,$msg);
-
- logger("Dispatcher reported ".$result, LOGGER_DEBUG);
- }
}
elseif($xmlbase->message) {
$ret = diaspora_message($importer,$xmlbase->message,$msg);
}
+ elseif($xmlbase->participation) {
+ $ret = diaspora_participation($importer,$xmlbase->participation);
+ }
else {
logger('diaspora_dispatch: unknown message type: ' . print_r($xmlbase,true));
}
// perhaps we were already sharing with this person. Now they're sharing with us.
// That makes us friends.
- if($contact['rel'] == CONTACT_IS_FOLLOWER && $importer['page-flags'] != PAGE_COMMUNITY) {
+ if($contact['rel'] == CONTACT_IS_FOLLOWER && in_array($importer['page-flags'], array(PAGE_FREELOVE))) {
q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
intval(CONTACT_IS_FRIEND),
intval($contact['id']),
return;
}
-function diaspora_post_allow($importer,$contact) {
+function diaspora_post_allow($importer,$contact, $is_comment = false) {
// perhaps we were already sharing with this person. Now they're sharing with us.
// That makes us friends.
// Normally this should have handled by getting a request - but this could get lost
- if($contact['rel'] == CONTACT_IS_FOLLOWER && $importer['page-flags'] != PAGE_COMMUNITY) {
+ if($contact['rel'] == CONTACT_IS_FOLLOWER && in_array($importer['page-flags'], array(PAGE_FREELOVE))) {
q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
intval(CONTACT_IS_FRIEND),
intval($contact['id']),
if($contact['rel'] == CONTACT_IS_SHARING || $contact['rel'] == CONTACT_IS_FRIEND)
return true;
if($contact['rel'] == CONTACT_IS_FOLLOWER)
- if($importer['page-flags'] == PAGE_COMMUNITY)
+ if(($importer['page-flags'] == PAGE_COMMUNITY) OR $is_comment)
return true;
// Messages for the global users are always accepted
return 203;
}
- if(! diaspora_post_allow($importer,$contact)) {
+ if(! diaspora_post_allow($importer,$contact, false)) {
logger('diaspora_post: Ignoring this author.');
return 202;
}
$message_id = $diaspora_handle . ':' . $guid;
- $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1",
+ $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer['uid']),
- dbesc($message_id),
dbesc($guid)
);
if(count($r)) {
$objecttype = $item["object-type"];
$message_id = $author.':'.$guid;
- $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1",
+ $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid),
- dbesc($message_id),
dbesc($guid)
);
if(count($r))
$person = find_diaspora_person_by_handle($author);
+ $contact_id = get_contact($person['url'], $uid);
+
+ $contacts = q("SELECT * FROM `contact` WHERE `id` = %d", intval($contact_id));
+ $importers = q("SELECT * FROM `user` WHERE `uid` = %d", intval($uid));
+
+ if ($contacts AND $importers)
+ if(!diaspora_post_allow($importers[0],$contacts[0], false)) {
+ logger('Ignoring author '.$person['url'].' for uid '.$uid);
+ return false;
+ } else
+ logger('Author '.$person['url'].' is allowed for uid '.$uid);
+
$datarray = array();
$datarray['uid'] = $uid;
- $datarray['contact-id'] = get_contact($person['url'], $uid);
+ $datarray['contact-id'] = $contact_id;
$datarray['wall'] = 0;
$datarray['network'] = NETWORK_DIASPORA;
$datarray['guid'] = $guid;
if(! $contact)
return;
- if(! diaspora_post_allow($importer,$contact)) {
+ if(! diaspora_post_allow($importer,$contact, false)) {
logger('diaspora_reshare: Ignoring this author: ' . $diaspora_handle . ' ' . print_r($xml,true));
return 202;
}
$message_id = $diaspora_handle . ':' . $guid;
- $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1",
+ $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer['uid']),
- dbesc($message_id),
dbesc($guid)
);
if(count($r)) {
if(! $contact)
return;
- if(! diaspora_post_allow($importer,$contact)) {
+ if(! diaspora_post_allow($importer,$contact, false)) {
logger('diaspora_asphoto: Ignoring this author.');
return 202;
}
$message_id = $diaspora_handle . ':' . $guid;
- $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1",
+ $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer['uid']),
- dbesc($message_id),
dbesc($guid)
);
if(count($r)) {
return;
}
- if(! diaspora_post_allow($importer,$contact)) {
+ if(! diaspora_post_allow($importer,$contact, true)) {
logger('diaspora_comment: Ignoring this author.');
return 202;
}
$msg_diaspora_handle = notags(unxmlify($xml->diaspora_handle));
$msg_conversation_guid = notags(unxmlify($xml->conversation_guid));
- $parent_uri = $diaspora_handle . ':' . $msg_parent_guid;
+ $parent_uri = $msg_diaspora_handle . ':' . $msg_parent_guid;
$contact = diaspora_get_contact_by_handle($importer['uid'],$msg_diaspora_handle);
if(! $contact) {
$author_signature = base64_decode($msg_author_signature);
- $person = find_diaspora_person_by_handle($msg_diaspora_handle);
+ $person = find_diaspora_person_by_handle($msg_diaspora_handle);
if(is_array($person) && x($person,'pubkey'))
$key = $person['pubkey'];
else {
return;
}
+function diaspora_participation($importer,$xml) {
+ logger("Unsupported message type 'participation' ".print_r($xml, true));
+}
function diaspora_photo($importer,$xml,$msg,$attempt=1) {
return;
}
- if(! diaspora_post_allow($importer,$contact)) {
+ if(! diaspora_post_allow($importer,$contact, false)) {
logger('diaspora_photo: Ignoring this author.');
return 202;
}
return;
}
- if(! diaspora_post_allow($importer,$contact)) {
+ if(! diaspora_post_allow($importer,$contact, false)) {
logger('diaspora_like: Ignoring this author.');
return 202;
}
$birthday = str_replace('1000','1901',$birthday);
- $birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d');
+ if ($birthday != "")
+ $birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d');
// this is to prevent multiple birthday notifications in a single year
// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
$body = bb2diaspora($item['body']);
$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
- $signed_text = $item['guid'] . ';' . $cnv['guid'] . ';' . $body . ';'
+ $signed_text = $item['guid'] . ';' . $cnv['guid'] . ';' . $body . ';'
. $created . ';' . $myaddr . ';' . $cnv['guid'];
$sig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
$msg = array(
'guid' => xmlify($item['guid']),
'parent_guid' => xmlify($cnv['guid']),
- 'parent_author_signature' => (($item['reply']) ? null : xmlify($sig)),
+ 'parent_author_signature' => xmlify($sig),
'author_signature' => xmlify($sig),
'text' => xmlify($body),
'created_at' => xmlify($created),