From 3e0a02f52daa802ba347654fd40c1a25399aff11 Mon Sep 17 00:00:00 2001
From: Jean Baptiste Favre <statusnet@jbfavre.org>
Date: Sun, 18 Dec 2011 12:13:42 +0100
Subject: [PATCH 1/2] Enhance is_twitter_bound function from file
 plugins/TwitterBridge/twitter.php to deal with new-style replies from Web UI
 not using at-mention replies anymore, which caused all replies to be sent to
 Twitter. Definitely fix #3386

---
 plugins/TwitterBridge/twitter.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 3da974df93..ac61cc6160 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -120,9 +120,9 @@ function is_twitter_bound($notice, $flink) {
 
         // If it's not a Twitter-style reply, or if the user WANTS to send replies,
         // or if it's in reply to a twitter notice
-        if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
-            (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) ||
-            is_twitter_notice($notice->reply_to)) {
+        if ( (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) ||
+             (is_twitter_notice($notice->reply_to) || is_twitter_notice($notice->repeat_of)) ||
+             (empty($notice->reply_to) && !preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content)) ){
             return true;
         }
     }

From 184290b5cf8448bb58b4ccd7d3bef39bd12a73f6 Mon Sep 17 00:00:00 2001
From: Jean Baptiste Favre <statusnet@jbfavre.org>
Date: Sun, 18 Dec 2011 12:17:28 +0100
Subject: [PATCH 2/2] Add my name to TwitterBridgePlugin onPluginVersion
 function

---
 plugins/TwitterBridge/TwitterBridgePlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index b37d01274d..d733f71c56 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -339,7 +339,7 @@ class TwitterBridgePlugin extends Plugin
         $versions[] = array(
             'name' => 'TwitterBridge',
             'version' => self::VERSION,
-            'author' => 'Zach Copley, Julien C',
+            'author' => 'Zach Copley, Julien C, Jean Baptiste Favre',
             'homepage' => 'http://status.net/wiki/Plugin:TwitterBridge',
             // TRANS: Plugin description.
             'rawdescription' => _m('The Twitter "bridge" plugin allows integration ' .