Merge branch 'master' into nightly

[quix0rs-gnu-social.git] / plugins / TwitterBridge / twitter.php

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index 0f1e686ac8865b35548cf5f0de62f6904372d8ea..99389a759f3e28a377c39d479702d654d37f4573 100644 (file)
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -81,7 +81,7 @@ function save_twitter_user($twitter_id, $screen_name)
         }
     } catch (NoResultException $e) {
         // No old users exist for this id
-    
+
         // Kill any old, invalid records for this screen name
         // XXX: Is this really only supposed to be run if the above getForeignUser fails?
         try {
@@ -124,8 +124,7 @@ 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 ( (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) ||
-              ((is_twitter_notice($notice->reply_to) || is_twitter_notice($notice->repeat_of))
-              && (($flink->noticesync & FOREIGN_NOTICE_RECV) == FOREIGN_NOTICE_RECV)) ||
+               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;
         }
@@ -390,11 +389,16 @@ function format_status($notice)
     // XXX: Make this an optional setting?
     $statustxt = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/', "\\1#\\2", $statustxt);
 
+    // detect links, each link uses 23 characters on twitter
+    $numberOfLinks = preg_match_all('`((http|https|ftp)://[^\s<]+[^\s<\.)])`i', $statustxt);
+    $statusWithoutLinks = preg_replace('`((http|https|ftp)://[^\s<]+[^\s<\.)])`i', '', $statustxt);
+    $statusLength = mb_strlen($statusWithoutLinks)  + $numberOfLinks * 23;
+
     // Twitter still has a 140-char hardcoded max.
-    if (mb_strlen($statustxt) > 140) {
+    if ($statusLength > 140) {
         $noticeUrl = common_shorten_url($notice->getUrl());
-        $urlLen = mb_strlen($noticeUrl);
-        $statustxt = mb_substr($statustxt, 0, 140 - ($urlLen + 3)) . ' … ' . $noticeUrl;
+        // each link uses 23 chars on twitter + 3 for the ' … ' => 26
+        $statustxt = mb_substr($statustxt, 0, 140 - 26) . ' … ' . $noticeUrl;
     }
 
     return $statustxt;