Merge branch 'nagisa77:main' into main

backend/src/main/java/com/openisle/model/Notification.java

@@ -22,7 +22,7 @@ public class Notification {
     private Long id;
 
     @Enumerated(EnumType.STRING)
-    @Column(nullable = false)
+    @Column(nullable = false, length = 50)
     private NotificationType type;
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false)

frontend_nuxt/assets/fonts.css

@@ -0,0 +1,143 @@
+/* Maple Mono - Thin 100 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-100-normal.woff2") format("woff2");
+  font-weight: 100;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Thin Italic 100 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-100-italic.woff2") format("woff2");
+  font-weight: 100;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - ExtraLight 200 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-200-normal.woff2") format("woff2");
+  font-weight: 200;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - ExtraLight Italic 200 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-200-italic.woff2") format("woff2");
+  font-weight: 200;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - Light 300 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-300-normal.woff2") format("woff2");
+  font-weight: 300;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Light Italic 300 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-300-italic.woff2") format("woff2");
+  font-weight: 300;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - Regular 400 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-400-normal.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Italic 400 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-400-italic.woff2") format("woff2");
+  font-weight: 400;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - Medium 500 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-500-normal.woff2") format("woff2");
+  font-weight: 500;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Medium Italic 500 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-500-italic.woff2") format("woff2");
+  font-weight: 500;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - SemiBold 600 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-600-normal.woff2") format("woff2");
+  font-weight: 600;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - SemiBold Italic 600 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-600-italic.woff2") format("woff2");
+  font-weight: 600;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - Bold 700 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-700-normal.woff2") format("woff2");
+  font-weight: 700;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - Bold Italic 700 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-700-italic.woff2") format("woff2");
+  font-weight: 700;
+  font-style: italic;
+  font-display: swap;
+}
+
+/* Maple Mono - ExtraBold 800 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-800-normal.woff2") format("woff2");
+  font-weight: 800;
+  font-style: normal;
+  font-display: swap;
+}
+
+/* Maple Mono - ExtraBold Italic 800 */
+@font-face {
+  font-family: "Maple Mono";
+  src: url("/fonts/maple-mono-800-italic.woff2") format("woff2");
+  font-weight: 800;
+  font-style: italic;
+  font-display: swap;
+}

frontend_nuxt/assets/global.css

@@ -28,7 +28,7 @@
 	--activity-card-background-color: #fafafa;
 }
 
-[data-theme='dark'] {
+[data-theme="dark"] {
 	--header-background-color: #2b2b2b;
 	--header-border-color: #555;
 	--primary-color: rgb(17, 182, 197);
@@ -55,7 +55,7 @@
 body {
 	margin: 0;
 	padding: 0;
-  font-family: 'Roboto', sans-serif;
+	font-family: "Roboto", sans-serif;
 	background-color: var(--normal-background-color);
 	color: var(--text-color);
 	/* 禁止滚动 */
@@ -131,6 +131,7 @@ body {
 }
 
 .info-content-text pre {
+	display: flex;
 	background-color: var(--normal-background-color);
 	padding: 8px 12px;
 	border-radius: 4px;
@@ -138,6 +139,36 @@ body {
 	position: relative;
 }
 
+.info-content-text pre .line-numbers {
+	counter-reset: line-number 0;
+	width: 2em;
+	font-size: 13px;
+	position: sticky;
+	flex-shrink: 0;
+	font-family: "Maple Mono", monospace;
+	margin: 1em 0;
+	color: #888;
+	background-color: var(--normal-background-color);
+	border-right: 1px solid #888;
+	box-sizing: border-box;
+	padding-right: 0.5em;
+	text-align: end;
+}
+
+.info-content-text pre .line-numbers .line-number::before {
+	content: counter(line-number);
+	counter-increment: line-number;
+}
+
+.info-content-text code {
+	font-family: "Maple Mono", monospace;
+	font-size: 13px;
+	border-radius: 4px;
+	white-space: no-wrap;
+	background-color: var(--normal-background-color);
+	color: var(--text-color);
+}
+
 .copy-code-btn {
 	position: absolute;
 	top: 4px;
@@ -156,15 +187,6 @@ body {
 	opacity: 1;
 }
 
-.info-content-text code {
-  font-family: 'Roboto Mono', monospace;
-  font-size: 13px;
-  border-radius: 4px;
-  white-space: pre-wrap;
-  background-color: var(--normal-background-color);
-  color: var(--text-color);
-}
-
 .info-content-text a {
 	color: var(--primary-color);
 	text-decoration: none;
@@ -197,7 +219,7 @@ body {
 	font-weight: 600;
 }
 
-[data-theme='dark'] .info-content-text thead th {
+[data-theme="dark"] .info-content-text thead th {
 	background-color: var(--primary-color-hover); /* 暗色稍暗一点 */
 }
 
@@ -205,7 +227,7 @@ body {
 	background-color: rgba(208, 250, 255, 0.25); /* 斑马纹 */
 }
 
-[data-theme='dark'] .info-content-text tbody tr:nth-child(even) {
+[data-theme="dark"] .info-content-text tbody tr:nth-child(even) {
 	background-color: rgba(255, 255, 255, 0.05);
 }
 
@@ -267,7 +289,7 @@ body {
 	}
 
 	.info-content-text pre {
-    line-height: 1.1;
+		line-height: 1.5;
 	}
 
 	.vditor-panel {

frontend_nuxt/components/HeaderComponent.vue

@@ -146,14 +146,6 @@ onMounted(async () => {
       await updateUnread()
     },
   )
-
-  watch(
-    () => router.currentRoute.value.fullPath,
-    () => {
-      if (userMenu.value) userMenu.value.close()
-      showSearch.value = false
-    },
-  )
 })
 </script>
 

frontend_nuxt/nuxt.config.ts

@@ -13,7 +13,7 @@ export default defineNuxtConfig({
     },
   },
   // Ensure Vditor styles load before our overrides in global.css
-  css: ['vditor/dist/index.css', '~/assets/global.css'],
+  css: ['vditor/dist/index.css', '~/assets/fonts.css', '~/assets/global.css'],
   app: {
     head: {
       script: [

frontend_nuxt/pages/index.vue

@@ -265,7 +265,7 @@ const {
       time: TimeManager.format(
         selectedTopic.value === '最新回复' ? p.lastReplyAt || p.createdAt : p.createdAt,
       ),
-      pinned: !!p.pinnedAt,
+      pinned: Boolean(p.pinned ?? p.pinnedAt ?? p.pinned_at),
       type: p.type,
     }))
   },
@@ -308,7 +308,7 @@ const fetchNextPage = async () => {
         time: TimeManager.format(
           selectedTopic.value === '最新回复' ? p.lastReplyAt || p.createdAt : p.createdAt,
         ),
-        pinned: !!p.pinnedAt,
+        pinned: Boolean(p.pinned ?? p.pinnedAt ?? p.pinned_at),
         type: p.type,
       }))
       articles.value.push(...mapped)

frontend_nuxt/pages/posts/[id]/index.vue

@@ -392,7 +392,7 @@ const mapComment = (c, parentUserName = '', level = 0) => ({
   avatar: c.author.avatar,
   text: c.content,
   reactions: c.reactions || [],
-  pinned: !!c.pinnedAt,
+  pinned: Boolean(c.pinned ?? c.pinnedAt ?? c.pinned_at),
   reply: (c.replies || []).map((r) => mapComment(r, c.author.username, level + 1)),
   openReplies: level === 0,
   src: c.author.avatar,

frontend_nuxt/plugins/soft-manifest.client.ts

@@ -1,9 +0,0 @@
-import { defineNuxtPlugin } from 'nuxt/app'
-
-export default defineNuxtPlugin((nuxtApp) => {
-  // 覆盖默认行为：收到 manifest 更新时，不立刻在路由切换里刷新
-  nuxtApp.hooks.hook('app:manifest:update', () => {
-    // todo 选择：弹个提示，让用户点击刷新；或延迟到页面隐藏时再刷新
-    // 例如：document.addEventListener('visibilitychange', () => { if (document.hidden) location.reload() })
-  })
-})

frontend_nuxt/utils/markdown.js

@@ -86,7 +86,11 @@ const md = new MarkdownIt({
     } else {
       code = hljs.highlightAuto(str).value
     }
-    return `<pre class="code-block"><button class="copy-code-btn">Copy</button><code class="hljs language-${lang || ''}">${code}</code></pre>`
+    const lineNumbers = code
+      .trim()
+      .split('\n')
+      .map(() => `<div class="line-number"></div>`)
+    return `<pre class="code-block"><button class="copy-code-btn">Copy</button><div class="line-numbers">${lineNumbers.join('')}</div><code class="hljs language-${lang || ''}">${code.trim()}</code></pre>`
   },
 })