X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FTwitterBridge%2Ftwitter.php;h=20cdf42b823276f477dfc5240020037d2efe6299;hb=d6719760d61b204ab7cf5ce013f2933ef4024f1a;hp=9c2ba502bfa58b701bc9f111c5c7310e3e3a0712;hpb=2b56d3b534389cba1d44c6f5ef4d1a8a514acda6;p=quix0rs-gnu-social.git

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 9c2ba502bf..20cdf42b82 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -145,17 +145,43 @@ function broadcast_twitter($notice)
     $flink = Foreign_link::getByUserID($notice->profile_id,
                                        TWITTER_SERVICE);
 
-    if (is_twitter_bound($notice, $flink)) {
-        if (TwitterOAuthClient::isPackedToken($flink->credentials)) {
+    // 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)) {
+            return retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of));
+        } else if (is_twitter_bound($notice, $flink)) {
             return broadcast_oauth($notice, $flink);
-        } else {
-            return broadcast_basicauth($notice, $flink);
         }
     }
 
     return true;
 }
 
+function retweet_notice($flink, $notice)
+{
+    $token = TwitterOAuthClient::unpackToken($flink->credentials);
+    $client = new TwitterOAuthClient($token->key, $token->secret);
+
+    $id = twitter_status_id($notice);
+
+    try {
+        $status = $client->statusesRetweet($id);
+    } catch (OAuthClientException $e) {
+        return process_error($e, $flink, $notice);
+    }
+}
+
+function twitter_status_id($notice)
+{
+    if ($notice->source == 'twitter' &&
+        preg_match('#^http://twitter.com/[\w_.]+/status/(\d+)$#', $notice->uri, $match)) {
+        return $match[1];
+    }
+
+    return null;
+}
+
 /**
  * Pull any extra information from a notice that we should transfer over
  * to Twitter beyond the notice text itself.