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

bug #447 - make followed feeds private

Browse source
This commit is contained in:
friendica 2012-06-11 05:28:08 -07:00
parent 0ac3f5fc1c
commit afa8815411
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/items.php
View file

@ -693,6 +693,8 @@ function encode_rel_links($links) {
return xmlify($o); return xmlify($o);
} }
function item_store($arr,$force_parent = false) { function item_store($arr,$force_parent = false) {
// If a Diaspora signature structure was passed in, pull it out of the // If a Diaspora signature structure was passed in, pull it out of the
@ -806,6 +808,14 @@ function item_store($arr,$force_parent = false) {
$deny_cid = $r[0]['deny_cid']; $deny_cid = $r[0]['deny_cid'];
$deny_gid = $r[0]['deny_gid']; $deny_gid = $r[0]['deny_gid'];
$arr['wall'] = $r[0]['wall']; $arr['wall'] = $r[0]['wall'];
// if the parent is private, force privacy for the entire conversation
// This differs from the above settings as it subtly allows comments from
// email correspondents to be private even if the overall thread is not.
if($r[0]['private'])
$arr['private'] = 1;
} }
else { else {
@ -1835,10 +1845,13 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
$datarray['last-child'] = 1; $datarray['last-child'] = 1;
} }
if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) { if($contact['network'] === NETWORK_FEED) {
if(! strlen($contact['notify'])) {
// one way feed - no remote comment ability // one way feed - no remote comment ability
$datarray['last-child'] = 0; $datarray['last-child'] = 0;
} }
$datarray['private'] = 1;
}
// This is my contact on another system, but it's really me. // This is my contact on another system, but it's really me.
// Turn this into a wall post. // Turn this into a wall post.