From 9cbda32768f65fc53dbeef4e5fb4f53fa4701109 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 2 Nov 2010 16:51:07 -0700 Subject: [PATCH] Pull out the 'tweetctl' queue for now; these should go over control signals, and actual handling isn't implemented yet anyway. --- plugins/TwitterBridge/TwitterBridgePlugin.php | 3 --- plugins/TwitterBridge/twittersettings.php | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index 1078abc484..f5c3612506 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -279,9 +279,6 @@ class TwitterBridgePlugin extends Plugin // 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/twittersettings.php b/plugins/TwitterBridge/twittersettings.php index de1ba58b0d..c169172b00 100644 --- a/plugins/TwitterBridge/twittersettings.php +++ b/plugins/TwitterBridge/twittersettings.php @@ -285,7 +285,7 @@ class TwittersettingsAction extends ConnectSettingsAction } $original = clone($flink); - $wasReceiving = (bool)($original->notice_sync & FOREIGN_NOTICE_RECV); + $wasReceiving = (bool)($original->noticesync & FOREIGN_NOTICE_RECV); $flink->set_flags($noticesend, $noticerecv, $replysync, $friendsync); $result = $flink->update($original); @@ -307,10 +307,7 @@ class TwittersettingsAction extends ConnectSettingsAction */ function notifyDaemon($twitterUserId, $receiving) { - $data = array('for_user' => $twitterUserId, - 'action' => $receiving ? 'stop' : 'start'); - $qm = QueueManager::get(); - $qm->enqueue($data, 'twitterctl'); + // todo... should use control signals rather than queues } }