chore: merge branch main

.vitepress/theme/apis/forum/gitee/index.ts

@@ -10,6 +10,7 @@ import * as labels from './labels'
 import * as oauth from './oauth'
 import * as user from './user'
 import type ForumAPI from '../api'
+import { isPlainObject } from 'lodash-es'
 
 class HTTPError extends Error {}
 
@@ -95,20 +96,20 @@ const cachedApiCall = useMemoize(
   async <T>(
     method: HttpMethod,
     endpoint: string,
-    { params, body, hooks }: ApiCallParams,
+    { params = {}, body, hooks }: ApiCallParams,
   ): ApiCallResult<T> => {
     if (!isNodeEnvironment() && !endpoint.includes('oauth')) {
       const { auth } = useUserAuthStore()
 
       const accessToken = auth.accessToken
 
       if (accessToken) {
-        if (params) {
-          params.access_token = accessToken
-        }
         if (body) {
           if (body instanceof FormData) body.append('access_token', accessToken)
-          else body.access_token = accessToken
+          else if (isPlainObject(body)) body.access_token = accessToken
+          else params.access_token = accessToken
+        } else {
+          params.access_token = accessToken
         }
       }
     }

src/components/forum/ForumTopic.vue

@@ -17,8 +17,9 @@
             <p class="mr-2" v-if="topic.type">
               <span
                 class="inline-flex items-center px-1 pt-.5 text-nowrap text-center font-size-3 rounded-0.5 align-middle text-xs font-semibold transition-colors color-[#b2b2b2] border-[#bdbdbd] border border-solid"
-                >{{ topicTypeMap.get(topic.type) }}</span
               >
+                {{ topicTypeMap.get(topic.type) }}
+              </span>
             </p>
           </h4>
         </a>
@@ -121,10 +122,11 @@ const { title, author, topic } = defineProps<{
 const [isExpanded, toggleExpand] = useToggle()
 
 const renderText = computed(() => {
-  if (isAnn.value) return topic.contentRaw.replace(/!\[.*?\]\(.*?\)/g, '')
-  return topic.contentRaw
+  const contentSanitized = topic.contentRaw
     .replace(/!\[.*?\]\(.*?\)/g, '')
-    .slice(0, isExpanded.value ? undefined : 180)
+    .replace(/<!--.*(?=-->)-->/giu, '')
+  if (isAnn.value) return contentSanitized
+  return contentSanitized.slice(0, isExpanded.value ? undefined : 180)
 })
 
 const hasOverflow = computed(

src/components/forum/topic/ForumTopicPage.vue

@@ -94,6 +94,7 @@ import { useLocalized } from '@/hooks/useLocalized'
 import { watchOnce } from '@vueuse/core'
 import { useSharedTopicInfo } from '~/composables/sharedTopicInfo'
 import ForumTopicFooter from './ForumTopicFooter.vue'
+import { sanitizeMarkdown } from '~/composables/sanitizeMarkdown'
 
 const userInfo = useUserInfoStore()
 const number = getTopicNumber()
@@ -111,7 +112,9 @@ const isTeamMember = computed(
   () => userInfo.isTeamMember(data.value?.user.id).value,
 )
 const renderedContent = computed(() =>
-  markdownit().render(data.value?.content.text || ''),
+  sanitizeMarkdown(
+    markdownit().render(sanitizeMarkdown(data.value?.contentRaw)),
+  ),
 )
 
 if (sharedTopicInfo.value) {

src/composables/composeTopicBody.ts

@@ -0,0 +1,12 @@
+import { uniq } from 'lodash-es'
+
+export const composeTopicBody = (
+  body: string,
+  labels: (string | null | undefined)[],
+): string => {
+  const meta = {
+    labels: uniq(labels.filter((v) => v)),
+  }
+  const content = `<!-- ${JSON.stringify(meta)} -->${body}`
+  return content
+}

src/composables/sanitizeMarkdown.ts

@@ -0,0 +1,5 @@
+export const sanitizeMarkdown = (
+  markdown: string | null | undefined,
+): string => {
+  return (markdown || '').replace(/<!--.*(?=-->)-->/giu, '')
+}

src/stores/useForumData.ts

@@ -16,6 +16,7 @@ import { getForumLocaleLabelGetter } from '~/composables/getForumLocaleGetter'
 import { getTopicTagLabelGetter } from '~/composables/getTopicTagLabelGetter'
 
 import type ForumAPI from '@/apis/forum/api'
+import { composeTopicBody } from '~/composables/composeTopicBody'
 
 const typeLabelGetter = getTopicTypeLabelGetter()
 const localeLabelGetter = getForumLocaleLabelGetter()
@@ -161,15 +162,17 @@ export const useForumData = defineStore('forum-data', () => {
 
       userSelectedTags = body.tags
 
+      const labels = [
+        import.meta.env.DEV ? 'DEV-TEST' : 'WEB-FEEDBACK',
+        typeLabelGetter.getLabel(type),
+        localeLabelGetter.getLabel(lang.value.substring(0, 2).toUpperCase()),
+        ...topicLabelGetter.toLabels(body.tags),
+      ]
+
       submit({
-        body: bodyText(),
+        body: composeTopicBody(bodyText(), labels),
         title: `${type}:${body.title}`,
-        labels: [
-          import.meta.env.DEV ? 'DEV-TEST' : 'WEB-FEEDBACK',
-          typeLabelGetter.getLabel(type),
-          localeLabelGetter.getLabel(lang.value.substring(0, 2).toUpperCase()),
-          ...topicLabelGetter.toLabels(body.tags),
-        ].join(','),
+        labels: labels.join(','),
       })
     }