UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Autolinker

Browse source
This commit is contained in:
Daniel Supernault 2019-05-27 20:56:44 -06:00
parent 0fa282a190
commit 24ff176744
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Util/Lexer/Autolink.php
View file

@ -418,7 +418,7 @@ class Autolink extends Regex
if(Str::startsWith($entity['screen_name'], '@')) {
$text .= StringUtils::substr($tweet, $beginIndex, $entity['indices'][0] - $beginIndex);
} else {
$text .= StringUtils::substr($tweet, $beginIndex, $entity['indices'][0] - $beginIndex + 1);
$text .= StringUtils::substr($tweet, $beginIndex, $entity['indices'][0] - $beginIndex);
}
} else {
$text .= StringUtils::substr($tweet, $beginIndex, $entity['indices'][0] - $beginIndex);
@ -708,16 +708,17 @@ class Autolink extends Regex
{
$attributes = [];
$screen_name = $entity['screen_name'];
if (!empty($entity['list_slug'])) {
// Replace the list and username
$linkText = $entity['screen_name'];
$linkText = Str::startsWith($screen_name, '@') ? $screen_name : '@'.$screen_name;
$class = $this->class_list;
$url = $this->url_base_list.$linkText;
$url = $this->url_base_list.$screen_name;
} else {
// Replace the username
$linkText = $entity['screen_name'];
$linkText = Str::startsWith($screen_name, '@') ? $screen_name : '@'.$screen_name;
$class = $this->class_user;
$url = $this->url_base_user.$linkText;
$url = $this->url_base_user.$screen_name;;
}
if (!empty($class)) {
$attributes['class'] = $class;