forked from GNUsocial/gnu-social
Merge branch '0.7.x' of git://gitorious.org/laconica/bAvatar-clone without the unintended deletion.
This commit is contained in:
@@ -152,11 +152,6 @@ class XMPPDaemon extends Daemon
|
||||
$body = preg_replace('/d[\ ]*('. $to .')[\ ]*/', '', $pl['body']);
|
||||
$this->add_direct($user, $body, $to, $from);
|
||||
} else {
|
||||
$len = mb_strlen($pl['body']);
|
||||
if($len > 140) {
|
||||
$this->from_site($from, 'Message too long - maximum is 140 characters, you sent ' . $len);
|
||||
return;
|
||||
}
|
||||
$this->add_notice($user, $pl);
|
||||
}
|
||||
|
||||
@@ -255,15 +250,13 @@ class XMPPDaemon extends Daemon
|
||||
function add_notice(&$user, &$pl)
|
||||
{
|
||||
$body = trim($pl['body']);
|
||||
$content_shortened = common_shorten_link($body);
|
||||
$content_shortened = common_shorten_links($body);
|
||||
if (mb_strlen($content_shortened) > 140) {
|
||||
$content = trim(mb_substr($body, 0, 140));
|
||||
$content_shortened = common_shorten_link($content);
|
||||
$from = jabber_normalize_jid($pl['from']);
|
||||
$this->from_site($from, "Message too long - maximum is 140 characters, you sent ".mb_strlen($content_shortened));
|
||||
return;
|
||||
}
|
||||
else {
|
||||
$content = $body;
|
||||
}
|
||||
$notice = Notice::saveNew($user->id, $content, 'xmpp');
|
||||
$notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
|
||||
if (is_string($notice)) {
|
||||
$this->log(LOG_ERR, $notice);
|
||||
return;
|
||||
|
Reference in New Issue
Block a user