aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-26 20:22:50 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-26 20:22:50 -0700
commit54c88dfae91da709eeb959b5ad8b2eb034ac0041 (patch)
tree5997f92210f2c8ed529a311caa71c4fa14103672 /include
parentd2fec56456181fd54d11dcb24927e17c6bdd47dc (diff)
parentd1c23477dfb0ee48cf652d6e63969ed5a3809b18 (diff)
downloadvolse-hubzilla-54c88dfae91da709eeb959b5ad8b2eb034ac0041.tar.gz
volse-hubzilla-54c88dfae91da709eeb959b5ad8b2eb034ac0041.tar.bz2
volse-hubzilla-54c88dfae91da709eeb959b5ad8b2eb034ac0041.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/diaspora.php
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index e58429255..a3fdf39df 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -395,7 +395,9 @@ function count_descendants($item) {
* @brief Check if the activity of the item is visible.
*
* likes (etc.) can apply to other things besides posts. Check if they are post
- * children, in which case we handle them specially.
+ * children, in which case we handle them specially. Activities which are unrecognised
+ * as having special meaning and hidden will be treated as posts or comments and visible
+ * in the stream.
*
* @param array $item
* @return boolean
@@ -403,12 +405,21 @@ function count_descendants($item) {
function visible_activity($item) {
$hidden_activities = array(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));
+
foreach ($hidden_activities as $act) {
if ((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) {
return false;
}
}
+ // In order to share edits with networks which have no concept of editing, we'll create
+ // separate activities to indicate the edit. Our network will not require them, since our
+ // edits are automatically applied and the activity indicated.
+
+ if(($item['verb'] === ACTIVITY_UPDATE) && (in_array($item['obj_type'],$post_types)))
+ return false;
+
return true;
}