Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

8 files changed, 28 insertions, 817 deletions

diff --git a/lib/common.php b/lib/common.php
index ce33c871b..e29456ed4 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -223,7 +223,6 @@ require_once INSTALLDIR.'/lib/theme.php';
 require_once INSTALLDIR.'/lib/mail.php';
 require_once INSTALLDIR.'/lib/subs.php';
 require_once INSTALLDIR.'/lib/Shorturl_api.php';
-require_once INSTALLDIR.'/lib/twitter.php';
 
 require_once INSTALLDIR.'/lib/clientexception.php';
 require_once INSTALLDIR.'/lib/serverexception.php';
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index 2095a7ceb..e5fb8727b 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -98,34 +98,37 @@ class ConnectSettingsNav extends Widget
 
     function show()
     {
-        # action => array('prompt', 'title')
-        $menu = array();
-        if (common_config('xmpp', 'enabled')) {
-            $menu['imsettings'] =
-              array(_('IM'),
-                    _('Updates by instant messenger (IM)'));
-        }
-        if (common_config('sms', 'enabled')) {
-            $menu['smssettings'] =
-              array(_('SMS'),
-                    _('Updates by SMS'));
-        }
-        if (common_config('twitter', 'enabled')) {
-            $menu['twittersettings'] =
-              array(_('Twitter'),
-                    _('Twitter integration options'));
-        }
-
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        foreach ($menu as $menuaction => $menudesc) {
-            $this->action->menuItem(common_local_url($menuaction),
-				    $menudesc[0],
-				    $menudesc[1],
-				    $action_name === $menuaction);
+        if (Event::handle('StartConnectSettingsNav', array(&$this->action))) {
+
+            # action => array('prompt', 'title')
+            $menu = array();
+            if (common_config('xmpp', 'enabled')) {
+                $menu['imsettings'] =
+                  array(_('IM'),
+                        _('Updates by instant messenger (IM)'));
+            }
+            if (common_config('sms', 'enabled')) {
+                $menu['smssettings'] =
+                  array(_('SMS'),
+                        _('Updates by SMS'));
+            }
+
+            foreach ($menu as $menuaction => $menudesc) {
+                $this->action->menuItem(common_local_url($menuaction),
+                        $menudesc[0],
+                        $menudesc[1],
+                        $action_name === $menuaction);
+            }
+
+            Event::handle('EndConnectSettingsNav', array(&$this->action));
         }
 
         $this->action->elementEnd('ul');
     }
+
 }
+
+
diff --git a/lib/default.php b/lib/default.php
index 9ab8305ed..30e43eefb 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -140,7 +140,7 @@ $default =
         array('enabled' => true),
         'sms' =>
         array('enabled' => true),
-        'twitterbridge' =>
+        'twitterimport' =>
         array('enabled' => false),
         'integration' =>
         array('source' => 'StatusNet', # source attribute for Twitter
diff --git a/lib/router.php b/lib/router.php
index b9a45d867..a5b6a9a30 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -86,10 +86,6 @@ class Router
 
         $m->connect('doc/:title', array('action' => 'doc'));
 
-        // Twitter
-
-        $m->connect('twitter/authorization', array('action' => 'twitterauthorization'));
-
         // facebook
 
         $m->connect('facebook', array('action' => 'facebookhome'));
@@ -136,7 +132,7 @@ class Router
         // settings
 
         foreach (array('profile', 'avatar', 'password', 'im',
-                       'email', 'sms', 'twitter', 'userdesign', 'other') as $s) {
+                       'email', 'sms', 'userdesign', 'other') as $s) {
             $m->connect('settings/'.$s, array('action' => $s.'settings'));
         }
 
diff --git a/lib/twitter.php b/lib/twitter.php
deleted file mode 100644
index afc3f55ba..000000000
--- a/lib/twitter.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, 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('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-define('TWITTER_SERVICE', 1); // Twitter is foreign_service ID 1
-
-function updateTwitter_user($twitter_id, $screen_name)
-{
-    $uri = 'http://twitter.com/' . $screen_name;
-    $fuser = new Foreign_user();
-
-    $fuser->query('BEGIN');
-
-    // Dropping down to SQL because regular DB_DataObject udpate stuff doesn't seem
-    // to work so good with tables that have multiple column primary keys
-
-    // Any time we update the uri for a forein user we have to make sure there
-    // are no dupe entries first -- unique constraint on the uri column
-
-    $qry = 'UPDATE foreign_user set uri = \'\' WHERE uri = ';
-    $qry .= '\'' . $uri . '\'' . ' AND service = ' . TWITTER_SERVICE;
-
-    $fuser->query($qry);
-
-    // Update the user
-
-    $qry = 'UPDATE foreign_user SET nickname = ';
-    $qry .= '\'' . $screen_name . '\'' . ', uri = \'' . $uri . '\' ';
-    $qry .= 'WHERE id = ' . $twitter_id . ' AND service = ' . TWITTER_SERVICE;
-
-    $fuser->query('COMMIT');
-
-    $fuser->free();
-    unset($fuser);
-
-    return true;
-}
-
-function add_twitter_user($twitter_id, $screen_name)
-{
-
-    $new_uri = 'http://twitter.com/' . $screen_name;
-
-    // Clear out any bad old foreign_users with the new user's legit URL
-    // This can happen when users move around or fakester accounts get
-    // repoed, and things like that.
-
-    $luser = new Foreign_user();
-    $luser->uri = $new_uri;
-    $luser->service = TWITTER_SERVICE;
-    $result = $luser->delete();
-
-    if (empty($result)) {
-        common_log(LOG_WARNING,
-            "Twitter bridge - removed invalid Twitter user squatting on uri: $new_uri");
-    }
-
-    $luser->free();
-    unset($luser);
-
-    // Otherwise, create a new Twitter user
-
-    $fuser = new Foreign_user();
-
-    $fuser->nickname = $screen_name;
-    $fuser->uri = 'http://twitter.com/' . $screen_name;
-    $fuser->id = $twitter_id;
-    $fuser->service = TWITTER_SERVICE;
-    $fuser->created = common_sql_now();
-    $result = $fuser->insert();
-
-    if (empty($result)) {
-        common_log(LOG_WARNING,
-            "Twitter bridge - failed to add new Twitter user: $twitter_id - $screen_name.");
-        common_log_db_error($fuser, 'INSERT', __FILE__);
-    } else {
-        common_debug("Twitter bridge - Added new Twitter user: $screen_name ($twitter_id).");
-    }
-
-    return $result;
-}
-
-// Creates or Updates a Twitter user
-function save_twitter_user($twitter_id, $screen_name)
-{
-
-    // Check to see whether the Twitter user is already in the system,
-    // and update its screen name and uri if so.
-
-    $fuser = Foreign_user::getForeignUser($twitter_id, TWITTER_SERVICE);
-
-    if (!empty($fuser)) {
-
-        $result = true;
-
-        // Only update if Twitter screen name has changed
-
-        if ($fuser->nickname != $screen_name) {
-            $result = updateTwitter_user($twitter_id, $screen_name);
-
-            common_debug('Twitter bridge - Updated nickname (and URI) for Twitter user ' .
-                "$fuser->id to $screen_name, was $fuser->nickname");
-        }
-
-        return $result;
-
-    } else {
-        return add_twitter_user($twitter_id, $screen_name);
-    }
-
-    $fuser->free();
-    unset($fuser);
-
-    return true;
-}
-
-function is_twitter_bound($notice, $flink) {
-
-    // Check to see if notice should go to Twitter
-    if (!empty($flink) && ($flink->noticesync & FOREIGN_NOTICE_SEND)) {
-
-        // If it's not a Twitter-style reply, or if the user WANTS to send replies.
-        if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
-            ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-function broadcast_twitter($notice)
-{
-    $flink = Foreign_link::getByUserID($notice->profile_id,
-                                       TWITTER_SERVICE);
-
-    if (is_twitter_bound($notice, $flink)) {
-        if (TwitterOAuthClient::isPackedToken($flink->credentials)) {
-            return broadcast_oauth($notice, $flink);
-        } else {
-            return broadcast_basicauth($notice, $flink);
-        }
-    }
-
-    return true;
-}
-
-function broadcast_oauth($notice, $flink) {
-    $user = $flink->getUser();
-    $statustxt = format_status($notice);
-    // Convert !groups to #hashes
-    $statustxt = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/', "\\1#\\2", $statustxt);
-    $token = TwitterOAuthClient::unpackToken($flink->credentials);
-    $client = new TwitterOAuthClient($token->key, $token->secret);
-    $status = null;
-
-    try {
-        $status = $client->statusesUpdate($statustxt);
-    } catch (OAuthClientCurlException $e) {
-        return process_error($e, $flink);
-    }
-
-    if (empty($status)) {
-
-        // This could represent a failure posting,
-        // or the Twitter API might just be behaving flakey.
-
-        $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' .
-                          'trying to send update for %1$s (user id %2$s).',
-                          $user->nickname, $user->id);
-        common_log(LOG_WARNING, $errmsg);
-
-        return false;
-    }
-
-    // Notice crossed the great divide
-
-    $msg = sprintf('Twitter bridge - posted notice %s to Twitter using OAuth.',
-                   $notice->id);
-    common_log(LOG_INFO, $msg);
-
-    return true;
-}
-
-function broadcast_basicauth($notice, $flink)
-{
-    $user = $flink->getUser();
-
-    $statustxt = format_status($notice);
-
-    $client = new TwitterBasicAuthClient($flink);
-    $status = null;
-
-    try {
-        $status = $client->statusesUpdate($statustxt);
-    } catch (BasicAuthCurlException $e) {
-        return process_error($e, $flink);
-    }
-
-    if (empty($status)) {
-
-        $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' .
-                          'trying to send update for %1$s (user id %2$s).',
-                          $user->nickname, $user->id);
-        common_log(LOG_WARNING, $errmsg);
-
-            $errmsg = sprintf('No data returned by Twitter API when ' .
-                             'trying to send update for %1$s (user id %2$s).',
-                             $user->nickname, $user->id);
-            common_log(LOG_WARNING, $errmsg);
-        return false;
-    }
-
-    $msg = sprintf('Twitter bridge - posted notice %s to Twitter using basic auth.',
-                   $notice->id);
-    common_log(LOG_INFO, $msg);
-
-    return true;
-}
-
-function process_error($e, $flink)
-{
-    $user        = $flink->getUser();
-    $errmsg      = $e->getMessage();
-    $delivered   = false;
-
-    switch($errmsg) {
-     case 'The requested URL returned error: 401':
-        $logmsg = sprintf('Twiter bridge - User %1$s (user id: %2$s) has an invalid ' .
-                          'Twitter screen_name/password combo or an invalid acesss token.',
-                          $user->nickname, $user->id);
-        $delivered = true;
-        remove_twitter_link($flink);
-        break;
-     case 'The requested URL returned error: 403':
-        $logmsg = sprintf('Twitter bridge - User %1$s (user id: %2$s) has exceeded ' .
-                          'his/her Twitter request limit.',
-                          $user->nickname, $user->id);
-        break;
-     default:
-        $logmsg = sprintf('Twitter bridge - cURL error trying to send notice to Twitter ' .
-                          'for user %1$s (user id: %2$s) - ' .
-                          'code: %3$s message: %4$s.',
-                          $user->nickname, $user->id,
-                          $e->getCode(), $e->getMessage());
-        break;
-    }
-
-    common_log(LOG_WARNING, $logmsg);
-
-    return $delivered;
-}
-
-function format_status($notice)
-{
-    // XXX: Hack to get around PHP cURL's use of @ being a a meta character
-    return preg_replace('/^@/', ' @', $notice->content);
-}
-
-function remove_twitter_link($flink)
-{
-    $user = $flink->getUser();
-
-    common_log(LOG_INFO, 'Removing Twitter bridge Foreign link for ' .
-               "user $user->nickname (user id: $user->id).");
-
-    $result = $flink->delete();
-
-    if (empty($result)) {
-        common_log(LOG_ERR, 'Could not remove Twitter bridge ' .
-                   "Foreign_link for $user->nickname (user id: $user->id)!");
-        common_log_db_error($flink, 'DELETE', __FILE__);
-    }
-
-    // Notify the user that her Twitter bridge is down
-
-    if (isset($user->email)) {
-
-        $result = mail_twitter_bridge_removed($user);
-
-        if (!$result) {
-
-            $msg = 'Unable to send email to notify ' .
-              "$user->nickname (user id: $user->id) " .
-              'that their Twitter bridge link was ' .
-              'removed!';
-
-            common_log(LOG_WARNING, $msg);
-        }
-    }
-
-}
diff --git a/lib/twitterbasicauthclient.php b/lib/twitterbasicauthclient.php
deleted file mode 100644
index 1040d72fb..000000000
--- a/lib/twitterbasicauthclient.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Class for doing OAuth calls against Twitter
- *
- * 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  Integration
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Exception wrapper for cURL errors
- *
- * @category Integration
- * @package  StatusNet
- * @author Adrian Lang <mail@adrianlang.de>
- * @author Brenda Wallace <shiny@cpan.org>
- * @author Craig Andrews <candrews@integralblue.com>
- * @author Dan Moore <dan@moore.cx>
- * @author Evan Prodromou <evan@status.net>
- * @author mEDI <medi@milaro.net>
- * @author Sarven Capadisli <csarven@status.net>
- * @author Zach Copley <zach@status.net> * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-class BasicAuthCurlException extends Exception
-{
-}
-
-/**
- * Class for talking to the Twitter API with HTTP Basic Auth.
- *
- * @category Integration
- * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-class TwitterBasicAuthClient
-{
-    var $screen_name = null;
-    var $password    = null;
-
-    /**
-     * constructor
-     *
-     * @param Foreign_link $flink a Foreign_link storing the
-     *                            Twitter user's password, etc.
-     */
-    function __construct($flink)
-    {
-        $fuser             = $flink->getForeignUser();
-        $this->screen_name = $fuser->nickname;
-        $this->password    = $flink->credentials;
-    }
-
-    /**
-     * Calls Twitter's /statuses/update API method
-     *
-     * @param string $status                text of the status
-     * @param int    $in_reply_to_status_id optional id of the status it's
-     *                                      a reply to
-     *
-     * @return mixed the status
-     */
-    function statusesUpdate($status, $in_reply_to_status_id = null)
-    {
-        $url      = 'https://twitter.com/statuses/update.json';
-        $params   = array('status' => $status,
-                          'source' => common_config('integration', 'source'),
-                          'in_reply_to_status_id' => $in_reply_to_status_id);
-        $response = $this->httpRequest($url, $params);
-        $status   = json_decode($response);
-        return $status;
-    }
-
-    /**
-     * Calls Twitter's /statuses/friends_timeline API method
-     *
-     * @param int $since_id show statuses after this id
-     * @param int $max_id   show statuses before this id
-     * @param int $cnt      number of statuses to show
-     * @param int $page     page number
-     *
-     * @return mixed an array of statuses
-     */
-    function statusesFriendsTimeline($since_id = null, $max_id = null,
-                                     $cnt = null, $page = null)
-    {
-        $url    = 'https://twitter.com/statuses/friends_timeline.json';
-        $params = array('since_id' => $since_id,
-                        'max_id' => $max_id,
-                        'count' => $cnt,
-                        'page' => $page);
-        $qry    = http_build_query($params);
-
-        if (!empty($qry)) {
-            $url .= "?$qry";
-        }
-
-        $response = $this->httpRequest($url);
-        $statuses = json_decode($response);
-        return $statuses;
-    }
-
-    /**
-     * Calls Twitter's /statuses/friends API method
-     *
-     * @param int $id          id of the user whom you wish to see friends of
-     * @param int $user_id     numerical user id
-     * @param int $screen_name screen name
-     * @param int $page        page number
-     *
-     * @return mixed an array of twitter users and their latest status
-     */
-    function statusesFriends($id = null, $user_id = null, $screen_name = null,
-                             $page = null)
-    {
-        $url = "https://twitter.com/statuses/friends.json";
-
-        $params = array('id' => $id,
-                        'user_id' => $user_id,
-                        'screen_name' => $screen_name,
-                        'page' => $page);
-        $qry    = http_build_query($params);
-
-        if (!empty($qry)) {
-            $url .= "?$qry";
-        }
-
-        $response = $this->httpRequest($url);
-        $friends  = json_decode($response);
-        return $friends;
-    }
-
-    /**
-     * Calls Twitter's /statuses/friends/ids API method
-     *
-     * @param int $id          id of the user whom you wish to see friends of
-     * @param int $user_id     numerical user id
-     * @param int $screen_name screen name
-     * @param int $page        page number
-     *
-     * @return mixed a list of ids, 100 per page
-     */
-    function friendsIds($id = null, $user_id = null, $screen_name = null,
-                        $page = null)
-    {
-        $url = "https://twitter.com/friends/ids.json";
-
-        $params = array('id' => $id,
-                        'user_id' => $user_id,
-                        'screen_name' => $screen_name,
-                        'page' => $page);
-        $qry    = http_build_query($params);
-
-        if (!empty($qry)) {
-            $url .= "?$qry";
-        }
-
-        $response = $this->httpRequest($url);
-        $ids      = json_decode($response);
-        return $ids;
-    }
-
-    /**
-     * Make a HTTP request using cURL.
-     *
-     * @param string $url    Where to make the request
-     * @param array  $params post parameters
-     *
-     * @return mixed the request
-     */
-    function httpRequest($url, $params = null, $auth = true)
-    {
-        $options = array(
-                         CURLOPT_RETURNTRANSFER => true,
-                         CURLOPT_FAILONERROR    => true,
-                         CURLOPT_HEADER         => false,
-                         CURLOPT_FOLLOWLOCATION => true,
-                         CURLOPT_USERAGENT      => 'StatusNet',
-                         CURLOPT_CONNECTTIMEOUT => 120,
-                         CURLOPT_TIMEOUT        => 120,
-                         CURLOPT_HTTPAUTH       => CURLAUTH_ANY,
-                         CURLOPT_SSL_VERIFYPEER => false,
-
-                         // Twitter is strict about accepting invalid "Expect" headers
-
-                         CURLOPT_HTTPHEADER => array('Expect:')
-                         );
-
-        if (isset($params)) {
-            $options[CURLOPT_POST]       = true;
-            $options[CURLOPT_POSTFIELDS] = $params;
-        }
-
-        if ($auth) {
-            $options[CURLOPT_USERPWD] = $this->screen_name .
-              ':' . $this->password;
-        }
-
-        $ch = curl_init($url);
-        curl_setopt_array($ch, $options);
-        $response = curl_exec($ch);
-
-        if ($response === false) {
-            $msg  = curl_error($ch);
-            $code = curl_errno($ch);
-            throw new BasicAuthCurlException($msg, $code);
-        }
-
-        curl_close($ch);
-
-        return $response;
-    }
-
-}
diff --git a/lib/twitteroauthclient.php b/lib/twitteroauthclient.php
deleted file mode 100644
index bad2b74ca..000000000
--- a/lib/twitteroauthclient.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Class for doing OAuth calls against Twitter
- *
- * 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  Integration
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Class for talking to the Twitter API with OAuth.
- *
- * @category Integration
- * @package  StatusNet
- * @author   Zach Copley <zach@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- *
- */
-class TwitterOAuthClient extends OAuthClient
-{
-    public static $requestTokenURL = 'https://twitter.com/oauth/request_token';
-    public static $authorizeURL    = 'https://twitter.com/oauth/authorize';
-    public static $accessTokenURL  = 'https://twitter.com/oauth/access_token';
-
-    /**
-     * Constructor
-     *
-     * @param string $oauth_token        the user's token
-     * @param string $oauth_token_secret the user's token secret
-     *
-     * @return nothing
-     */
-    function __construct($oauth_token = null, $oauth_token_secret = null)
-    {
-        $consumer_key    = common_config('twitter', 'consumer_key');
-        $consumer_secret = common_config('twitter', 'consumer_secret');
-
-        parent::__construct($consumer_key, $consumer_secret,
-                            $oauth_token, $oauth_token_secret);
-    }
-
-    // XXX: the following two functions are to support the horrible hack
-    // of using the credentils field in Foreign_link to store both
-    // the access token and token secret.  This hack should go away with
-    // 0.9, in which we can make DB changes and add a new column for the
-    // token itself.
-
-    static function packToken($token)
-    {
-        return implode(chr(0), array($token->key, $token->secret));
-    }
-
-    static function unpackToken($str)
-    {
-        $vals = explode(chr(0), $str);
-        return new OAuthToken($vals[0], $vals[1]);
-    }
-
-    static function isPackedToken($str)
-    {
-        if (strpos($str, chr(0)) === false) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Builds a link to Twitter's endpoint for authorizing a request token
-     *
-     * @param OAuthToken $request_token token to authorize
-     *
-     * @return the link
-     */
-    function getAuthorizeLink($request_token)
-    {
-        return parent::getAuthorizeLink(self::$authorizeURL,
-                                        $request_token,
-                                        common_local_url('twitterauthorization'));
-    }
-
-    /**
-     * Calls Twitter's /account/verify_credentials API method
-     *
-     * @return mixed the Twitter user
-     */
-    function verifyCredentials()
-    {
-        $url          = 'https://twitter.com/account/verify_credentials.json';
-        $response     = $this->oAuthGet($url);
-        $twitter_user = json_decode($response);
-        return $twitter_user;
-    }
-
-    /**
-     * Calls Twitter's /statuses/update API method
-     *
-     * @param string $status                text of the status
-     * @param int    $in_reply_to_status_id optional id of the status it's
-     *                                      a reply to
-     *
-     * @return mixed the status
-     */
-    function statusesUpdate($status, $in_reply_to_status_id = null)
-    {
-        $url      = 'https://twitter.com/statuses/update.json';
-        $params   = array('status' => $status,
-            'in_reply_to_status_id' => $in_reply_to_status_id);
-        $response = $this->oAuthPost($url, $params);
-        $status   = json_decode($response);
-        return $status;
-    }
-
-    /**
-     * Calls Twitter's /statuses/friends_timeline API method
-     *
-     * @param int $since_id show statuses after this id
-     * @param int $max_id   show statuses before this id
-     * @param int $cnt      number of statuses to show
-     * @param int $page     page number
-     *
-     * @return mixed an array of statuses
-     */
-    function statusesFriendsTimeline($since_id = null, $max_id = null,
-                                     $cnt = null, $page = null)
-    {
-
-        $url    = 'https://twitter.com/statuses/friends_timeline.json';
-        $params = array('since_id' => $since_id,
-                        'max_id' => $max_id,
-                        'count' => $cnt,
-                        'page' => $page);
-        $qry    = http_build_query($params);
-
-        if (!empty($qry)) {
-            $url .= "?$qry";
-        }
-
-        $response = $this->oAuthGet($url);
-        $statuses = json_decode($response);
-        return $statuses;
-    }
-
-    /**
-     * Calls Twitter's /statuses/friends API method
-     *
-     * @param int $id          id of the user whom you wish to see friends of
-     * @param int $user_id     numerical user id
-     * @param int $screen_name screen name
-     * @param int $page        page number
-     *
-     * @return mixed an array of twitter users and their latest status
-     */
-    function statusesFriends($id = null, $user_id = null, $screen_name = null,
-                             $page = null)
-    {
-        $url = "https://twitter.com/statuses/friends.json";
-
-        $params = array('id' => $id,
-                        'user_id' => $user_id,
-                        'screen_name' => $screen_name,
-                        'page' => $page);
-        $qry    = http_build_query($params);
-
-        if (!empty($qry)) {
-            $url .= "?$qry";
-        }
-
-        $response = $this->oAuthGet($url);
-        $friends  = json_decode($response);
-        return $friends;
-    }
-
-    /**
-     * Calls Twitter's /statuses/friends/ids API method
-     *
-     * @param int $id          id of the user whom you wish to see friends of
-     * @param int $user_id     numerical user id
-     * @param int $screen_name screen name
-     * @param int $page        page number
-     *
-     * @return mixed a list of ids, 100 per page
-     */
-    function friendsIds($id = null, $user_id = null, $screen_name = null,
-                         $page = null)
-    {
-        $url = "https://twitter.com/friends/ids.json";
-
-        $params = array('id' => $id,
-                        'user_id' => $user_id,
-                        'screen_name' => $screen_name,
-                        'page' => $page);
-        $qry    = http_build_query($params);
-
-        if (!empty($qry)) {
-            $url .= "?$qry";
-        }
-
-        $response = $this->oAuthGet($url);
-        $ids      = json_decode($response);
-        return $ids;
-    }
-
-}
diff --git a/lib/unqueuemanager.php b/lib/unqueuemanager.php
index 6cfe5bcbd..51261bcd7 100644
--- a/lib/unqueuemanager.php
+++ b/lib/unqueuemanager.php
@@ -48,11 +48,6 @@ class UnQueueManager
                 jabber_public_notice($notice);
             }
             break;
-         case 'twitter':
-            if ($this->_isLocal($notice)) {
-                broadcast_twitter($notice);
-            }
-            break;
          case 'facebook':
             if ($this->_isLocal($notice)) {
                 require_once INSTALLDIR . '/lib/facebookutil.php';