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

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
   }

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,