chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #576 from pixelfed/frontend-ui-refactor 

Frontend ui refactor
This commit is contained in:
daniel 2018-11-20 21:06:36 -07:00 committed by GitHub
parent 3c5cf78eb8 685df5f690
commit 67251287c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Util/Lexer/Extractor.php
View File

@ -98,7 +98,6 @@ class Extractor extends Regex
$entities = array_merge($entities, $this->extractURLsWithIndices($tweet));
$entities = array_merge($entities, $this->extractHashtagsWithIndices($tweet, false));
$entities = array_merge($entities, $this->extractMentionsOrListsWithIndices($tweet));
$entities = array_merge($entities, $this->extractCashtagsWithIndices($tweet));
$entities = $this->removeOverlappingEntities($entities);
return $entities;
@ -303,33 +302,6 @@ class Extractor extends Regex
*/
public function extractCashtagsWithIndices($tweet = null)
{
if (is_null($tweet)) {
$tweet = $this->tweet;
}
if (!preg_match('/\$/iu', $tweet)) {
return [];
}
preg_match_all(self::$patterns['valid_cashtag'], $tweet, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
$tags = [];
foreach ($matches as $match) {
list($all, $before, $dollar, $cash_text, $outer) = array_pad($match, 3, ['', 0]);
$start_position = $dollar[1] > 0 ? StringUtils::strlen(substr($tweet, 0, $dollar[1])) : $dollar[1];
$end_position = $start_position + StringUtils::strlen($dollar[0].$cash_text[0]);
if (preg_match(self::$patterns['end_hashtag_match'], $outer[0])) {
continue;
}
$tags[] = [
'cashtag' => $cash_text[0],
'indices' => [$start_position, $end_position],
];
}
return $tags;
}
/**

2
resources/views/site/about.blade.php
View File

@ -9,7 +9,7 @@
</div>
<div class="bg-white">
<div class="container d-flex justify-content-center">
<div class="card" style="width:500px;margin-top:-20px;">
<div class="card" style="width:500px;margin-top:-30px;">
<div class="card-header d-inline-flex align-items-center bg-white">
<img src="/storage/avatars/default.png" width="32px" height="32px" style="border-radius: 32px; border: 1px solid #ccc">
<span class="username font-weight-bold pl-2 text-dark">