Skip to content

Commit

Permalink
更新:优化性能和评论主题
Browse files Browse the repository at this point in the history
  • Loading branch information
zhuchunshu committed Dec 23, 2022
1 parent 200443e commit 6f10ed6
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 177 deletions.
10 changes: 5 additions & 5 deletions app/CodeFec/CodeFec.php
Expand Up @@ -2,11 +2,11 @@

declare(strict_types=1);
/**
* This file is part of Hyperf.
* @link https://www.hyperf.io
* @document https://hyperf.wiki
* @contact group@hyperf.io
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
* This file is part of zhuchunshu.
* @link https://github.com/zhuchunshu
* @document https://github.com/zhuchunshu/super-forum
* @contact laravel@88.com
* @license https://github.com/zhuchunshu/super-forum/blob/master/LICENSE
*/
namespace App\CodeFec;

Expand Down
110 changes: 0 additions & 110 deletions app/Command/Docker.php

This file was deleted.

33 changes: 30 additions & 3 deletions app/Plugins/Comment/resources/views/Widget/topic.blade.php
Expand Up @@ -5,9 +5,36 @@
</div>
<div class="card-body">
@if(!auth()->check())
<a href="/login" class="btn btn-dark">登陆</a>
OR
<a href="/register" class="btn btn-light">注册</a>
<div class="col-md-12">
<div class="border-0 card">
<div class="empty">
<div class="empty-icon"><!-- Download SVG icon from http://tabler-icons.io/i/mood-sad -->
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-login" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
<path d="M14 8v-2a2 2 0 0 0 -2 -2h-7a2 2 0 0 0 -2 2v12a2 2 0 0 0 2 2h7a2 2 0 0 0 2 -2v-2"></path>
<path d="M20 12h-13l3 -3m0 6l-3 -3"></path>
</svg>
</div>
<p class="empty-title">无权限</p>
<p class="empty-subtitle text-muted">
请登录后评论
</p>
@if(!auth()->check())
<div class="empty-action">
<a href="/login" class="btn btn-primary">
<!-- Download SVG icon from http://tabler-icons.io/i/search -->
<svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-login" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
<path d="M14 8v-2a2 2 0 0 0 -2 -2h-7a2 2 0 0 0 -2 2v12a2 2 0 0 0 2 2h7a2 2 0 0 0 2 -2v-2"></path>
<path d="M20 12h-13l3 -3m0 6l-3 -3"></path>
</svg>
登陆
</a>
</div>
@endif
</div>
</div>
</div>
@else
<div class="alert alert-important alert-info alert-dismissible" role="alert">
<div class="d-flex">
Expand Down
119 changes: 61 additions & 58 deletions app/Plugins/Topic/src/ContentParse.php
@@ -1,67 +1,70 @@
<?php

declare(strict_types=1);
/**
* This file is part of zhuchunshu.
* @link https://github.com/zhuchunshu
* @document https://github.com/zhuchunshu/super-forum
* @contact laravel@88.com
* @license https://github.com/zhuchunshu/super-forum/blob/master/LICENSE
*/
namespace App\Plugins\Topic\src;

use Hyperf\Utils\Arr;
use Zhuchunshu\EmojiParse\Emoji;

class ContentParse
{
/**
* @param string $content 内容
* @param array $data 数据
*/
public function parse(string $content, array $data = [])
{
$content = $this->ShortCode($content, $data);
$content = $this->twemoji($content);
$content = $this->owo($content);
return $content;
}

/**
* ShortCode 处理
* @param string $content 内容
* @param array $data 数据
*/
private function ShortCode(string $content, array $data = []): string
{
// 要删除的ShortCode
// 要删除的ShortCode
$shortCode = [];
if(count(Itf()->get('topic_shortCode_remove'))) {
$shortCode = array_merge($shortCode, Itf()->get('topic_shortCode_remove'));
}
if(Arr::has($data, 'RemoveshortCode') && count($data['RemoveshortCode'])) {
$shortCode = array_merge($shortCode, $data['RemoveshortCode']);
}
$shortCode = array_unique($shortCode);
return ShortCodeR()->setRemove($shortCode)->handle($content, $data);
}

/**
* TwEmoji 处理
* @param string $content
* @return string
*/
private function twemoji(string $content): string
{
if(get_options("contentParse_twemoji", "开启") === "开启") {
return (new Emoji())->twemoji($content)->svg()->base(get_options("contentParse_twemoji_cdn", "https://lib.baomitu.com/twemoji/1.4.2"))->toHtml(null, ['width' => get_options("contentParse_twemoji_contentParse_width", 25), 'height' => get_options("contentParse_twemoji_contentParse_height", 25)]);
}
return $content;
}

/**
* 渲染owo表情
* @param string $content
* @return string
*/
private function owo(string $content): string
{
if(get_options('contentParse_owo', '开启') === "开启") {
return (new \App\Plugins\Core\src\Lib\Emoji())->parse($content);
}
return $content;
}
}
/**
* @param string $content 内容
* @param array $data 数据
*/
public function parse(string $content, array $data = [])
{
$content = $this->ShortCode($content, $data);
$content = $this->twemoji($content);
return $this->owo($content);
}

/**
* ShortCode 处理.
* @param string $content 内容
* @param array $data 数据
*/
private function ShortCode(string $content, array $data = []): string
{
// 要删除的ShortCode
// 要删除的ShortCode
$shortCode = [];
if (count(Itf()->get('topic_shortCode_remove'))) {
$shortCode = array_merge($shortCode, Itf()->get('topic_shortCode_remove'));
}
if (Arr::has($data, 'RemoveshortCode') && count($data['RemoveshortCode'])) {
$shortCode = array_merge($shortCode, $data['RemoveshortCode']);
}
$shortCode = array_unique($shortCode);
return ShortCodeR()->setRemove($shortCode)->handle($content, $data);
}

/**
* TwEmoji 处理.
*/
private function twemoji(string $content): string
{
if (get_options('contentParse_twemoji', '开启') === '开启') {
return (new Emoji())->twemoji($content)->svg()->base(get_options('contentParse_twemoji_cdn', 'https://lib.baomitu.com/twemoji/1.4.2'))->toHtml(null, ['width' => get_options('contentParse_twemoji_contentParse_width', 25), 'height' => get_options('contentParse_twemoji_contentParse_height', 25)]);
}
return $content;
}

/**
* 渲染owo表情.
*/
private function owo(string $content): string
{
if (get_options('contentParse_owo', '开启') === '开启') {
return (new \App\Plugins\Core\src\Lib\Emoji())->parse($content);
}
return $content;
}
}
2 changes: 1 addition & 1 deletion config/config.php
Expand Up @@ -14,7 +14,7 @@
return [
'app_name' => env('APP_NAME', 'CodeFec'),
'app_env' => env('APP_ENV', 'dev'),
'scan_cacheable' => env('SCAN_CACHEABLE', false),
'scan_cacheable' => env('SCAN_CACHEABLE', true),
StdoutLoggerInterface::class => [
'log_level' => [
LogLevel::INFO,
Expand Down

0 comments on commit 6f10ed6

Please sign in to comment.