koishi-plugin-foxy-daily 0.2.3 → 0.2.5

package/lib/comments.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { createHash } = require('node:crypto')
 const { generateReply } = require('./digest')
 
 function formatAuthor(comment) {
@@ -10,8 +11,21 @@ function flattenComments(post) {
   return Array.isArray(post.comments) ? post.comments : []
 }
 
+function commentKey(comment) {
+  const id = String(comment?.id || '')
+  const kind = String(comment?.kind || 'comment')
+  const target = String(comment?.replyTo?.id ?? comment?.replyToUser?.id ?? comment?.parentId ?? '')
+  const author = String(comment?.author?.id || '')
+  const content = String(comment?.content || '')
+  const hash = createHash('sha1').update(content).digest('hex').slice(0, 10)
+  return `${id}:${kind}:${target}:${author}:${hash}`
+}
+
 function findComment(post, commentId) {
-  return flattenComments(post).find((comment) => String(comment.id) === String(commentId))
+  const value = String(commentId)
+  return flattenComments(post).find(
+    (comment) => commentKey(comment) === value || String(comment.id) === value,
+  )
 }
 
 function normalizeIds(values) {
@@ -123,6 +137,22 @@ class CommentRunner {
     return posts
   }
 
+  _commentState(post, comment, comments = flattenComments(post)) {
+    const stableKey = commentKey(comment)
+    const direct = this.state.commentState(post.id, stableKey)
+    if (direct) return direct
+    const legacy = this.state.commentState(post.id, String(comment.id))
+    if (!legacy) return undefined
+    const siblings = comments.filter((item) => String(item.id) === String(comment.id))
+    if (siblings.length <= 1) return legacy
+    // Qzone can reuse a raw comment id for a root comment and a nested reply.
+    // Legacy state has only the raw id; prefer the reply sibling because old
+    // flows usually consumed the nested reply first.
+    const replySibling = siblings.find((item) => item.kind === 'reply')
+    if (replySibling) return replySibling === comment ? legacy : undefined
+    return siblings[0] === comment ? legacy : undefined
+  }
+
   async listComments(postId) {
     const posts = await this._targets(postId)
     const lines = []
@@ -133,7 +163,7 @@ class CommentRunner {
       const comments = flattenComments(post)
       if (comments.length === 0) lines.push('  （无评论）')
       for (const comment of comments) {
-        const state = this.state.commentState(post.id, comment.id)
+        const state = this._commentState(post, comment, comments)
         const mark = state?.status === 'replied' ? '已回复' : state?.status === 'unknown' ? '待确认' : '未回复'
         const nested = comment.kind === 'reply'
           ? `，回复 ${comment.replyToUser?.nickname || comment.replyTo?.id || '?'}`
@@ -151,10 +181,11 @@ class CommentRunner {
       const post = await this.qzone.getPost(summary)
       if (!this._isOwnPost(post) && !this._otherPostAllowed(post)) continue
       const pending = []
-      for (const comment of flattenComments(post)) {
+      const comments = flattenComments(post)
+      for (const comment of comments) {
         if (!this._commentAllowed(post, comment)) continue
         if (!this._commenterAllowed(post, comment)) continue
-        const existing = this.state.commentState(post.id, comment.id)
+        const existing = this._commentState(post, comment, comments)
         if (existing && ['replied', 'processing', 'unknown', 'skipped'].includes(existing.status)) continue
         if ((existing?.attempts || 0) >= (this.config.commentMaxAttempts || 3)) continue
         const ageMs = comment.createdAt ? Date.now() - new Date(comment.createdAt).getTime() : 0
@@ -179,8 +210,9 @@ class CommentRunner {
     const comment = findComment(post, commentId)
     if (!comment) throw new Error(`动态 ${postId} 下找不到评论 ${commentId}`)
     if (!this._commentAllowed(post, comment)) throw new Error('这条评论不在允许回复的范围内')
+    const key = commentKey(comment)
     const result = await this.qzone.reply(post, comment, content)
-    this.state.setCommentState(post.id, comment.id, {
+    this.state.setCommentState(post.id, key, {
       status: result.outcome === 'unknown' ? 'unknown' : 'replied',
       outcome: result.outcome,
       reply: content,
@@ -191,8 +223,9 @@ class CommentRunner {
   }
 
   async _reply(post, comment) {
-    const existing = this.state.commentState(post.id, comment.id)
-    this.state.setCommentState(post.id, comment.id, {
+    const key = commentKey(comment)
+    const existing = this._commentState(post, comment)
+    this.state.setCommentState(post.id, key, {
       status: 'processing',
       attempts: (existing?.attempts || 0) + 1,
     })
@@ -201,7 +234,7 @@ class CommentRunner {
     const persona = await this.getPersona()
     const content = await generateReply({ model, post, comment, persona })
     if (!content) {
-      this.state.setCommentState(post.id, comment.id, {
+      this.state.setCommentState(post.id, key, {
         status: 'failed',
         attempts: (existing?.attempts || 0) + 1,
         error: 'empty reply',
@@ -210,7 +243,7 @@ class CommentRunner {
       return { replied: false, reason: 'empty' }
     }
     const result = await this.qzone.reply(post, comment, content)
-    this.state.setCommentState(post.id, comment.id, {
+    this.state.setCommentState(post.id, key, {
       status: result.outcome === 'unknown' ? 'unknown' : 'replied',
       outcome: result.outcome,
       reply: content,
@@ -232,18 +265,19 @@ class CommentRunner {
       for (const summary of posts) {
         const post = await this.qzone.getPost(summary)
         if (!this._isOwnPost(post) && !this._otherPostAllowed(post)) continue
-        for (const comment of flattenComments(post)) {
+        const comments = flattenComments(post)
+        for (const comment of comments) {
           if (!this._commentAllowed(post, comment)) continue
           if (!this._commenterAllowed(post, comment)) {
             report.skipped++
             continue
           }
-          const existing = this.state.commentState(post.id, comment.id)
+          const existing = this._commentState(post, comment, comments)
           if (existing && ['replied', 'processing', 'unknown', 'skipped'].includes(existing.status)) continue
           if ((existing?.attempts || 0) >= (this.config.commentMaxAttempts || 3)) continue
           const ageMs = comment.createdAt ? Date.now() - new Date(comment.createdAt).getTime() : 0
           if (ageMs > (this.config.commentMaxAgeHours || 72) * 3600_000) {
-            this.state.setCommentState(post.id, comment.id, { status: 'skipped', reason: 'too-old' })
+            this.state.setCommentState(post.id, commentKey(comment), { status: 'skipped', reason: 'too-old' })
             await this.state.save()
             report.skipped++
             continue
@@ -259,7 +293,7 @@ class CommentRunner {
               report.skipped++
             }
           } catch (error) {
-            this.state.setCommentState(post.id, comment.id, {
+            this.state.setCommentState(post.id, commentKey(comment), {
               status: 'failed',
               attempts: (existing?.attempts || 0) + 1,
               error: error.message,
@@ -276,4 +310,4 @@ class CommentRunner {
   }
 }
 
-module.exports = { CommentRunner, flattenComments, findComment }
+module.exports = { CommentRunner, commentKey, flattenComments, findComment }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-foxy-daily",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "LivingMemory-backed Qzone daily posts, nested comments, auto-like and public-feed tools for ChatLuna / Character.",
   "main": "lib/index.js",
   "files": [