From 62408fef09990a127a58aa8f8a24777bc34d160d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 29 Oct 2010 14:12:18 -0700 Subject: [PATCH] Work in progress on twitter import daemon --- plugins/TwitterBridge/TwitterBridgePlugin.php | 7 +++ .../TwitterBridge/daemons/twitterdaemon.php | 4 +- .../TwitterBridge/tweetctlqueuehandler.php | 59 +++++++++++++++++++ plugins/TwitterBridge/twittersettings.php | 17 ++++++ 4 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 plugins/TwitterBridge/tweetctlqueuehandler.php diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index b4eb9d2f98..1078abc484 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -274,7 +274,14 @@ class TwitterBridgePlugin extends Plugin function onEndInitializeQueueManager($manager) { if (self::hasKeys()) { + // Outgoing notices -> twitter $manager->connect('twitter', 'TwitterQueueHandler'); + + // Incoming statuses <- twitter + $manager->connect('tweetin', 'TweetInQueueHandler'); + + // Control messages from our web interface to the import daemon + $manager->connect('tweetctl', 'TweetCtlQueueHandler', 'twitter'); } return true; } diff --git a/plugins/TwitterBridge/daemons/twitterdaemon.php b/plugins/TwitterBridge/daemons/twitterdaemon.php index 9e218a1a1c..d313d2de96 100644 --- a/plugins/TwitterBridge/daemons/twitterdaemon.php +++ b/plugins/TwitterBridge/daemons/twitterdaemon.php @@ -98,8 +98,8 @@ class TwitterManager extends IoManager const USERS_PER_STREAM = 100; const STREAMS_PER_SECOND = 20; - protected $twitterStreams; - protected $twitterUsers; + protected $streams; + protected $users; /** * Pull the site's active Twitter-importing users and start spawning diff --git a/plugins/TwitterBridge/tweetctlqueuehandler.php b/plugins/TwitterBridge/tweetctlqueuehandler.php new file mode 100644 index 0000000000..4c8bef463e --- /dev/null +++ b/plugins/TwitterBridge/tweetctlqueuehandler.php @@ -0,0 +1,59 @@ +. + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } + +require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; + +/** + * Queue handler to deal with incoming Twitter status updates, as retrieved by + * TwitterDaemon (twitterdaemon.php). + * + * The queue handler passes the status through TwitterImporter for import into the + * local database (if necessary), then adds the imported notice to the local inbox + * of the attached Twitter user. + * + * Warning: the way we do inbox distribution manually means that realtime, XMPP, etc + * don't work on Twitter-borne messages. When TwitterImporter is changed to handle + * that correctly, we'll only need to do this once...? + */ +class TweetCtlQueueHandler extends QueueHandler +{ + function transport() + { + return 'tweetctl'; + } + + function handle($data) + { + // A user has activated or deactivated their Twitter bridge + // import status. + $action = $data['action']; + $userId = $data['for_user']; + + $tm = TwitterManager::get(); + if ($action == 'start') { + $tm->startTwitterUser($userId); + } else if ($action == 'stop') { + $tm->stopTwitterUser($userId); + } + + return true; + } +} diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php index 33c5eb65bb..de1ba58b0d 100644 --- a/plugins/TwitterBridge/twittersettings.php +++ b/plugins/TwitterBridge/twittersettings.php @@ -285,6 +285,7 @@ class TwittersettingsAction extends ConnectSettingsAction } $original = clone($flink); + $wasReceiving = (bool)($original->notice_sync & FOREIGN_NOTICE_RECV); $flink->set_flags($noticesend, $noticerecv, $replysync, $friendsync); $result = $flink->update($original); @@ -294,6 +295,22 @@ class TwittersettingsAction extends ConnectSettingsAction return; } + if ($wasReceiving xor $noticerecv) { + $this->notifyDaemon($flink->foreign_id, $noticerecv); + } + $this->showForm(_m('Twitter preferences saved.'), true); } + + /** + * Tell the import daemon that we've updated a user's receive status. + */ + function notifyDaemon($twitterUserId, $receiving) + { + $data = array('for_user' => $twitterUserId, + 'action' => $receiving ? 'stop' : 'start'); + $qm = QueueManager::get(); + $qm->enqueue($data, 'twitterctl'); + } + }