git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 9fead39f authored by mmn's avatar mmn

Merge branch 'master' of git.gnu.io:gnu/gnu-social

parents 94874453 7dcb229a
...@@ -81,7 +81,7 @@ function save_twitter_user($twitter_id, $screen_name) ...@@ -81,7 +81,7 @@ function save_twitter_user($twitter_id, $screen_name)
} }
} catch (NoResultException $e) { } catch (NoResultException $e) {
// No old users exist for this id // No old users exist for this id
// Kill any old, invalid records for this screen name // Kill any old, invalid records for this screen name
// XXX: Is this really only supposed to be run if the above getForeignUser fails? // XXX: Is this really only supposed to be run if the above getForeignUser fails?
try { try {
...@@ -389,11 +389,16 @@ function format_status($notice) ...@@ -389,11 +389,16 @@ function format_status($notice)
// XXX: Make this an optional setting? // XXX: Make this an optional setting?
$statustxt = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/', "\\1#\\2", $statustxt); $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. // Twitter still has a 140-char hardcoded max.
if (mb_strlen($statustxt) > 140) { if ($statusLength > 140) {
$noticeUrl = common_shorten_url($notice->getUrl()); $noticeUrl = common_shorten_url($notice->getUrl());
$urlLen = mb_strlen($noticeUrl); // each link uses 23 chars on twitter + 3 for the ' … ' => 26
$statustxt = mb_substr($statustxt, 0, 140 - ($urlLen + 3)) . ' … ' . $noticeUrl; $statustxt = mb_substr($statustxt, 0, 140 - 26) . ' … ' . $noticeUrl;
} }
return $statustxt; return $statustxt;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment