Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / classes / Notice_tag.php

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 3d7658a1acfe19ed64e08f2c0d6ee152f43c2e4c..30394ef8f3bd220567a98e03a8aa703ed23feed5 100644 (file)
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -56,8 +56,7 @@ class Notice_tag extends Managed_DataObject
     static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0)
     {
         $stream = new TagNoticeStream($tag);
-        
-        return $stream->getNotices($offset, $limit, $sinceId, $maxId);
+        return $stream;
     }
 
     function blowCache($blowLast=false)
@@ -82,4 +81,35 @@ class Notice_tag extends Managed_DataObject
 
                return $url;
        }
+
+    /**
+     * Checks whether the current profile is allowed (in scope) to see this tag.
+     *
+     * @return $inScope Whether the current profile is allowed to see this tag
+     */
+    function isCurrentProfileInScope () {
+        // Check scope, default is allowed
+        $inScope = TRUE;
+
+        // 1) Get notice object and set id
+        $notice = new Notice();
+        $notice->id = $this->notice_id;
+
+        //* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] this->tag=' . $this->tag . ',this->notice_id=' . $this->notice_id . ' - Calling find() ... fetch() ...');
+
+        // Fetch notice
+        if ((!$notice->find()) || (!$notice->fetch())) {
+            // No longer valid, so better don't allow to see it
+            return FALSE;
+        }
+
+        //* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] this->tag=' . $this->tag . ',notice->id=' . $notice->id . ',notice->scope=' . $notice->scope);
+
+        // Is it private scope?
+        $inScope = $notice->isCurrentProfileInScope();
+
+        // Return result
+        //* NOISY-DEBUG: */ common_debug('[' . __METHOD__ . ':' . __LINE__ . '] this->tag=' . $this->tag . ',this->weight=' . $this->weight . ',inScope=' . intval($inScope) . ' - EXIT!');
+        return $inScope;
+    }
 }