From e6cbe3a26938ca8d88d44bacc6c40ba09f5f1fd1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 11:07:22 -0400
Subject: [PATCH 01/18] Revert "Added a check for any URL param. If found,
 strips them out before"

This reverts commit 13de845e95da9ea579516c4480789819c9a26edd.
---
 plugins/Meteor/meteorupdater.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 91d12cde9c..a7c87330c9 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -11,17 +11,11 @@ var MeteorUpdater = function()
             Meteor.callbacks["process"] = function(data) {
                 var d = JSON.parse(data);
 
-                var user_url = $('address .url')[0].href+d['user']['screen_name'];
-
-                var wlh = window.location.href;
-
-                if (wlh.indexOf('?') > 0) {
-                   wlh = wlh.slice(0, wlh.indexOf('?'))
-                }
+                $user_url = $('address .url')[0].href+d['user']['screen_name'];
 
                 if (timeline == 'public' ||
-                    user_url+'/all' == wlh ||
-                    user_url == wlh) {
+                    $user_url+'/all' == window.location.href ||
+                    $user_url == window.location.href) {
 
                     RealtimeUpdate.receive(d);
                 }

From 87ff03890e6512bf4cf336c5583382e22bb75414 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 11:07:56 -0400
Subject: [PATCH 02/18] Revert "Made it slighly more compact with less jQuery
 selection"

This reverts commit c9bc3900909a85b9b4be31c4dac7f809127a8bf0.
---
 plugins/Meteor/meteorupdater.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index a7c87330c9..82594d91c7 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -8,15 +8,15 @@ var MeteorUpdater = function()
 
         init: function(server, port, timeline)
         {
+            var screen_name;
+
             Meteor.callbacks["process"] = function(data) {
                 var d = JSON.parse(data);
-
-                $user_url = $('address .url')[0].href+d['user']['screen_name'];
+                screen_name = d['user']['screen_name'];
 
                 if (timeline == 'public' ||
-                    $user_url+'/all' == window.location.href ||
-                    $user_url == window.location.href) {
-
+                    $('address .url')[0].href+screen_name+'/all' == window.location.href ||
+                    $('address .url')[0].href+screen_name == window.location.href) {
                     RealtimeUpdate.receive(d);
                 }
             };

From 35eb33fe2bd0d41fb4c03000c557c36125b2c809 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 11:08:12 -0400
Subject: [PATCH 03/18] Revert "Fixed indenting"

This reverts commit 182257cbbf1557c2671b1995c9126c45b0bd8e79.
---
 plugins/Meteor/meteorupdater.js | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index 82594d91c7..de01d430a1 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -4,28 +4,28 @@
 
 var MeteorUpdater = function()
 {
-    return {
+     return {
 
-        init: function(server, port, timeline)
-        {
-            var screen_name;
+          init: function(server, port, timeline)
+          {
+               var screen_name;
 
-            Meteor.callbacks["process"] = function(data) {
-                var d = JSON.parse(data);
-                screen_name = d['user']['screen_name'];
+               Meteor.callbacks["process"] = function(data) {
+                    var d = JSON.parse(data);
+                    screen_name = d['user']['screen_name'];
 
-                if (timeline == 'public' ||
-                    $('address .url')[0].href+screen_name+'/all' == window.location.href ||
-                    $('address .url')[0].href+screen_name == window.location.href) {
-                    RealtimeUpdate.receive(d);
-                }
-            };
+                    if (timeline == 'public' ||
+                        $('address .url')[0].href+screen_name+'/all' == window.location.href ||
+                        $('address .url')[0].href+screen_name == window.location.href) {
+                        RealtimeUpdate.receive(d);
+                    }
+               };
 
-            Meteor.host = server;
-            Meteor.port = port;
-            Meteor.joinChannel(timeline, 0);
-            Meteor.connect();
-        }
-    }
+               Meteor.host = server;
+               Meteor.port = port;
+               Meteor.joinChannel(timeline, 0);
+               Meteor.connect();
+          }
+     }
 }();
 

From 6cb2f89983f89fb7f4559fe607ca2af2c6729d27 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 11:08:35 -0400
Subject: [PATCH 04/18] Revert "Added realtime streams for all and showstream
 timelines"

This reverts commit 49e91ec7d068fa7b98576207696d2192418baf5b.
---
 plugins/Meteor/meteorupdater.js     | 11 +---------
 plugins/Realtime/RealtimePlugin.php | 34 +++++++++++++----------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
index de01d430a1..9ce68775bf 100644
--- a/plugins/Meteor/meteorupdater.js
+++ b/plugins/Meteor/meteorupdater.js
@@ -8,17 +8,8 @@ var MeteorUpdater = function()
 
           init: function(server, port, timeline)
           {
-               var screen_name;
-
                Meteor.callbacks["process"] = function(data) {
-                    var d = JSON.parse(data);
-                    screen_name = d['user']['screen_name'];
-
-                    if (timeline == 'public' ||
-                        $('address .url')[0].href+screen_name+'/all' == window.location.href ||
-                        $('address .url')[0].href+screen_name == window.location.href) {
-                        RealtimeUpdate.receive(d);
-                    }
+                    RealtimeUpdate.receive(JSON.parse(data));
                };
 
                Meteor.host = server;
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 611b1d86c9..4548822610 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -63,22 +63,20 @@ class RealtimePlugin extends Plugin
     {
         $path = null;
 
-        $a = $action->trimmed('action');
-
-        switch ($a) {
-            case 'public': case 'all': case 'replies': case 'showstream':
-                $path = array($a);
-                break;
-            case 'tag':
-                $tag = $action->trimmed('tag');
-                if (!empty($tag)) {
-                    $path = array('tag', $tag);
-                } else {
-                    return true;
-                }
-                break;
-             default:
+        switch ($action->trimmed('action')) {
+         case 'public':
+            $path = array('public');
+            break;
+         case 'tag':
+            $tag = $action->trimmed('tag');
+            if (!empty($tag)) {
+                $path = array('tag', $tag);
+            } else {
                 return true;
+            }
+            break;
+         default:
+            return true;
         }
 
         $timeline = $this->_pathToChannel($path);
@@ -116,13 +114,11 @@ class RealtimePlugin extends Plugin
     {
         $paths = array();
 
-        // TODO: Replies timeline
+        // XXX: Add other timelines; this is just for the public one
 
         if ($notice->is_local ||
             ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
-            foreach (array('public', 'all', 'replies', 'showstream') as $a) {
-                $paths[] = array($a);
-            }
+            $paths[] = array('public');
         }
 
         $tags = $this->getNoticeTags($notice);

From 13976f5796f24725280f4ff33901349df4668f50 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 17:22:51 +0000
Subject: [PATCH 05/18] JavaScript fixes for IE

---
 plugins/Realtime/realtimeupdate.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index da2f9ed3aa..d034deef16 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -17,7 +17,7 @@ $(document).ready(function() {
 
         $('#realtime_timeline').click(function() {
             window.open($(this).parent('a').attr('href')+'?realtime=1',
-                        $(this).parent('a').attr('title'),
+                        $('body').attr('id'),
                         'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
 
             return false;
@@ -25,8 +25,8 @@ $(document).ready(function() {
     }
     else {
         window.resizeTo(575, 640);
-        address = $('address');
-        content = $('#content');
+        var address = $('address');
+        var content = $('#content');
         $('body').html(address);
         $('address').hide();
         $('body').append(content);

From 1fe11eabb675fa876bdbcd5884231ffd6fa278ff Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 17:07:20 -0400
Subject: [PATCH 06/18] Do realtime popup with PHP instead of Javascript

Move the realtime detection code to PHP extension rather than
JavaScript.
---
 plugins/Realtime/RealtimePlugin.php | 110 ++++++++++----
 plugins/Realtime/realtimeupdate.js  | 222 ++++++++++++----------------
 2 files changed, 177 insertions(+), 155 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 4548822610..22851a6c14 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -50,6 +50,11 @@ class RealtimePlugin extends Plugin
     protected $favorurl = null;
     protected $deleteurl = null;
 
+    /**
+     * When it's time to initialize the plugin, calculate and
+     * pass the URLs we need.
+     */
+
     function onInitializePlugin()
     {
         $this->replyurl = common_local_url('newnotice');
@@ -57,30 +62,20 @@ class RealtimePlugin extends Plugin
         // FIXME: need to find a better way to pass this pattern in
         $this->deleteurl = common_local_url('deletenotice',
                                             array('notice' => '0000000000'));
+        return true;
     }
 
     function onEndShowScripts($action)
     {
-        $path = null;
+        $timeline = $this->_getTimeline($action);
 
-        switch ($action->trimmed('action')) {
-         case 'public':
-            $path = array('public');
-            break;
-         case 'tag':
-            $tag = $action->trimmed('tag');
-            if (!empty($tag)) {
-                $path = array('tag', $tag);
-            } else {
-                return true;
-            }
-            break;
-         default:
+        // If there's not a timeline on this page,
+        // just return true
+
+        if (empty($timeline)) {
             return true;
         }
 
-        $timeline = $this->_pathToChannel($path);
-
         $scripts = $this->_getScripts();
 
         foreach ($scripts as $script) {
@@ -95,16 +90,14 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
-        $action->script('plugins/Realtime/jquery.getUrlParam.js');
-
         $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw('
-        <!--
-        $(document).ready(function() {
-            ' . $this->_updateInitialize($timeline, $user_id) . '
-        });
-        -->
-        ');
+
+        $script = ' $(document).ready(function() { '.
+          $this->_updateInitialize($timeline, $user_id).
+          '}); ';
+
+        $action->raw($script);
+
         $action->elementEnd('script');
 
         return true;
@@ -146,6 +139,47 @@ class RealtimePlugin extends Plugin
         return true;
     }
 
+    function onStartShowPageNotice($action)
+    {
+        $timeline = $this->_getTimeline($action);
+        if (!empty($timeline)) {
+            $base = $action->selfUrl();
+            if (mb_strstr($url, '?')) {
+                $url = $base . '&realtime=1';
+            } else {
+                $url = $base . '?realtime=1';
+            }
+            $title = $action->title();
+            $code = "window.open('$url', '$title', 'toolbar=no,resizable=yes,scrollbars=yes,status=yes,height=640,width=575');";
+            $action->element('a', array('href' => $base,
+                                        'onclick' => $code,
+                                        'id' => 'realtime_timeline',
+                                        'title' => _('Pop up')),
+                             'Pop up');
+
+        }
+        return true;
+    }
+
+    function onStartShowBody($action)
+    {
+        $realtime = $action->boolean('realtime');
+        if (!$realtime) {
+            return true;
+        }
+
+        $action->elementStart('body',
+                              (common_current_user()) ? array('id' => $action->trimmed('action'),
+                                                              'class' => 'user_in')
+                              : array('id' => $action->trimmed('action')));
+        if (common_logged_in()) {
+            $action->showNoticeForm();
+        }
+        $action->showContent();
+        $action->elementEnd('body');
+        return false; // No default processing
+    }
+
     function noticeAsJson($notice)
     {
         // FIXME: this code should be abstracted to a neutral third
@@ -230,4 +264,30 @@ class RealtimePlugin extends Plugin
     {
         return '';
     }
+
+    function _getTimeline($action)
+    {
+        $path = null;
+        $timeline = null;
+
+        switch ($action->trimmed('action')) {
+         case 'public':
+            $path = array('public');
+            break;
+         case 'tag':
+            $tag = $action->trimmed('tag');
+            if (!empty($tag)) {
+                $path = array('tag', $tag);
+            }
+            break;
+         default:
+            break;
+        }
+
+        if (!is_null($path)) {
+            $timeline = $this->_pathToChannel($path);
+        }
+
+        return $timeline;
+    }
 }
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index da2f9ed3aa..3293ef6e9f 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,152 +1,114 @@
-$(document).ready(function() {
-    if (!$(document).getUrlParam('realtime')) {
-        $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Pop this tab">&#8599;</button>');
+// add a notice encoded as JSON into the current timeline
+//
+// TODO: i18n
 
-        $('#realtime_timeline').css({
-            'margin':'2px 0 0 11px',
-            'background':'transparent url('+$('address .url')[0].href+'/plugins/Realtime/icon_external.gif) no-repeat 45% 45%',
-            'text-indent':'-9999px',
-            'width':'16px',
-            'height':'16px',
-            'padding':'0',
-            'display':'block',
-            'float':'right',
-            'border':'none',
-            'cursor':'pointer'
-        });
+RealtimeUpdate = {
+     _userid: 0,
+     _replyurl: '',
+     _favorurl: '',
+     _deleteurl: '',
 
-        $('#realtime_timeline').click(function() {
-            window.open($(this).parent('a').attr('href')+'?realtime=1',
-                        $(this).parent('a').attr('title'),
-                        'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
+     init: function(userid, replyurl, favorurl, deleteurl)
+     {
+        RealtimeUpdate._userid = userid;
+        RealtimeUpdate._replyurl = replyurl;
+        RealtimeUpdate._favorurl = favorurl;
+        RealtimeUpdate._deleteurl = deleteurl;
+     },
 
-            return false;
-        });
-    }
-    else {
-        window.resizeTo(575, 640);
-        address = $('address');
-        content = $('#content');
-        $('body').html(address);
-        $('address').hide();
-        $('body').append(content);
-        $('#content').css({'width':'92%'});
-    }
+     receive: function(data)
+     {
+          id = data.id;
 
+          // Don't add it if it already exists
+          //
+          if ($("#notice-"+id).length > 0) {
+               return;
+          }
 
-    // add a notice encoded as JSON into the current timeline
-    //
-    // TODO: i18n
+          var noticeItem = RealtimeUpdate.makeNoticeItem(data);
+          $("#notices_primary .notices").prepend(noticeItem, true);
+          $("#notices_primary .notice:first").css({display:"none"});
+          $("#notices_primary .notice:first").fadeIn(1000);
+          NoticeReply();
+     },
 
-    RealtimeUpdate = {
-        _userid: 0,
-        _replyurl: '',
-        _favorurl: '',
-        _deleteurl: '',
+     makeNoticeItem: function(data)
+     {
+          user = data['user'];
+          html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+          source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
 
-        init: function(userid, replyurl, favorurl, deleteurl)
-        {
-            RealtimeUpdate._userid = userid;
-            RealtimeUpdate._replyurl = replyurl;
-            RealtimeUpdate._favorurl = favorurl;
-            RealtimeUpdate._deleteurl = deleteurl;
-        },
-
-        receive: function(data)
-        {
-            id = data.id;
-
-            // Don't add it if it already exists
-
-            if ($("#notice-"+id).length > 0) {
-                return;
-            }
-
-            var noticeItem = RealtimeUpdate.makeNoticeItem(data);
-            $("#notices_primary .notices").prepend(noticeItem, true);
-            $("#notices_primary .notice:first").css({display:"none"});
-            $("#notices_primary .notice:first").fadeIn(1000);
-            NoticeReply();
-        },
-
-        makeNoticeItem: function(data)
-        {
-            user = data['user'];
-            html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
-            source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
-
-            ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
-                "<div class=\"entry-title\">"+
-                "<span class=\"vcard author\">"+
-                "<a href=\""+user['profile_url']+"\" class=\"url\">"+
-                "<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
-                "<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
-                "</a>"+
-                "</span>"+
-                "<p class=\"entry-content\">"+html+"</p>"+
-                "</div>"+
-                "<div class=\"entry-content\">"+
-                "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
-                "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
-                "</a> "+
-                "<span class=\"source\">"+
-                "from "+
+          ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
+               "<div class=\"entry-title\">"+
+               "<span class=\"vcard author\">"+
+               "<a href=\""+user['profile_url']+"\" class=\"url\">"+
+               "<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
+               "<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
+               "</a>"+
+               "</span>"+
+               "<p class=\"entry-content\">"+html+"</p>"+
+               "</div>"+
+               "<div class=\"entry-content\">"+
+               "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
+               "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
+               "</a> "+
+               "<span class=\"source\">"+
+               "from "+
                 "<span class=\"device\">"+source+"</span>"+ // may have a link
-                "</span>";
-            if (data['in_reply_to_status_id']) {
-                ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
-            }
+               "</span>";
+          if (data['in_reply_to_status_id']) {
+               ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
+          }
 
-            ni = ni+"</div>"+
+          ni = ni+"</div>"+
             "<div class=\"notice-options\">";
 
-            if (RealtimeUpdate._userid != 0) {
-                var input = $("form#form_notice fieldset input#token");
-                var session_key = input.val();
-                ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
-                ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
-                if (RealtimeUpdate._userid == data['user']['id']) {
+          if (RealtimeUpdate._userid != 0) {
+               var input = $("form#form_notice fieldset input#token");
+               var session_key = input.val();
+               ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
+               ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
+               if (RealtimeUpdate._userid == data['user']['id']) {
                     ni = ni+RealtimeUpdate.makeDeleteLink(data['id']);
-                }
-             }
+               }
+          }
 
-            ni = ni+"</div>"+
-            "</li>";
-            return ni;
-        },
+          ni = ni+"</div>"+
+               "</li>";
+          return ni;
+     },
 
-        makeFavoriteForm: function(id, session_key)
-        {
-            var ff;
+     makeFavoriteForm: function(id, session_key)
+     {
+          var ff;
 
-            ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
+          ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
                 "<fieldset>"+
-                "<legend>Favor this notice</legend>"+
-                "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
-                "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
-                "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
+               "<legend>Favor this notice</legend>"+
+               "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
+               "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
+               "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
                 "</fieldset>"+
-                "</form>";
-            return ff;
+               "</form>";
+          return ff;
+     },
+
+     makeReplyLink: function(id, nickname)
+     {
+          var rl;
+          rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
+          return rl;
         },
 
-        makeReplyLink: function(id, nickname)
-        {
-            var rl;
-            rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
-            return rl;
-        },
+     makeDeleteLink: function(id)
+     {
+          var dl, delurl;
+          delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
 
-        makeDeleteLink: function(id)
-        {
-            var dl, delurl;
-            delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
+          dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
 
-            dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
-
-            return dl;
-        }
-    }
-
-});
+          return dl;
+     }
+}
 

From 5152d31d2a4199306d656480ca5ff8d0978d8984 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 17:28:14 -0400
Subject: [PATCH 07/18] Add some more realtime feeds

---
 plugins/Realtime/RealtimePlugin.php | 67 +++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 22851a6c14..0f3e310714 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -107,13 +107,23 @@ class RealtimePlugin extends Plugin
     {
         $paths = array();
 
-        // XXX: Add other timelines; this is just for the public one
+        // Add to the author's timeline
+
+        $user = User::staticGet('id', $notice->profile_id);
+
+        if (!empty($user)) {
+            $paths[] = array('showstream', $user->nickname);
+        }
+
+        // Add to the public timeline
 
         if ($notice->is_local ||
             ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
             $paths[] = array('public');
         }
 
+        // Add to the tags timeline
+
         $tags = $this->getNoticeTags($notice);
 
         if (!empty($tags)) {
@@ -122,6 +132,46 @@ class RealtimePlugin extends Plugin
             }
         }
 
+        // Add to inbox timelines
+        // XXX: do a join
+
+        $inbox = new Notice_inbox();
+        $inbox->notice_id = $notice->id;
+
+        if ($inbox->find()) {
+            while ($inbox->fetch()) {
+                $user = User::staticGet('id', $inbox->user_id);
+                $paths[] = array('all', $user->nickname);
+            }
+        }
+
+        // Add to the replies timeline
+
+        $reply = new Reply();
+        $reply->notice_id = $notice->id;
+
+        if ($reply->find()) {
+            while ($reply->fetch()) {
+                $user = User::staticGet('id', $reply->profile_id);
+                if (!empty($user)) {
+                    $paths[] = array('replies', $user->nickname);
+                }
+            }
+        }
+
+        // Add to the group timeline
+        // XXX: join
+
+        $gi = new Group_inbox();
+        $gi->notice_id = $notice->id;
+
+        if ($gi->find()) {
+            while ($gi->fetch()) {
+                $ug = User_group::staticGet('id', $gi->group_id);
+                $paths[] = array('showgroup', $ug->nickname);
+            }
+        }
+
         if (count($paths) > 0) {
 
             $json = $this->noticeAsJson($notice);
@@ -270,7 +320,9 @@ class RealtimePlugin extends Plugin
         $path = null;
         $timeline = null;
 
-        switch ($action->trimmed('action')) {
+        $action_name = $action->trimmed('action');
+
+        switch ($action_name) {
          case 'public':
             $path = array('public');
             break;
@@ -280,11 +332,20 @@ class RealtimePlugin extends Plugin
                 $path = array('tag', $tag);
             }
             break;
+         case 'showstream':
+         case 'all':
+         case 'replies':
+         case 'showgroup':
+            $nickname = common_canonical_nickname($action->trimmed('nickname'));
+            if (!empty($nickname)) {
+                $path = array($action_name, $nickname);
+            }
+            break;
          default:
             break;
         }
 
-        if (!is_null($path)) {
+        if (!empty($path)) {
             $timeline = $this->_pathToChannel($path);
         }
 

From 36e009349d68d8f34fc50d77c26e6e3307116b2c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 14:58:42 -0400
Subject: [PATCH 08/18] hack around address hack in util.js

---
 plugins/Realtime/RealtimePlugin.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 0f3e310714..c41c9ce4ac 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -222,6 +222,16 @@ class RealtimePlugin extends Plugin
                               (common_current_user()) ? array('id' => $action->trimmed('action'),
                                                               'class' => 'user_in')
                               : array('id' => $action->trimmed('action')));
+
+        // XXX hack to deal with JS that tries to get the
+        // root url from page output
+
+        $action->elementStart('address');
+        $action->element('a', array('class' => 'url',
+                                  'href' => common_local_url('public')),
+                         '');
+        $action->elementEnd('address');
+
         if (common_logged_in()) {
             $action->showNoticeForm();
         }

From bdbc2cb8de370eef6d5d06412746f52797ea0458 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 15:24:12 -0400
Subject: [PATCH 09/18] move some stuff around for realtime

---
 plugins/Realtime/RealtimePlugin.php | 32 +++++++++--------------------
 plugins/Realtime/realtimeupdate.js  |  5 +++++
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index c41c9ce4ac..fde3060216 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -76,6 +76,15 @@ class RealtimePlugin extends Plugin
             return true;
         }
 
+        $base = $action->selfUrl();
+        if (mb_strstr($url, '?')) {
+            $url = $base . '&realtime=1';
+        } else {
+            $url = $base . '?realtime=1';
+        }
+
+        $title = $action->title();
+
         $scripts = $this->_getScripts();
 
         foreach ($scripts as $script) {
@@ -94,6 +103,7 @@ class RealtimePlugin extends Plugin
 
         $script = ' $(document).ready(function() { '.
           $this->_updateInitialize($timeline, $user_id).
+          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'"); '.
           '}); ';
 
         $action->raw($script);
@@ -189,28 +199,6 @@ class RealtimePlugin extends Plugin
         return true;
     }
 
-    function onStartShowPageNotice($action)
-    {
-        $timeline = $this->_getTimeline($action);
-        if (!empty($timeline)) {
-            $base = $action->selfUrl();
-            if (mb_strstr($url, '?')) {
-                $url = $base . '&realtime=1';
-            } else {
-                $url = $base . '?realtime=1';
-            }
-            $title = $action->title();
-            $code = "window.open('$url', '$title', 'toolbar=no,resizable=yes,scrollbars=yes,status=yes,height=640,width=575');";
-            $action->element('a', array('href' => $base,
-                                        'onclick' => $code,
-                                        'id' => 'realtime_timeline',
-                                        'title' => _('Pop up')),
-                             'Pop up');
-
-        }
-        return true;
-    }
-
     function onStartShowBody($action)
     {
         $realtime = $action->boolean('realtime');
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 3293ef6e9f..04e07956d5 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -109,6 +109,11 @@ RealtimeUpdate = {
           dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
 
           return dl;
+     },
+
+     addPopup: function(url, title)
+     {
+          // FIXME: need to add the realtime popup button here
      }
 }
 

From 4d4bb089a5e3addfd4be2f82e5e4e257070f4058 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 21:58:35 +0000
Subject: [PATCH 10/18] Created addPop() for Realtime plugin and added param to
 include iconurl

---
 plugins/Realtime/RealtimePlugin.php |  4 +++-
 plugins/Realtime/realtimeupdate.js  | 25 +++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index fde3060216..157c800d95 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -99,11 +99,13 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
+        $iconurl = $base.'plugins/Realtime/icon_external.gif';
+
         $action->elementStart('script', array('type' => 'text/javascript'));
 
         $script = ' $(document).ready(function() { '.
           $this->_updateInitialize($timeline, $user_id).
-          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'"); '.
+          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");'
           '}); ';
 
         $action->raw($script);
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 04e07956d5..2910e4a802 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -111,9 +111,30 @@ RealtimeUpdate = {
           return dl;
      },
 
-     addPopup: function(url, title)
+     addPopup: function(url, title, iconurl)
      {
-          // FIXME: need to add the realtime popup button here
+         $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Real-time pop window">&#8599;</button>');
+ 
+         $('#realtime_timeline').css({
+             'margin':'2px 0 0 11px',
+             'background':'transparent url('+ iconurl + ') no-repeat 45% 45%',
+             'text-indent':'-9999px',
+             'width':'16px',
+             'height':'16px',
+             'padding':'0',
+             'display':'block',
+             'float':'right',
+             'border':'none',
+             'cursor':'pointer'
+         });
+ 
+         $('#realtime_timeline').click(function() {
+             window.open(url,
+                         title,
+                         'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
+ 
+             return false;
+         });
      }
 }
 

From ddb9518c9949989f99c3e7b0323c9bbd01c1d5ee Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 22:00:22 +0000
Subject: [PATCH 11/18] Some layout and rendering adjustment for Realtime
 plugin

---
 plugins/Realtime/RealtimePlugin.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 157c800d95..f211c01f94 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -213,9 +213,9 @@ class RealtimePlugin extends Plugin
                                                               'class' => 'user_in')
                               : array('id' => $action->trimmed('action')));
 
+        $action->elementStart('div', array('id' => 'header'));
         // XXX hack to deal with JS that tries to get the
         // root url from page output
-
         $action->elementStart('address');
         $action->element('a', array('class' => 'url',
                                   'href' => common_local_url('public')),
@@ -225,7 +225,9 @@ class RealtimePlugin extends Plugin
         if (common_logged_in()) {
             $action->showNoticeForm();
         }
-        $action->showContent();
+        $action->elementEnd('div');
+
+        $action->showContentBlock();
         $action->elementEnd('body');
         return false; // No default processing
     }

From 1f12993a4ddad8eba29c604c55f6b82d08dc0127 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 22:02:42 +0000
Subject: [PATCH 12/18] Added JavaScript to initialize the poped Window

---
 plugins/Realtime/RealtimePlugin.php | 13 ++++++++++---
 plugins/Realtime/realtimeupdate.js  |  7 +++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index f211c01f94..4fb8bf84e5 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -99,15 +99,22 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
-        $iconurl = $base.'plugins/Realtime/icon_external.gif';
+        // FIXME: Need to check if the current URL is a poped realtime window
+        if (1==2) {
+            $realtimeUI = ' RealtimeUpdate.initPopupWindow();';
+        }
+        else {
+            // FIXME: This icon URL is no good if fancy URLs are off.
+            $iconurl = $base.'plugins/Realtime/icon_external.gif';
+            $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");';
+        }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
 
         $script = ' $(document).ready(function() { '.
           $this->_updateInitialize($timeline, $user_id).
-          ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");'
+          $realtimeUI.
           '}); ';
-
         $action->raw($script);
 
         $action->elementEnd('script');
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 2910e4a802..4fda5079d4 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -135,6 +135,13 @@ RealtimeUpdate = {
  
              return false;
          });
+     },
+
+     initPopupWindow: function()
+     {
+         window.resizeTo(575, 640);
+         $('address').hide();
+         $('#content').css({'width':'92%'});
      }
 }
 

From d86155ad943032918c2fab070ca49f0a3586f25d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 23 Sep 2009 22:04:39 +0000
Subject: [PATCH 13/18] Using timeline string instead of title for WindowName
 because IE doesn't like names with whitespace.

---
 plugins/Realtime/RealtimePlugin.php | 4 +---
 plugins/Realtime/realtimeupdate.js  | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 4fb8bf84e5..7334f56572 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -83,8 +83,6 @@ class RealtimePlugin extends Plugin
             $url = $base . '?realtime=1';
         }
 
-        $title = $action->title();
-
         $scripts = $this->_getScripts();
 
         foreach ($scripts as $script) {
@@ -106,7 +104,7 @@ class RealtimePlugin extends Plugin
         else {
             // FIXME: This icon URL is no good if fancy URLs are off.
             $iconurl = $base.'plugins/Realtime/icon_external.gif';
-            $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$title.'", "'. $iconurl .'");';
+            $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
         }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js
index 4fda5079d4..57fe0a8436 100644
--- a/plugins/Realtime/realtimeupdate.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -111,7 +111,7 @@ RealtimeUpdate = {
           return dl;
      },
 
-     addPopup: function(url, title, iconurl)
+     addPopup: function(url, timeline, iconurl)
      {
          $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Real-time pop window">&#8599;</button>');
  
@@ -130,7 +130,7 @@ RealtimeUpdate = {
  
          $('#realtime_timeline').click(function() {
              window.open(url,
-                         title,
+                         timeline,
                          'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
  
              return false;

From 543e3e797277526ac0f0c6ac99be64897955258a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 23:04:25 -0400
Subject: [PATCH 14/18] some UI fixes

---
 plugins/Realtime/RealtimePlugin.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 7334f56572..e30c411567 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -77,7 +77,7 @@ class RealtimePlugin extends Plugin
         }
 
         $base = $action->selfUrl();
-        if (mb_strstr($url, '?')) {
+        if (mb_strstr($base, '?')) {
             $url = $base . '&realtime=1';
         } else {
             $url = $base . '?realtime=1';
@@ -97,21 +97,19 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
-        // FIXME: Need to check if the current URL is a poped realtime window
-        if (1==2) {
+        if ($action->boolean('realtime')) {
             $realtimeUI = ' RealtimeUpdate.initPopupWindow();';
         }
         else {
-            // FIXME: This icon URL is no good if fancy URLs are off.
-            $iconurl = $base.'plugins/Realtime/icon_external.gif';
+            $iconurl = common_path('plugins/Realtime/icon_external.gif');
             $realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
         }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
 
         $script = ' $(document).ready(function() { '.
-          $this->_updateInitialize($timeline, $user_id).
           $realtimeUI.
+          $this->_updateInitialize($timeline, $user_id).
           '}); ';
         $action->raw($script);
 
@@ -219,8 +217,10 @@ class RealtimePlugin extends Plugin
                               : array('id' => $action->trimmed('action')));
 
         $action->elementStart('div', array('id' => 'header'));
+
         // XXX hack to deal with JS that tries to get the
         // root url from page output
+
         $action->elementStart('address');
         $action->element('a', array('class' => 'url',
                                   'href' => common_local_url('public')),

From a5ed805aeabab3930d066b2777dbab9663bc487f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 23 Sep 2009 23:23:13 -0400
Subject: [PATCH 15/18] move scripts to just before </body>, add event for
 scripts that need to be in <head>

---
 EVENTS.txt     |  6 ++++++
 lib/action.php | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 68cb28603b..dfaf34a66e 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -134,3 +134,9 @@ StartAddressData: Allows the site owner to provide additional information about
 
 EndAddressData: At the end of <address>
 - $action: the current action
+
+StartShowHeadElements: Right after the <head> tag
+- $action: the current action
+
+EndShowHeadElements: Right before the </head> tag; put <script>s here if you need them in <head>
+- $action: the current action
diff --git a/lib/action.php b/lib/action.php
index 670eb498c1..ebc812acaa 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -120,14 +120,16 @@ class Action extends HTMLOutputter // lawsuit
     {
         // XXX: attributes (profile?)
         $this->elementStart('head');
-        $this->showTitle();
-        $this->showShortcutIcon();
-        $this->showStylesheets();
-        $this->showScripts();
-        $this->showOpenSearch();
-        $this->showFeeds();
-        $this->showDescription();
-        $this->extraHead();
+        if (Event::handle('StartShowHeadElements', array($this))) {
+            $this->showTitle();
+            $this->showShortcutIcon();
+            $this->showStylesheets();
+            $this->showOpenSearch();
+            $this->showFeeds();
+            $this->showDescription();
+            $this->extraHead();
+            Event::handle('EndShowHeadElements', array($this));
+        }
         $this->elementEnd('head');
     }
 
@@ -352,6 +354,7 @@ class Action extends HTMLOutputter // lawsuit
             Event::handle('EndShowFooter', array($this));
         }
         $this->elementEnd('div');
+        $this->showScripts();
         $this->elementEnd('body');
     }
 

From 55fb3222881b6a4a6613283a49d20d5d45cd4856 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Thu, 24 Sep 2009 11:01:18 +0100
Subject: [PATCH 16/18] Fixed broken Piwik plugin - was not using the supplied
 site code

---
 plugins/PiwikAnalyticsPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index e36bd1c5c3..8191f51811 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -73,7 +73,7 @@ class PiwikAnalyticsPlugin extends Plugin
     function __construct($root=null, $id=null)
     {
         $this->piwikroot = $root;
-        $this->piwikid   = $id;
+        $this->piwikId   = $id;
         parent::__construct();
     }
 

From 5323956e388ebc2e4dfa1a5193aa670c96fff027 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 24 Sep 2009 13:48:38 -0400
Subject: [PATCH 17/18] implemented etag and last modified

---
 plugins/Autocomplete/autocomplete.php | 54 +++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/plugins/Autocomplete/autocomplete.php b/plugins/Autocomplete/autocomplete.php
index 4379a86f28..aa57b3915f 100644
--- a/plugins/Autocomplete/autocomplete.php
+++ b/plugins/Autocomplete/autocomplete.php
@@ -47,10 +47,48 @@ class AutocompleteAction extends Action
 {
     private $result;
 
+    /**
+     * Last-modified date for page
+     *
+     * When was the content of this page last modified? Based on notice,
+     * profile, avatar.
+     *
+     * @return int last-modified date as unix timestamp
+     */
+    function lastModified()
+    {
+        $max=0;
+        foreach($this->users as $user){
+            $max = max($max,strtotime($user->modified),strtotime($user->profile->modified));
+        }
+        foreach($this->groups as $group){
+            $max = max($max,strtotime($group->modified));
+        }
+        return $max;
+    }
+
+    /**
+     * An entity tag for this page
+     *
+     * Shows the ETag for the page, based on the notice ID and timestamps
+     * for the notice, profile, and avatar. It's weak, since we change
+     * the date text "one hour ago", etc.
+     *
+     * @return string etag
+     */
+    function etag()
+    {
+        return '"' . implode(':', array($this->arg('action'),
+            crc32($this->arg('q')), //the actual string can have funny characters in we don't want showing up in the etag
+            $this->arg('limit'),
+            $this->lastModified())) . '"';
+    }
+
     function prepare($args)
     {
         parent::prepare($args);
-        $this->results = array();
+        $this->groups=array();
+        $this->users=array();
         $q = $this->arg('q');
         $limit = $this->arg('limit');
         if($limit > 200) $limit=200; //prevent DOS attacks
@@ -63,7 +101,8 @@ class AutocompleteAction extends Action
             $user->find();
             while($user->fetch()) {
                 $profile = Profile::staticGet($user->id);
-                $this->results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'user');
+                $user->profile=$profile;
+                $this->users[]=$user;
             }
         }
         if(substr($q,0,1)=='!'){
@@ -74,7 +113,7 @@ class AutocompleteAction extends Action
             $group->whereAdd('nickname like \'' . trim($group->escape($q), '\'') . '%\'');
             $group->find();
             while($group->fetch()) {
-                $this->results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
+                $this->groups[]=$group;
             }
         }
         return true;
@@ -83,7 +122,14 @@ class AutocompleteAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        foreach($this->results as $result) {
+        $results = array();
+        foreach($this->users as $user){
+            $results[]=array('nickname' => $user->nickname, 'fullname'=> $user->profile->fullname, 'type'=>'user');
+        }
+        foreach($this->groups as $group){
+            $results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
+        }
+        foreach($results as $result) {
             print json_encode($result) . "\n";
         }
     }

From 3d30ad83f881a69d76b57a9af051fef308644987 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 24 Sep 2009 16:52:32 -0400
Subject: [PATCH 18/18] Implemented join and leave groups api methods

---
 actions/twitapigroups.php | 124 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
index 4deb1b764a..493144e77e 100644
--- a/actions/twitapigroups.php
+++ b/actions/twitapigroups.php
@@ -293,6 +293,105 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
          }
      }
 
+     function join($args, $apidata)
+     {
+         parent::handle($args);
+
+         common_debug("in groups api action");
+
+         $this->auth_user = $apidata['user'];
+         $group = $this->get_group($apidata['api_arg'], $apidata);
+
+         if (empty($group)) {
+             $this->clientError('Not Found', 404, $apidata['content-type']);
+             return false;
+         }
+
+         if($this->auth_user->isMember($group)){
+            $this->clientError(_('You are already a member of that group'), $code = 403);
+            return false;
+         }
+
+         if (Group_block::isBlocked($group, $this->auth_user->getProfile())) {
+            $this->clientError(_('You have been blocked from that group by the admin.'), 403);
+            return false;
+         }
+
+         $member = new Group_member();
+
+         $member->group_id   = $group->id;
+         $member->profile_id = $this->auth_user->id;
+         $member->created    = common_sql_now();
+
+         $result = $member->insert();
+
+         if (!$result) {
+            common_log_db_error($member, 'INSERT', __FILE__);
+            $this->serverError(sprintf(_('Could not join user %s to group %s'),
+                                       $this->auth_user->nickname, $group->nickname));
+         }
+
+         switch($apidata['content-type']) {
+          case 'xml':
+             $this->show_single_xml_group($group);
+             break;
+          case 'json':
+             $this->show_single_json_group($group);
+             break;
+          default:
+             $this->clientError(_('API method not found!'), $code = 404);
+         }
+     }
+
+     function leave($args, $apidata)
+     {
+         parent::handle($args);
+
+         common_debug("in groups api action");
+
+         $this->auth_user = $apidata['user'];
+         $group = $this->get_group($apidata['api_arg'], $apidata);
+
+         if (empty($group)) {
+             $this->clientError('Not Found', 404, $apidata['content-type']);
+             return false;
+         }
+
+         if(! $this->auth_user->isMember($group)){
+            $this->clientError(_('You are not a member of that group'), $code = 403);
+            return false;
+         }
+
+         $member = new Group_member();
+
+         $member->group_id   = $group->id;
+         $member->profile_id = $this->auth_user->id;
+
+         if (!$member->find(true)) {
+            $this->serverError(_('Could not find membership record.'));
+            return;
+         }
+
+         $result = $member->delete();
+
+         if (!$result) {
+            common_log_db_error($member, 'INSERT', __FILE__);
+            $this->serverError(sprintf(_('Could not remove user %s to group %s'),
+                                       $this->auth_user->nickname, $group->nickname));
+         }
+
+         switch($apidata['content-type']) {
+          case 'xml':
+             $this->show_single_xml_group($group);
+             break;
+          case 'json':
+             $this->show_single_json_group($group);
+             break;
+          default:
+             $this->clientError(_('API method not found!'), $code = 404);
+         }
+     }
+
      function is_member($args, $apidata)
      {
          parent::handle($args);
@@ -326,4 +425,29 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
              $this->clientError(_('API method not found!'), $code = 404);
          }
      }
+
+     function create($args, $apidata)
+     {
+        die("todo");
+     }
+
+     function update($args, $apidata)
+     {
+        die("todo");
+     }
+
+     function update_group_logo($args, $apidata)
+     {
+        die("todo");
+     }
+
+     function destroy($args, $apidata)
+     {
+        die("todo");
+     }
+
+     function tag($args, $apidata)
+     {
+        die("todo");
+     }
 }