GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

correctly check for max notice length in xmppdaemon

Browse Source
This commit is contained in:
Evan Prodromou 2009-08-21 08:19:09 -04:00
parent 35bf388204
commit a94a5fb51a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/xmppdaemon.php
View File

@ -316,9 +316,11 @@ class XMPPDaemon extends Daemon
{ {
$body = trim($pl['body']); $body = trim($pl['body']);
$content_shortened = common_shorten_links($body); $content_shortened = common_shorten_links($body);
if (mb_strlen($content_shortened) > 140) { if (Notice::contentTooLong($content_shortened)) {
$from = jabber_normalize_jid($pl['from']); $from = jabber_normalize_jid($pl['from']);
$this->from_site($from, "Message too long - maximum is 140 characters, you sent ".mb_strlen($content_shortened)); $this->from_site($from, sprintf(_("Message too long - maximum is %d characters, you sent %d"),
Notice::maxContent(),
mb_strlen($content_shortened)));
return; return;
} }
$notice = Notice::saveNew($user->id, $content_shortened, 'xmpp'); $notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');