summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/facebookqueuehandler.php71
-rwxr-xr-xscripts/sitemap.php3
-rwxr-xr-xscripts/startdaemons.sh3
-rwxr-xr-xscripts/stopdaemons.sh2
-rwxr-xr-xscripts/twitterqueuehandler.php71
-rwxr-xr-xscripts/update_facebook.php141
-rwxr-xr-xscripts/xmppdaemon.php2
7 files changed, 149 insertions, 144 deletions
diff --git a/scripts/facebookqueuehandler.php b/scripts/facebookqueuehandler.php
new file mode 100755
index 000000000..c6859cb21
--- /dev/null
+++ b/scripts/facebookqueuehandler.php
@@ -0,0 +1,71 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, 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/>.
+ */
+
+# Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+ print "This script must be run from the command line\n";
+ exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+require_once(INSTALLDIR . '/lib/facebookutil.php');
+require_once(INSTALLDIR . '/lib/queuehandler.php');
+
+set_error_handler('common_error_handler');
+
+class FacebookQueueHandler extends QueueHandler
+{
+
+ function transport()
+ {
+ return 'facebook';
+ }
+
+ function start()
+ {
+ $this->log(LOG_INFO, "INITIALIZE");
+ return true;
+ }
+
+ function handle_notice($notice)
+ {
+ return facebookBroadcastNotice($notice);
+ }
+
+ function finish()
+ {
+ }
+
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+
+mb_internal_encoding('UTF-8');
+
+$id = ($argc > 1) ? $argv[1] : null;
+
+$handler = new FacebookQueueHandler($id);
+
+$handler->runOnce();
diff --git a/scripts/sitemap.php b/scripts/sitemap.php
index 51a9bbd75..39eb859bb 100755
--- a/scripts/sitemap.php
+++ b/scripts/sitemap.php
@@ -61,7 +61,8 @@ function standard_map()
)
);
- $docs = array('about', 'faq', 'contact', 'im', 'openid', 'openmublog', 'privacy', 'source');
+ $docs = array('about', 'faq', 'contact', 'im', 'openid', 'openmublog',
+ 'privacy', 'source', 'badge');
foreach($docs as $title) {
$standard_map_urls .= url(
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 685bd938f..a3256966d 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -23,7 +23,8 @@
DIR=`dirname $0`
for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
- xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php; do
+ xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
+ twitterqueuehandler.php facebookqueuehandler.php; do
echo -n "Starting $f...";
php $DIR/$f
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 08e1d4714..fd4406d41 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -24,7 +24,7 @@ SDIR=`dirname $0`
DIR=`php $SDIR/getpiddir.php`
for f in jabberhandler ombhandler publichandler smshandler \
- xmppconfirmhandler xmppdaemon; do
+ xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
FILES="$DIR/$f.*.pid"
for ff in "$FILES" ; do
diff --git a/scripts/twitterqueuehandler.php b/scripts/twitterqueuehandler.php
new file mode 100755
index 000000000..7da4f1e20
--- /dev/null
+++ b/scripts/twitterqueuehandler.php
@@ -0,0 +1,71 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, 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/>.
+ */
+
+# Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+ print "This script must be run from the command line\n";
+ exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+require_once(INSTALLDIR . '/lib/twitter.php');
+require_once(INSTALLDIR . '/lib/queuehandler.php');
+
+set_error_handler('common_error_handler');
+
+class TwitterQueueHandler extends QueueHandler
+{
+
+ function transport()
+ {
+ return 'twitter';
+ }
+
+ function start()
+ {
+ $this->log(LOG_INFO, "INITIALIZE");
+ return true;
+ }
+
+ function handle_notice($notice)
+ {
+ return broadcast_twitter($notice);
+ }
+
+ function finish()
+ {
+ }
+
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+
+mb_internal_encoding('UTF-8');
+
+$id = ($argc > 1) ? $argv[1] : null;
+
+$handler = new TwitterQueueHandler($id);
+
+$handler->runOnce();
diff --git a/scripts/update_facebook.php b/scripts/update_facebook.php
deleted file mode 100755
index 60e10417f..000000000
--- a/scripts/update_facebook.php
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, 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/>.
- */
-
-# Abort if called from a web server
-if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
- print "This script must be run from the command line\n";
- exit();
-}
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
-
-require_once INSTALLDIR . '/lib/common.php';
-require_once INSTALLDIR . '/lib/facebookutil.php';
-
-// For storing the last run date-time
-$last_updated_file = INSTALLDIR . '/scripts/facebook_last_updated';
-
-// Lock file name
-$lock_file = INSTALLDIR . '/scripts/update_facebook.lock';
-
-// Make sure only one copy of the script is running at a time
-$lock_file = @fopen($lock_file, "w+");
-if (!flock( $lock_file, LOCK_EX | LOCK_NB, &$wouldblock) || $wouldblock) {
- die("Can't open lock file. Script already running?\n");
-}
-
-$facebook = getFacebook();
-$current_time = time();
-$since = getLastUpdated();
-updateLastUpdated($current_time);
-$notice = getFacebookNotices($since);
-$cnt = 0;
-
-while($notice->fetch()) {
-
- $flink = Foreign_link::getByUserID($notice->profile_id, FACEBOOK_SERVICE);
- $user = $flink->getUser();
- $fbuid = $flink->foreign_id;
-
- if (!userCanUpdate($fbuid)) {
- continue;
- }
-
- $prefix = $facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, $fbuid);
- $content = "$prefix $notice->content";
-
- if (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND) {
-
- // If it's not a reply, or if the user WANTS to send replies...
- if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $content) ||
- (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) {
-
- // Avoid a Loop
- if ($notice->source != 'Facebook') {
-
- try {
- $facebook->api_client->users_setStatus($content,
- $fbuid, false, true);
- updateProfileBox($facebook, $flink, $notice);
- $cnt++;
- } catch(FacebookRestClientException $e) {
- print "Couldn't sent notice $notice->id!\n";
- print $e->getMessage();
-
- // Remove flink?
- }
- }
- }
- }
-}
-
-if ($cnt > 0) {
- print date('r', $current_time) .
- ": Found $cnt new notices for Facebook since last run at " .
- date('r', $since) . "\n";
-}
-
-fclose($lock_file);
-exit(0);
-
-
-function userCanUpdate($fbuid) {
-
- global $facebook;
-
- $result = false;
-
- try {
- $result = $facebook->api_client->users_hasAppPermission('status_update', $fbuid);
- } catch(FacebookRestClientException $e){
- print_r($e);
- }
-
- return $result;
-}
-
-function getLastUpdated(){
- global $last_updated_file, $current_time;
- $last = $current_time;
-
- if (file_exists($last_updated_file) &&
- ($file = fopen($last_updated_file, 'r'))) {
- $last = fgets($file);
- } else {
- print "$last_updated_file doesn't exit. Trying to create it...\n";
- $file = fopen($last_updated_file, 'w+') or
- die("Can't open $last_updated_file for writing!\n");
- print 'Success. Using current time (' . date('r', $last) .
- ") to look for new notices.\n";
- }
-
- fclose($file);
- return $last;
-}
-
-function updateLastUpdated($time){
- global $last_updated_file;
- $file = fopen($last_updated_file, 'w') or
- die("Can't open $last_updated_file for writing!");
- fwrite($file, $time);
- fclose($file);
-}
-
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 01fe8914f..ef3f8c63d 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -208,6 +208,8 @@ class XMPPDaemon extends Daemon
{
if (preg_match('/[\[\(]?[Aa]uto[-\s]?[Rr]e(ply|sponse)[\]\)]/', $txt)) {
return true;
+ } else if (preg_match('/^System: Message wasn\'t delivered. Offline storage size was exceeded.$/', $txt)) {
+ return true;
} else {
return false;
}