更新获取豆瓣方式

404.php

@@ -4,9 +4,7 @@
     <section class="template--404">
         <div class="error--text">404</div>
         <div class="error--posts">
-       
             <article class="post--error" itemtype="http://schema.org/Article" itemscope="itemscope">
-              
                 <div class="content">
                     <h2 class="post--title" itemprop="headline">
                         <a href="<?php $this->options->siteUrl(); ?>">
@@ -19,11 +17,9 @@
                                 d="M512 97.52381c228.912762 0 414.47619 185.563429 414.47619 414.47619s-185.563429 414.47619-414.47619 414.47619S97.52381 740.912762 97.52381 512 283.087238 97.52381 512 97.52381z m0 73.142857C323.486476 170.666667 170.666667 323.486476 170.666667 512s152.81981 341.333333 341.333333 341.333333 341.333333-152.81981 341.333333-341.333333S700.513524 170.666667 512 170.666667z m36.571429 89.697523v229.86362h160.865523v73.142857H512a36.571429 36.571429 0 0 1-36.571429-36.571429V260.388571h73.142858z">
                             </path>
                         </svg>
-          
                     </div>
                 </div>
-            </article>
-           
+            </article>  
         </div>
     </section>
 </main>

README.md

@@ -2,7 +2,35 @@
 
 移植自 `bigfa `大大的 `hugo-theme-farallon` 原汁原味,可以直接使用 原主题的CSS 
 精简部分 JS.
-感谢
+
+- 2024.6.12
+
+更新豆瓣API获取方式
+[Docker 自动同步豆瓣书影音记录](https://fatesinger.com/103483)
+主题设置处填入API
+
+- 2024.6.7
+
+用自带评论做的说说页面,来自
+https://github.com/gogobody/typecho-whisper
+删减部分内容只能发表文字
+
+- 2024.6.5 v0.5.3
+
+新增了好物的页面 还是通过memos来获取
+
+- 2024.6.4 v0.5.1
+
+更改了设置memos的方式
+新增了Mastodon 的 说说 页面
+
+- 2024.6.3 v0.5.0
+
+还是抄了原版的豆瓣获取方式
+
+- 2024.5.26 v0.4.1
+
+抄了个网站统计页面
 
 - 2024.5.24
 
@@ -10,16 +38,13 @@
 在后台设置memos的地址和memoID即可
 默认获取最近20条公开的memo
 
-- 2024.5.26
-
-抄了个网站统计页面
 
 ## 原项目地址
 https://github.com/bigfa/hugo-theme-farallon
 
 ## 移植进度
 
-95%
+96%
 
 ## 功能
 
@@ -31,13 +56,17 @@ https://github.com/bigfa/hugo-theme-farallon
 
 
 ### 豆瓣观影
-* 能力有限原项目功能无法实现
 
-目前只能配合`DoubanBoard`插件使用
+  更新 获取方式
 
-项目地址
-https://github.com/AlanDecode/Typecho-Plugin-DoubanBoard
-!!记得重命名文件夹为`DoubanBoard`
+~~使用原版的获取方式~~
+
+~~豆瓣收藏使用方法~~
+~~微信扫码登录https://node.wpista.com/~~
+~~输入你的豆瓣数字 id，点击保存即可自动同步豆瓣记录。~~
+~~点击 Get integration token 会生成一个 token。~~
+
+~~获取`token`之后填入主题设置项中~~
 
 ### 友情链接
 
@@ -49,7 +78,31 @@ https://github.com/AlanDecode/Typecho-Plugin-DoubanBoard
 
 若使用AI摘要插件则显示AI摘要,不使用则显示默认字数摘要
 
+### 说说 by Memos
+
+使用自定义字段设置memos
+
+在自定义字段中填入`memos`值为memos地址,不带`/`
+
+在自定义字段中填入`memosID`默认值为`1`,不为`1`时才需要设置
+
+在自定义字段中填入`memosnum`默认值为`20`,默认获取20条最近的memo
+
+### 说说 by Mastodon
+
+根据 https://www.imsun.org/archives/1643.html#toc3 
+获得API地址
+
+在自定义字段中填入`tooot`值为Mastodon API 地址
+
+### 好物 by memos
+
+
 
 ## 预览地址
 
-https://www.imsun.org
+https://www.imsun.org
+
+## 感谢
+
+[bigfa](https://github.com/bigfa/hugo-theme-farallon)

archive.php

@@ -12,7 +12,6 @@
         <h3 class="post--single__subtitle"><?php $this->categorydescription(); ?></h3>
         <?php while($this->next()): ?>
     </header>
- 
     <article class="post--item">   
     <div class="content">
         <h2 class="post--title">
@@ -41,7 +40,7 @@
                         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><a href="<?php $this->permalink() ?>#comments"><?php $this->commentsNum('评论', '1 评论', '%d 评论'); ?></a>
+            </svg><a href="<?php $this->permalink() ?>#comments"><?php $this->commentsNum('0 ', '1 ', '%d '); ?></a>
         </div>
     </div> 
     </article>  
@@ -55,7 +54,7 @@
                 '...',
                 array(
                     'wrapTag' => 'div',
-                    'wrapClass' => 'cat_pagination_page',
+                    'wrapClass' => 'pagination_page',
                     'itemTag' => '',
                     'textTag' => 'a',
                     'currentClass' => 'active',
@@ -63,8 +62,7 @@
                     'nextClass' => 'next'
                 )
             );
-        ?> 
-          
+        ?>   
         <!-- 搜索结果 --> 
         <?php else: ?>
         <main class="site--main">              
@@ -76,5 +74,44 @@
         </header> 
         </main>        
         <?php endif; ?>   
-
+<style>
+/* 分页 */
+.pagination_page{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: var(--margin);
+    gap: 0.5rem;
+}
+.pagination_page li.active a {
+    background: var(--theme);
+    color: #fff;
+    font-weight: 500;
+}
+.pagination_page a{
+    display: flex;
+    padding: 0.5rem;
+    font-size: 0.9rem;
+    width: 1.75rem;
+    height: 1.75rem;
+    background: var(--background);
+    border-radius: 50%;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    transition: 0.2s;
+    -webkit-transition: 0.2s;
+    justify-content: center;
+    align-items: center;
+    letter-spacing: 0;
+}
+.pagination_page span.next{
+    cursor: pointer;
+}
+.pagination_page li.active a:hover{
+    cursor: not-allowed;
+}
+/* 分页 */
+</style>
 <?php $this->need('footer.php'); ?>

comments.php

@@ -55,30 +55,6 @@
             </svg><?php $this->commentsNum(_t('0'), _t('1'), _t('%d')); ?>
         </h3>
         <ol class="commentlist sulliComment--list"></ol>
-        <?php if ($comments->have()): ?>
-        <?php $comments->listComments(); ?>
-    <?php
-            $comments->pageNav(
-                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10.8284 12.0007L15.7782 16.9504L14.364 18.3646L8 12.0007L14.364 5.63672L15.7782 7.05093L10.8284 12.0007Z" fill="var(--main)"></path></svg>',
-                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.1714 12.0007L8.22168 7.05093L9.63589 5.63672L15.9999 12.0007L9.63589 18.3646L8.22168 16.9504L13.1714 12.0007Z" fill="var(--main)"></path></svg>',
-                1,
-                '...',
-                array(
-                    'wrapTag' => 'div',
-                    'wrapClass' => 'pagination_page',
-                    'itemTag' => '',
-                    'textTag' => 'a',
-                    'currentClass' => 'active',
-                    'prevClass' => 'prev',
-                    'nextClass' => 'next'
-                )
-            );
-        ?>
-        <?php else: ?>
-       
-            <center><h3><?php _e('暂无评论'); ?></h3></center>
-
-        <?php endif; ?>
     <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">
@@ -112,6 +88,29 @@
     <?php else: ?>
     <?php _e(''); ?>
     <?php endif; ?>   
+    
+        <?php if ($comments->have()): ?>
+        <?php $comments->listComments(); ?>
+    <?php
+            $comments->pageNav(
+                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10.8284 12.0007L15.7782 16.9504L14.364 18.3646L8 12.0007L14.364 5.63672L15.7782 7.05093L10.8284 12.0007Z" fill="var(--main)"></path></svg>',
+                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.1714 12.0007L8.22168 7.05093L9.63589 5.63672L15.9999 12.0007L9.63589 18.3646L8.22168 16.9504L13.1714 12.0007Z" fill="var(--main)"></path></svg>',
+                1,
+                '...',
+                array(
+                    'wrapTag' => 'div',
+                    'wrapClass' => 'pagination_page',
+                    'itemTag' => '',
+                    'textTag' => 'a',
+                    'currentClass' => 'active',
+                    'prevClass' => 'prev',
+                    'nextClass' => 'next'
+                )
+            );
+        ?>
+        <?php else: ?>   
+            <center><h3><?php _e('暂无评论'); ?></h3></center>
+        <?php endif; ?>
     <?php $this->options->twikoo(); ?>
 </div>
 <?php
@@ -142,7 +141,6 @@ function threadedComments($comments, $options) {
                         <?php else: ?>
                             <?php echo $comments->gravatar('40', ''); ?> 
                         <?php endif; ?>
-                    
                 </div>
                 <div class="comment--meta">
                     <div class="comment--author"><?php echo $comments->author; ?><span class="dot"></span>

dist/js/bundle.js

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

dist/js/db.js

@@ -0,0 +1,350 @@
+class Douban {
+    constructor(config) {
+        this.container = config.container;
+        this.types = config.types ?? [
+            "movie",
+            "book",
+            "music",
+            "game",
+            "drama",
+        ];
+        this.baseAPI = config.baseAPI;
+        this.ver = "1.0.6";
+        this.type = "movie";
+        this.status = "done";
+        this.finished = false;
+        this.paged = 1;
+        this.genre_list = [
+            {
+                name: "已看",
+                value: "done",
+            },
+            {
+                name: "在看",
+                value: "doing",
+            },
+            {
+                name: "想看",
+                value: "mark",
+            },
+        ];
+        this.subjects = [];
+        this._create();
+    }
+
+    on(event, element, callback) {
+        const nodeList = document.querySelectorAll(element);
+        nodeList.forEach((item) => {
+            item.addEventListener(event, callback);
+        });
+    }
+
+    _handleGenreClick() {
+        this.on("click", ".db--genreItem", (t) => {
+            const self = t.currentTarget;
+            if (self.classList.contains("is-active")) {
+                return;
+            }
+            document.querySelector(".db--list").innerHTML = "";
+            document.querySelector(".lds-ripple").classList.remove("u-hide");
+
+            this.status = self.dataset.status || ""; // Provide a default value of an empty string if self.dataset.status is undefined
+            this._renderGenre();
+            this.paged = 1;
+            this.finished = false;
+            this.subjects = [];
+            this._fetchData();
+        });
+    }
+
+    _reanderTypes() {
+        document.querySelector(".db--nav").innerHTML = this.types
+            .map((item) => {
+                return `<span class="db--navItem JiEun${
+                    this.type == item ? " current" : ""
+                }" data-type="${item}">${item}</span>`;
+            })
+            .join("");
+        this._handleNavClick();
+    }
+
+    _renderGenre() {
+        document.querySelector(".db--genres").innerHTML = this.genre_list
+            .map((item) => {
+                return `<span class="db--genreItem${
+                    this.status == item.value ? " is-active" : ""
+                }" data-status="${item.value}">${item.name}</span>`;
+            })
+            .join("");
+        this._handleGenreClick();
+    }
+
+    _fetchData() {
+        const params = new URLSearchParams({
+            paged: this.paged.toString(),
+            type: this.type,
+            status: this.status,
+        });
+        fetch(this.baseAPI + "list?" + params.toString())
+            .then((response) => response.json())
+            .then((t) => {
+                console.log(t.results);
+                if (t.results.length) {
+                    if (
+                        document
+                            .querySelector(".db--list")
+                            .classList.contains("db--list__card")
+                    ) {
+                        this.subjects = [...this.subjects, ...t.results];
+                        this._randerDateTemplate();
+                    } else {
+                        this.subjects = [...this.subjects, ...t.results];
+                        this._randerListTemplate();
+                    }
+                    document
+                        .querySelector(".lds-ripple")
+                        .classList.add("u-hide");
+                } else {
+                    this.finished = true;
+                    document
+                        .querySelector(".lds-ripple")
+                        .classList.add("u-hide");
+                }
+            });
+    }
+
+    _randerDateTemplate() {
+        const result = this.subjects.reduce((result, item) => {
+            const date = new Date(item.create_time);
+            const year = date.getFullYear();
+            const month = date.getMonth() + 1;
+            const key = `${year}-${month.toString().padStart(2, "0")}`;
+            if (Object.prototype.hasOwnProperty.call(result, key)) {
+                result[key].push(item);
+            } else {
+                result[key] = [item];
+            }
+            return result;
+        }, {});
+
+        let html = ``;
+        for (let key in result) {
+            const date = key.split("-");
+            html += `<div class="db--listBydate"><div class="db--titleDate"><div class="db--titleDate__day">${date[1]}</div><div class="db--titleDate__month">${date[0]}</div></div><div class="db--dateList__card">`;
+            html += result[key]
+                .map((movie) => {
+                    return `<div class="db--item${
+                        this.type == "music" ? " db--item__music" : ""
+                    }"><img src="${
+                        movie.poster
+                    }" referrerpolicy="no-referrer" class="db--image"><div class="db--score ">${
+                        movie.douban_score > 0
+                            ? '<svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor" ><path d="M12 20.1l5.82 3.682c1.066.675 2.37-.322 2.09-1.584l-1.543-6.926 5.146-4.667c.94-.85.435-2.465-.799-2.567l-6.773-.602L13.29.89a1.38 1.38 0 0 0-2.581 0l-2.65 6.53-6.774.602C.052 8.126-.453 9.74.486 10.59l5.147 4.666-1.542 6.926c-.28 1.262 1.023 2.26 2.09 1.585L12 20.099z"></path></svg>' +
+                              movie.douban_score
+                            : ""
+                    }${
+                        movie.year > 0 ? " · " + movie.year : ""
+                    }</div><div class="db--title"><a href="${
+                        movie.link
+                    }" target="_blank">${movie.name}</a></div></div>`;
+                })
+                .join("");
+            html += `</div></div>`;
+        }
+        document.querySelector(".db--list").innerHTML = html;
+    }
+
+    _randerListTemplate() {
+        document.querySelector(".db--list").innerHTML = this.subjects
+            .map((item) => {
+                return `<div class="db--item"><img src="${
+                    item.poster
+                }" referrerpolicy="no-referrer" class="db--image"><div class="ipc-signpost ">${
+                    item.create_time
+                }</div><div class="db--score ">${
+                    item.douban_score
+                        ? '<svg width="12" height="12" viewBox="0 0 24 24" fill="currentColor" ><path d="M12 20.1l5.82 3.682c1.066.675 2.37-.322 2.09-1.584l-1.543-6.926 5.146-4.667c.94-.85.435-2.465-.799-2.567l-6.773-.602L13.29.89a1.38 1.38 0 0 0-2.581 0l-2.65 6.53-6.774.602C.052 8.126-.453 9.74.486 10.59l5.147 4.666-1.542 6.926c-.28 1.262 1.023 2.26 2.09 1.585L12 20.099z"></path></svg>' +
+                          item.douban_score
+                        : ""
+                }${
+                    item.year ? " · " + item.year : ""
+                }</div><div class="db--title"><a href="${
+                    item.link
+                }" target="_blank">${item.name}</a></div>
+                </div>
+                </div>`;
+            })
+            .join("");
+    }
+
+    _handleScroll() {
+        window.addEventListener("scroll", () => {
+            var t = window.scrollY || window.pageYOffset;
+            const moreElement = document.querySelector(
+                ".block-more"
+            );
+            if (
+                moreElement.offsetTop + -window.innerHeight < t &&
+                document
+                    .querySelector(".lds-ripple")
+                    .classList.contains("u-hide") &&
+                !this.finished
+            ) {
+                document
+                    .querySelector(".lds-ripple")
+                    .classList.remove("u-hide");
+                this.paged++;
+                this._fetchData();
+            }
+        });
+    }
+
+    _handleNavClick() {
+        this.on("click", ".db--navItem", (t) => {
+            const self = t.currentTarget;
+            if (self.classList.contains("current")) return;
+            this.status = "done";
+            this.type = self.dataset.type;
+            this._renderGenre();
+            document.querySelector(".db--list").innerHTML = "";
+            document.querySelector(".lds-ripple").classList.remove("u-hide");
+            document
+                .querySelector(".db--navItem.current")
+                .classList            .remove("current");
+            self.classList.add("current");
+            this.paged = 1;
+            this.finished = false;
+            this.subjects = [];
+            this._fetchData();
+        });
+    }
+
+    _create() {
+        if (document.querySelector(".db--container")) {
+            const container = document.querySelector(
+                this.container
+            );
+            if (!container) return;
+            container.innerHTML = `<nav class="db--nav">
+            </nav>
+            <div class="db--genres">
+            </div>
+            <div class="db--list db--list__card">
+            </div>
+            <div class="block-more block-more__centered">
+                <div class="lds-ripple">
+                </div>
+            </div>`;
+            this._renderGenre();
+            this._reanderTypes();
+            this._fetchData();
+            this._handleScroll();
+        }
+
+        if (document.querySelector(".js-db")) {
+            document.querySelectorAll(".js-db").forEach((item) => {
+                const db = item;
+                const id = db.dataset.id;
+                const type = db.dataset.type;
+                const nodeParent = db.parentNode;
+                fetch(this.baseAPI + `${type}/${id}`).then((response) => {
+                    response.json().then((t) => {
+                        if (t.data) {
+                            const data = t.data;
+                            const node = document.createElement("div");
+                            node.classList.add("doulist-item");
+                            node.innerHTML = `<div class="doulist-subject">
+                            <div class="doulist-post"><img decoding="async" referrerpolicy="no-referrer" src="${data.poster}"></div>
+                            <div class="doulist-content">
+                            <div class="doulist-title"><a href="${data.link}" class="cute" target="_blank" rel="external nofollow">${data.name}</a></div>
+                            <div class="rating"><span class="allstardark"><span class="allstarlight" style="width:55%"></span></span><span class="rating_nums"> ${data.douban_score} </span></div>
+                            <div class="abstract">${data.card_subtitle}</div>
+                            </div>
+                            </div>`;
+                            nodeParent.replaceWith(node);
+                        }
+                    });
+                });
+            });
+        }
+
+        if (document.querySelector(".db--collection")) {
+            document
+                .querySelectorAll(".db--collection")
+                .forEach((item) => {
+                    this._fetchCollection(item);
+                });
+        }
+    }
+
+    _fetchCollection(item) {
+        const type = item.dataset.style ? item.dataset.style : "card";
+        fetch(
+            this.baseAPI +
+                "/list?type=" +
+                item.dataset.type +
+                "&paged=1&start_time=" +
+                item.dataset.start +
+                "&end_time=" +
+                item.dataset.end
+        )
+            .then((response) => response.json())
+            .then((t) => {
+                if (t.length) {
+                    if (type == "card") {
+                        item.innerHTML += t
+                            .map((movie) => {
+                                return `<div class="doulist-item">
+                            <div class="doulist-subject">
+                            <div class="db--viewTime ">Marked ${movie.create_time}</div>
+                            <div class="doulist-post"><img referrerpolicy="no-referrer" src="${movie.poster}"></div><div class="doulist-content"><div class="doulist-title"><a href="${movie.link}" class="cute" target="_blank" rel="external nofollow">${movie.name}</a></div><div class="rating"><span class="allstardark"><span class="allstarlight" style="width:75%"></span></span><span class="rating_nums">${movie.douban_score}</span></div><div class="abstract">${movie.card_subtitle}</div></div></div></div>`;
+                            })
+                            .join("");
+                    } else {
+                        const result = t.reduce(
+                            (result, item) => {
+                                if (
+                                    Object.prototype.hasOwnProperty.call(
+                                        result,
+                                        item.create_time
+                                    )
+                                ) {
+                                    result[item.create_time].push(item);
+                                } else {
+                                    result[item.create_time] = [item];
+                                }
+                                return result;
+                            },
+                            {}
+                        );
+                        let html = ``;
+                        for (let key in result) {
+                            html += `<div class="db--date">${key}</div><div class="db--dateList">`;
+                            html += result[key]
+                                .map((movie) => {
+                                    return `<div class="db--card__list">
+                                    <img referrerpolicy="no-referrer" src="${
+                                        movie.poster
+                                    }">
+                                    <div>
+                                    <div class="title"><a href="${
+                                        movie.link
+                                    }" class="cute" target="_blank" rel="external nofollow">${
+                                        movie.name
+                                    }</a></div>
+                                    <div class="rating"><span class="allstardark"><span class="allstarlight" style="width:75%"></span></span><span class="rating_nums">${
+                                        movie.douban_score
+                                    }</span></div>
+                                    ${movie.remark || movie.card_subtitle}
+                                    </div>
+                                    </div>`;
+                                })
+                                .join("");
+                            html += `</div>`;
+                        }
+                        item.innerHTML = html;
+                    }
+                }
+            });
+    }
+}

functions.php

@@ -5,40 +5,36 @@ 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('建站年份 eg. 2006'));
+    $jzyear = new Typecho_Widget_Helper_Form_Element_Text('jzyear', NULL, NULL, _t('建站年份'), _t('eg. 2006'));
     $form->addInput($jzyear);
-    $instagramurl = new Typecho_Widget_Helper_Form_Element_Text('instagramurl', NULL, NULL, _t('ins'));
-    $form->addInput($instagramurl);
-    $telegramurl = new Typecho_Widget_Helper_Form_Element_Text('telegramurl', NULL, NULL, _t('电报'));
-    $form->addInput($telegramurl);
-    $githuburl = new Typecho_Widget_Helper_Form_Element_Text('githuburl', NULL, NULL, _t('github'));
-    $form->addInput($githuburl);
-    $twitterurl = new Typecho_Widget_Helper_Form_Element_Text('twitterurl', NULL, NULL, _t('twitter'));
-    $form->addInput($twitterurl);
-    $mastodonurl = new Typecho_Widget_Helper_Form_Element_Text('mastodonurl', NULL, NULL, _t('mastodon'));
-    $form->addInput($mastodonurl);
-    $sitemapurl = new Typecho_Widget_Helper_Form_Element_Text('sitemapurl', NULL, NULL, _t('sitemap'));
-    $form->addInput($sitemapurl);
-    $cnavatar = new Typecho_Widget_Helper_Form_Element_Text('cnavatar', NULL, 'https://cravatar.cn/avatar/', _t('自定义Gravatar镜像服务器,默认https://cravatar.cn/avatar/'));
-    $form->addInput($cnavatar);
-    $donate = new Typecho_Widget_Helper_Form_Element_Text('donate', NULL, 'https://blogcdn.loliko.cn/donate/wx.png', _t('赞赏二维码'));
-    $form->addInput($donate);
-    $memos = new Typecho_Widget_Helper_Form_Element_Text('memos', NULL, 'https://m.loliko.cn', _t('memos地址结尾不带"/"'));
-    $form->addInput($memos);
-    $memosID = new Typecho_Widget_Helper_Form_Element_Text('memosID', NULL, '1', _t('memosID'));
-    $form->addInput($memosID);
-
-    $twikoo = new Typecho_Widget_Helper_Form_Element_Textarea('twikoo', NULL, NULL, _t('引用第三方评论'));
-    $form->addInput($twikoo);
-
-    $addhead = new Typecho_Widget_Helper_Form_Element_Textarea('addhead', NULL, NULL, _t('添加head'));
-    $form->addInput($addhead);
-    $tongji = new Typecho_Widget_Helper_Form_Element_Textarea('tongji', NULL, NULL, _t('统计代码'));
-    $form->addInput($tongji);
     $showProfile = new Typecho_Widget_Helper_Form_Element_Radio('showProfile',
     array('0'=> _t('否'), '1'=> _t('是')),
     '0', _t('是否在文章页面显示显示作者信息'), _t('选择“是”将在文章页面包含显示作者信息。'));
     $form->addInput($showProfile);
+    $instagramurl = new Typecho_Widget_Helper_Form_Element_Text('instagramurl', NULL, NULL, _t('Instagram'), _t('会在个人信息显示'));
+    $form->addInput($instagramurl);
+    $telegramurl = new Typecho_Widget_Helper_Form_Element_Text('telegramurl', NULL, NULL, _t('电报'), _t('会在个人信息显示'));
+    $form->addInput($telegramurl);
+    $githuburl = new Typecho_Widget_Helper_Form_Element_Text('githuburl', NULL, NULL, _t('github'), _t('会在个人信息显示'));
+    $form->addInput($githuburl);
+    $twitterurl = new Typecho_Widget_Helper_Form_Element_Text('twitterurl', NULL, NULL, _t('twitter'), _t('会在个人信息显示'));
+    $form->addInput($twitterurl);
+    $mastodonurl = new Typecho_Widget_Helper_Form_Element_Text('mastodonurl', NULL, NULL, _t('mastodon'), _t('会在个人信息显示'));
+    $form->addInput($mastodonurl);
+    $sitemapurl = new Typecho_Widget_Helper_Form_Element_Text('sitemapurl', NULL, NULL, _t('sitemap'), _t('会在页脚显示'));
+    $form->addInput($sitemapurl);
+    $cnavatar = new Typecho_Widget_Helper_Form_Element_Text('cnavatar', NULL, 'https://cravatar.cn/avatar/', _t('Gravatar镜像'), _t('默认https://cravatar.cn/avatar/,建议保持默认'));
+    $form->addInput($cnavatar);
+    $donate = new Typecho_Widget_Helper_Form_Element_Text('donate', NULL, 'https://blogcdn.loliko.cn/donate/wx.png', _t('赞赏二维码'), _t('不填写则不显示'));
+    $form->addInput($donate);
+    $doubanID = new Typecho_Widget_Helper_Form_Element_Text('doubanID', NULL, 'https://db.imsun.org/', _t('豆瓣页面必需API,包含"/"'), _t(' '));
+    $form->addInput($doubanID);
+    $twikoo = new Typecho_Widget_Helper_Form_Element_Textarea('twikoo', NULL, NULL, _t('引用第三方评论'), _t('不填写则不显示'));
+    $form->addInput($twikoo);
+    $addhead = new Typecho_Widget_Helper_Form_Element_Textarea('addhead', NULL, NULL, _t('添加head'), _t('支持HTML'));
+    $form->addInput($addhead);
+    $tongji = new Typecho_Widget_Helper_Form_Element_Textarea('tongji', NULL, NULL, _t('统计代码'), _t('支持HTML'));
+    $form->addInput($tongji);
     $showallwords = new Typecho_Widget_Helper_Form_Element_Radio('showallwords',
     array('0'=> _t('否'), '1'=> _t('是')),
     '0', _t('是否显示归档字数统计'), _t('选择“是”将在归档页面显示全站总字数。'));
@@ -175,13 +171,24 @@ function allwords() {
     elseif ($chars>1000000){
     echo '全站共 '.$chars.' 字，已写一本列夫·托尔斯泰的《战争与和平》了！';}
 } 
-function show_first_image($content) {
-    preg_match_all('/<img.+src=[\'"]([^\'"]+)[\'"].*>/i', $content, $matches);
-    // 检查是否找到了图片
-    if(isset($matches[1][0])){
-        return $matches[1][0];
+function img_postthumb($cid) {
+    $db = Typecho_Db::get();
+    $rs = $db->fetchRow($db->select('table.contents.text')
+        ->from('table.contents')
+        ->where('table.contents.cid=?', $cid)
+        ->order('table.contents.cid', Typecho_Db::SORT_ASC)
+        ->limit(1));
+    // 检查是否获取到结果
+    if (!$rs) {
+        return "";
+    }
+    preg_match_all("/https?:\/\/[^\s]*.(png|jpeg|jpg|gif|bmp|webp)/", $rs['text'], $thumbUrl);  //通过正则式获取图片地址
+    // 检查是否匹配到图片URL
+    if (count($thumbUrl[0]) > 0) {
+        return $thumbUrl[0][0];  // 返回第一张图片的URL
+    } else {
+        return "";  // 没有匹配到图片URL，返回空字符串
     }
-    return false; // 没有找到图片，返回 false
 }
 //开始增加某些奇怪的东西
 // 获取月份

header.php

@@ -1,6 +1,8 @@
-<?php ini_set('display_errors', 1);
+<?php 
+ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
-error_reporting(E_ALL);if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+error_reporting(E_ALL);
+if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <!DOCTYPE HTML>
 <html>
 <head>
@@ -50,26 +52,21 @@ error_reporting(E_ALL);if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
         <div class="inner">
         <nav>
 		    <ul>
-                <li class="whome"><a <?php if($this->is('index')): ?> class="current"<?php endif; ?> href="<?php $this->options->siteUrl(); ?>"><?php _e('首页'); ?></a></li>
-
                     <?php $this->widget('Widget_Contents_Page_List')->to($pages); ?>
                     <?php while($pages->next()): ?>
                     <li><a <?php if($this->is('page', $pages->slug)): ?> class="current"<?php endif; ?> href="<?php $pages->permalink(); ?>" title="<?php $pages->title(); ?>"><?php $pages->title(); ?></a></li>
-                    <?php endwhile; ?>
-					 
+                    <?php endwhile; ?>		 
             </ul>
 		</nav>
- <!-- 这年头谁会用站内的搜索啊      --> 
+                    <!-- 这年头谁会用站内的搜索啊      --> 
         <div class="search--area">
             <form id="search" method="post" action="./" role="search" class="search-form">
             <label>
 				<input type="text" name="s" class="search-field text" placeholder="Search" required/>
             </label>
                 <button type="submit" class="search-submit submit">搜索</button>
-			</form>  
-                 
+			</form>                 
         </div>
-
         </div> 
     </div>
      <svg class="svgIcon" width="25" height="25" data-action="show-search">

index.php

@@ -1,16 +1,15 @@
 <?php
 /**
- * 移植自HUGO主题`farallon`原作者`bigfa` 
+ * 移植自HUGO主题 farallon 原作者 bigfa  
  * @package farallon
  * @author  老孙 
- * @version 0.4.1
+ * @version 0.5.4
  * @link https://imsun.org
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 $this->need('header.php');
 ?>
 <main class="site--main">
- 
 <div class="articleList">
 <?php $this->need('postlist.php'); ?>
 </div>

page-archives.php

@@ -10,10 +10,10 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
     <header class="archive--header">
         <h1 class="post--single__title"><?php $this->title() ?></h1>
         <?php Typecho_Widget::widget('Widget_Stat')->to($quantity); ?>
-        <h2 class="archive--title__year">共包含 <?php $quantity->publishedPostsNum(); ?> 篇文章</h2>
+        <h2 class="post--single__subtitle">共包含 <?php $quantity->publishedPostsNum(); ?> 篇文章</h2>
         <?php if ($this->options->showallwords): ?>
-                <h3><?php echo allwords(); ?></h3>
-<?php endif; ?>
+        <h3><?php echo allwords(); ?></h3>
+        <?php endif; ?>
 </header>
 <div class="page--archive">
     <?php

page-categories.php

@@ -9,6 +9,7 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <div class="site--main">
     <header class="archive--header">
         <h1 class="post--single__title"><?php $this->title() ?></h1>  
+        <h2 class="post--single__subtitle"><?php $this->content(); ?> </h2>
     </header>
     <section class="category--list">
       <?php $this->widget('Widget_Metas_Category_List')->parse('

page-data.php

@@ -9,7 +9,7 @@ $this->need('header.php');
 <section class="site--main">
     <header class="archive--header">
         <h1 class="post--single__title"><?php $this->title() ?></h1>
-        <h2 class="archive--title__year"> </h2>
+        <h2 class="post--single__subtitle"><?php $this->content(); ?> </h2>
     </header>
     <article class="post--single">
     <div class="graph u-marginBottom30">
@@ -79,7 +79,7 @@ $this->need('header.php');
         category: <?php echo json_encode(categoryPostCount()); ?>
       };
     </script>
-    <script type="text/javascript" src="<?php $this->options->themeUrl('/dist/js/chart.js'); ?>"></script>
+    <script type="text/javascript" src="https://cdn.jsdelivr.net/gh/jkjoy/typecho-theme-farallon@0.5.0/dist/js/chart.js"></script>
     <script id="MathJax-script" async src="https://jsd.onmicrosoft.cn/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
             <script>
                 // 配置 MathJax

page-douban.php

@@ -6,13 +6,20 @@
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php $this->need('header.php'); ?>
+<script src="<?php $this->options->themeUrl('/dist/js/db.js'); ?>"></script>
 <section class="site--main">
     <header class="archive--header">
         <h1 class="post--single__title"><?php $this->title() ?></h1>
-        <h2 class="post--single__subtitle">观影数据来源于豆瓣</h2>
+        <h2 class="post--single__subtitle">数据来源于豆瓣</h2>
     </header>
-    
-    <div data-status="watched" class="douban-movie-list doubanboard-list"></div>
-     
+    <div class="site--main">
+    <div class="db--container"></div>
+    <script>
+     new Douban({
+     baseAPI: '<?php $this->options->doubanID() ?>', // api
+     container: ".db--container", // 容器名
+    });
+    </script>
+</div>
 </section>
 <?php $this->need('footer.php'); ?>

page-goods.php

@@ -0,0 +1,64 @@
+<?php 
+/**
+ * 好物页面
+ *
+ * @package custom
+ */
+if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php $this->need('header.php'); ?>
+<div class="site--main site--main__gears">
+<header class="archive--header">
+    <h1 class="post--single__title"><?php $this->title() ?></h1>
+    <h2 class="post--single__subtitle"><?php $this->content(); ?></h2>
+</header>
+<div id=goods class="good--list"></div>
+</div>
+<style>
+.img40 {
+  height: 137px;
+  width: auto;
+}    
+</style>
+<?php
+        // 检查是否存在自定义字段 'memos' 和 'memosID'
+        $memos = $this->fields->memos ? $this->fields->memos : 'https://memos.imsun.org';
+        $memosID = $this->fields->memosID ? $this->fields->memosID : '1';
+        $memostag = $this->fields->memostag ? $this->fields->memostag : '好物';
+        ?>
+<script>
+document.addEventListener("DOMContentLoaded", () => {
+    memoGoods();
+});
+function memoGoods(e) {
+    let t = e || 12;
+    var n = "<?php echo $memos; ?>",
+        s = n + "/api/v1/memo?creatorId=<?php echo $memosID; ?>&limit=" + t + "&tag=<?php echo $memostag; ?>";
+    let i = 1;
+    const o = /\n/;
+    fetch(s).then(e => e.json()).then(e => {
+        let c = "";
+        for (var t, s, i, a, d, u, h, m, r = 0; r < e.length; r++) {
+            a = e[r].content.replace(`#好物 \n`, ""),
+            t = a.split(o),
+            i = t[0].replace(/!\[.*?\]\((.*?)\)/g, "$1"), // 图片链接
+            s = t[0].replace(/!\[(.*?)\]\(.*?\)/g, "$1"), 
+            d = s.split(",")[0], // 商品名称
+            u = s.split(",")[1], // 价格
+            h = t[1].replace(/\[.*?\]\((.*?)\)/g, "$1"), // 商品链接
+            m = t[1].replace(/\[(.*?)\]\(.*?\)/g, "$1"), // 推荐理由
+            c += 
+            '<div class="good--item"><div class="img-spacer"><a href="'
+            + h + 
+            '" target="_blank"><img src="' 
+            + i + 
+            '" class="img40"></a></div><div class="good--name"><div class="brand">' 
+            + d + '·' + m +'</div>' 
+            + u + 
+            '</div></div>';
+        }
+        let f = document.querySelector("#goods");
+        f.innerHTML = c;
+    });
+}
+</script>
+<?php $this->need('footer.php'); ?>

page-links.php

@@ -9,9 +9,8 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <section class="site--main">
 <header class="archive--header">
         <h1 class="post--single__title"><?php $this->title() ?></h1>
-        <h2 class="archive--title__year"> </h2>
+        <h2 class="post--single__subtitle"><?php $this->content(); ?> </h2>
 </header>
-
 <div class="graph u-marginBottom30">
 <?php $this->content(); ?>
         </div>
@@ -30,5 +29,4 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
     <?php endif; ?>
     </article>
 </section>
-
-<?php $this->need('footer.php'); ?>
+<?php $this->need('footer.php'); ?>

page-mastodon.php

@@ -0,0 +1,165 @@
+<?php 
+/**
+ * 说说页面 - Mastodon
+ *
+ * @package custom
+ */
+if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php $this->need('header.php'); ?>
+<div class="site--main">
+    <header class="archive--header">
+        <h1 class="post--single__title"><?php $this->title() ?></h1>
+        <h2 class="post--single__subtitle"><?php $this->content(); ?> </h2>
+    </header>
+    <article class="post--single">
+    <?php $tooot = $this->fields->tooot ? $this->fields->tooot : 'https://bbapi.ima.cm'; ?>
+    <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.umd.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.css" />    
+    <div id="tooot"></div>
+    <div class="nav-links" id="loadmore">
+        <span class="loadmore">加载更多</span>
+    </div>
+    </article> 
+<script>
+window.onload = function() {
+    let offset = 0; // 初始偏移量
+    const limit = 20; // 每次加载的数量
+    function formatHTML(toots) {
+        let htmlString = '';      
+        toots.forEach(toot => {
+            const { content, account, url, created_at, media_attachments} = toot;
+            let mediaHTML = ''; // 初始化资源相关HTML为空字符串
+            // 处理媒体附件
+            if (media_attachments.length > 0) {
+                media_attachments.forEach(attachment => {
+                    if (attachment.type === 'image') {
+                        mediaHTML += `<a href="${attachment.url}" target="_blank"><img src="${attachment.preview_url}" data-fancybox="img" class="thumbnail-image img"></a>`;
+                    }
+                });
+            }
+            // 使用 marked 转换 markdown 内容为 HTML
+            const htmlContent = marked.parse(content);
+            // 创建 HTML 字符串
+            htmlString += `
+            <article class='post--item post--item__status'>
+                <div class='content'>
+                <header>
+                <img src="${account.avatar}" class="avatar" width="48" height="48" />
+                <a class="humane--time" href="${url}" target="_blank">${new Date(created_at).toLocaleString()}</a>
+                </header>
+                <div class="description" itemprop="about">
+                ${htmlContent}
+                <div class="resimg">${mediaHTML}</div>
+                </div>
+                </div>
+                </article>`;
+        });
+        return htmlString;
+    }
+    function fetchToots() {
+        return fetch('<?php echo $tooot; ?>')
+            .then(response => response.json())
+            .catch(error => {
+                console.error('Error fetching toots:', error);
+                return [];
+            });
+    }
+    function fetchAndDisplayToots() {
+        fetchToots().then(data => {
+            const memosContainer = document.getElementById('tooot');
+            const tootsToShow = data.slice(offset, offset + limit); // 选择要显示的toots
+            memosContainer.innerHTML += formatHTML(tootsToShow);
+            offset += limit; // 更新偏移量
+            // 如果没有更多的toots，隐藏“加载更多”按钮
+            if (offset >= data.length) {
+                document.getElementById('loadmore').style.display = 'none';
+            }
+        });
+    }
+    // 在页面加载完成后获取并展示 toots
+    fetchAndDisplayToots();
+    // 绑定“加载更多”按钮的点击事件
+    document.getElementById('loadmore').addEventListener('click', fetchAndDisplayToots);
+};
+Fancybox.bind("[data-fancybox]", {
+  // Your custom options
+});
+</script>         
+<style>
+div pre code {
+  /* 迫使文字断行 */
+  white-space: pre-wrap; /* CSS3 */
+  word-wrap: break-word; /* 老版本的浏览器 */
+  overflow-wrap: break-word;  
+  /* 指定如何断行 */
+  word-break: break-all;  
+  word-break: break-word;  
+}
+div p a {
+    word-break: break-all;  
+  word-break: break-word;  
+}
+.thumbnail-image {
+    width:100%;
+    height: 200px;  
+    align-items: center; 
+    justify-content: center;
+    overflow: hidden;
+}
+.resimg {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    column-gap: 10px; 
+    row-gap: 10px; 
+}
+.thumbnail-image img {
+    width:100%;
+    height:170px;
+    object-fit:cover;
+    border-radius:4px;
+    transition:transform .3s ease;
+    cursor:zoom-in
+}  
+/* 当屏幕宽度小于732px时 */
+@media (max-width: 732px) {
+    .resimg {
+        grid-template-columns: repeat(2, 1fr); /* 修改为两列 */
+    }
+}
+/* 当屏幕宽度小于400px时 */
+@media (max-width: 400px) {
+    .resimg {
+        grid-template-columns: 1fr; /* 修改为一列 */
+    }
+} 
+.load-more-btn {
+      display: block;
+      margin: 20px auto;
+      padding: 10px 20px;
+      background-color: #007bff;
+      color: white;
+      border: none;
+      cursor: pointer;
+      border-radius: 5px;
+  }
+.load-more-btn:hover {
+      background-color: #0056b3;
+  } 
+.nav-links .loadmore {
+    border: 1px solid var(--farallon-border-color);
+    cursor: pointer;
+    position: relative;
+    padding: 5px 30px;
+    border-radius: 8px;
+    font-size: 14px;
+    color: var(--farallon-text-gray)
+}
+
+.nav-links .loadmore:hover {
+    border-color: var(--farallon-hover-color);
+    color: var(--farallon-hover-color)
+}  
+</style>  
+</div>
+<?php $this->need('footer.php'); ?>

page-memos.php

@@ -1,6 +1,6 @@
 <?php 
 /**
- * 说说页面
+ * 说说页面 - memos
  *
  * @package custom
  */
@@ -9,16 +9,24 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <div class="site--main">
     <header class="archive--header">
         <h1 class="post--single__title"><?php $this->title() ?></h1>
-        <h2 class="archive--title__year"><?php $this->content(); ?> </h2>
+        <h2 class="post--single__subtitle"><?php $this->content(); ?> </h2>
     </header>
+    <?php
+        // 检查是否存在自定义字段 'memos' 和 'memosID'
+        $memos = $this->fields->memos ? $this->fields->memos : 'https://memos.loliko.cn';
+        $memosID = $this->fields->memosID ? $this->fields->memosID : '1';
+        $memosnum = $this->fields->memosnum ? $this->fields->memosnum : '20';
+        ?>
+    <article class="post--single">
     <script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.umd.js"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/ui@5.0/dist/fancybox/fancybox.css" />    
     <div id="talk"></div>
+    </article> 
 <script>
 if (99) {
-    let url = '<?php $this->options->memos() ?>';
-    fetch(url + '/api/v1/memo?creatorId=<?php $this->options->memosID() ?>&rowStatus=NORMAL&limit=20')
+    let url = '<?php echo $memos; ?>';
+    fetch(url + '/api/v1/memo?creatorId=<?php echo $memosID; ?>&rowStatus=NORMAL&limit=<?php echo $memosnum; ?>')
     .then(res => res.json())
     .then(data => { 
         let html = '';
@@ -42,14 +50,12 @@ if (99) {
                 </article>
             `;
         });
-        
         document.getElementById('talk').innerHTML = html;
     })
     .catch(error => {
         console.error('Error:', error);
         // 这里可以添加一些用户提示错误发生的 HTML 更新
     });
- 
     // 页面内容格式化
     function Format(item) {
         let date = getTime(new Date(item.createdTs * 1000).toString()),
@@ -136,7 +142,6 @@ div p a {
         grid-template-columns: repeat(2, 1fr); /* 修改为两列 */
     }
 }
-
 /* 当屏幕宽度小于400px时 */
 @media (max-width: 400px) {
     .resimg {

page-tags.php

@@ -9,6 +9,7 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <section class="site--main">
     <header class="archive--header">
         <h1 class="post--single__title"><?php $this->title() ?></h1>   
+        <h2 class="post--single__subtitle"><?php $this->content(); ?> </h2>
     </header>
     <div class="post-content">
                         <?php $this->widget('Widget_Metas_Tag_Cloud', 'sort=mid&ignoreZeroCount=1&desc=0')->to($tags); ?>
@@ -24,6 +25,5 @@ if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
                             <p class="text-center pb-2"><?php _e('没有任何标签'); ?></p>
                         <?php endif; ?>
                     </div>
- 
 </section>
 <?php $this->need('footer.php'); ?>

page-times.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * 说说页面 - 时光机
+ *
+ * @package custom
+ */
+if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
+<?php $this->need('header.php'); ?>
+<section class="site--main">
+    <header class="archive--header">
+        <h1 class="post--single__title"><?php $this->title() ?></h1>
+        <h2 class="post--single__subtitle"><?php $this->content(); ?> </h2>
+    </header>
+    <article class="post--single">
+            <?php $this->need('times/dycomment.php'); ?>
+    </article> 
+</section>
+<?php $this->need('footer.php'); ?>

page.php

@@ -8,7 +8,6 @@
         <div class="graph u-marginBottom30">
             <?php $this->content(); ?>
         </div>
-    
     <!-- 判断如果禁止评论则不显示评论的div -->
     <?php if ($this->allow('comment')): ?>
        <?php $this->need('comments.php'); ?>

post.php

@@ -19,22 +19,20 @@
                     d="M12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9ZM11 12C11 11.4477 11.4477 11 12 11C12.5523 11 13 11.4477 13 12C13 12.5523 12.5523 13 12 13C11.4477 13 11 12.5523 11 12Z" />
                 <path fill-rule="evenodd" clip-rule="evenodd"
                     d="M21.83 11.2807C19.542 7.15186 15.8122 5 12 5C8.18777 5 4.45796 7.15186 2.17003 11.2807C1.94637 11.6844 1.94361 12.1821 2.16029 12.5876C4.41183 16.8013 8.1628 19 12 19C15.8372 19 19.5882 16.8013 21.8397 12.5876C22.0564 12.1821 22.0536 11.6844 21.83 11.2807ZM12 17C9.06097 17 6.04052 15.3724 4.09173 11.9487C6.06862 8.59614 9.07319 7 12 7C14.9268 7 17.9314 8.59614 19.9083 11.9487C17.9595 15.3724 14.939 17 12 17Z" />
-            </svg><span class="article--views"><a><?php get_post_view($this) ?></a></span> 阅读 
+            </svg><span class="article--views"><a><?php get_post_view($this) ?></a></span>  
             <svg viewBox="0 0 24 24" class="icon" aria-hidden="true" width="16" height="16">
                 <g>
                     <path
                         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> <a href="<?php $this->permalink() ?>#comments"><?php $this->commentsNum('评论', '1 评论', '%d 评论'); ?></a> 
-            <?php if($this->user->hasLogin() && $this->user->pass('editor', true)): ?>
-              <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="16" height="16">
-                <!--!Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
+            </svg> <a href="<?php $this->permalink() ?>#comments"><?php $this->commentsNum('0 ', '1 ', '%d '); ?></a> 
+            <?php if($this->user->hasLogin() && $this->user->pass('editor', true)): ?>    
+                <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="16" height="16">
                 <path 
                 d="M362.7 19.3L314.3 67.7 444.3 197.7l48.4-48.4c25-25 25-65.5 0-90.5L453.3 19.3c-25-25-65.5-25-90.5 0zm-71 71L58.6 323.5c-10.4 10.4-18 23.3-22.2 37.4L1 481.2C-1.5 489.7 .8 498.8 7 505s15.3 8.5 23.7 6.1l120.3-35.4c14.1-4.2 27-11.8 37.4-22.2L421.7 220.3 291.7 90.3z"/>
-              </svg>
-               <a href="<?php $this->options->adminUrl('write-post.php?cid=' . $this->cid); ?>" target="_blank" title="编辑文章">编辑文章</a>
-                  <?php endif; ?>
+                </svg><a href="<?php $this->options->adminUrl('write-post.php?cid=' . $this->cid); ?>" target="_blank" title="编辑文章">Edit</a>
+                <?php endif; ?>
         </div>         
             <h2 class="post--single__title"><?php $this->title() ?></h2>
             <div class="post--single__content graph" ><?php $this->content(); ?></div>
@@ -118,7 +116,7 @@
             }
         }
     });
-    </script>
+</script>
 </div>
 <?php endif; ?>
 <!-- TAG -->
@@ -133,12 +131,12 @@
 <?php if ($this->options->showrelated): ?>
     <?php $this->need('related.php'); ?>
 <?php endif; ?>
-    <!-- 判断如果禁止评论则不显示评论的div -->
-    <?php if ($this->allow('comment')): ?>
-       <?php $this->need('comments.php'); ?>
-   <?php endif; ?>
-<!-- 可以使用第三方评论-->
-<?php $this->options->twikoo(); ?> 
+    <!-- 如果设置了第三方评论系统则使用第三方评论 -->
+    <?php if($this->options->twikoo): ?> 
+        <?php $this->options->twikoo(); ?> 
+    <?php else: ?>
+        <?php $this->need('comments.php'); ?>
+    <?php endif; ?>
 <!--翻页-->
     <nav class="navigation post-navigation is-active">
         <div class="nav-links">
@@ -166,7 +164,6 @@ document.addEventListener('DOMContentLoaded', (event) => {
     }
   }
   if (!found) return;
-
   const heads = postContent.querySelectorAll('h1, h2, h3, h4, h5, h6');
   const toc = document.createElement('div');
   toc.id = 'toc';
@@ -183,10 +180,8 @@ document.addEventListener('DOMContentLoaded', (event) => {
     } else {
       levelCounts[level]++;
     }
-    
     // 重置下级标题的计数器
     levelCounts = levelCounts.slice(0, level + 1);
-
     if (currentLevel === 0) {
       currentLevel = level;
     }

postlist.php

@@ -53,16 +53,18 @@
                     </path>
                 </g>
             </svg>
-				 <a href="<?php $this->permalink() ?>#comments"><?php $this->commentsNum('评论', '1 评论', '%d 评论'); ?></a>
+				 <a href="<?php $this->permalink() ?>#comments"><?php $this->commentsNum('0 ', '1 ', '%d '); ?></a>
 	    </div>
     </div>    
-    <?php $firstImage = show_first_image($this->content); ?>
-    <?php if($firstImage): ?>
-    <img src="<?php echo $firstImage; ?>" alt="文章图片" class="cover"/>
-    <?php endif; ?>    
+    <?php
+       $firstImage = img_postthumb($this->cid);
+       $cover = $this->fields->cover;
+       $imageToDisplay = !empty($cover) ? $cover : $firstImage;
+       if($imageToDisplay): ?>
+    <img src="<?php echo $imageToDisplay; ?>" alt="文章图片" class="cover"/>
+    <?php endif; ?>  
 </article>
 	<?php endwhile; ?>
- 
     <?php
             $this->pagenav(
                 '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10.8284 12.0007L15.7782 16.9504L14.364 18.3646L8 12.0007L14.364 5.63672L15.7782 7.05093L10.8284 12.0007Z" fill="var(--main)"></path></svg>',

profile.php

@@ -1,4 +1,4 @@
-  
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?> 
  <div class="author--card">
             <img src="<?php $this->options->logoUrl() ?>" class="avatar" height="64" width="64" decoding="async">
             <div class="author--name">

related.php

@@ -1,8 +1,8 @@
+<?php if (!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <div class="related--content">
     <h3 class="related--posts__title">相关文章</h3>
     <div class="post--single__related">
     <?php $this->related(6)->to($relatedPosts); ?>   
-  
     <?php while ($relatedPosts->next()): ?>     
         <div class="post--single__related__item">
             <a href="<?php $relatedPosts->permalink(); ?>">

times/Content.php

@@ -0,0 +1,54 @@
+<?php
+if (!defined('__TYPECHO_ROOT_DIR__')) exit;
+class Content
+{
+    public static function postCommentContent($content, $isLogin, $rememberEmail, $currentEmail, $parentEmail, $isTime = false)
+    {
+        //解析私密评论
+        $flag = true;
+        if (strpos($content, '[secret]') !== false) {//提高效率，避免每篇文章都要解析
+            $pattern = self::get_shortcode_regex(array('secret'));
+            $content = preg_replace_callback("/$pattern/", array('Content', 'secretContentParseCallback'), $content);
+            if ($isLogin || ($currentEmail == $rememberEmail && $currentEmail != "") || ($parentEmail == $rememberEmail && $rememberEmail != "")) {
+                $flag = true;
+            } else {
+                $flag = false;
+            }
+        }
+        if ($flag) {
+            $content = Content::parseContentPublic($content);
+            return $content;
+        } else {
+            if ($isTime) {
+                return '<div class="hideContent">此条为私密说说，仅发布者可见</div>';
+            } else {
+                return '<div class="hideContent">该评论仅登录用户及评论双方可见</div>';
+            }
+        }
+    }
+    /**
+     * 解析时光机页面的评论内容
+     * @param $content
+     * @return string
+     */
+    public static function timeMachineCommentContent($content)
+    {
+        return Content::parseContentPublic($content);
+    }
+    /**
+     * 一些公用的解析，文章、评论、时光机公用的，与用户状态无关
+     * @param $content
+     * @return null|string|string[]
+     */
+    public static function parseContentPublic($content)
+    {
+        $options = Helper::options();
+        //倒计时
+        if (strpos($content, '[countdown') !== false) {
+            $pattern = self::get_shortcode_regex(array('countdown'));
+            $content = preg_replace_callback("/$pattern/", array('Content', 'countdownParseCallback'),
+                $content);
+        }
+        return $content;
+    }
+}

times/UA.php

@@ -0,0 +1,256 @@
+<?php
+class UA{
+    public $ua;
+    public function __construct($ua = '')
+    {
+        $this->ua = $ua;
+    }
+    public function returnBrowser(){
+        $ua = $this->ua;
+        if(preg_match('/rv:(11.0)/i', $ua, $matches)){
+            $title = 'Internet Explorer '. $matches[1];
+            $icon = 'fa fa-internet-explorer';//ie11
+        }elseif (preg_match('#MSIE ([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'Internet Explorer '. $matches[1];
+
+            if ( strpos($matches[1], '7') !== false || strpos($matches[1], '8') !== false)
+                $icon = 'fa fa-internet-explorer';//ie8
+            elseif ( strpos($matches[1], '9') !== false)
+                $icon = 'fa fa-internet-explorer';//ie9
+            elseif ( strpos($matches[1], '10') !== false)
+                $icon = 'fa fa-internet-explorer';//ie10
+        }elseif (preg_match('#Edge/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'Edge '. $matches[1];
+            $icon = 'fa fa-edge';
+        }elseif (preg_match('#TheWorld ([a-zA-Z0-9.]+)#i', $ua, $matches)){
+            $title = 'TheWorld(世界之窗) '. $matches[1];
+            $icon = 'iconfont icon-theworld';
+        }elseif (preg_match('#JuziBrowser#i', $ua, $matches)){
+            $title = 'Juzi(桔子) '.$matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('#KBrowser#i', $ua, $matches)){
+            $title = 'KBrowser(超快) '.$matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('#MyIE#i', $ua, $matches)){
+            $title = 'MyIE(蚂蚁) '.$matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('#(Firefox|Phoenix|Firebird|BonEcho|GranParadiso|Minefield|Iceweasel)/([a-zA-Z0-9.]+)#i', $ua, $matches)){
+            $title = 'Firefox '. $matches[1];
+            $icon = 'fa fa-firefox';
+        }elseif (preg_match('#CriOS/([a-zA-Z0-9.]+)#i', $ua, $matches)){
+            $title = 'Chrome for iOS '. $matches[1];
+            $icon = 'fa fa-chrome';
+        } elseif (preg_match('#LBBROWSER#i', $ua, $matches)) {
+            $title = '猎豹';
+            $icon = 'iconfont icon-liebaoliulanqi';
+        }elseif (preg_match('#Opera.(.*)Version[ /]([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'Opera '. $matches[2];
+            $icon = 'fa fa-opera';
+            if (preg_match('#opera mini#i', $ua))
+                $title = 'Opera Mini '. $matches[2];
+        }elseif (preg_match('#Maxthon( |\/)([a-zA-Z0-9.]+)#i', $ua,$matches)) {
+            $title = 'Maxthon(遨游) '. $matches[2];
+            $icon = 'iconfont icon-liulanqi-aoyou';
+        }elseif (preg_match('#360([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = '360 Browser '. $matches[1];
+            $icon = 'iconfont icon-liulanqi-jisu';
+        }elseif (preg_match('#SE 2([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'SouGou Browser 2 '.$matches[1];
+            $icon = 'iconfont icon-liulanqi-sougou';
+        }elseif (preg_match('#QQBrowser/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'QQBrowser '.$matches[1];
+            $icon = 'iconfont icon-QQliulanqi';
+            if (preg_match('#Mobile MQQBrowser/([a-zA-Z0-9.]+)#i', $ua,$matches)) {
+                $title = 'Mobile MQQBrowser '. $matches[1];
+                $icon = 'fa fa-qq';
+            }elseif (preg_match('#MicroMessenger/([a-zA-Z0-9.]+)#i', $ua,$matches)) {
+                $title = 'Wechat Browser '. $matches[1];
+                $icon = 'weixin';
+            }
+        }elseif (preg_match('#QQ/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'QQ '.$matches[1];
+            $icon = 'fa fa-qq';
+        }elseif (preg_match('#YYE/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'YYE '.$matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('#115Browser/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = '115 '.$matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('#37abc/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = '37abc '.$matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('#TheWorld ([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = '世界之窗 '.$matches[1];
+            $icon = 'iconfont icon-theworld';
+        }elseif (preg_match('#UCWEB([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'UCWEB '. $matches[1];
+            $icon = 'icon-win8 icon-ucliulanqi';
+        }elseif (preg_match('#UBrowser/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'UBrowser '. $matches[1];
+            $icon = 'iconfont icon-ucliulanqi';
+        }elseif (preg_match('#Quark/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'Quark '. $matches[1];
+            $icon = 'iconfont icon-ucliulanqi';	//
+        }elseif (preg_match('#2345Explorer/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = '2345Explorer '. $matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('#XiaoMi/MiuiBrowser/([0-9.]+)#i', $ua, $matches)) {
+            $title = '小米 '. $matches[1];
+            $icon = 'iconfont icon-xiaomi';
+        }elseif (preg_match('/WeiBo/i', $ua, $matches)) {
+            $title = '微博 '. $matches[1];
+            $icon = 'iconfont icon-weibo';
+        }elseif (preg_match('/BIDU/i', $ua, $matches)) {
+            $title = '百度 '. $matches[1];
+            $icon = 'iconfont icon-setting';
+        }elseif (preg_match('/mailapp/i', $ua, $matches)) {
+            $title = 'EmailApp '. $matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('/Sleipnir/i', $ua, $matches)) {
+            $title = '神马 '. $matches[1];
+            $icon = 'iconfont icon-weibiaoti--';
+        }elseif (preg_match('/MZBrowser/i', $ua, $matches)) {
+            $title = '魅族 '. $matches[1];
+            $icon = 'iconfont icon-meizu';
+        }elseif (preg_match('/VivoBrowser/i', $ua, $matches)) {
+            $title = 'Vivo '. $matches[1];
+            $icon = 'iconfont icon-VIVO';
+        }elseif (preg_match('/mixia/i', $ua, $matches)) {
+            $title = '米侠 '. $matches[1];
+            $icon = 'fa fa-globe';
+        }elseif (preg_match('/CoolMarket/i', $ua, $matches)) {
+            $title = '酷安 '. $matches[1];
+            $icon = 'iconfont icon-coolapk';
+        }elseif (preg_match('/YaBrowser/i', $ua, $matches)) {
+            $title = 'Yandex '. $matches[1];
+            $icon = 'iconfont icon-yandex';
+        }elseif (preg_match('/Kraitnabo\/([^\s|;]+)/i', $ua, $matches)) {
+            $title = '南博 '. $matches[1];
+            $icon = 'anzhuo';
+        }elseif (preg_match('#Chrome/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'Google Chrome '. $matches[1];
+            $icon = 'fa fa-chrome';
+            if (preg_match('#OPR/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+                $title = 'Opera '. $matches[1];
+                $icon = 'fa fa-opera';
+            }
+        }elseif (preg_match('#Safari/([a-zA-Z0-9.]+)#i', $ua, $matches)) {
+            $title = 'Safari '. $matches[1];
+            $icon = 'fa fa-safari';
+        }
+        return array("title"=>$title,
+            "icon"=>$icon);
+    }
+    public function returnOS(){
+        $ua = $this->ua;
+        $title = "未知浏览器";
+        $icon = "";
+        if (preg_match('/win/i', $ua)) {
+            if (preg_match('/Windows NT 6.1/i', $ua)) {
+                $title = "Windows 7";
+                $icon = "iconfont icon-win";
+            }elseif (preg_match('/Windows 98/i', $ua)) {
+                $title = "Windows 98";
+                $icon = "iconfont icon-win2";
+            }elseif (preg_match('/Windows NT 5.0/i', $ua)) {
+                $title = "Windows 2000";
+                $icon = "iconfont icon-win2";
+            }elseif (preg_match('/Windows NT 5.1/i', $ua)) {
+                $title = "Windows XP";
+                $icon = "iconfont icon-win";
+            }elseif (preg_match('/Windows NT 5.2/i', $ua)) {
+                if (preg_match('/Win64/i', $ua)) {
+                    $title = "Windows XP 64 bit";
+                } else {
+                    $title = "Windows Server 2003";
+                }
+                $icon = 'iconfont icon-win';
+            }elseif (preg_match('/Windows NT 6.0/i', $ua)) {
+                $title = "Windows Vista";
+                $icon = "fa fa-windows";
+            }elseif (preg_match('/Windows NT 6.2/i', $ua)) {
+                $title = "Windows 8";
+                $icon = "iconfont icon-win8";
+            }elseif (preg_match('/Windows NT 6.3/i', $ua)) {
+                $title = "Windows 8.1";
+                $icon = "iconfont icon-win8";
+            }elseif (preg_match('/Windows NT 10.0/i', $ua)) {
+                $title = "Windows 10";
+                $icon = "iconfont icon-win3";
+            }elseif (preg_match('/Windows Phone/i', $ua)) {
+                $matches = explode(';',$ua);
+                $title = $matches[2];
+                $icon = "iconfont icon-winphone";
+            }
+        } elseif (preg_match('#iPod.*.CPU.([a-zA-Z0-9.( _)]+)#i', $ua, $matches)) {
+            $title = "iPod ";//.$matches[1]
+            $icon = "iconfont icon-ipod";
+        } elseif (preg_match('/iPhone OS ([_0-9]+)/i', $ua, $matches)) {
+            $title = "Iphone ";//.$matches[1]
+            $icon = "iconfont icon-iphone";
+        } elseif (preg_match('/iPad; CPU OS ([_0-9]+)/i', $ua, $matches)) {
+            $title = "iPad ";//.$matches[1]
+            $icon = "iconfont icon-ipad";
+        } elseif (preg_match('/Mac OS X ([0-9_]+)/i', $ua, $matches)) {
+            if(count(explode(7,$matches[1]))>1) $matches[1] = 'Lion '.$matches[1];
+            elseif(count(explode(8,$matches[1]))>1) $matches[1] = 'Mountain Lion '.$matches[1];
+            $title = "Mac OSX";
+            $icon = "iconfont icon-macosdeicon";
+        } elseif (preg_match('/Macintosh/i', $ua)) {
+            $title = "Mac OS";
+            $icon = "iconfont icon-iconmacos";
+        } elseif (preg_match('/CrOS/i', $ua)){
+            $title = "Google Chrome OS";
+            $icon = "iconfont icon-iconchromeos";
+        } elseif (preg_match('/Linux/i', $ua)) {
+            $title = 'Linux';
+            $icon = 'fa fa-linux';
+            if (preg_match('/Ubuntu/i', $ua)) {
+                $title = "Ubuntu Linux";
+                $icon = "iconfont icon-ubuntu";
+            }elseif(preg_match('#Debian#i', $ua)) {
+                $title = "Debian GNU/Linux";
+                $icon = "iconfont icon-debian";
+            }elseif (preg_match('#Fedora#i', $ua)) {
+                $title = "Fedora Linux";
+                $icon = "iconfont icon-fedora";
+            }elseif (preg_match('/Kraitnabo\/([^\s|;]+)/i', $ua, $matches)) {
+            $title = '南博app '. $matches[1];
+            $icon = 'anzhuo';
+            }elseif (preg_match('/Android.([0-9. _]+)/i',$ua, $matches)) {
+                $title= "Android";
+                $icon = "iconfont icon-android";
+            }
+        } elseif (preg_match('/Android.([0-9. _]+)/i',$ua, $matches)) {
+            $title= "Android";
+            $icon = "iconfont icon-android";
+        }
+        return array("title"=>$title,
+            "icon"=>$icon);
+    }
+    /**
+     * 时光机页面ua，如果是手机设备，只显示设备类型，如果是电脑设备只显示电脑设备类型，如果是扩展发送，显示发送自「扩展」，如果是微信公众号，显示
+     */
+    public function returnTimeUa(){
+        if ($this->ua == "weixin" || $this->ua == "weChat"){
+            return array("title"=>("微信公众号"),
+                "icon"=>"weixin");
+        }elseif ($this->ua == "crx"){
+            return array("title"=>("Chrome扩展"),
+                "icon"=>"liulanqi");
+        }elseif ($this->ua == "yearcross"){
+            return array("title"=>("YearCross"),
+                "icon"=>"QQ");
+        }elseif ($this->ua == "Kraitnabo"){
+            return array("title"=>("南博app"),
+                "icon"=>"anzhuo");
+        }elseif ($this->ua == "python"){
+            return array("title"=>("python脚本"),
+                "icon"=>"python");
+        }else{
+            $ua = $this->returnOS();
+            $ua["icon"] = "anzhuo";
+            return $ua;
+        }
+    }
+}

times/dycomment.php

@@ -0,0 +1,107 @@
+<?php
+require_once 'UA.php';
+require_once 'Content.php';
+if ($this->user->hasLogin()){
+    $GLOBALS['isLogin'] = true;
+}else{
+    $GLOBALS['isLogin'] = false;
+}
+function threadedComments($comments, $options)
+{
+    $db = Typecho_Db::get();
+?>
+    <article class='post--item post--item__status'>
+        <div class='content'>
+            <header>
+            <?php $ua = new UA($comments->agent); ?>
+            <div class="comment--avatar"><?php echo $comments->gravatar('48', ''); ?></div>
+                 <?php $comments->author(); ?> 
+                <span class="dot"></span>
+                <p class="humane--time"><?php $comments->date('Y年m月d日 H:i'); ?></p>
+                <span class="dot"></span>
+                <?php echo "发自" . $ua->returnTimeUa()['title'];?>
+            </header>
+                <div class="description" itemprop="about">
+                <?php echo Content::postCommentContent(Content::timeMachineCommentContent($comments->text),$GLOBALS['isLogin'] ,"","","",true); ?>
+                </div>
+                </div>
+    </article>
+<?php } ?>
+<?php $this->comments()->to($comments); ?>
+    <input type="hidden" class="j-comment-url" value="<?php $this->commentUrl() ?>">
+    <?php if ($this->user->hasLogin()) : ?>
+        <div class="respond" id="comments">
+            <div class="comments--title">有什么新鲜事想告诉大家？</div>
+            <form method="post" id="textarea"  class="comment-form" action="<?php $this->commentUrl() ?>">
+            <p class="comment-form-comment">
+            <textarea name="text" id="j-dynamic-form-text" class="textarea" autocomplete="off" rows="3" placeholder="发表您的新鲜事儿..."></textarea>
+                <input type="hidden" value="<?php $this->user->screenName(); ?>" name="author" />
+                <input type="hidden" value="<?php $this->user->mail(); ?>" name="mail" />
+                <input type="hidden" value="<?php $this->options->siteUrl(); ?>" name="url" />
+                <input type="hidden" name="_" value="<?php Typecho_Widget::widget('Widget_Security')->to($security);
+                echo $security->getToken($this->request->getRequestUrl()); ?>">
+            </p>
+                <p class="form-submit">
+                    <button type="submit" class="submit"><?php _e('发表（Ctrl+Enter）'); ?></button>
+                </p>
+            </form>
+        </div>
+    <?php endif; ?>
+    <?php $comments->listComments(['commentUrl'=>$this->commentUrl,'class'=>$this]); ?>
+    <?php
+            $comments->pageNav(
+                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M10.8284 12.0007L15.7782 16.9504L14.364 18.3646L8 12.0007L14.364 5.63672L15.7782 7.05093L10.8284 12.0007Z" fill="var(--main)"></path></svg>',
+                '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M13.1714 12.0007L8.22168 7.05093L9.63589 5.63672L15.9999 12.0007L9.63589 18.3646L8.22168 16.9504L13.1714 12.0007Z" fill="var(--main)"></path></svg>',
+                1,
+                '...',
+                array(
+                    'wrapTag' => 'div',
+                    'wrapClass' => 'pagination_page',
+                    'itemTag' => '',
+                    'textTag' => 'a',
+                    'currentClass' => 'active',
+                    'prevClass' => 'prev',
+                    'nextClass' => 'next'
+                )
+            );
+        ?>
+<style>
+/* 分页 */
+.pagination_page{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: var(--margin);
+    gap: 0.5rem;
+}
+.pagination_page li.active a {
+    background: var(--theme);
+    color: #fff;
+    font-weight: 500;
+}
+.pagination_page a{
+    display: flex;
+    padding: 0.5rem;
+    font-size: 0.9rem;
+    width: 1.75rem;
+    height: 1.75rem;
+    background: var(--background);
+    border-radius: 50%;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    transition: 0.2s;
+    -webkit-transition: 0.2s;
+    justify-content: center;
+    align-items: center;
+    letter-spacing: 0;
+}
+.pagination_page span.next{
+    cursor: pointer;
+}
+.pagination_page li.active a:hover{
+    cursor: not-allowed;
+}
+/* 分页 */
+</style>