Merge remote branch 'laconica/0.8.x' into 0.9.x

[quix0rs-gnu-social.git] / lib / twitter.php

diff --git a/lib/twitter.php b/lib/twitter.php
index 676c9b20a2522f37fafbcd0092a7c88dd1e1f778..b49e2e11902997bdfb1681a48729361397f956f1 100644 (file)
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -165,9 +165,10 @@ function broadcast_twitter($notice)
 }
 
 function broadcast_oauth($notice, $flink) {
-
     $user = $flink->getUser();
     $statustxt = format_status($notice);
+    // Convert !groups to #hashes
+    $statustxt = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/', "\\1#\\2", $statustxt);
     $token = TwitterOAuthClient::unpackToken($flink->credentials);
     $client = new TwitterOAuthClient($token->key, $token->secret);
     $status = null;
@@ -222,6 +223,10 @@ function broadcast_basicauth($notice, $flink)
                           $user->nickname, $user->id);
         common_log(LOG_WARNING, $errmsg);
 
+            $errmsg = sprintf('No data returned by Twitter API when ' .
+                             'trying to send update for %1$s (user id %2$s).',
+                             $user->nickname, $user->id);
+            common_log(LOG_WARNING, $errmsg);
         return false;
     }