0.5.7

增加置顶文章的设置,样式来自于wordpress版本的主题样式

README.md

@@ -3,6 +3,9 @@
 移植自 `bigfa `大大的 `hugo-theme-farallon` 原汁原味,可以直接使用 原主题的CSS 
 精简部分 JS.
 
+- 2024.7.4
+把分类图片以`mid`.jpg 的形式在主题`/dist/img`目录下,自动匹配
+
 - 2024.6.12
 
 更新豆瓣API获取方式
@@ -42,32 +45,13 @@ https://github.com/gogobody/typecho-whisper
 ## 原项目地址
 https://github.com/bigfa/hugo-theme-farallon
 
-## 移植进度
-
-96%
 
 ## 功能
 
-### 已知问题
-
-由于typecho分类并无图片,所以默认使用
-`bigfa` 的 `https://static.fatesinger.com/2021/12/vhp6eou5x2wqh2zy.jpg` 
-可以自行替换或者删除
-
-
 ### 豆瓣观影
 
   更新 获取方式
 
-~~使用原版的获取方式~~
-
-~~豆瓣收藏使用方法~~
-~~微信扫码登录https://node.wpista.com/~~
-~~输入你的豆瓣数字 id，点击保存即可自动同步豆瓣记录。~~
-~~点击 Get integration token 会生成一个 token。~~
-
-~~获取`token`之后填入主题设置项中~~
-
 ### 友情链接
 
 基于 `links` 插件实现
@@ -90,15 +74,16 @@ https://github.com/bigfa/hugo-theme-farallon
 
 ### 说说 by Mastodon
 
-根据 https://www.imsun.org/archives/1643.html#toc3 
+根据 https://www.imsun.org/archives/1643.html
 获得API地址
 
 在自定义字段中填入`tooot`值为Mastodon API 地址
 
 ### 好物 by memos
 
-
-
+在自定义字段中填入`memos`值为memos地址
+在自定义字段中填入`memosID`默认值为`1`,不为`1`时才需要设置
+在自定义字段中填入`memostag`默认值为`好物`,不为`好物`时才需要设置
 ## 预览地址
 
 https://www.imsun.org

comments.php

@@ -43,7 +43,6 @@
     <?php $this->comments()->to($comments); ?>
     <?php if($this->allow('comment')): ?>
         <?php if ($this->is('attachment')) : ?>
-        <?php _e(''); ?>
         <?php else: ?>
     	<h3 class="comments--title" id="comments">
             <svg viewBox="0 0 24 24" class="icon" aria-hidden="true" width="16" height="16">
@@ -52,8 +51,10 @@
                         d="M1.751 10c0-4.42 3.584-8 8.005-8h4.366c4.49 0 8.129 3.64 8.129 8.13 0 2.96-1.607 5.68-4.196 7.11l-8.054 4.46v-3.69h-.067c-4.49.1-8.183-3.51-8.183-8.01zm8.005-6c-3.317 0-6.005 2.69-6.005 6 0 3.37 2.77 6.08 6.138 6.01l.351-.01h1.761v2.3l5.087-2.81c1.951-1.08 3.163-3.13 3.163-5.36 0-3.39-2.744-6.13-6.129-6.13H9.756z">
                     </path>
                 </g>
-            </svg><?php $this->commentsNum(_t('0'), _t('1'), _t('%d')); ?>
-        </h3>
+            </svg>
+            <?php $this->commentsNum(_t('0'), _t('1'), _t('%d')); ?>
+        </h3> 
+        <ol class="commentlist sulliComment--list"></ol>   
     <div id="<?php $this->respondId(); ?>" class="comment-respond">
         <div class="cancel-comment-reply cancel-comment-reply-link"><?php $comments->cancelReply(); ?></div>
     	<form method="post" action="<?php $this->commentUrl() ?>" id="comment-form" role="form" class="comment-form">
@@ -76,7 +77,6 @@
             <p class="comment-form-comment">
             <textarea rows="8" cols="50" name="text" id="textarea" class="textarea" onkeydown="if(event.ctrlKey&&event.keyCode==13){document.getElementById('misubmit').click();return false};" placeholder="<?php _e('评论审核后显示，请勿重复提交...'); ?>" required ><?php $this->remember('text'); ?></textarea>
     		</p>
-            
     		<p class="form-submit">
             <button type="submit" class="submit" id="misubmit"><?php _e('提交评论（Ctrl+Enter）'); ?></button>
             </p>
@@ -84,9 +84,8 @@
     </div>
     <?php endif; ?>
     <?php else: ?>
-    <?php _e(''); ?>
+
     <?php endif; ?>
-    <ol class="commentlist sulliComment--list"></ol>   
         <?php if ($comments->have()): ?>
         <?php $comments->listComments(); ?>
     <?php
@@ -161,8 +160,3 @@ function threadedComments($comments, $options) {
         <?php } ?>
     </li>
     <?php } ?>
-<ol class="commentlist">
-    <?php $this->comments()->to($comments); ?>
-    <?php while($comments->next()): ?>       
-    <?php endwhile; ?>
-</ol>

dist/js/bundle.js

@@ -17,7 +17,7 @@
       is_single = false;
       post_id = 0;
       is_archive = false;
-      VERSION = "0.5.4.1";
+      VERSION = "0.5.6";
       constructor() {
         super();
         this.initCopyright();

functions.php

@@ -5,7 +5,9 @@ function themeConfig($form) {
     $form->addInput($logoUrl);
     $icoUrl = new Typecho_Widget_Helper_Form_Element_Text('icoUrl', NULL, NULL, _t('站点 Favicon 地址'));
     $form->addInput($icoUrl);
-    $jzyear = new Typecho_Widget_Helper_Form_Element_Text('jzyear', NULL, NULL, _t('建站年份'), _t('eg. 2006'));
+    $sticky = new Typecho_Widget_Helper_Form_Element_Text('sticky', NULL, NULL, _t('置顶文章cid'), _t('多篇文章以`|`符号隔开'), _t('会在首页展示置顶文章。'));
+    $form->addInput($sticky);
+    $jzyear = new Typecho_Widget_Helper_Form_Element_Text('jzyear', NULL, NULL, _t('建站年份'), _t('eg. 2006'), _t('会在页脚显示。'));
     $form->addInput($jzyear);
     $showProfile = new Typecho_Widget_Helper_Form_Element_Radio('showProfile',
     array('0'=> _t('否'), '1'=> _t('是')),
@@ -47,10 +49,6 @@ function themeConfig($form) {
     array('0'=> _t('否'), '1'=> _t('是')),
     '0', _t('是否显示复制链接'), _t('选择“是”将在文章页面显示复制链接。'));
     $form->addInput($showshare);
-    $showtoc = new Typecho_Widget_Helper_Form_Element_Radio('showtoc',
-    array('0'=> _t('否'), '1'=> _t('是')),
-    '0', _t('是否显示文章目录'), _t('选择“是”将在文章页面显示文章目录(仅在宽度大于1400px的设备中显示)。'));
-    $form->addInput($showtoc);
     $showtime = new Typecho_Widget_Helper_Form_Element_Radio('showtime',
     array('0'=> _t('否'), '1'=> _t('是')),
     '0', _t('是否显示页面加载时间'), _t('选择“是”将在页脚显示加载时间。'));

header.php

@@ -17,7 +17,7 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
             'date'      =>  _t('在<span> %s </span>发布的文章'),
             'author'    =>  _t('%s 发布的文章')
         ), '', ' - '); ?><?php if ($this->is('post')) $this->category(',', false);?><?php if ($this->is('post')) echo ' - ';?><?php $this->options->title(); ?><?php if ($this->is('index')) echo ' - '; ?><?php if ($this->is('index')) $this->options->description() ?></title>
-    <link rel="stylesheet" href="<?php $this->options->themeUrl('/dist/css/style.css'); ?>">
+    <link rel="stylesheet" href="<?php $this->options->themeUrl('/dist/css/style.min.css'); ?>">
     <?php if ($this->options->icoUrl): ?>
     <link rel='icon' href='<?php $this->options->icoUrl() ?>' type='image/x-icon' />
     <?php endif; ?>

index.php

@@ -1,10 +1,10 @@
 <?php
 /**
  * 移植自HUGO主题 farallon 原作者 bigfa  
- * @package farallon
+ * @package Farallon
  * @author  老孙 
- * @version 0.5.5
- * @link https://imsun.org
+ * @version 0.5.7
+ * @link https://www.imsun.org
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 $this->need('header.php');

page-categories.php

@@ -12,17 +12,26 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
         <h2 class="post--single__subtitle"><?php $this->content(); ?> </h2>
     </header>
     <section class="category--list">
-      <?php $this->widget('Widget_Metas_Category_List')->parse('
-      <div class="category--item">
-      <img src="https://static.fatesinger.com/2021/12/vhp6eou5x2wqh2zy.jpg" class="category--cover"/>
-      <div class="category--content">
-       <a href="{permalink}" class="category--card">{name}
-       <span>({count})</span>
-       </a> 
-         <div class="category--desc">{description}</div>
-      </div>
-      </div>    
-    '); ?>
+    <?php $this->widget('Widget_Metas_Category_List')->to($categories); ?>
+<?php while($categories->next()): ?>
+    <?php
+    // 获取分类 ID
+    $categoryId = $categories->mid;
+    // 获取主题URL
+    $themeUrl = $this->options->themeUrl;
+    // 为每个分类生成图片地址
+    $categoryImage = $themeUrl . '/dist/img/' . $categoryId . '.jpg';
+    ?>
+    <div class="category--item">
+    <img class="category--cover" src="<?php echo $categoryImage; ?>" loading="lazy" alt="<?php $categories->name(); ?>">
+    <div class="category--content">
+        <a class="category--card" href="<?php $categories->permalink(); ?>"><?php $categories->name(); ?>
+        <span>(<?php $categories->count(); ?>)</span></a>
+        <div class="category--desc">   <?php $categories->description(); ?>
+        </div>
+        </div>
+        </div>  
+<?php endwhile; ?>
     </section>
 </div>
 <?php $this->need('footer.php'); ?>

post.php

@@ -1,5 +1,13 @@
 <?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php $this->need('header.php'); ?>
+<style>
+#toc {font-size:14px;padding:10px 15px;background-color:var(--farallon-background-gray);border-radius:10px;margin-bottom:20px}
+#toc  summary{cursor:pointer}
+#toc toc-title{font-weight:600}
+#toc  ul{padding-left:10px;margin-bottom:10px}
+#toc  ul li::before{content:"·";margin-right:5px}
+#toc  ul li>ul{margin-left:10px;font-size:12px}
+</style>
 <main class="site--main">
 <article class="post--single">
     <ul class="meta">
@@ -36,8 +44,8 @@
         </div>         
             <h2 class="post--single__title"><?php $this->title() ?></h2>
             <div class="post--single__content graph" ><?php $this->content(); ?></div>
-               <!--打赏  -->
         <?php if($this->options->donate): ?> 
+            <!--打赏  -->
         <div class="post--single__action">   
         <link rel="stylesheet" href="<?php $this->options->themeUrl('/dist/css/donate.css'); ?>">
         <script type="text/javascript" src="<?php $this->options->themeUrl('/dist/js/donate.js'); ?>"></script>
@@ -150,90 +158,76 @@
     </nav> 
 </ul>    
 </article>
-<?php if($this->options->showtoc): ?>
-<!--TOC 在宽度大于1400px时才会显示-->
+</main>
 <script>
 document.addEventListener('DOMContentLoaded', (event) => {
-  const postContent = document.querySelector('.post--single__content');
-  if (!postContent) return;
+    const targetClassElement = document.querySelector('.post--single__title');
+    const postContent = document.querySelector('.post--single__content');
+    if (!postContent) return;
 
-  let found = false;
-  for (let i = 1; i <= 6 && !found; i++) {
-    if (postContent.querySelector(`h${i}`)) {
-      found = true;
+    let found = false;
+    for (let i = 1; i <= 6 &&!found; i++) {
+        if (postContent.querySelector(`h${i}`)) {
+            found = true;
+        }
     }
-  }
-  if (!found) return;
-  const heads = postContent.querySelectorAll('h1, h2, h3, h4, h5, h6');
-  const toc = document.createElement('div');
-  toc.id = 'toc';
-  toc.innerHTML = '<strong>目录</strong><ul></ul>';
-  document.body.appendChild(toc);
-  let currentLevel = 0;
-  let currentList = toc.querySelector('ul');
-  let levelCounts = [0]; // 初始化层级计数器
+    if (!found) return;
 
-  heads.forEach((head, index) => {
-    const level = parseInt(head.tagName.substring(1));
-    if (levelCounts[level] === undefined) {
-      levelCounts[level] = 1; // 初始化该层级计数
-    } else {
-      levelCounts[level]++;
+    const heads = postContent.querySelectorAll('h1, h2, h3, h4, h5, h6');
+    const toc = document.createElement('div');
+    toc.id = 'toc';
+    toc.innerHTML = '<details class="toc" open><summary class="toc-title">目录</summary><nav id="TableOfContents"><ul></ul></nav></details>';
+
+    // 插入到指定 class 元素之后
+    if (targetClassElement) {
+        targetClassElement.parentNode.insertBefore(toc, targetClassElement.nextSibling);
     }
-    // 重置下级标题的计数器
-    levelCounts = levelCounts.slice(0, level + 1);
-    if (currentLevel === 0) {
-      currentLevel = level;
-    }
-    while (level > currentLevel) {
-      let newList = document.createElement('ul');
-      if(!currentList.lastElementChild) {
-        currentList.appendChild(newList);
-      } else {
-        currentList.lastElementChild.appendChild(newList);
-      }
-      currentList = newList;
-      currentLevel++;
-      levelCounts[currentLevel] = 1; // 初始化下一层级的计数器
-    }
-    while (level < currentLevel) {
-      currentList = currentList.parentElement;
-      if(currentList.tagName.toLowerCase() === 'li') {
-        currentList = currentList.parentElement;
-      }
-      currentLevel--;
-    }
-    const numbers = levelCounts.slice(1, level + 1).join(' ') ; 
-    const item = document.createElement('li');
-    item.classList.add('toc-item'); // 添加基本类
-    item.classList.add(`level-${level}`); // 根据级别添加类
-    const anchor = `toc${index}`;
-    head.id = anchor;
-    const link = document.createElement('a');
-    link.href = `#${anchor}`;
-    link.textContent = `${numbers}. ${head.textContent}`; // 序号+标题文本
-    item.appendChild(link);
-    currentList.appendChild(item);
-  });
+
+    let currentLevel = 0;
+    let currentList = toc.querySelector('ul');
+    let levelCounts = [0];
+
+    heads.forEach((head, index) => {
+        const level = parseInt(head.tagName.substring(1));
+        if (levelCounts[level] === undefined) {
+            levelCounts[level] = 1;
+        } else {
+            levelCounts[level]++;
+        }
+        // 重置下级标题的计数器
+        levelCounts = levelCounts.slice(0, level + 1);
+        if (currentLevel === 0) {
+            currentLevel = level;
+        }
+        while (level > currentLevel) {
+            let newList = document.createElement('ul');
+            if (!currentList.lastElementChild) {
+                currentList.appendChild(newList);
+            } else {
+                currentList.lastElementChild.appendChild(newList);
+            }
+            currentList = newList;
+            currentLevel++;
+            levelCounts[currentLevel] = 1;
+        }
+        while (level < currentLevel) {
+            currentList = currentList.parentElement;
+            if (currentList.tagName.toLowerCase() === 'li') {
+                currentList = currentList.parentElement;
+            }
+            currentLevel--;
+        }
+        const anchor = head.textContent.trim().replace(/\s+/g, '-');
+        head.id = anchor;
+        const item = document.createElement('li');
+        const link = document.createElement('a');
+        link.href = `#${anchor}`;
+        link.textContent = `${head.textContent}`;
+        link.style.textDecoration = 'none';
+        item.appendChild(link);
+        currentList.appendChild(item);
+    });
 });
 </script>
-<style>
-#toc {
-  position: fixed;
-  top: 100px;
-  right: 50px;
-  max-width: 200px;
-  background-color: var(--farallon-background-gray);
-  padding: 10px;
-  border-radius: 5px;
-  /* 其他样式... */
-}
-@media screen and (max-width: 1400px) {
-  #toc {
-    display: none;
-  }
-}
-</style>
-<?php endif; ?>
-</main>
+
 <?php $this->need('footer.php'); ?>

postlist.php

@@ -1,11 +1,76 @@
-<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php 
+//确保退出安全
+if (!defined('__TYPECHO_ROOT_DIR__')) exit; 
+
+/** 文章置顶 */
+$sticky = $this->options->sticky ; //置顶的文章id，多个用|隔开
+
+if ($sticky) {
+    $sticky_cids = array_filter(explode('|', $sticky)); //分割文本并过滤空值
+    $sticky_html = " <span class=sticky--post> 置顶 </span> "; //置顶标题的 html
+
+    $db = Typecho_Db::get();
+    $pageSize = $this->options->pageSize;
+    
+    // 构建置顶文章的查询
+    $selectSticky = $this->select()->where('type = ?', 'post');
+    foreach ($sticky_cids as $i => $cid) {
+        if($i == 0) 
+            $selectSticky->where('cid = ?', $cid);
+        else 
+            $selectSticky->orWhere('cid = ?', $cid);
+    }
+
+    // 清空原有文章的列队
+    $this->row = [];
+    $this->stack = [];
+    $this->length = 0;
+    
+    // 只在首页第一页展示置顶文章
+    if (($this->_currentPage || $this->currentPage) == 1) {
+        $stickyPosts = $db->fetchAll($selectSticky);
+        foreach ($stickyPosts as $stickyPost) {
+            $stickyPost['title'] =  $stickyPost['title'] .  $sticky_html;
+            $this->push($stickyPost); //压入列队
+        }
+    }
+  
+    // 构建普通文章的查询，排除置顶文章的 CID
+    $selectNormal = $this->select()
+        ->where('type = ?', 'post')
+        ->where('status = ?', 'publish')
+        ->where('created < ?', time())
+        ->order('created', Typecho_Db::SORT_DESC)
+        ->page($this->_currentPage, $pageSize);
+
+    foreach ($sticky_cids as $cid) {
+        $selectNormal->where('table.contents.cid != ?', $cid);
+    }
+
+    // 登录用户显示私密文章
+    if ($this->user->hasLogin()) {
+        $uid = $this->user->uid;
+        if ($uid) {
+            $selectNormal->orWhere('authorId = ? AND status = ?', $uid, 'private');
+        }
+    }
+
+    $normalPosts = $db->fetchAll($selectNormal);
+    foreach ($normalPosts as $normalPost) {
+        $this->push($normalPost); //压入列队
+    }
+
+    // 设置总数（减去置顶文章数量，以进行正确的分页）
+    $total = $this->getTotal() - count($sticky_cids);
+    $this->setTotal(max($total, 0)); // 确保总数不为负数
+}
+?>
 <?php while($this->next()): ?>
 	<article class="post--item">
     <div class="content">
         <h2 class="post--title">
 			 <a href="<?php $this->permalink() ?>">
-             <!--三天内显示火苗-->
-                <?php $this->title() ?>
+             <?php $this->title() ?>
                 <?php if((time() - $this->created) < 60*60*24*3): ?>
                 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
                     class="icon--sticky" stroke="currentColor" stroke-width="2" stroke-linecap="round"