jeff/timeline
1
0
Fork 0
mirror of https://github.com/sorenpeter/timeline.git synced 2025-12-15 10:57:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trying to fix markdown vs. hashtags

Browse source
This commit is contained in:
sørenpeter 2024-11-30 18:28:14 +01:00
parent f8d686310a
commit 7bc27a5034
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libs/twtxt.php
View file

@ -124,6 +124,8 @@ function getImagesFromTwt(string $twtString) {
function getTagsFromTwt(string $twtString) { function getTagsFromTwt(string $twtString) {
//$pattern = '/(?<!\()\B#\w+(?!\))/iu'; //$pattern = '/(?<!\()\B#\w+(?!\))/iu';
$pattern = '/(?<=\B)#(\w+)/'; $pattern = '/(?<=\B)#(\w+)/';
//$pattern = '/(?<=\s)#(\w+)/';
//$pattern = '/\s#(\w+)/';
//$pattern = "/\(#\w{7}\)/"; //$pattern = "/\(#\w{7}\)/";
//$pattern = '/(?<=\s|^)#(\w+)/'; //$pattern = '/(?<=\s|^)#(\w+)/';
// TODO: Fix so it does not match with url#fragments (\B vs \s) // TODO: Fix so it does not match with url#fragments (\B vs \s)
@ -209,7 +211,9 @@ function replaceImagesFromTwt(string $twtString) {
} }
function replaceTagsFromTwt(string $twtString) { function replaceTagsFromTwt(string $twtString) {
$pattern = '/#(\w+)?/'; //$pattern = '/#(\w+)?/';
$pattern = '/(?<=\s)#(\w+)/';
//$replacement = '<a href="#">#\1</a>'; // Dummy link //$replacement = '<a href="#">#\1</a>'; // Dummy link
$replacement = '<a href="?search=$1" class="tag">#${1}</a>'; $replacement = '<a href="?search=$1" class="tag">#${1}</a>';
$result = preg_replace($pattern, $replacement, $twtString); $result = preg_replace($pattern, $replacement, $twtString);
@ -226,10 +230,6 @@ function embedYoutubeFromTwt(string $twtString) {
$youtubeLinks = array_unique($youtubeLinks[1]); // Remove dublicate cause by raw URLs conceverter to links $youtubeLinks = array_unique($youtubeLinks[1]); // Remove dublicate cause by raw URLs conceverter to links
//echo "<pre>";
//print_r($youtubeLinks);
//echo "</pre>";
foreach ($youtubeLinks as $videoID) { foreach ($youtubeLinks as $videoID) {
$twtString .= '<iframe loading="lazy" src="https://www.youtube.com/embed/'.$videoID.'" class="embed-video" allow="encrypted-media" title="" allowfullscreen="allowfullscreen" frameborder="0"></iframe>'; $twtString .= '<iframe loading="lazy" src="https://www.youtube.com/embed/'.$videoID.'" class="embed-video" allow="encrypted-media" title="" allowfullscreen="allowfullscreen" frameborder="0"></iframe>';
} }
@ -435,7 +435,6 @@ function getTwtsFromTwtxtString($url) {
//$twtContent = replaceMarkdownLinksFromTwt($twtContent); //$twtContent = replaceMarkdownLinksFromTwt($twtContent);
//$twtContent = replaceImagesFromTwt($twtContent); //$twtContent = replaceImagesFromTwt($twtContent);
//$twtContent = Slimdown::render($twtContent);
$Parsedown = new Parsedown(); $Parsedown = new Parsedown();
$twtContent = $Parsedown->text($twtContent); $twtContent = $Parsedown->text($twtContent);