Merge branch 'cometplugin' into 0.7.x

1 files changed, 37 insertions, 0 deletions

diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index a7a4f4b23..2e0bb40a4 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -62,6 +62,14 @@ class CometPlugin extends Plugin
          case 'public':
             $timeline = '/timelines/public';
             break;
+         case 'tag':
+            $tag = $action->trimmed('tag');
+            if (!empty($tag)) {
+                $timeline = '/timelines/tag/'.$tag;
+            } else {
+                return true;
+            }
+            break;
          default:
             return true;
         }
@@ -94,6 +102,14 @@ class CometPlugin extends Plugin
             $timelines[] = '/timelines/public';
         }
 
+        $tags = $this->getNoticeTags($notice);
+
+        if (!empty($tags)) {
+            foreach ($tags as $tag) {
+                $timelines[] = '/timelines/tag/' . $tag;
+            }
+        }
+
         if (count($timelines) > 0) {
             // Require this, since we need it
             require_once(INSTALLDIR.'/plugins/Comet/bayeux.class.inc.php');
@@ -127,6 +143,7 @@ class CometPlugin extends Plugin
 
         $arr = $act->twitter_status_array($notice, true);
         $arr['url'] = $notice->bestUrl();
+        $arr['html'] = htmlspecialchars($notice->rendered);
 
         $profile = $notice->getProfile();
         $arr['user']['profile_url'] = $profile->profileurl;
@@ -134,6 +151,26 @@ class CometPlugin extends Plugin
         return $arr;
     }
 
+    function getNoticeTags($notice)
+    {
+        $tags = null;
+
+        $nt = new Notice_tag();
+        $nt->notice_id = $notice->id;
+
+        if ($nt->find()) {
+            $tags = array();
+            while ($nt->fetch()) {
+                $tags[] = $nt->tag;
+            }
+        }
+
+        $nt->free();
+        $nt = null;
+
+        return $tags;
+    }
+
     // Push this up to Plugin
 
     function log($level, $msg)