luqaska
/
twtxt-frontend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update picoblog.php 

- Fix regex for parsing.
- Added ability to parse usernames (`@<user url>`) and hashlinks (`#<hashtag url>`).
- Added classes to IDs and tags.
This commit is contained in:
Paul (hxii) Glushak 2021-01-27 15:24:12 +02:00
parent d63c3a2cef
commit ed4bbfeedd
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
picoblog.php
View File

@ -54,7 +54,7 @@ class PicoBlog
private function readSource()
{
if (is_file($this->sourcefile) && is_readable($this->sourcefile)) {
$this->rawentries = file($this->sourcefile);
$this->rawentries = explode(PHP_EOL, file_get_contents($this->sourcefile));
if (!empty($this->rawentries)) {
return true;
}
@ -73,24 +73,48 @@ class PicoBlog
{
switch ($this->format) {
case 'twtxt':
$pattern = '/^(?<date>[0-9-T:Z]+)\t(?<entry>.*)/';
$pattern = '/^(?<date>[^\t]+)\t(?<entry>.+)/';
break;
case 'picoblog':
$pattern = '/^(?<date>[0-9-T:Z]+)\t(?<id>[a-zA-Z0-9]{6})\t(?<entry>.*)/';
$pattern = '/^(?<date>[^\t]+)\t#(?<id>[a-zA-Z0-9]{6})\t(?<entry>.+)/';
break;
}
foreach ($entries as $i => $entry) {
preg_match($pattern, $entry, $matches);
if (!$matches) continue;
$id = (!empty($matches['id'])) ? $matches['id'] : $i;
$matches['entry'] = $this->parseUsers($matches['entry']);
$matches['entry'] = $this->parseHashlinks($matches['entry']);
$parsedEntries[$id] = [
'date' => $matches['date'],
'entry' => ($parseTags) ? preg_replace('/#(\w+)?/', '<a href="?tag=$1">#${1}</a>', $matches['entry']) : $matches['entry'],
'entry' => ($parseTags) ? preg_replace('/#(\w+)?/', '<a href="?tag=$1" class="tag">#${1}</a>', $matches['entry']) : $matches['entry'],
];
}
return $parsedEntries;
}
/**
* Parse any mentioned users in twtxt format: @<username https://feed-url>
*
* @param string $entry
* @return string string with parsed users
*/
private function parseUsers(string $entry) {
$pattern = '/\@<([a-zA-Z0-9\.]+)\W+(https?:\/\/[^>]+)>/';
return preg_replace($pattern,'<a href="$2">@$1</a>',$entry);
}
/**
* Parse any hashtags in twtxt.net hashlink format: #<tag https://feed-url>
*
* @param string $entry
* @return string string with parsed hashtags
*/
private function parseHashlinks(string $entry) {
$pattern = '/#<(\w+)\W+(https?:\/\/[^>]+)>/';
return preg_replace($pattern, '<a href="$2">#$1</a>', $entry);
}
/**
* Returns a filtered list of raw entries
*
@ -146,9 +170,9 @@ class PicoBlog
foreach ($entries as $id => $entry) {
$text = \Slimdown::render($entry['entry']);
$date = $entry['date'];
$text = "<a href='?id={$id}' title='{$date}'>[{$id}]</a> " . $text;
$text = "<a href='?id={$id}' title='{$date}' class='id'>[{$id}]</a> " . $text;
$html .= str_replace('{entry}', $text, $entryWrap);
}
return $html;
}
}
}