From 2bf8a68908fef5d4680235c561912b5e3c2ee4da Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 10 Feb 2011 10:53:24 -0800 Subject: [PATCH] Fix for ticket #3039: TwitterBridge was incorrectly sending repeats of Twitter-bound messages if the repeater has sending of things to Twitter disabled. A repeat/retweet is roughly equivalent to an active direct post, so should follow the posting rules, rather than always sending over as we do for fave notifications. --- plugins/TwitterBridge/twitter.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php index e8d11f3b6a..f5a0b62588 100644 --- a/plugins/TwitterBridge/twitter.php +++ b/plugins/TwitterBridge/twitter.php @@ -173,18 +173,20 @@ function broadcast_twitter($notice) // Don't bother with basic auth, since it's no longer allowed if (!empty($flink) && TwitterOAuthClient::isPackedToken($flink->credentials)) { - if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) { - $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of)); - if (is_object($retweet)) { - Notice_to_status::saveNew($notice->id, twitter_id($retweet)); - return true; + if (is_twitter_bound($notice, $flink)) { + if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) { + $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of)); + if (is_object($retweet)) { + Notice_to_status::saveNew($notice->id, twitter_id($retweet)); + return true; + } else { + // Our error processing will have decided if we need to requeue + // this or can discard safely. + return $retweet; + } } else { - // Our error processing will have decided if we need to requeue - // this or can discard safely. - return $retweet; + return broadcast_oauth($notice, $flink); } - } else if (is_twitter_bound($notice, $flink)) { - return broadcast_oauth($notice, $flink); } } -- 2.39.5