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

some work to provide propagation and honouring of the item_notshown flag.

Browse Source
This commit is contained in:
redmatrix 2016-06-13 22:09:22 -07:00
parent 1ff9abe1b4
commit 0ef2622621
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Wiki.php
View File

@ -1,6 +1,6 @@
<?php <?php /** @file */
namespace Zotlabs\Module;/** @file */ namespace Zotlabs\Module;
class Wiki extends \Zotlabs\Web\Controller { class Wiki extends \Zotlabs\Web\Controller {

7
include/conversation.php
View File

@ -403,9 +403,12 @@ function count_descendants($item) {
* @return boolean * @return boolean
*/ */
function visible_activity($item) { function visible_activity($item) {
$hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE); $hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE ];
$post_types = array(ACTIVITY_OBJ_NOTE,ACTIVITY_OBJ_COMMENT,basename(ACTIVITY_OBJ_NOTE),basename(ACTIVITY_OBJ_COMMENT)); $post_types = [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT, basename(ACTIVITY_OBJ_NOTE), basename(ACTIVITY_OBJ_COMMENT)];
if(intval($item['item_notshown']))
return false;
foreach ($hidden_activities as $act) { foreach ($hidden_activities as $act) {
if ((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) { if ((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) {

24
include/items.php
View File

@ -677,13 +677,23 @@ function get_item_elements($x,$allow_code = false) {
$arr['item_flags'] = 0; $arr['item_flags'] = 0;
if(array_key_exists('flags',$x) && in_array('consensus',$x['flags'])) if(array_key_exists('flags',$x)) {
$arr['item_consensus'] = 1;
if(array_key_exists('flags',$x) && in_array('deleted',$x['flags'])) if(in_array('consensus',$x['flags']))
$arr['item_deleted'] = 1; $arr['item_consensus'] = 1;
if(array_key_exists('flags',$x) && in_array('hidden',$x['flags']))
$arr['item_hidden'] = 1; if(in_array('deleted',$x['flags']))
$arr['item_deleted'] = 1;
if(in_array('notshown',$x['flags']))
$arr['item_notshown'] = 1;
// hidden item are no longer propagated - notshown may be a suitable alternative
if(in_array('hidden',$x['flags']))
$arr['item_hidden'] = 1;
}
// Here's the deal - the site might be down or whatever but if there's a new person you've never // Here's the deal - the site might be down or whatever but if there's a new person you've never
// seen before sending stuff to your stream, we MUST be able to look them up and import their data from their // seen before sending stuff to your stream, we MUST be able to look them up and import their data from their
@ -1339,6 +1349,8 @@ function encode_item_flags($item) {
$ret[] = 'deleted'; $ret[] = 'deleted';
if(intval($item['item_hidden'])) if(intval($item['item_hidden']))
$ret[] = 'hidden'; $ret[] = 'hidden';
if(intval($item['item_notshown']))
$ret[] = 'notshown';
if(intval($item['item_thread_top'])) if(intval($item['item_thread_top']))
$ret[] = 'thread_parent'; $ret[] = 'thread_parent';
if(intval($item['item_nsfw'])) if(intval($item['item_nsfw']))