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

shortenLinks _after_ media upload to be consistent with api

This commit is contained in:
Mikael Nordfeldth 2016-01-07 18:14:45 +01:00
parent be58fd64f5
commit 1f02dc639e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
actions/newnotice.php
View File

@ -129,19 +129,6 @@ class NewnoticeAction extends FormAction
$act->time = time();
$act->actor = $this->scoped->asActivityObject();
$content = $this->scoped->shortenLinks($content);
// Reject notice if it is too long (without the HTML)
// Should we do this before or after the upload attachment link? I think before...
if (Notice::contentTooLong($content)) {
// TRANS: Client error displayed when the parameter "status" is missing.
// TRANS: %d is the maximum number of character for a notice.
throw new ClientException(sprintf(_m('That\'s too long. Maximum notice size is %d character.',
'That\'s too long. Maximum notice size is %d characters.',
Notice::maxContent()),
Notice::maxContent()));
}
$upload = null;
try {
// throws exception on failure
@ -158,6 +145,19 @@ class NewnoticeAction extends FormAction
// simply no attached media to the new notice
}
$content = $this->scoped->shortenLinks($content);
// Reject notice if it is too long (without the HTML)
// This is done after MediaFile::fromUpload etc. just to act the same as the ApiStatusesUpdateAction
if (Notice::contentTooLong($content)) {
// TRANS: Client error displayed when the parameter "status" is missing.
// TRANS: %d is the maximum number of character for a notice.
throw new ClientException(sprintf(_m('That\'s too long. Maximum notice size is %d character.',
'That\'s too long. Maximum notice size is %d characters.',
Notice::maxContent()),
Notice::maxContent()));
}
$actobj = new ActivityObject();
$actobj->type = ActivityObject::NOTE;
$actobj->content = common_render_content($content, $this->scoped, $parent);

2
lib/httpclient.php
View File

@ -360,4 +360,4 @@ class HTTPClient extends HTTP_Request2
} while ($maxRedirs);
return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs);
}
}
}