keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

spoiler-auto-cw #1

Closed
keith wants to merge 5 commits from spoiler-auto-cw into megamerge
pull from: spoiler-auto-cw
merge into: keith:megamerge
Conversation 0 Commits 5 Files changed 11 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1e7471b71e - Show all commits

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

@ -2184,9 +2184,9 @@ class BBCode
* Returns a list of the headings of "spoiler" elements * Returns a list of the headings of "spoiler" elements
* *
* @param string $text The text containing spoiler elements * @param string $text The text containing spoiler elements
* @return array The list of spoiler headings * @return string The list of spoiler headings
*/ */
public static function getSpoilerHeadings(string $text): array public static function getSpoilerHeadings(string $text): string
{ {
DI::profiler()->startRecording('rendering'); DI::profiler()->startRecording('rendering');
@ -2197,7 +2197,7 @@ class BBCode
$headings[] = BBCode::toPlaintext($item); $headings[] = BBCode::toPlaintext($item);
} }
} }
return $headings; return implode(', ', $headings);
}); });
DI::profiler()->stopRecording(); DI::profiler()->stopRecording();

2
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1605,7 +1605,7 @@ class Transmitter
} else { } else {
$warnings = BBCode::getSpoilerHeadings($item['body']); $warnings = BBCode::getSpoilerHeadings($item['body']);
if ($warnings) { if ($warnings) {
$data['summary'] = implode(', ', $warnings); $data['summary'] = $warnings;
$data['keithext:summaryFromSpoilers'] = true; $data['keithext:summaryFromSpoilers'] = true;
} }
} }