move notice_to_status initialization code to run-once script

3 files changed, 59 insertions, 21 deletions

diff --git a/plugins/TwitterBridge/README b/plugins/TwitterBridge/README
index d7dfe20de..10ea35b2b 100644
--- a/plugins/TwitterBridge/README
+++ b/plugins/TwitterBridge/README
@@ -62,6 +62,14 @@ unless you configure it with a consumer key and secret.)
    $config['twitter']['global_consumer_key']    = 'YOUR_CONSUMER_KEY';
    $config['twitter']['global_consumer_secret'] = 'YOUR_CONSUMER_SECRET';
 
+Upgrade
+-------
+
+If you've used the Twitter bridge plugin prior to version 0.9.5,
+you'll need to run the new scripts/initialize_notice_to_status.php
+script to initialize the new notice-to-status mapping file, which
+greatly improves the integration between StatusNet and Twitter.
+
 Administration panel
 --------------------
 
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 21a10775d..e641c1009 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -404,27 +404,6 @@ class TwitterBridgePlugin extends Plugin
                                    new ColumnDef('created', 'datetime', null,
                                                  false)));
 
-        // We update any notices that may have come in from
-        // Twitter that we don't have a status_id for. Note that
-        // this won't catch notices that originated at this StatusNet site.
-
-        $n = new Notice();
-
-        $n->query('SELECT notice.id, notice.uri ' .
-                  'FROM notice LEFT JOIN notice_to_status ' .
-                  'ON notice.id = notice_to_status.notice_id ' .
-                  'WHERE notice.source = "twitter"' .
-                  'AND notice_to_status.status_id IS NULL');
-
-        while ($n->fetch()) {
-            if (preg_match('#^http://twitter.com/[\w_.]+/status/(\d+)$#', $n->uri, $match)) {
-
-                $status_id = $match[1];
-
-                Notice_to_status::saveNew($n->id, $status_id);
-            }
-        }
-
         return true;
     }
 
diff --git a/plugins/TwitterBridge/scripts/initialize_notice_to_status.php b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
new file mode 100644
index 000000000..d1acfd53f
--- /dev/null
+++ b/plugins/TwitterBridge/scripts/initialize_notice_to_status.php
@@ -0,0 +1,51 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, 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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$helptext = <<<ENDOFHELP
+USAGE: initialize_notice_to_status.php
+
+Initializes the notice_to_status table with existing Twitter synch
+data. Only necessary if you've had the Twitter bridge enabled before
+version 0.9.5.
+
+ENDOFHELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+// We update any notices that may have come in from
+// Twitter that we don't have a status_id for. Note that
+// this won't catch notices that originated at this StatusNet site.
+
+$n = new Notice();
+
+$n->query('SELECT notice.id, notice.uri ' .
+          'FROM notice LEFT JOIN notice_to_status ' .
+          'ON notice.id = notice_to_status.notice_id ' .
+          'WHERE notice.source = "twitter"' .
+          'AND notice_to_status.status_id IS NULL');
+
+while ($n->fetch()) {
+    if (preg_match('#^http://twitter.com/[\w_.]+/status/(\d+)$#', $n->uri, $match)) {
+        $status_id = $match[1];
+        Notice_to_status::saveNew($n->id, $status_id);
+    }
+}