forked from GNUsocial/gnu-social
correctly check for max notice length in xmppdaemon
This commit is contained in:
parent
35bf388204
commit
a94a5fb51a
@ -316,9 +316,11 @@ class XMPPDaemon extends Daemon
|
||||
{
|
||||
$body = trim($pl['body']);
|
||||
$content_shortened = common_shorten_links($body);
|
||||
if (mb_strlen($content_shortened) > 140) {
|
||||
if (Notice::contentTooLong($content_shortened)) {
|
||||
$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;
|
||||
}
|
||||
$notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
|
||||
|
Loading…
Reference in New Issue
Block a user