summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.php.sample3
-rw-r--r--lib/common.php2
-rwxr-xr-xscripts/getvaliddaemons.php3
-rwxr-xr-xscripts/stopdaemons.sh2
-rwxr-xr-xscripts/twitterstatusfetcher.php10
5 files changed, 15 insertions, 5 deletions
diff --git a/config.php.sample b/config.php.sample
index b8ed45fa8..6d6a9b533 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -150,6 +150,9 @@ $config['sphinx']['port'] = 3312;
#$config['memcached']['server'] = 'localhost';
#$config['memcached']['port'] = 11211;
+# Enable bidirectional Twitter bridge
+#$config['twitterbridge']['enabled'] = true;
+
#Twitter integration source attribute. Note: default is Laconica
#$config['integration']['source'] = 'Laconica';
diff --git a/lib/common.php b/lib/common.php
index 00e5b0bc2..abdc22c0e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -143,6 +143,8 @@ $config =
array('piddir' => '/var/run',
'user' => false,
'group' => false),
+ 'twitterbridge' =>
+ array('enabled' => false),
'integration' =>
array('source' => 'Laconica', # source attribute for Twitter
'taguri' => $_server.',2009'), # base for tag URIs
diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 482e63af7..a10233e69 100755
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -44,6 +44,9 @@ if(common_config('xmpp','enabled')) {
if(common_config('memcached','enabled')) {
echo "memcachedqueuehandler.php ";
}
+if(common_config('twitterbridge','enabled')) {
+ echo "twitterstatusfetcher.php ";
+}
echo "ombqueuehandler.php ";
echo "twitterqueuehandler.php ";
echo "facebookqueuehandler.php ";
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index f6d71eddf..764037e8f 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -25,7 +25,7 @@ DIR=`php $SDIR/getpiddir.php`
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
- memcachehandler inboxhandler; do
+ memcachehandler inboxhandler twitterstatusfetcher; do
FILES="$DIR/$f.*.pid"
for ff in "$FILES" ; do
diff --git a/scripts/twitterstatusfetcher.php b/scripts/twitterstatusfetcher.php
index e8819f665..9dfadc760 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/scripts/twitterstatusfetcher.php
@@ -32,7 +32,7 @@ define('LACONICA', true);
define('MAXCHILDREN', 2);
define('POLL_INTERVAL', 60); // in seconds
-// Uncomment this to get useful console output
+// Uncomment this to get useful logging
define('SCRIPT_DEBUG', true);
require_once(INSTALLDIR . '/lib/common.php');
@@ -45,7 +45,7 @@ class TwitterStatusFetcher extends Daemon
function name()
{
- return 'twitterstatusfetcher';
+ return ('twitterstatusfetcher.generic');
}
function run()
@@ -130,7 +130,9 @@ class TwitterStatusFetcher extends Daemon
' secs before hitting Twitter again.');
}
- sleep(POLL_INTERVAL);
+ if (POLL_INTERVAL > 0) {
+ sleep(POLL_INTERVAL);
+ }
} while (true);
}
@@ -282,7 +284,7 @@ class TwitterStatusFetcher extends Daemon
// XXX: Figure out a better way to link Twitter replies?
$notice->saveReplies();
- // XXX: Do we want to polute our tag cloud with
+ // XXX: Do we want to pollute our tag cloud with
// hashtags from Twitter?
$notice->saveTags();
$notice->saveGroups();