oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-10 09:04:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow using punctuation chars as smiley delimiters

Browse source
This commit is contained in:
gudzpoz 2023-11-16 13:31:31 +08:00
parent d45e9d6af2
commit d493946ba4
7 changed files with 95 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tests/src/Content/SmiliesTest.php
View file

@ -147,7 +147,7 @@ class SmiliesTest extends FixtureTest
public function dataReplace(): array
{
return [
$data = [
'simple-1' => [
'expected' => 'alt=":-p"',
'body' => ':-p',
@ -165,7 +165,7 @@ class SmiliesTest extends FixtureTest
'body' => '~friendicaca',
],
'symbol-boundary-1' => [
'expected' => '(:-p)',
'expected' => 'alt=":-p"',
'body' => '(:-p)',
],
'hearts-1' => [
@ -185,6 +185,19 @@ class SmiliesTest extends FixtureTest
'body' => '(3<33)',
],
];
foreach ([':-[', ':-D', 'o.O'] as $emoji) {
foreach (['A', '_', ':', '-'] as $prefix) {
foreach (['', ' ', 'A', ':', '-'] as $suffix) {
$no_smile = ($prefix !== '' && ctype_alnum($prefix)) || ($suffix !== '' && ctype_alnum($suffix));
$s = $prefix . $emoji . $suffix;
$data[] = [
'expected' => $no_smile ? $s : 'alt="' . $emoji . '"',
'body' => $s,
];
}
}
}
return $data;
}
/**
@ -202,6 +215,11 @@ class SmiliesTest extends FixtureTest
public function dataExtractUsedSmilies(): array
{
return [
'symbols' => [
'expected' => ['p', 'heart', 'embarrassed', 'kiss'],
'body' => ':-p <3 ":-[:-"',
'normalized' => ':p: :heart: ":embarrassed::kiss:',
],
'single-smiley' => [
'expected' => ['like'],
'body' => ':like',
@ -239,11 +257,12 @@ class SmiliesTest extends FixtureTest
*/
public function testExtractUsedSmilies(array $expected, string $body, string $normalized)
{
$extracted = Smilies::extractUsedSmilies($body);
$this->assertEquals($normalized, $extracted['']);
foreach ($expected as $shortcode) {
$this->assertArrayHasKey($shortcode, $extracted);
$extracted = Smilies::extractUsedSmilies($body, $converted);
$expected = array_fill_keys($expected, true);
$this->assertEquals($normalized, $converted);
foreach (array_keys($extracted) as $shortcode) {
$this->assertArrayHasKey($shortcode, $expected);
}
$this->assertEquals(count($expected), count($extracted) - 1);
$this->assertEquals(count($expected), count($extracted));
}
}