From 33175a89515ce0d35ab126a1b20c10c296a56b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=AA=E5=AD=90?= Date: Wed, 23 Jul 2025 16:26:09 +0800 Subject: [PATCH] 0.8 --- README.md | 8 ++- assets/js/bundle.js | 7 +- footer.php | 9 +-- functions.php | 161 ++++++++++++++++++++++++++++++++++++++------ header.php | 59 ++++++++-------- index.php | 7 +- post.php | 2 +- 7 files changed, 189 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index ddbb8d2..b52294a 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,15 @@ ## 更新日志 & 预览 +### 0.8 + +- 兼容 Typecho 1.3.0 +- 自动裁切封面并保存在主题目录 `usr/cache/covers` 下,使用前必须开启 `php` 的 `GD拓展` 和`usr`目录的写权限. +- 站点统计 + ### 0.7.2 -- 优化页面加载速度,自动裁切封面,并压缩为`webp`格式,并保存在主题目录`assets`-`images`-`covers`下,使用前必须开启`php`的`GD拓展`和主题目录的写入权限 +- ~~优化页面加载速度,自动裁切封面,并压缩为`webp`格式,并保存在主题目录`assets`-`images`-`covers`下,使用前必须开启`php`的`GD拓展`和主题目录的写入权限~~ - 修复了置顶文章和翻页的问题 ### 0.7.1 diff --git a/assets/js/bundle.js b/assets/js/bundle.js index aaccb6e..ce12cba 100644 --- a/assets/js/bundle.js +++ b/assets/js/bundle.js @@ -17,7 +17,7 @@ is_single = false; post_id = 0; is_archive = false; - VERSION = "0.7.2"; + VERSION = "0.8"; constructor() { super(); this.initCopyright(); @@ -45,8 +45,9 @@ } } initCopyright() { - const copyright = `
由Typecho 驱动
- Theme farallon by bigfa  
Made with 老孙博客 / version ${this.VERSION} + const copyright = `
+ Theme farallon Designed by bigfa   +

老孙博客 移植 / version ${this.VERSION}

`; document.querySelector(".site--footer__content").insertAdjacentHTML("afterend", copyright); document.querySelector(".icon--copryrights").addEventListener("click", () => { diff --git a/footer.php b/footer.php index db500c6..366da18 100644 --- a/footer.php +++ b/footer.php @@ -5,16 +5,17 @@ need('./module/sns.php'); ?> options->sitemapurl): ?> - 💗 +
options->showtime): ?>  页面加载耗时 - options->tongji(); ?> -
© - options->title(); ?> + options->tongji(); ?> + +
© - + options->title(); ?> 💗 由 Typecho 驱动 query("//img[not(ancestor::figure) and not(contains(@src, '.svg'))]"); if ($images->length > 0) { foreach ($images as $img) { @@ -291,10 +290,9 @@ function process_cover_image($imageUrl) { $filename = md5($imageUrl) . '.webp'; // 处理后图片的保存路径 - $themeDir = dirname(__FILE__); - $savePath = $themeDir . '/assets/images/covers/' . $filename; - $webPath = Helper::options()->themeUrl . '/assets/images/covers/' . $filename; - + $savePath = __TYPECHO_ROOT_DIR__ . '/usr/cache/covers/' . $filename; + $webPath = Helper::options()->siteUrl . '/usr/cache/covers/' . $filename; + // 如果缓存文件已存在，直接返回 if (file_exists($savePath)) { return $webPath; @@ -367,8 +365,8 @@ function process_cover_image($imageUrl) { if (!function_exists('imagewebp')) { // 如果不支持webp，保存为png $filename = md5($imageUrl) . '.png'; - $savePath = $themeDir . '/assets/images/covers/' . $filename; - $webPath = Helper::options()->themeUrl . '/assets/images/covers/' . $filename; + $savePath = __TYPECHO_ROOT_DIR__ . '/usr/cache/covers/' . $filename; + $webPath = Helper::options()->siteUrl . '/usr/cache/covers/' . $filename; imagepng($targetImage, $savePath, 9); // 9是最高压缩质量 } else { // 保存为webp @@ -388,23 +386,60 @@ function process_cover_image($imageUrl) { * */ function get_article_summary($post) { - // 首先尝试从自定义字段获取摘要 + // 优先从自定义字段获取摘要 $db = Typecho_Db::get(); - // 查询自定义字段表 - $row = $db->fetchRow($db->select() + $row = $db->fetchRow($db->select('str_value') ->from('table.fields') ->where('cid = ?', $post['cid']) ->where('name = ?', 'summary')); - // 如果找到自定义摘要字段 + if ($row && !empty($row['str_value'])) { - return $row['str_value']; - } - // 如果没有自定义摘要，截取文章内容 - // 去除HTML标签 + // 确保自定义摘要不超过 100 字节 + $text = $row['str_value']; + $byte_limit = 280; + $summary = ''; + $byte_count = 0; + $length = mb_strlen($text, 'UTF-8'); + + for ($i = 0; $i < $length; $i++) { + $char = mb_substr($text, $i, 1, 'UTF-8'); + $char_bytes = strlen($char); + if ($byte_count + $char_bytes > $byte_limit) { + break; + } + $summary .= $char; + $byte_count += $char_bytes; + } + return $summary; + } + + // 没有自定义摘要，处理文章内容 + if (empty($post['text']) || !is_string($post['text'])) { + return ''; + } + $text = strip_tags($post['text']); - - // 截取指定长度的摘要 - return Typecho_Common::subStr($text, 0, 100, '...'); + $byte_limit = 277; // 预留 3 字节给省略号 + $summary = ''; + $byte_count = 0; + $length = mb_strlen($text, 'UTF-8'); + + for ($i = 0; $i < $length; $i++) { + $char = mb_substr($text, $i, 1, 'UTF-8'); + $char_bytes = strlen($char); + if ($byte_count + $char_bytes > $byte_limit) { + break; + } + $summary .= $char; + $byte_count += $char_bytes; + } + + // 如果截断了，添加省略号 + if ($byte_count < strlen($text)) { + $summary .= '...'; + } + + return $summary; } // 在原函数中使用 function get_article_info($atts) { @@ -488,8 +523,6 @@ class ContentFilter return $atts; } } -// 注册钩子 -Typecho_Plugin::factory('Widget_Abstract_Contents')->contentEx = array('ContentFilter', 'filterContent'); // 编辑器按钮类 class EditorButton { public static function render() @@ -780,4 +813,90 @@ function time_ago($time, $threshold = 31536000) { // 31536000秒 = 1年 $difference = round($difference); return $difference . $periods[$j] . "前"; +} + +/*** + * 获取站点统计信息（带缓存） + */ +function getSiteStatsWithCache() { + $cacheFile = __TYPECHO_ROOT_DIR__ . '/usr/cache/site_stats.cache'; + $cacheTime = 3600; // 1小时缓存 + $currentVersion = '1.1'; // 当前版本号 + + // 检查缓存 + if (file_exists($cacheFile)) { + $cacheData = json_decode(file_get_contents($cacheFile), true); + if ($cacheData && + isset($cacheData['cache_time']) && + time() - $cacheData['cache_time'] < $cacheTime && + isset($cacheData['cache_version']) && + $cacheData['cache_version'] === $currentVersion) { + return $cacheData; + } + } + + $db = Typecho_Db::get(); + $stats = []; + + // 1. 总分类数 + $stats['totalCategories'] = $db->fetchObject($db->select('COUNT(*) AS cnt') + ->from('table.metas') + ->where('type = ?', 'category'))->cnt; + + // 2. 总标签数 + $stats['totalTags'] = $db->fetchObject($db->select('COUNT(*) AS cnt') + ->from('table.metas') + ->where('type = ?', 'tag'))->cnt; + + // 3. 总文章数 + $stats['totalPosts'] = $db->fetchObject($db->select('COUNT(*) AS cnt') + ->from('table.contents') + ->where('type = ?', 'post') + ->where('status = ?', 'publish'))->cnt; + + // 4. 总文章字数 + $stats['totalWords'] = $db->fetchObject($db->select('SUM(LENGTH(text)) AS total') + ->from('table.contents') + ->where('type = ?', 'post') + ->where('status = ?', 'publish'))->total ?: 0; + + // 5. 建站时间 + $oldestPost = $db->fetchObject($db->select('MIN(created) AS created') + ->from('table.contents') + ->where('type = ?', 'post') + ->where('status = ?', 'publish')); + + if ($oldestPost && !empty($oldestPost->created)) { + $stats['siteCreationDate'] = date('Y-m-d', $oldestPost->created); + $stats['siteCreateYear'] = date('Y', $oldestPost->created); + $stats['siteDays'] = ceil((time() - $oldestPost->created) / 86400); + } else { + $stats['siteCreationDate'] = 'N/A'; + $stats['siteCreateYear'] = 'N/A'; + $stats['siteDays'] = 0; + } + + // 6. 友情链接数量 + $stats['totalLinks'] = 0; + if (class_exists('Links_Plugin')) { + $stats['totalLinks'] = $db->fetchObject($db->select('COUNT(*) AS cnt') + ->from('table.links'))->cnt ?: 0; + } + + // 7. 总留言数量 + $stats['totalComments'] = $db->fetchObject($db->select('COUNT(*) AS cnt') + ->from('table.comments') + ->where('status != ?', 'spam'))->cnt; + + // 保存缓存 + $stats['cache_time'] = time(); + $stats['cache_version'] = $currentVersion; // 设置版本号 + if (!is_dir(dirname($cacheFile))) { + mkdir(dirname($cacheFile), 0755, true); + } + if (!file_put_contents($cacheFile, json_encode($stats))) { + error_log('Failed to write site stats cache to ' . $cacheFile); + } + + return $stats; } \ No newline at end of file diff --git a/header.php b/header.php index 61559b9..02c8265 100644 --- a/header.php +++ b/header.php @@ -39,42 +39,37 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
- options->logoUrl): ?> - - <?php $this->options->title() ?> - - - options->title() ?> - - - - options->title() ?> - - -
-
- - -
+ options->logoUrl): ?> + + <?php $this->options->title() ?> + + + options->title() ?> + + + + options->title() ?> + + +
+
+ +
-
-
-
- - - - +
+
+
+
\ No newline at end of file diff --git a/index.php b/index.php index 5b7b39d..6f690d9 100644 --- a/index.php +++ b/index.php @@ -1,9 +1,12 @@ Farallon + * 原作者 bigfa + * * 适配Typecho 1.3.0 * @package Farallon * @author 老孙 - * @version 0.7.3 + * @version 0.8 * @link https://www.imsun.org */ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?> diff --git a/post.php b/post.php index 951fbd3..7a0e110 100644 --- a/post.php +++ b/post.php @@ -37,7 +37,7 @@

title() ?>

-
content(); ?>
+
content(); ?>content, $this, null); ?>
options->wxpay): ?>