mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8654 from annando/annando/issue8458

Browse source 
Issue 8458: Display big emojis
This commit is contained in:
Hypolite Petovan 2020-05-17 14:00:23 -04:00 committed by GitHub
parent db63d1d501 2304642535
commit 78793894fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Content/Text/BBCode.php
View file

@ -1724,7 +1724,15 @@ class BBCode
// Replace non graphical smilies for external posts // Replace non graphical smilies for external posts
if (!$nosmile && !$for_plaintext) { if (!$nosmile && !$for_plaintext) {
$text = Smilies::replace($text); $oldtext = $text;
$text = Smilies::replace($text);
if (DI::config()->get('system', 'big_emojis') && ($simple_html != self::DIASPORA) && ($oldtext != $text)) {
$conv = html_entity_decode(str_replace([' ', "\n", "\r"], '', $text));
// Emojis are always 4 byte Unicode characters
if (strlen($conv) / mb_strlen($conv) == 4) {
$text = '<span style="font-size: xx-large; line-height: initial;">' . $text . '</span>';
}
}
} }
if (!$for_plaintext) { if (!$for_plaintext) {

4
static/defaults.config.php
View file

@ -103,6 +103,10 @@ return [
// chose "Remember me" when logging in is considered logged out. // chose "Remember me" when logging in is considered logged out.
'auth_cookie_lifetime' => 7, 'auth_cookie_lifetime' => 7,
// big_emojis (Boolean)
// Display "Emoji Only" posts in big.
'big_emojis' => false,
// block_local_dir (Boolean) // block_local_dir (Boolean)
// Deny public access to the local user directory. // Deny public access to the local user directory.
'block_local_dir' => false, 'block_local_dir' => false,

3
tests/src/Content/Text/BBCodeTest.php
View file

@ -58,6 +58,9 @@ class BBCodeTest extends MockedTest
$this->configMock->shouldReceive('get') $this->configMock->shouldReceive('get')
->with('system', 'no_smilies') ->with('system', 'no_smilies')
->andReturn(false); ->andReturn(false);
$this->configMock->shouldReceive('get')
->with('system', 'big_emojis')
->andReturn(false);
$l10nMock = \Mockery::mock(L10n::class); $l10nMock = \Mockery::mock(L10n::class);
$l10nMock->shouldReceive('t')->withAnyArgs()->andReturnUsing(function ($args) { return $args; }); $l10nMock->shouldReceive('t')->withAnyArgs()->andReturnUsing(function ($args) { return $args; });