Merge branch '0.7.x' into 0.8.x

17 files changed, 489 insertions, 66 deletions

diff --git a/lib/action.php b/lib/action.php
index 2ba877c9c..ee2305911 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -977,17 +977,17 @@ class Action extends HTMLOutputter // lawsuit
         }
         if ($have_before) {
             $pargs   = array('page' => $page-1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
             $this->elementStart('li', array('class' => 'nav_prev'));
-            $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
+            $this->element('a', array('href' => common_local_url($action, $args, $pargs),
+                                      'rel' => 'prev'),
                            _('After'));
             $this->elementEnd('li');
         }
         if ($have_after) {
             $pargs   = array('page' => $page+1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
             $this->elementStart('li', array('class' => 'nav_next'));
-            $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
+            $this->element('a', array('href' => common_local_url($action, $args, $pargs),
+                                      'rel' => 'next'),
                            _('Before'));
             $this->elementEnd('li');
         }
diff --git a/lib/clienterroraction.php b/lib/clienterroraction.php
index 5019dc06d..0c48414d5 100644
--- a/lib/clienterroraction.php
+++ b/lib/clienterroraction.php
@@ -49,7 +49,7 @@ class ClientErrorAction extends ErrorAction
     function __construct($message='Error', $code=400)
     {
         parent::__construct($message, $code);
-        
+
         $this->status  = array(400 => 'Bad Request',
                                401 => 'Unauthorized',
                                402 => 'Payment Required',
@@ -72,7 +72,7 @@ class ClientErrorAction extends ErrorAction
     }
 
     // XXX: Should these error actions even be invokable via URI?
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -84,11 +84,16 @@ class ClientErrorAction extends ErrorAction
         }
 
         $this->message = $this->trimmed('message');
-        
+
         if (!$this->message) {
-            $this->message = "Client Error $this->code"; 
-        }        
+            $this->message = "Client Error $this->code";
+        }
 
         $this->showPage();
     }
+
+    function title()
+    {
+        return $this->status[$this->code];
+    }
 }
diff --git a/lib/common.php b/lib/common.php
index 0fff3af2e..0355d01e3 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -73,6 +73,7 @@ $config =
               'theme' => 'default',
               'path' => $_path,
               'logfile' => null,
+              'logdebug' => false,
               'fancy' => false,
               'locale_path' => INSTALLDIR.'/locale',
               'language' => 'en_US',
@@ -143,6 +144,8 @@ $config =
         array('enabled' => false,
               'server' => 'localhost',
               'port' => 11211),
+ 		'ping' =>
+        array('notify' => array()),
         'inboxes' =>
         array('enabled' => true), # on by default for new sites
         );
@@ -187,6 +190,12 @@ foreach ($_config_files as $_config_file) {
     }
 }
 
+function _have_config()
+{
+    global $_have_a_config;
+    return $_have_a_config;
+}
+
 // XXX: Throw a conniption if database not installed
 
 // Fixup for laconica.ini
diff --git a/lib/groupsbymemberssection.php b/lib/groupsbymemberssection.php
index 4fa07a244..963e21f15 100644
--- a/lib/groupsbymemberssection.php
+++ b/lib/groupsbymemberssection.php
@@ -48,7 +48,7 @@ class GroupsByMembersSection extends GroupSection
         $qry = 'SELECT user_group.*, count(*) as value ' .
           'FROM user_group JOIN group_member '.
           'ON user_group.id = group_member.group_id ' .
-          'GROUP BY user_group.id ' .
+          'GROUP BY user_group.id,user_group.nickname,user_group.fullname,user_group.homepage,user_group.description,user_group.location,user_group.original_logo,user_group.homepage_logo,user_group.stream_logo,user_group.mini_logo,user_group.created,user_group.modified ' .
           'ORDER BY value DESC ';
 
         $limit = GROUPS_PER_SECTION;
diff --git a/lib/groupsbypostssection.php b/lib/groupsbypostssection.php
index a5e33a93d..325b4033f 100644
--- a/lib/groupsbypostssection.php
+++ b/lib/groupsbypostssection.php
@@ -48,7 +48,7 @@ class GroupsByPostsSection extends GroupSection
         $qry = 'SELECT user_group.*, count(*) as value ' .
           'FROM user_group JOIN group_inbox '.
           'ON user_group.id = group_inbox.group_id ' .
-          'GROUP BY user_group.id ' .
+          'GROUP BY user_group.id,user_group.nickname,user_group.fullname,user_group.homepage,user_group.description,user_group.location,user_group.original_logo,user_group.homepage_logo,user_group.stream_logo,user_group.mini_logo,user_group.created,user_group.modified ' .
           'ORDER BY value DESC ';
 
         $limit = GROUPS_PER_SECTION;
diff --git a/lib/grouptagcloudsection.php b/lib/grouptagcloudsection.php
index f05be85cb..5d68af28b 100644
--- a/lib/grouptagcloudsection.php
+++ b/lib/grouptagcloudsection.php
@@ -58,8 +58,14 @@ class GroupTagCloudSection extends TagCloudSection
 
     function getTags()
     {
+        if (common_config('db', 'type') == 'pgsql') {
+            $weightexpr='sum(exp(-extract(epoch from (now() - notice_tag.created)) / %s))';
+        } else {
+            $weightexpr='sum(exp(-(now() - notice_tag.created) / %s))';
+        }
+
         $qry = 'SELECT notice_tag.tag, '.
-          'sum(exp(-(now() - notice_tag.created)/%s)) as weight ' .
+          $weightexpr . ' as weight ' .
           'FROM notice_tag JOIN notice ' .
           'ON notice_tag.notice_id = notice.id ' .
           'JOIN group_inbox on group_inbox.notice_id = notice.id ' .
diff --git a/lib/jsonsearchresultslist.php b/lib/jsonsearchresultslist.php
new file mode 100644
index 000000000..171e1db4d
--- /dev/null
+++ b/lib/jsonsearchresultslist.php
@@ -0,0 +1,259 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * widget for displaying a list of notices
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Search
+ * @package   Laconica
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * widget-like class for showing JSON search results
+ *
+ * @category Search
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ */
+
+class JSONSearchResultsList
+{
+    protected $notice;  // protected attrs invisible to json_encode()
+    protected $rpp;
+
+    // The below attributes are carefully named so the JSON output from
+    // this obj matches the output from search.twitter.com
+
+    var $results;
+    var $since_id;
+    var $max_id;
+    var $refresh_url;
+    var $results_per_page;
+    var $completed_in;
+    var $page;
+    var $query;
+
+    /**
+     * constructor
+     *
+     * @param Notice $notice stream of notices from DB_DataObject
+     */
+
+    function __construct($notice, $query, $rpp, $page, $since_id = 0)
+    {
+        $this->notice           = $notice;
+        $this->query            = urlencode($query);
+        $this->results_per_page = $this->rpp = $rpp;
+        $this->page             = $page;
+        $this->since_id         = $since_id;
+        $this->results          = array();
+    }
+
+    /**
+     * show the list of search results
+     *
+     * @return int count of the search results listed.
+     */
+
+    function show()
+    {
+        $cnt = 0;
+
+        $time_start = microtime(true);
+
+        while ($this->notice->fetch() && $cnt <= $this->rpp) {
+            $cnt++;
+
+            // XXX: Hmmm. this depends on desc sort order
+            if (!$this->max_id) {
+                $this->max_id = (int)$this->notice->id;
+            }
+
+            if ($cnt > $this->rpp) {
+                break;
+            }
+
+            $item = new ResultItem($this->notice);
+            array_push($this->results, $item);
+        }
+
+        $time_end = microtime(true);
+        $this->completed_in = $time_end - $time_start;
+
+        // Set other attrs
+
+        $this->refresh_url = '?since_id=' . $this->max_id .
+            '&q=' . $this->query;
+
+        // pagination stuff
+
+        if ($cnt > $this->rpp) {
+            $this->next_page = '?page=' . ($this->page + 1) .
+                '&max_id=' . $this->max_id;
+            if ($this->rpp != 15) {
+                $this->next_page .= '&rpp=' . $this->rpp;
+            }
+            $this->next_page .= '&q=' . $this->query;
+        }
+
+        if ($this->page > 1) {
+            $this->previous_page = '?page=' . ($this->page - 1) .
+                '&max_id=' . $this->max_id;
+            if ($this->rpp != 15) {
+                $this->previous_page .= '&rpp=' . $this->rpp;
+            }
+            $this->previous_page .= '&q=' . $this->query;
+        }
+
+        print json_encode($this);
+
+        return $cnt;
+    }
+}
+
+/**
+ * widget for displaying a single JSON search result
+ *
+ * @category UI
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ * @see      JSONSearchResultsList
+ */
+
+class ResultItem
+{
+    /** The notice this item is based on. */
+
+    protected $notice;  // protected attrs invisible to json_encode()
+
+    /** The profile associated with the notice. */
+
+    protected $profile;
+
+    // The below attributes are carefully named so the JSON output from
+    // this obj matches the output from search.twitter.com
+
+    var $text;
+    var $to_user_id;
+    var $to_user;
+    var $from_user;
+    var $id;
+    var $from_user_id;
+    var $iso_language_code;
+    var $source;
+    var $profile_image_url;
+    var $created_at;
+
+    /**
+     * constructor
+     *
+     * Also initializes the profile attribute.
+     *
+     * @param Notice $notice The notice we'll display
+     */
+
+    function __construct($notice)
+    {
+        $this->notice  = $notice;
+        $this->profile = $notice->getProfile();
+        $this->buildResult();
+    }
+
+    /**
+     * Build a search result object
+     *
+     * This populates the the result in preparation for JSON encoding.
+     *
+     * @return void
+     */
+
+    function buildResult()
+    {
+        $this->text = $this->notice->content;
+        $replier_profile = null;
+
+        if ($this->notice->reply_to) {
+            $reply = Notice::staticGet(intval($notice->reply_to));
+            if ($reply) {
+                $replier_profile = $reply->getProfile();
+            }
+        }
+
+        $this->to_user_id = ($replier_profile) ?
+            intval($replier_profile->id) : null;
+        $this->to_user = ($replier_profile) ?
+            $replier_profile->nickname : null;
+        $this->from_user = $this->profile->nickname;
+        $this->id = $this->notice->id;
+        $this->from_user_id = $this->profile->id;
+
+        $user = User::staticGet('id', $this->profile->id);
+        $this->iso_language_code = $this->user->language;
+
+        $this->source = $this->getSourceLink($this->notice->source);
+
+        $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
+        $this->profile_image_url = ($avatar) ?
+            $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE);
+
+        $this->created_at = date('r', $this->notice->created);
+    }
+
+    /**
+     * Show the source of the notice
+     *
+     * Either the name (and link) of the API client that posted the notice,
+     * or one of other other channels.
+     *
+     * @return string the source of the Notice
+     */
+
+     function getSourceLink($source)
+     {
+         $source_name = _($source);
+         switch ($source) {
+          case 'web':
+          case 'xmpp':
+          case 'mail':
+          case 'omb':
+          case 'api':
+             break;
+          default:
+             $ns = Notice_source::staticGet($source);
+             if ($ns) {
+                 $source_name = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+             }
+             break;
+         }
+         return $source_name;
+     }
+
+}
diff --git a/lib/noticesection.php b/lib/noticesection.php
index b31f18744..94c2738ef 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -73,6 +73,11 @@ class NoticeSection extends Section
     function showNotice($notice)
     {
         $profile = $notice->getProfile();
+        if (empty($profile)) {
+            common_log(LOG_WARNING, sprintf("Notice %d has no profile",
+                                            $notice->id));
+            return;
+        }
         $this->out->elementStart('li', 'hentry notice');
         $this->out->elementStart('div', 'entry-title');
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index 7ad3be20e..9af05ea2d 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -63,7 +63,7 @@ class LaconicaOAuthDataStore extends OAuthDataStore
         if ($n->find(true)) {
             return true;
         } else {
-            $n->timestamp = $timestamp;
+            $n->ts = $timestamp;
             $n->created = DB_DataObject_Cast::dateTime();
             $n->insert();
             return false;
diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index 0882822db..978153a84 100644
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -58,8 +58,14 @@ class PersonalTagCloudSection extends TagCloudSection
 
     function getTags()
     {
-        $qry = 'SELECT notice_tag.tag, '.
-          'sum(exp(-(now() - notice_tag.created)/%s)) as weight ' .
+        if (common_config('db', 'type') == 'pgsql') {
+            $weightexpr='sum(exp(-extract(epoch from (now() - notice_tag.created)) / %s))';
+        } else {
+            $weightexpr='sum(exp(-(now() - notice_tag.created) / %s))';
+        }
+ 
+       $qry = 'SELECT notice_tag.tag, '.
+          $weightexpr . ' as weight ' .
           'FROM notice_tag JOIN notice ' .
           'ON notice_tag.notice_id = notice.id ' .
           'WHERE notice.profile_id = %d ' .
diff --git a/lib/ping.php b/lib/ping.php
new file mode 100644
index 000000000..32c0b9806
--- /dev/null
+++ b/lib/ping.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+function ping_broadcast_notice($notice) {
+	if (!$notice->is_local) {
+		return;
+	}
+	
+	# Array of servers, URL => type
+	$notify = common_config('ping', 'notify');
+	$profile = $notice->getProfile();
+	$tags = ping_notice_tags($notice);
+	
+	foreach ($notify as $notify_url => $type) {
+		switch ($type) {
+		 case 'xmlrpc':
+		 case 'extended':
+			$req = xmlrpc_encode_request('weblogUpdates.ping',
+										 array($profile->nickname, # site name
+											   common_local_url('showstream', 
+																array('nickname' => $profile->nickname)),
+											   common_local_url('shownotice',
+																array('notice' => $notice->id)),
+											   common_local_url('userrss', 
+																array('nickname' => $profile->nickname)),
+											   $tags));
+			
+			# We re-use this tool's fetcher, since it's pretty good
+	
+			$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
+
+			if (!$fetcher) {
+				common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__);
+				return false;
+			}
+	
+			$result = $fetcher->post($notify_url,
+									 $req);
+											   
+		 case 'get':
+		 case 'post':			
+		 default:
+			common_log(LOG_WARNING, 'Unknown notify type for ' . $notify_url . ': ' . $type);
+										   }
+	}
+}
+		
+function ping_notice_tags($notice) {
+	$tag = new Notice_tag();
+	$tag->notice_id = $notice->id;
+	$tags = array();
+	if ($tag->find()) {
+		while ($tag->fetch()) {
+			$tags[] = $tag->tag;
+		}
+		$tag->free();
+		unset($tag);
+		return implode('|', $tags);
+	}
+	return NULL;
+}
\ No newline at end of file
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index c7c7f0215..0505f0fa9 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -48,10 +48,18 @@ class PopularNoticeSection extends NoticeSection
 {
     function getNotices()
     {
+        if (common_config('db', 'type') == 'pgsql') {
+            $weightexpr='sum(exp(-extract(epoch from (now() - fave.modified)) / %s))';
+        } else {
+            $weightexpr='sum(exp(-(now() - fave.modified) / %s))';
+        }
+
         $qry = 'SELECT notice.*, '.
-          'sum(exp(-(now() - fave.modified) / %s)) as weight ' .
+          $weightexpr . ' as weight ' .
           'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
-          'GROUP BY fave.notice_id ' .
+          'GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' .
+                   'notice.rendered,notice.url,notice.created,notice.modified,' .
+                   'notice.reply_to,notice.is_local,notice.source ' .
           'ORDER BY weight DESC';
 
         $offset = 0;
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index d72475e20..485d25e20 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -39,6 +39,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @category Output
  * @package  Laconica
  * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  *
@@ -73,23 +74,26 @@ class PublicGroupNav extends Widget
 
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        $this->out->menuItem(common_local_url('public'), _('Public'),
-            _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
+        if (Event::handle('StartPublicGroupNav', array($this))) {
+            $this->out->menuItem(common_local_url('public'), _('Public'),
+                _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
 
-        $this->out->menuItem(common_local_url('groups'), _('Groups'),
-            _('User groups'), $action_name == 'groups', 'nav_groups');
+            $this->out->menuItem(common_local_url('groups'), _('Groups'),
+                _('User groups'), $action_name == 'groups', 'nav_groups');
 
-        $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
-            _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
+            $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
+                _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
 
-        if (count(common_config('nickname', 'featured')) > 0) {
-            $this->out->menuItem(common_local_url('featured'), _('Featured'),
-                _('Featured users'), $action_name == 'featured', 'nav_featured');
-        }
+            if (count(common_config('nickname', 'featured')) > 0) {
+                $this->out->menuItem(common_local_url('featured'), _('Featured'),
+                    _('Featured users'), $action_name == 'featured', 'nav_featured');
+            }
 
-        $this->out->menuItem(common_local_url('favorited'), _('Popular'),
-            _("Popular notices"), $action_name == 'favorited', 'nav_timeline_favorited');
+            $this->out->menuItem(common_local_url('favorited'), _('Popular'),
+                _("Popular notices"), $action_name == 'favorited', 'nav_timeline_favorited');
 
+            Event::handle('EndPublicGroupNav', array($this));
+        }
         $this->action->elementEnd('ul');
     }
 }
diff --git a/lib/router.php b/lib/router.php
index 1d1a5ba4c..aab286721 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -234,14 +234,15 @@ class Router
 
         // users
 
-        $m->connect('api/users/show/:argument',
+        $m->connect('api/users/:method/:argument',
                     array('action' => 'api',
-                          'apiaction' => 'users'));
+                          'apiaction' => 'users'),
+                    array('method' => 'show(\.(xml|json))?'));
 
         $m->connect('api/users/:method',
                     array('action' => 'api',
                           'apiaction' => 'users'),
-                    array('method' => 'show(\.(xml|json|atom|rss))?'));
+                    array('method' => 'show(\.(xml|json))?'));
 
         // direct messages
 
@@ -356,9 +357,15 @@ class Router
                     array('action' => 'api',
                           'apiaction' => 'laconica'));
 
+
+        // search
+        $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
+        $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
+        $m->connect('api/trends.json', array('action' => 'twitapitrends'));
+
         // user stuff
 
-        foreach (array('subscriptions', 'subscribers',
+      foreach (array('subscriptions', 'subscribers',
                        'nudge', 'xrds', 'all', 'foaf',
                        'replies', 'inbox', 'outbox', 'microsummary') as $a) {
             $m->connect(':nickname/'.$a,
@@ -398,6 +405,8 @@ class Router
                     array('action' => 'showstream'),
                     array('nickname' => '[a-zA-Z0-9]{1,64}'));
 
+        Event::handle('RouterInitialized', array($m));
+
         return $m;
     }
 
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index 80a3fdd7b..595dcf147 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -42,7 +42,7 @@ require_once INSTALLDIR.'/lib/error.php';
  * says that 500 errors should be treated similarly to 400 errors, and
  * it's easier to give an HTML response.  Maybe we can customize these
  * to display some funny animal cartoons.  If not, we can probably role
- * these classes up into a single class. 
+ * these classes up into a single class.
  *
  * See: http://tools.ietf.org/html/rfc2616#section-10
  *
@@ -57,19 +57,19 @@ class ServerErrorAction extends ErrorAction
     function __construct($message='Error', $code=500)
     {
         parent::__construct($message, $code);
-        
+
         $this->status  = array(500 => 'Internal Server Error',
                                501 => 'Not Implemented',
                                502 => 'Bad Gateway',
                                503 => 'Service Unavailable',
                                504 => 'Gateway Timeout',
                                505 => 'HTTP Version Not Supported');
-        
+
         $this->default = 500;
     }
 
     // XXX: Should these error actions even be invokable via URI?
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -81,12 +81,16 @@ class ServerErrorAction extends ErrorAction
         }
 
         $this->message = $this->trimmed('message');
-        
+
         if (!$this->message) {
-            $this->message = "Server Error $this->code"; 
-        }        
+            $this->message = "Server Error $this->code";
+        }
 
         $this->showPage();
     }
-     
+
+    function title()
+    {
+        return $this->status[$this->code];
+    }
 }
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index a4d183fcd..1de169a0b 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -24,11 +24,33 @@ class TwitterapiAction extends Action
 
     var $auth_user;
 
+    /**
+     * Initialization.
+     *
+     * @param array $args Web and URL arguments
+     *
+     * @return boolean false if user doesn't exist
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        return true;
+    }
+
+    /**
+     * Handle a request
+     *
+     * @param array $args Arguments from $_REQUEST
+     *
+     * @return void
+     */
+
     function handle($args)
     {
         parent::handle($args);
     }
-    
+
     function twitter_user_array($profile, $get_notice=false)
     {
 
@@ -60,20 +82,34 @@ class TwitterapiAction extends Action
 
     function twitter_status_array($notice, $include_user=true)
     {
-
         $profile = $notice->getProfile();
 
         $twitter_status = array();
         $twitter_status['text'] = $notice->content;
         $twitter_status['truncated'] = 'false'; # Not possible on Laconica
         $twitter_status['created_at'] = $this->date_twitter($notice->created);
-        $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : null;
+        $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ?
+            intval($notice->reply_to) : null;
         $twitter_status['source'] = $this->source_link($notice->source);
         $twitter_status['id'] = intval($notice->id);
-        $twitter_status['in_reply_to_user_id'] = ($notice->reply_to) ? $this->replier_by_reply(intval($notice->reply_to)) : null;
+
+        $replier_profile = null;
+
+        if ($notice->reply_to) {
+            $reply = Notice::staticGet(intval($notice->reply_to));
+            if ($reply) {
+                $replier_profile = $reply->getProfile();
+            }
+        }
+
+        $twitter_status['in_reply_to_user_id'] =
+            ($replier_profile) ? intval($replier_profile->id) : null;
+        $twitter_status['in_reply_to_screen_name'] =
+            ($replier_profile) ? $replier_profile->nickname : null;
 
         if (isset($this->auth_user)) {
-            $twitter_status['favorited'] = ($this->auth_user->hasFave($notice)) ? 'true' : 'false';
+            $twitter_status['favorited'] =
+                ($this->auth_user->hasFave($notice)) ? 'true' : 'false';
         } else {
             $twitter_status['favorited'] = 'false';
         }
@@ -137,7 +173,6 @@ class TwitterapiAction extends Action
 
     function twitter_dmsg_array($message)
     {
-
         $twitter_dm = array();
 
         $from_profile = $message->getFrom();
@@ -387,22 +422,6 @@ class TwitterapiAction extends Action
         return date("D M d G:i:s O Y", $t);
     }
 
-    function replier_by_reply($reply_id)
-    {
-        $notice = Notice::staticGet($reply_id);
-        if ($notice) {
-            $profile = $notice->getProfile();
-            if ($profile) {
-                return intval($profile->id);
-            } else {
-                common_debug('Can\'t find a profile for notice: ' . $notice->id, __FILE__);
-            }
-        } else {
-            common_debug("Can't get notice: $reply_id", __FILE__);
-        }
-        return null;
-    }
-
     // XXX: Candidate for a general utility method somewhere?
     function count_subscriptions($profile)
     {
diff --git a/lib/util.php b/lib/util.php
index 18e4f310c..9637dc506 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -81,7 +81,7 @@ function common_language()
 
     // If there is a user logged in and they've set a language preference
     // then return that one...
-    if (common_logged_in()) {
+    if (_have_config() && common_logged_in()) {
         $user = common_current_user();
         $user_language = $user->language;
         if ($user_language)
@@ -315,6 +315,10 @@ function common_current_user()
 {
     global $_cur;
 
+    if (!_have_config()) {
+        return null;
+    }
+
     if ($_cur === false) {
 
         if (isset($_REQUEST[session_name()]) || (isset($_SESSION['userid']) && $_SESSION['userid'])) {
@@ -618,9 +622,15 @@ function common_at_link($sender_id, $nickname)
     $sender = Profile::staticGet($sender_id);
     $recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
     if ($recipient) {
+        $user = User::staticGet('id', $recipient->id);
+        if ($user) {
+            $url = common_local_url('userbyid', array('id' => $user->id));
+        } else {
+            $url = $recipient->profileurl;
+        }
         $xs = new XMLStringer(false);
         $xs->elementStart('span', 'vcard');
-        $xs->elementStart('a', array('href' => $recipient->profileurl,
+        $xs->elementStart('a', array('href' => $url,
                                      'class' => 'url'));
         $xs->element('span', 'fn nickname', $nickname);
         $xs->elementEnd('a');
@@ -842,7 +852,7 @@ function common_broadcast_notice($notice, $remote=false)
 
 function common_enqueue_notice($notice)
 {
-    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook') as $transport) {
+    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) {
         $qi = new Queue_item();
         $qi->notice_id = $notice->id;
         $qi->transport = $transport;