From 2edfbe345c2b1e346c952cd75b833502fc8cea30 Mon Sep 17 00:00:00 2001
From: WooMai <34209782+WooMai@users.noreply.github.com>
Date: Sun, 9 May 2021 06:15:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(docs,=20route):=20=E6=A2=A8=E5=9B=AD?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=20&=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E6=96=87=E6=A1=A3=E7=A4=BA=E4=BE=8B=20(#7446)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/bbs.md | 6 +++---
lib/routes/liyuan-forums/threads.js | 29 ++++++++++++++++++++++-------
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/docs/bbs.md b/docs/bbs.md
index 5f18f34222..bcef757ca9 100644
--- a/docs/bbs.md
+++ b/docs/bbs.md
@@ -368,15 +368,15 @@ pageClass: routes
### 主题帖(板块)
-
+
### 主题帖(专题)
-
+
### 主题帖(用户)
-
+
## 龙空
diff --git a/lib/routes/liyuan-forums/threads.js b/lib/routes/liyuan-forums/threads.js
index c4e4f9347a..e4d9f81c7e 100644
--- a/lib/routes/liyuan-forums/threads.js
+++ b/lib/routes/liyuan-forums/threads.js
@@ -5,23 +5,38 @@ module.exports = async (ctx) => {
const topic_id = ctx.params.topic_id || null;
const user_id = ctx.params.user_id || null;
- const query = ['initial_post=1'];
+ const query = ['initial_post=1', `order_by=create_time`];
let link = 'https://forums.liyuans.com/recent';
if (forum_id) {
- query.push(`forum_id=${encodeURIComponent(forum_id)}`);
- link = `https://forums.liyuans.com/forum/${forum_id}`;
+ if (!isNaN(forum_id)) {
+ query.push(`forum_id=${encodeURIComponent(forum_id)}`);
+ link = `https://forums.liyuans.com/forum/${forum_id}`;
+ } else {
+ query.push(`forum_ids=${encodeURIComponent(forum_id)}`);
+ link = `https://forums.liyuans.com`;
+ }
}
if (topic_id) {
- query.push(`topic_id=${encodeURIComponent(topic_id)}`);
- link = `https://forums.liyuans.com/topic/${topic_id}`;
+ if (!isNaN(topic_id)) {
+ query.push(`topic_id=${encodeURIComponent(topic_id)}`);
+ link = `https://forums.liyuans.com/topic/${topic_id}`;
+ } else {
+ query.push(`topic_ids=${encodeURIComponent(topic_id)}`);
+ link = `https://forums.liyuans.com`;
+ }
}
if (user_id) {
- query.push(`user_id=${encodeURIComponent(user_id)}`);
- link = `https://forums.liyuans.com/user/${user_id}`;
+ if (!isNaN(user_id)) {
+ query.push(`user_id=${encodeURIComponent(user_id)}`);
+ link = `https://forums.liyuans.com/user/${user_id}`;
+ } else {
+ query.push(`user_ids=${encodeURIComponent(user_id)}`);
+ link = `https://forums.liyuans.com`;
+ }
}
let qstr = '';