Merge remote-tracking branch 'origin/main' into feature/env

2026-06-11 16:26:10 +00:00 · 2025-08-14 10:34:10 +08:00
parent 655e8f2a65 7a0afedc7c
commit 48e3593ef9
14 changed files with 304 additions and 11 deletions
--- a/frontend_nuxt/components/CommentItem.vue
+++ b/frontend_nuxt/components/CommentItem.vue
@@ -22,6 +22,7 @@
            :to="`/users/${comment.userId}?tab=achievements`"
            >{{ getMedalTitle(comment.medal) }}</router-link
          >
+          <i v-if="comment.pinned" class="fas fa-thumbtack pin-icon"></i>
          <span v-if="level >= 2">
            <i class="fas fa-reply reply-icon"></i>
            <span class="user-name reply-user-name">{{ comment.parentUserName }}</span>
@@ -74,6 +75,7 @@
              :comment="item"
              :level="level + 1"
              :default-show-replies="item.openReplies"
+              :post-author-id="postAuthorId"
            />
          </template>
        </BaseTimeline>
@@ -116,6 +118,10 @@ const props = defineProps({
    type: Boolean,
    default: false,
  },
+  postAuthorId: {
+    type: [Number, String],
+    required: true,
+  },
 })

 const emit = defineEmits(['deleted'])
@@ -170,12 +176,22 @@ const replyList = computed(() => {
 })

 const isAuthor = computed(() => authState.username === props.comment.userName)
+const isPostAuthor = computed(() => Number(authState.userId) === Number(props.postAuthorId))
 const isAdmin = computed(() => authState.role === 'ADMIN')
-const commentMenuItems = computed(() =>
-  isAuthor.value || isAdmin.value
-    ? [{ text: '删除评论', color: 'red', onClick: () => deleteComment() }]
-    : [],
-)
+const commentMenuItems = computed(() => {
+  const items = []
+  if (isAuthor.value || isAdmin.value) {
+    items.push({ text: '删除评论', color: 'red', onClick: () => deleteComment() })
+  }
+  if (isAdmin.value || isPostAuthor.value) {
+    if (props.comment.pinned) {
+      items.push({ text: '取消置顶', onClick: () => unpinComment() })
+    } else {
+      items.push({ text: '置顶', onClick: () => pinComment() })
+    }
+  }
+  return items
+})
 const deleteComment = async () => {
  const token = getToken()
  if (!token) {
@@ -257,6 +273,47 @@ const submitReply = async (parentUserName, text, clear) => {
  }
 }

+const pinComment = async () => {
+  const token = getToken()
+  if (!token) {
+    toast.error('请先登录')
+    return
+  }
+  const url = isAdmin.value
+    ? `${API_BASE_URL}/api/admin/comments/${props.comment.id}/pin`
+    : `${API_BASE_URL}/api/comments/${props.comment.id}/pin`
+  const res = await fetch(url, {
+    method: 'POST',
+    headers: { Authorization: `Bearer ${token}` },
+  })
+  if (res.ok) {
+    props.comment.pinned = true
+    toast.success('已置顶')
+  } else {
+    toast.error('操作失败')
+  }
+}
+const unpinComment = async () => {
+  const token = getToken()
+  if (!token) {
+    toast.error('请先登录')
+    return
+  }
+  const url = isAdmin.value
+    ? `${API_BASE_URL}/api/admin/comments/${props.comment.id}/unpin`
+    : `${API_BASE_URL}/api/comments/${props.comment.id}/unpin`
+  const res = await fetch(url, {
+    method: 'POST',
+    headers: { Authorization: `Bearer ${token}` },
+  })
+  if (res.ok) {
+    props.comment.pinned = false
+    toast.success('已取消置顶')
+  } else {
+    toast.error('操作失败')
+  }
+}
+
 const copyCommentLink = () => {
  const link = `${location.origin}${location.pathname}#comment-${props.comment.id}`
  navigator.clipboard.writeText(link).then(() => {
@@ -336,6 +393,12 @@ const handleContentClick = (e) => {
  margin-left: 10px;
 }

+.pin-icon {
+  font-size: 12px;
+  margin-left: 10px;
+  opacity: 0.6;
+}
+
@keyframes highlight {
  from {
    background-color: yellow;
--- a/frontend_nuxt/pages/message.vue
+++ b/frontend_nuxt/pages/message.vue
@@ -185,6 +185,32 @@
                    </router-link>
                  </NotificationContainer>
                </template>
+                <template v-else-if="item.type === 'LOTTERY_WIN'">
+                  <NotificationContainer :item="item" :markRead="markRead">
+                    恭喜你在抽奖贴
+                    <router-link
+                      class="notif-content-text"
+                      @click="markRead(item.id)"
+                      :to="`/posts/${item.post.id}`"
+                    >
+                      {{ stripMarkdownLength(item.post.title, 100) }}
+                    </router-link>
+                    中获奖
+                  </NotificationContainer>
+                </template>
+                <template v-else-if="item.type === 'LOTTERY_DRAW'">
+                  <NotificationContainer :item="item" :markRead="markRead">
+                    您的抽奖贴
+                    <router-link
+                      class="notif-content-text"
+                      @click="markRead(item.id)"
+                      :to="`/posts/${item.post.id}`"
+                    >
+                      {{ stripMarkdownLength(item.post.title, 100) }}
+                    </router-link>
+                    已开奖
+                  </NotificationContainer>
+                </template>
                <template v-else-if="item.type === 'POST_UPDATED'">
                  <NotificationContainer :item="item" :markRead="markRead">
                    您关注的帖子
@@ -557,6 +583,8 @@ const iconMap = {
  POST_UNSUBSCRIBED: 'fas fa-bookmark',
  REGISTER_REQUEST: 'fas fa-user-clock',
  ACTIVITY_REDEEM: 'fas fa-coffee',
+  LOTTERY_WIN: 'fas fa-trophy',
+  LOTTERY_DRAW: 'fas fa-bullhorn',
  MENTION: 'fas fa-at',
 }

@@ -614,6 +642,28 @@ const fetchNotifications = async () => {
            }
          },
        })
+      } else if (n.type === 'LOTTERY_WIN') {
+        notifications.value.push({
+          ...n,
+          icon: iconMap[n.type],
+          iconClick: () => {
+            if (n.post) {
+              markRead(n.id)
+              router.push(`/posts/${n.post.id}`)
+            }
+          },
+        })
+      } else if (n.type === 'LOTTERY_DRAW') {
+        notifications.value.push({
+          ...n,
+          icon: iconMap[n.type],
+          iconClick: () => {
+            if (n.post) {
+              markRead(n.id)
+              router.push(`/posts/${n.post.id}`)
+            }
+          },
+        })
      } else if (n.type === 'POST_UPDATED') {
        notifications.value.push({
          ...n,
@@ -783,6 +833,10 @@ const formatType = (t) => {
      return '有人申请注册'
    case 'ACTIVITY_REDEEM':
      return '有人申请兑换奶茶'
+    case 'LOTTERY_WIN':
+      return '抽奖中奖了'
+    case 'LOTTERY_DRAW':
+      return '抽奖已开奖'
    default:
      return t
  }
--- a/frontend_nuxt/pages/posts/[id]/index.vue
+++ b/frontend_nuxt/pages/posts/[id]/index.vue
@@ -195,6 +195,7 @@
              :comment="item"
              :level="0"
              :default-show-replies="item.openReplies"
+              :post-author-id="author.id"
              @deleted="onCommentDeleted"
            />
          </template>
@@ -391,6 +392,7 @@ const mapComment = (c, parentUserName = '', level = 0) => ({
  avatar: c.author.avatar,
  text: c.content,
  reactions: c.reactions || [],
+  pinned: !!c.pinnedAt,
  reply: (c.replies || []).map((r) => mapComment(r, c.author.username, level + 1)),
  openReplies: level === 0,
  src: c.author.avatar,
--- a/frontend_nuxt/utils/markdown.js
+++ b/frontend_nuxt/utils/markdown.js
@@ -50,6 +50,31 @@ function tiebaEmojiPlugin(md) {
  })
 }

+// 链接在新窗口打开
+function linkPlugin(md) {
+  const defaultRender =
+    md.renderer.rules.link_open ||
+    function (tokens, idx, options, env, self) {
+      return self.renderToken(tokens, idx, options)
+    }
+
+  md.renderer.rules.link_open = function (tokens, idx, options, env, self) {
+    const token = tokens[idx]
+    const hrefIndex = token.attrIndex('href')
+
+    if (hrefIndex >= 0) {
+      const href = token.attrs[hrefIndex][1]
+      // 如果是外部链接，添加 target="_blank" 和 rel="noopener noreferrer"
+      if (href.startsWith('http://') || href.startsWith('https://')) {
+        token.attrPush(['target', '_blank'])
+        token.attrPush(['rel', 'noopener noreferrer'])
+      }
+    }
+
+    return defaultRender(tokens, idx, options, env, self)
+  }
+}
+
 const md = new MarkdownIt({
  html: false,
  linkify: true,
@@ -67,6 +92,7 @@ const md = new MarkdownIt({

 md.use(mentionPlugin)
 md.use(tiebaEmojiPlugin)
+md.use(linkPlugin) // 添加链接插件

 export function renderMarkdown(text) {
  return md.render(text || '')