Skip to content

Commit

Permalink
feat: add urls parameter to getRecentComments
Browse files Browse the repository at this point in the history
  • Loading branch information
imaegoo committed Dec 4, 2023
1 parent 9f9c4bb commit 369de30
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 15 deletions.
2 changes: 1 addition & 1 deletion docs/.vitepress/theme/Twikoo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@ onMounted(() => {

<!-- Twikoo -->
<div id="twikoo"></div>
<component :is="'script'" src="https://cdn.jsdelivr.net/npm/[email protected].26/dist/twikoo.all.min.js" ref="twikooJs"></component>
<component :is="'script'" src="https://cdn.jsdelivr.net/npm/[email protected].27/dist/twikoo.all.min.js" ref="twikooJs"></component>
</div>
</template>
5 changes: 5 additions & 0 deletions docs/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ twikoo.getCommentsCount({
twikoo.getRecentComments({
envId: '您的环境id', // 环境 ID
// region: 'ap-guangzhou', // 环境地域,默认为 ap-shanghai,如果您的环境地域不是上海,需传此参数
urls: [ // 要求云函数版本 >= 1.6.27。不包含协议、域名、参数的文章路径列表,不传默认获取所有最新评论
'/2020/10/post-1.html',
'/2020/11/post-2.html',
'/2020/12/post-3.html'
],
pageSize: 10, // 获取多少条,默认:10,最大:100
includeReply: false // 是否包括最新回复,默认:false
}).then(function (res) {
Expand Down
2 changes: 1 addition & 1 deletion docs/backend.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ exports.main = require('twikoo-func').main
8. 创建完成后,点击“twikoo"进入云函数详情页,进入“函数代码”标签,点击“文件 - 新建文件”,输入 `package.json`,回车
9. 复制以下代码、粘贴到代码框中,点击“保存并安装依赖”
``` json
{ "dependencies": { "twikoo-func": "1.6.26" } }
{ "dependencies": { "twikoo-func": "1.6.27" } }
```

## 腾讯云命令行部署
Expand Down
10 changes: 5 additions & 5 deletions docs/frontend.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ twikoo:

``` html
<div id="tcomment"></div>
<script src="https://cdn.staticfile.org/twikoo/1.6.26/twikoo.all.min.js"></script>
<script src="https://cdn.staticfile.org/twikoo/1.6.27/twikoo.all.min.js"></script>
<script>
twikoo.init({
envId: '您的环境id', // 腾讯云环境填 envId;Vercel 环境填地址(https://xxx.vercel.app)
Expand All @@ -103,10 +103,10 @@ twikoo.init({

如果遇到默认 CDN 加载速度缓慢,可更换其他 CDN 镜像。以下为可供选择的公共 CDN,其中一些 CDN 可能需要数天时间同步最新版本:

* `https://cdn.staticfile.org/twikoo/1.6.26/twikoo.all.min.js`
* `https://lib.baomitu.com/twikoo/1.6.26/twikoo.all.min.js`
* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.26/twikoo.all.min.js`
* `https://cdn.jsdelivr.net/npm/[email protected].26/dist/twikoo.all.min.js`
* `https://cdn.staticfile.org/twikoo/1.6.27/twikoo.all.min.js`
* `https://lib.baomitu.com/twikoo/1.6.27/twikoo.all.min.js`
* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.27/twikoo.all.min.js`
* `https://cdn.jsdelivr.net/npm/[email protected].27/dist/twikoo.all.min.js`

## 开启管理面板(腾讯云环境)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twikoo",
"version": "1.6.26",
"version": "1.6.27",
"description": "A simple comment system.",
"keywords": [
"twikoojs",
Expand Down
2 changes: 1 addition & 1 deletion src/client/version.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const version = '1.6.26'
const version = '1.6.27'

export { version }
3 changes: 3 additions & 0 deletions src/server/function/twikoo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,9 @@ async function getRecentComments (event) {
try {
const query = {}
query.isSpam = _.neq(true)
if (event.urls && event.urls.length) {
query.url = _.in(getUrlsQuery(event.urls))
}
if (!event.includeReply) query.rid = _.in(['', null])
if (event.pageSize > 100) event.pageSize = 100
const result = await db
Expand Down
2 changes: 1 addition & 1 deletion src/server/function/twikoo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twikoo-func",
"version": "1.6.26",
"version": "1.6.27",
"description": "A simple comment system.",
"author": "imaegoo <[email protected]> (https://github.com/imaegoo)",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion src/server/netlify/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twikoo-netlify",
"version": "1.6.26",
"version": "1.6.27",
"description": "A simple comment system.",
"author": "imaegoo <[email protected]> (https://github.com/imaegoo)",
"license": "MIT",
Expand Down
3 changes: 3 additions & 0 deletions src/server/self-hosted/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,9 @@ async function getRecentComments (event) {
try {
const query = {}
query.isSpam = { $ne: true }
if (event.urls && event.urls.length) {
query.url = { $in: getUrlsQuery(event.urls) }
}
if (!event.includeReply) query.rid = { $exists: false }
if (event.pageSize > 100) event.pageSize = 100
const result = db
Expand Down
3 changes: 3 additions & 0 deletions src/server/self-hosted/mongo.js
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,9 @@ async function getRecentComments (event) {
try {
const query = {}
query.isSpam = { $ne: true }
if (event.urls && event.urls.length) {
query.url = { $in: getUrlsQuery(event.urls) }
}
if (!event.includeReply) query.rid = { $in: ['', null] }
if (event.pageSize > 100) event.pageSize = 100
const result = await db
Expand Down
4 changes: 2 additions & 2 deletions src/server/self-hosted/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tkserver",
"version": "1.6.26",
"version": "1.6.27",
"description": "A simple comment system.",
"keywords": [
"twikoo",
Expand Down Expand Up @@ -31,7 +31,7 @@
"get-user-ip": "^1.0.1",
"lokijs": "^1.5.12",
"mongodb": "^3.6.3",
"twikoo-func": "1.6.26",
"twikoo-func": "1.6.27",
"uuid": "^8.3.2"
}
}
3 changes: 3 additions & 0 deletions src/server/vercel/api/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,9 @@ async function getRecentComments (event) {
try {
const query = {}
query.isSpam = { $ne: true }
if (event.urls && event.urls.length) {
query.url = { $in: getUrlsQuery(event.urls) }
}
if (!event.includeReply) query.rid = { $in: ['', null] }
if (event.pageSize > 100) event.pageSize = 100
const result = await db
Expand Down
4 changes: 2 additions & 2 deletions src/server/vercel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twikoo-vercel",
"version": "1.6.26",
"version": "1.6.27",
"description": "A simple comment system.",
"author": "imaegoo <[email protected]> (https://github.com/imaegoo)",
"license": "MIT",
Expand All @@ -13,7 +13,7 @@
"dependencies": {
"get-user-ip": "^1.0.1",
"mongodb": "^3.6.3",
"twikoo-func": "1.6.26",
"twikoo-func": "1.6.27",
"uuid": "^8.3.2"
}
}

0 comments on commit 369de30

Please sign in to comment.