aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2015-01-10 13:01:02 +0100
committergit-marijus <mario@mariovavti.com>2015-01-10 13:01:02 +0100
commit884fa8bf9fc73609aafc5f49c1eaaade1013366e (patch)
tree8c266aed1f4f3e83778e1e62dc8ea24a0c6f68c1
parente1c5cc46f63028a6525049339e84de711666817a (diff)
parent978d78b95310adad1075d525babfa566c81876f5 (diff)
downloadvolse-hubzilla-884fa8bf9fc73609aafc5f49c1eaaade1013366e.tar.gz
volse-hubzilla-884fa8bf9fc73609aafc5f49c1eaaade1013366e.tar.bz2
volse-hubzilla-884fa8bf9fc73609aafc5f49c1eaaade1013366e.zip
Merge pull request #837 from git-marijus/master
basic changes for file activity
-rwxr-xr-xboot.php1
-rw-r--r--include/conversation.php1
-rwxr-xr-xinclude/items.php6
-rwxr-xr-xmod/mood.php2
4 files changed, 8 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 7414057c2..d559c16f2 100755
--- a/boot.php
+++ b/boot.php
@@ -497,6 +497,7 @@ define ( 'ACTIVITY_FAVORITE', NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
define ( 'ACTIVITY_POKE', NAMESPACE_ZOT . '/activity/poke' );
define ( 'ACTIVITY_MOOD', NAMESPACE_ZOT . '/activity/mood' );
+define ( 'ACTIVITY_FILE', NAMESPACE_ZOT . '/activity/file' );
define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
define ( 'ACTIVITY_OBJ_NOTE', NAMESPACE_ACTIVITY_SCHEMA . 'note' );
diff --git a/include/conversation.php b/include/conversation.php
index a2fb3d162..986892fff 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -264,6 +264,7 @@ function localize_item(&$item){
}
+
/*
// FIXME store parent item as object or target
// (and update to json storage)
diff --git a/include/items.php b/include/items.php
index e2534528a..e7cc15878 100755
--- a/include/items.php
+++ b/include/items.php
@@ -835,7 +835,9 @@ function get_item_elements($x) {
if(array_key_exists('flags',$x) && in_array('deleted',$x['flags']))
- $arr['item_restrict'] = ITEM_DELETED;
+ $arr['item_restrict'] = ITEM_DELETED;
+ if(array_key_exists('flags',$x) && in_array('hidden',$x['flags']))
+ $arr['item_restrict'] = ITEM_HIDDEN;
// 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
@@ -1306,6 +1308,8 @@ function encode_item_flags($item) {
if($item['item_restrict'] & ITEM_DELETED)
$ret[] = 'deleted';
+ if($item['item_restrict'] & ITEM_HIDDEN)
+ $ret[] = 'hidden';
if($item['item_flags'] & ITEM_THREAD_TOP)
$ret[] = 'thread_parent';
if($item['item_flags'] & ITEM_NSFW)
diff --git a/mod/mood.php b/mod/mood.php
index ff765fcac..e6f4760e0 100755
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -137,4 +137,4 @@ function mood_content(&$a) {
return $o;
-} \ No newline at end of file
+}