Commit 0fd8e758 authored by Zach Copley's avatar Zach Copley

Make queuing and daemons work via events

parent 39bcd514
...@@ -81,7 +81,7 @@ class Avatar extends Memcached_DataObject ...@@ -81,7 +81,7 @@ class Avatar extends Memcached_DataObject
if (empty($server)) { if (empty($server)) {
$server = common_config('site', 'server'); $server = common_config('site', 'server');
} }
common_debug('path = ' . $path);
// XXX: protocol // XXX: protocol
return 'http://'.$server.$path.$filename; return 'http://'.$server.$path.$filename;
......
...@@ -97,5 +97,22 @@ class TwitterBridgePlugin extends Plugin ...@@ -97,5 +97,22 @@ class TwitterBridgePlugin extends Plugin
} }
} }
function onStartEnqueueNotice($notice, $transports)
{
array_push($transports, 'twitter');
return true;
}
function onGetValidDaemons($daemons)
{
array_push($daemons, INSTALLDIR . '/plugins/TwitterBridge/daemons/twitterqueuehandler.php');
array_push($daemons, INSTALLDIR . '/plugins/TwitterBridge/daemons/synctwitterfriends.php');
if (common_config('twitterbridge', 'enabled')) {
array_push($daemons, INSTALLDIR . '/plugins/TwitterBridge/daemons/twitterstatusfetcher.php');
}
return true;
}
} }
\ No newline at end of file
...@@ -33,6 +33,8 @@ END_OF_TRIM_HELP; ...@@ -33,6 +33,8 @@ END_OF_TRIM_HELP;
require_once INSTALLDIR . '/scripts/commandline.inc'; require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/parallelizingdaemon.php'; require_once INSTALLDIR . '/lib/parallelizingdaemon.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitterbasicauthclient.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
/** /**
* Daemon to sync local friends with Twitter friends * Daemon to sync local friends with Twitter friends
...@@ -45,14 +47,6 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; ...@@ -45,14 +47,6 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
* @link http://status.net/ * @link http://status.net/
*/ */
$helptext = <<<END_OF_TWITTER_HELP
Batch script for synching local friends with Twitter friends.
END_OF_TWITTER_HELP;
require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/parallelizingdaemon.php';
class SyncTwitterFriendsDaemon extends ParallelizingDaemon class SyncTwitterFriendsDaemon extends ParallelizingDaemon
{ {
/** /**
......
...@@ -37,8 +37,11 @@ Batch script for retrieving Twitter messages from foreign service. ...@@ -37,8 +37,11 @@ Batch script for retrieving Twitter messages from foreign service.
END_OF_TRIM_HELP; END_OF_TRIM_HELP;
require_once INSTALLDIR . '/scripts/commandline.inc'; require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/common.php';
require_once INSTALLDIR . '/lib/daemon.php'; require_once INSTALLDIR . '/lib/daemon.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitterbasicauthclient.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
/** /**
* Fetcher for statuses from Twitter * Fetcher for statuses from Twitter
...@@ -497,8 +500,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon ...@@ -497,8 +500,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$avatar->filename = $filename; $avatar->filename = $filename;
$avatar->url = Avatar::url($filename); $avatar->url = Avatar::url($filename);
common_debug($this->name() . " - New filename: $avatar->url");
$avatar->created = common_sql_now(); $avatar->created = common_sql_now();
$id = $avatar->insert(); $id = $avatar->insert();
...@@ -516,9 +517,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon ...@@ -516,9 +517,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
function fetchAvatar($url, $filename) function fetchAvatar($url, $filename)
{ {
$avatar_dir = INSTALLDIR . '/avatar/'; $avatarfile = Avatar::path($filename);
$avatarfile = $avatar_dir . $filename;
$out = fopen($avatarfile, 'wb'); $out = fopen($avatarfile, 'wb');
if (!$out) { if (!$out) {
......
...@@ -23,6 +23,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { ...@@ -23,6 +23,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
define('TWITTER_SERVICE', 1); // Twitter is foreign_service ID 1 define('TWITTER_SERVICE', 1); // Twitter is foreign_service ID 1
require_once INSTALLDIR . '/plugins/TwitterBridge/twitterbasicauthclient.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitteroauthclient.php';
function updateTwitter_user($twitter_id, $screen_name) function updateTwitter_user($twitter_id, $screen_name)
{ {
$uri = 'http://twitter.com/' . $screen_name; $uri = 'http://twitter.com/' . $screen_name;
......
...@@ -49,15 +49,6 @@ if(common_config('xmpp','enabled')) { ...@@ -49,15 +49,6 @@ if(common_config('xmpp','enabled')) {
$daemons[] = INSTALLDIR.'/scripts/xmppconfirmhandler.php'; $daemons[] = INSTALLDIR.'/scripts/xmppconfirmhandler.php';
} }
if(common_config('twitterbridge','enabled')) {
$daemons[] = INSTALLDIR.'/scripts/twitterstatusfetcher.php';
}
if (common_config('twitter', 'enabled')) {
$daemons[] = INSTALLDIR.'/scripts/twitterqueuehandler.php';
$daemons[] = INSTALLDIR.'/scripts/synctwitterfriends.php';
}
if (common_config('sms', 'enabled')) { if (common_config('sms', 'enabled')) {
$daemons[] = INSTALLDIR.'/scripts/smsqueuehandler.php'; $daemons[] = INSTALLDIR.'/scripts/smsqueuehandler.php';
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment