Fix notification pagination after filtering disabled types

This reverts commit e7a1e1d159.

backend/pom.xml

@@ -38,6 +38,16 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-security</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.vladsch.flexmark</groupId>
+      <artifactId>flexmark-all</artifactId>
+      <version>0.64.8</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+      <version>1.17.2</version>
+    </dependency>
     <dependency>
       <groupId>com.mysql</groupId>
       <artifactId>mysql-connector-j</artifactId>

backend/src/main/java/com/openisle/config/SecurityConfig.java

@@ -119,6 +119,7 @@ public class SecurityConfig {
                     .requestMatchers(HttpMethod.GET, "/api/reaction-types").permitAll()
                     .requestMatchers(HttpMethod.GET, "/api/activities/**").permitAll()
                     .requestMatchers(HttpMethod.GET, "/api/sitemap.xml").permitAll()
+                    .requestMatchers(HttpMethod.GET, "/api/rss").permitAll()
                     .requestMatchers(HttpMethod.GET, "/api/point-goods").permitAll()
                     .requestMatchers(HttpMethod.POST, "/api/point-goods").permitAll()
                     .requestMatchers(HttpMethod.POST, "/api/categories/**").hasAuthority("ADMIN")
@@ -154,7 +155,8 @@ public class SecurityConfig {
                          uri.startsWith("/api/reaction-types") || uri.startsWith("/api/config") ||
                          uri.startsWith("/api/activities") || uri.startsWith("/api/push/public-key") ||
                                 uri.startsWith("/api/point-goods") ||
-                         uri.startsWith("/api/sitemap.xml") || uri.startsWith("/api/medals"));
+                         uri.startsWith("/api/sitemap.xml") || uri.startsWith("/api/medals") ||
+                         uri.startsWith("/api/rss"));
 
                 if (authHeader != null && authHeader.startsWith("Bearer ")) {
                     String token = authHeader.substring(7);

backend/src/main/java/com/openisle/controller/AdminPostController.java

@@ -45,4 +45,14 @@ public class AdminPostController {
     public PostSummaryDto unpin(@PathVariable Long id) {
         return postMapper.toSummaryDto(postService.unpinPost(id));
     }
+
+    @PostMapping("/{id}/rss-exclude")
+    public PostSummaryDto excludeFromRss(@PathVariable Long id) {
+        return postMapper.toSummaryDto(postService.excludeFromRss(id));
+    }
+
+    @PostMapping("/{id}/rss-include")
+    public PostSummaryDto includeInRss(@PathVariable Long id) {
+        return postMapper.toSummaryDto(postService.includeInRss(id));
+    }
 }

backend/src/main/java/com/openisle/controller/NotificationController.java

@@ -23,9 +23,19 @@ public class NotificationController {
     private final NotificationMapper notificationMapper;
 
     @GetMapping
-    public List<NotificationDto> list(@RequestParam(value = "read", required = false) Boolean read,
+    public List<NotificationDto> list(@RequestParam(value = "page", defaultValue = "0") int page,
+                                      @RequestParam(value = "size", defaultValue = "30") int size,
                                       Authentication auth) {
-        return notificationService.listNotifications(auth.getName(), read).stream()
+        return notificationService.listNotifications(auth.getName(), null, page, size).stream()
+                .map(notificationMapper::toDto)
+                .collect(Collectors.toList());
+    }
+
+    @GetMapping("/unread")
+    public List<NotificationDto> listUnread(@RequestParam(value = "page", defaultValue = "0") int page,
+                                            @RequestParam(value = "size", defaultValue = "30") int size,
+                                            Authentication auth) {
+        return notificationService.listNotifications(auth.getName(), false, page, size).stream()
                 .map(notificationMapper::toDto)
                 .collect(Collectors.toList());
     }

backend/src/main/java/com/openisle/controller/RssController.java

@@ -0,0 +1,282 @@
+package com.openisle.controller;
+
+import com.openisle.model.Post;
+import com.openisle.service.PostService;
+import lombok.RequiredArgsConstructor;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.safety.Safelist;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
+import com.vladsch.flexmark.ext.tables.TablesExtension;
+import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension;
+import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
+import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.util.data.MutableDataSet;
+
+import java.net.URI;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RestController
+@RequiredArgsConstructor
+public class RssController {
+    private final PostService postService;
+
+    @Value("${app.website-url:https://www.open-isle.com}")
+    private String websiteUrl;
+
+    // 兼容 Markdown/HTML 两类图片写法（用于 enclosure）
+    private static final Pattern MD_IMAGE = Pattern.compile("!\\[[^\\]]*\\]\\(([^)]+)\\)");
+    private static final Pattern HTML_IMAGE = Pattern.compile("<img[^>]+src=[\"']?([^\"'>]+)[\"']?[^>]*>");
+
+    private static final DateTimeFormatter RFC1123 = DateTimeFormatter.RFC_1123_DATE_TIME;
+
+    // flexmark：Markdown -> HTML
+    private static final Parser MD_PARSER;
+    private static final HtmlRenderer MD_RENDERER;
+    static {
+        MutableDataSet opts = new MutableDataSet();
+        opts.set(Parser.EXTENSIONS, Arrays.asList(
+                TablesExtension.create(),
+                AutolinkExtension.create(),
+                StrikethroughExtension.create(),
+                TaskListExtension.create()
+        ));
+        // 允许内联 HTML（下游再做 sanitize）
+        opts.set(Parser.HTML_BLOCK_PARSER, true);
+        MD_PARSER = Parser.builder(opts).build();
+        MD_RENDERER = HtmlRenderer.builder(opts).escapeHtml(false).build();
+    }
+
+    @GetMapping(value = "/api/rss", produces = "application/rss+xml;charset=UTF-8")
+    public String feed() {
+        // 建议 20；你现在是 10，这里保留你的 10
+        List<Post> posts = postService.listLatestRssPosts(10);
+        String base = trimTrailingSlash(websiteUrl);
+
+        StringBuilder sb = new StringBuilder(4096);
+        sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+        sb.append("<rss version=\"2.0\" xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">");
+        sb.append("<channel>");
+        elem(sb, "title", cdata("OpenIsle RSS"));
+        elem(sb, "link", base + "/");
+        elem(sb, "description", cdata("Latest posts"));
+        ZonedDateTime updated = posts.stream()
+                .map(p -> p.getCreatedAt().atZone(ZoneId.systemDefault()))
+                .max(Comparator.naturalOrder())
+                .orElse(ZonedDateTime.now());
+        // channel lastBuildDate（GMT）
+        elem(sb, "lastBuildDate", toRfc1123Gmt(updated));
+
+        for (Post p : posts) {
+            String link = base + "/posts/" + p.getId();
+
+            // 1) Markdown -> HTML
+            String html = renderMarkdown(p.getContent());
+
+            // 2) Sanitize（白名单增强）
+            String safeHtml = sanitizeHtml(html);
+
+            // 3) 绝对化 href/src + 强制 rel/target
+            String absHtml = absolutifyHtml(safeHtml, base);
+
+            // 4) 纯文本摘要（用于 <description>）
+            String plain = textSummary(absHtml, 180);
+
+            // 5) enclosure（首图，已绝对化）
+            String enclosure = firstImage(p.getContent());
+            if (enclosure == null) {
+                // 如果 Markdown 没有图，尝试从渲染后的 HTML 再抓一次
+                enclosure = firstImage(absHtml);
+            }
+            if (enclosure != null) {
+                enclosure = absolutifyUrl(enclosure, base);
+            }
+
+            sb.append("<item>");
+            elem(sb, "title", cdata(nullSafe(p.getTitle())));
+            elem(sb, "link", link);
+            sb.append("<guid isPermaLink=\"true\">").append(link).append("</guid>");
+            elem(sb, "pubDate", toRfc1123Gmt(p.getCreatedAt().atZone(ZoneId.systemDefault())));
+            // 摘要
+            elem(sb, "description", cdata(plain));
+            // 全文（HTML）
+            sb.append("<content:encoded><![CDATA[").append(absHtml).append("]]></content:encoded>");
+            // 首图 enclosure（图片类型）
+            if (enclosure != null) {
+                sb.append("<enclosure url=\"").append(escapeXml(enclosure)).append("\" type=\"")
+                        .append(getMimeType(enclosure)).append("\" />");
+            }
+            sb.append("</item>");
+        }
+
+        sb.append("</channel></rss>");
+        return sb.toString();
+    }
+
+    /* ===================== Markdown → HTML ===================== */
+
+    private static String renderMarkdown(String md) {
+        if (md == null || md.isEmpty()) return "";
+        return MD_RENDERER.render(MD_PARSER.parse(md));
+    }
+
+    /* ===================== Sanitize & 绝对化 ===================== */
+
+    private static String sanitizeHtml(String html) {
+        if (html == null) return "";
+        Safelist wl = Safelist.relaxed()
+                .addTags("pre", "code", "figure", "figcaption", "picture", "source",
+                        "table","thead","tbody","tr","th","td","h1","h2","h3","h4","h5","h6")
+                .addAttributes("a", "href", "title", "target", "rel")
+                .addAttributes("img", "src", "alt", "title", "width", "height")
+                .addAttributes("source", "srcset", "type", "media")
+                .addAttributes("code", "class")
+                .addAttributes("pre", "class")
+                .addProtocols("a", "href", "http", "https", "mailto")
+                .addProtocols("img", "src", "http", "https", "data")
+                .addProtocols("source", "srcset", "http", "https");
+        // 清除所有 on* 事件、style（避免阅读器环境差异）
+        return Jsoup.clean(html, wl);
+    }
+
+    private static String absolutifyHtml(String html, String baseUrl) {
+        if (html == null || html.isEmpty()) return "";
+        Document doc = Jsoup.parseBodyFragment(html, baseUrl);
+        // a[href]
+        for (Element a : doc.select("a[href]")) {
+            String href = a.attr("href");
+            String abs = absolutifyUrl(href, baseUrl);
+            a.attr("href", abs);
+            // 强制外链安全属性
+            a.attr("rel", "noopener noreferrer nofollow");
+            a.attr("target", "_blank");
+        }
+        // img[src]
+        for (Element img : doc.select("img[src]")) {
+            String src = img.attr("src");
+            String abs = absolutifyUrl(src, baseUrl);
+            img.attr("src", abs);
+        }
+        // source[srcset] （picture/webp）
+        for (Element s : doc.select("source[srcset]")) {
+            String srcset = s.attr("srcset");
+            s.attr("srcset", absolutifySrcset(srcset, baseUrl));
+        }
+        return doc.body().html();
+    }
+
+    private static String absolutifyUrl(String url, String baseUrl) {
+        if (url == null || url.isEmpty()) return url;
+        String u = url.trim();
+        if (u.startsWith("//")) {
+            return "https:" + u;
+        }
+        if (u.startsWith("#")) {
+            // 保留页面内锚点：拼接到首页（也可拼接到当前帖子的 link，但此处无上下文）
+            return baseUrl + "/" + u;
+        }
+        try {
+            URI base = URI.create(ensureTrailingSlash(baseUrl));
+            URI abs = base.resolve(u);
+            return abs.toString();
+        } catch (Exception e) {
+            return url;
+        }
+    }
+
+    private static String absolutifySrcset(String srcset, String baseUrl) {
+        if (srcset == null || srcset.isEmpty()) return srcset;
+        String[] parts = srcset.split(",");
+        List<String> out = new ArrayList<>(parts.length);
+        for (String part : parts) {
+            String p = part.trim();
+            if (p.isEmpty()) continue;
+            String[] seg = p.split("\\s+");
+            String url = seg[0];
+            String size = seg.length > 1 ? seg[1] : "";
+            out.add(absolutifyUrl(url, baseUrl) + (size.isEmpty() ? "" : " " + size));
+        }
+        return String.join(", ", out);
+    }
+
+    /* ===================== 摘要 & enclosure ===================== */
+
+    private static String textSummary(String html, int maxLen) {
+        if (html == null) return "";
+        String text = Jsoup.parse(html).text().replaceAll("\\s+", " ").trim();
+        if (text.length() <= maxLen) return text;
+        return text.substring(0, maxLen) + "…";
+    }
+
+    private String firstImage(String content) {
+        if (content == null) return null;
+        Matcher m = MD_IMAGE.matcher(content);
+        if (m.find()) return m.group(1);
+        m = HTML_IMAGE.matcher(content);
+        if (m.find()) return m.group(1);
+        // 再从纯 HTML 里解析一次（如果传入的是渲染后的）
+        try {
+            Document doc = Jsoup.parse(content);
+            Element img = doc.selectFirst("img[src]");
+            if (img != null) return img.attr("src");
+        } catch (Exception ignored) {}
+        return null;
+    }
+
+    private static String getMimeType(String url) {
+        String lower = url == null ? "" : url.toLowerCase(Locale.ROOT);
+        if (lower.endsWith(".png"))  return "image/png";
+        if (lower.endsWith(".gif"))  return "image/gif";
+        if (lower.endsWith(".webp")) return "image/webp";
+        if (lower.endsWith(".svg"))  return "image/svg+xml";
+        if (lower.endsWith(".avif")) return "image/avif";
+        if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
+        // 默认兜底
+        return "image/jpeg";
+    }
+
+    /* ===================== 时间/字符串/XML ===================== */
+
+    private static String toRfc1123Gmt(ZonedDateTime zdt) {
+        return zdt.withZoneSameInstant(ZoneId.of("GMT")).format(RFC1123);
+    }
+
+    private static String cdata(String s) {
+        if (s == null) return "<![CDATA[]]>";
+        // 防止出现 "]]>" 终止标记破坏 CDATA
+        return "<![CDATA[" + s.replace("]]>", "]]]]><![CDATA[>") + "]]>";
+    }
+
+    private static void elem(StringBuilder sb, String name, String value) {
+        sb.append('<').append(name).append('>').append(value).append("</").append(name).append('>');
+    }
+
+    private static String escapeXml(String s) {
+        if (s == null) return "";
+        return s.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+                .replace("\"", "&quot;").replace("'", "&apos;");
+    }
+
+    private static String trimTrailingSlash(String s) {
+        if (s == null) return "";
+        return s.endsWith("/") ? s.substring(0, s.length() - 1) : s;
+    }
+
+    private static String ensureTrailingSlash(String s) {
+        if (s == null || s.isEmpty()) return "/";
+        return s.endsWith("/") ? s : s + "/";
+    }
+
+    private static String nullSafe(String s) { return s == null ? "" : s; }
+}

backend/src/main/java/com/openisle/dto/PostSummaryDto.java

@@ -31,5 +31,6 @@ public class PostSummaryDto {
     private int pointReward;
     private PostType type;
     private LotteryDto lottery;
+    private boolean rssExcluded;
 }
 

backend/src/main/java/com/openisle/mapper/PostMapper.java

@@ -63,6 +63,7 @@ public class PostMapper {
         dto.setCommentCount(commentService.countComments(post.getId()));
         dto.setStatus(post.getStatus());
         dto.setPinnedAt(post.getPinnedAt());
+        dto.setRssExcluded(post.getRssExcluded() == null || post.getRssExcluded());
 
         List<ReactionDto> reactions = reactionService.getReactionsForPost(post.getId())
                 .stream()

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

@@ -67,4 +67,6 @@ public class Post {
     @Column
     private LocalDateTime pinnedAt;
 
+    @Column(nullable = true)
+    private Boolean rssExcluded = true;
 }

backend/src/main/java/com/openisle/repository/NotificationRepository.java

@@ -6,6 +6,8 @@ import com.openisle.model.Post;
 import com.openisle.model.Comment;
 import com.openisle.model.NotificationType;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
@@ -13,7 +15,12 @@ import java.util.List;
 public interface NotificationRepository extends JpaRepository<Notification, Long> {
     List<Notification> findByUserOrderByCreatedAtDesc(User user);
     List<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read);
+    Page<Notification> findByUserOrderByCreatedAtDesc(User user, Pageable pageable);
+    Page<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read, Pageable pageable);
+    Page<Notification> findByUserAndTypeNotInOrderByCreatedAtDesc(User user, java.util.Collection<NotificationType> types, Pageable pageable);
+    Page<Notification> findByUserAndReadAndTypeNotInOrderByCreatedAtDesc(User user, boolean read, java.util.Collection<NotificationType> types, Pageable pageable);
     long countByUserAndRead(User user, boolean read);
+    long countByUserAndReadAndTypeNotIn(User user, boolean read, java.util.Collection<NotificationType> types);
     List<Notification> findByPost(Post post);
     List<Notification> findByComment(Comment comment);
 

backend/src/main/java/com/openisle/repository/PostRepository.java

@@ -106,4 +106,6 @@ public interface PostRepository extends JpaRepository<Post, Long> {
            "WHERE p.createdAt >= :start AND p.createdAt < :end GROUP BY d ORDER BY d")
     java.util.List<Object[]> countDailyRange(@Param("start") LocalDateTime start,
                                              @Param("end") LocalDateTime end);
+
+    List<Post> findByStatusAndRssExcludedFalseOrderByCreatedAtDesc(PostStatus status, Pageable pageable);
 }

backend/src/main/java/com/openisle/service/NotificationService.java

@@ -23,7 +23,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.concurrent.Executor;
-import java.util.stream.Collectors;
 
 /** Service for creating and retrieving notifications. */
 @Service
@@ -180,17 +179,26 @@ public class NotificationService {
         userRepository.save(user);
     }
 
-    public List<Notification> listNotifications(String username, Boolean read) {
+    public List<Notification> listNotifications(String username, Boolean read, int page, int size) {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
         Set<NotificationType> disabled = user.getDisabledNotificationTypes();
-        List<Notification> list;
+        org.springframework.data.domain.Pageable pageable = org.springframework.data.domain.PageRequest.of(page, size);
+        org.springframework.data.domain.Page<Notification> result;
         if (read == null) {
-            list = notificationRepository.findByUserOrderByCreatedAtDesc(user);
+            if (disabled.isEmpty()) {
+                result = notificationRepository.findByUserOrderByCreatedAtDesc(user, pageable);
+            } else {
+                result = notificationRepository.findByUserAndTypeNotInOrderByCreatedAtDesc(user, disabled, pageable);
+            }
         } else {
-            list = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read);
+            if (disabled.isEmpty()) {
+                result = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read, pageable);
+            } else {
+                result = notificationRepository.findByUserAndReadAndTypeNotInOrderByCreatedAtDesc(user, read, disabled, pageable);
+            }
         }
-        return list.stream().filter(n -> !disabled.contains(n.getType())).collect(Collectors.toList());
+        return result.getContent();
     }
 
     public void markRead(String username, List<Long> ids) {
@@ -209,8 +217,10 @@ public class NotificationService {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
         Set<NotificationType> disabled = user.getDisabledNotificationTypes();
-        return notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, false).stream()
-                .filter(n -> !disabled.contains(n.getType())).count();
+        if (disabled.isEmpty()) {
+            return notificationRepository.countByUserAndRead(user, false);
+        }
+        return notificationRepository.countByUserAndReadAndTypeNotIn(user, false, disabled);
     }
 
     public void notifyMentions(String content, User fromUser, Post post, Comment comment) {

backend/src/main/java/com/openisle/service/PostService.java

@@ -132,6 +132,23 @@ public class PostService {
         this.publishMode = publishMode;
     }
 
+    public List<Post> listLatestRssPosts(int limit) {
+        Pageable pageable = PageRequest.of(0, limit, Sort.by(Sort.Direction.DESC, "createdAt"));
+        return postRepository.findByStatusAndRssExcludedFalseOrderByCreatedAtDesc(PostStatus.PUBLISHED, pageable);
+    }
+
+    public Post excludeFromRss(Long id) {
+        Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
+        post.setRssExcluded(true);
+        return postRepository.save(post);
+    }
+
+    public Post includeInRss(Long id) {
+        Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
+        post.setRssExcluded(false);
+        return postRepository.save(post);
+    }
+
     public Post createPost(String username,
                            Long categoryId,
                            String title,

backend/src/main/resources/db/migration/V2__add_rss_excluded_to_posts.sql

@@ -0,0 +1 @@
+ALTER TABLE posts ADD COLUMN rss_excluded BOOLEAN NOT NULL DEFAULT 0;

backend/src/test/java/com/openisle/controller/NotificationControllerTest.java

@@ -45,7 +45,7 @@ class NotificationControllerTest {
         p.setId(2L);
         n.setPost(p);
         n.setCreatedAt(LocalDateTime.now());
-        when(notificationService.listNotifications("alice", null))
+        when(notificationService.listNotifications("alice", null, 0, 30))
                 .thenReturn(List.of(n));
 
         NotificationDto dto = new NotificationDto();
@@ -62,6 +62,24 @@ class NotificationControllerTest {
                 .andExpect(jsonPath("$[0].post.id").value(2));
     }
 
+    @Test
+    void listUnreadNotifications() throws Exception {
+        Notification n = new Notification();
+        n.setId(5L);
+        n.setType(NotificationType.POST_VIEWED);
+        when(notificationService.listNotifications("alice", false, 0, 30))
+                .thenReturn(List.of(n));
+
+        NotificationDto dto = new NotificationDto();
+        dto.setId(5L);
+        when(notificationMapper.toDto(n)).thenReturn(dto);
+
+        mockMvc.perform(get("/api/notifications/unread")
+                        .principal(new UsernamePasswordAuthenticationToken("alice","p")))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$[0].id").value(5));
+    }
+
     @Test
     void markReadEndpoint() throws Exception {
         mockMvc.perform(post("/api/notifications/read")

backend/src/test/java/com/openisle/service/NotificationServiceTest.java

@@ -11,6 +11,9 @@ import org.mockito.Mockito;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.HashSet;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -62,15 +65,17 @@ class NotificationServiceTest {
         User user = new User();
         user.setId(2L);
         user.setUsername("bob");
+        user.setDisabledNotificationTypes(new HashSet<>());
         when(uRepo.findByUsername("bob")).thenReturn(Optional.of(user));
 
         Notification n = new Notification();
-        when(nRepo.findByUserOrderByCreatedAtDesc(user)).thenReturn(List.of(n));
+        when(nRepo.findByUserOrderByCreatedAtDesc(eq(user), any(Pageable.class)))
+                .thenReturn(new PageImpl<>(List.of(n)));
 
-        List<Notification> list = service.listNotifications("bob", null);
+        List<Notification> list = service.listNotifications("bob", null, 0, 10);
 
         assertEquals(1, list.size());
-        verify(nRepo).findByUserOrderByCreatedAtDesc(user);
+        verify(nRepo).findByUserOrderByCreatedAtDesc(eq(user), any(Pageable.class));
     }
 
     @Test
@@ -87,6 +92,7 @@ class NotificationServiceTest {
         User user = new User();
         user.setId(3L);
         user.setUsername("carl");
+        user.setDisabledNotificationTypes(new HashSet<>());
         when(uRepo.findByUsername("carl")).thenReturn(Optional.of(user));
         when(nRepo.countByUserAndRead(user, false)).thenReturn(5L);
 
@@ -96,6 +102,56 @@ class NotificationServiceTest {
         verify(nRepo).countByUserAndRead(user, false);
     }
 
+    @Test
+    void listNotificationsFiltersDisabledTypes() {
+        NotificationRepository nRepo = mock(NotificationRepository.class);
+        UserRepository uRepo = mock(UserRepository.class);
+        ReactionRepository rRepo = mock(ReactionRepository.class);
+        EmailSender email = mock(EmailSender.class);
+        PushNotificationService push = mock(PushNotificationService.class);
+        Executor executor = Runnable::run;
+        NotificationService service = new NotificationService(nRepo, uRepo, email, push, rRepo, executor);
+        org.springframework.test.util.ReflectionTestUtils.setField(service, "websiteUrl", "https://ex.com");
+
+        User user = new User();
+        user.setId(4L);
+        user.setUsername("dana");
+        when(uRepo.findByUsername("dana")).thenReturn(Optional.of(user));
+
+        Notification n = new Notification();
+        when(nRepo.findByUserAndTypeNotInOrderByCreatedAtDesc(eq(user), eq(user.getDisabledNotificationTypes()), any(Pageable.class)))
+                .thenReturn(new PageImpl<>(List.of(n)));
+
+        List<Notification> list = service.listNotifications("dana", null, 0, 10);
+
+        assertEquals(1, list.size());
+        verify(nRepo).findByUserAndTypeNotInOrderByCreatedAtDesc(eq(user), eq(user.getDisabledNotificationTypes()), any(Pageable.class));
+    }
+
+    @Test
+    void countUnreadFiltersDisabledTypes() {
+        NotificationRepository nRepo = mock(NotificationRepository.class);
+        UserRepository uRepo = mock(UserRepository.class);
+        ReactionRepository rRepo = mock(ReactionRepository.class);
+        EmailSender email = mock(EmailSender.class);
+        PushNotificationService push = mock(PushNotificationService.class);
+        Executor executor = Runnable::run;
+        NotificationService service = new NotificationService(nRepo, uRepo, email, push, rRepo, executor);
+        org.springframework.test.util.ReflectionTestUtils.setField(service, "websiteUrl", "https://ex.com");
+
+        User user = new User();
+        user.setId(5L);
+        user.setUsername("erin");
+        when(uRepo.findByUsername("erin")).thenReturn(Optional.of(user));
+        when(nRepo.countByUserAndReadAndTypeNotIn(eq(user), eq(false), eq(user.getDisabledNotificationTypes())))
+                .thenReturn(2L);
+
+        long count = service.countUnread("erin");
+
+        assertEquals(2L, count);
+        verify(nRepo).countByUserAndReadAndTypeNotIn(eq(user), eq(false), eq(user.getDisabledNotificationTypes()));
+    }
+
     @Test
     void createRegisterRequestNotificationsDeletesOldOnes() {
         NotificationRepository nRepo = mock(NotificationRepository.class);

frontend_nuxt/components/CommentItem.vue

@@ -16,11 +16,11 @@
         <div class="info-content-header-left">
           <span class="user-name">{{ comment.userName }}</span>
           <i class="fas fa-medal medal-icon"></i>
-          <router-link
+          <NuxtLink
             v-if="comment.medal"
             class="medal-name"
             :to="`/users/${comment.userId}?tab=achievements`"
-            >{{ getMedalTitle(comment.medal) }}</router-link
+            >{{ getMedalTitle(comment.medal) }}</NuxtLink
           >
           <i v-if="comment.pinned" class="fas fa-thumbtack pin-icon"></i>
           <span v-if="level >= 2">

frontend_nuxt/components/HeaderComponent.vue

@@ -29,6 +29,18 @@
             <i :class="iconClass"></i>
           </div>
 
+          <div v-if="!isMobile" class="invite_text" @click="copyInviteLink">
+            <i class="fas fa-copy"></i>
+            邀请
+            <i v-if="isCopying" class="fas fa-spinner fa-spin"></i>
+          </div>
+
+          <ToolTip content="复制RSS链接" placement="bottom">
+            <div class="rss-icon" @click="copyRssLink">
+              <i class="fas fa-rss"></i>
+            </div>
+          </ToolTip>
+
           <ToolTip v-if="!isMobile && isLogin" content="发帖" placement="bottom">
             <div class="new-post-icon" @click="goToNewPost">
               <i class="fas fa-edit"></i>
@@ -66,6 +78,11 @@ import { authState, clearToken, loadCurrentUser } from '~/utils/auth'
 import { fetchUnreadCount, notificationState } from '~/utils/notification'
 import { useIsMobile } from '~/utils/screen'
 import { themeState, cycleTheme, ThemeMode } from '~/utils/theme'
+import { toast } from '~/main'
+import { getToken } from '~/utils/auth'
+const config = useRuntimeConfig()
+const API_BASE_URL = config.public.apiBaseUrl
+const WEBSITE_BASE_URL = config.public.websiteBaseUrl
 
 const props = defineProps({
   showMenuBtn: {
@@ -82,6 +99,7 @@ const showSearch = ref(false)
 const searchDropdown = ref(null)
 const userMenu = ref(null)
 const menuBtn = ref(null)
+const isCopying = ref(false)
 
 const search = () => {
   showSearch.value = true
@@ -100,6 +118,41 @@ const goToLogin = () => {
 const goToSettings = () => {
   navigateTo('/settings', { replace: true })
 }
+
+const copyInviteLink = async () => {
+  isCopying.value = true
+  const token = getToken()
+  if (!token) {
+    toast.error('请先登录')
+    return
+  }
+  try {
+    const res = await fetch(`${API_BASE_URL}/api/invite/generate`, {
+      method: 'POST',
+      headers: { Authorization: `Bearer ${token}` },
+    })
+    if (res.ok) {
+      const data = await res.json()
+      const inviteLink = data.token ? `${WEBSITE_BASE_URL}/signup?invite_token=${data.token}` : ''
+      await navigator.clipboard.writeText(inviteLink)
+      toast.success('邀请链接已复制')
+    } else {
+      const data = await res.json().catch(() => ({}))
+      toast.error(data.error || '生成邀请链接失败')
+    }
+  } catch (e) {
+    toast.error('生成邀请链接失败')
+  } finally {
+    isCopying.value = false
+  }
+}
+
+const copyRssLink = async () => {
+  const rssLink = `${API_BASE_URL}/api/rss`
+  await navigator.clipboard.writeText(rssLink)
+  toast.success('RSS链接已复制')
+}
+
 const goToProfile = async () => {
   if (!authState.loggedIn) {
     navigateTo('/login', { replace: true })
@@ -224,7 +277,7 @@ onMounted(async () => {
   margin-left: auto;
   flex-direction: row;
   align-items: center;
-  gap: 20px;
+  gap: 30px;
 }
 
 .auth-btns {
@@ -315,11 +368,41 @@ onMounted(async () => {
   cursor: pointer;
 }
 
+.invite_text {
+  font-size: 12px;
+  cursor: pointer;
+  color: var(--primary-color);
+}
+
+.invite_text:hover {
+  text-decoration: underline;
+}
+
+.rss-icon,
 .new-post-icon {
   font-size: 18px;
   cursor: pointer;
 }
 
+.rss-icon {
+  animation: rss-glow 2s 3;
+}
+
+@keyframes rss-glow {
+  0% {
+    text-shadow: 0 0 0px var(--primary-color);
+    opacity: 1;
+  }
+  50% {
+    text-shadow: 0 0 12px var(--primary-color);
+    opacity: 0.8;
+  }
+  100% {
+    text-shadow: 0 0 0px var(--primary-color);
+    opacity: 1;
+  }
+}
+
 @media (max-width: 1200px) {
   .header-content {
     padding-left: 15px;
@@ -336,5 +419,9 @@ onMounted(async () => {
   .logo-text {
     display: none;
   }
+
+  .header-content-right {
+    gap: 15px;
+  }
 }
 </style>

frontend_nuxt/components/InfiniteLoadMore.vue

@@ -0,0 +1,102 @@
+<template>
+  <!-- 当 done 后整个容器自动隐藏，不再占位 -->
+  <div v-show="!done" class="infinite-loadmore">
+    <div v-show="isLoading" class="loading-container bottom-loading" aria-live="polite">
+      <l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
+    </div>
+    <!-- 永久存在的底部触发器（由组件内部持有与观察） -->
+    <div ref="sentinel" class="load-more-trigger" aria-hidden="true"></div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
+
+const props = defineProps({
+  /** 父组件提供：执行“加载下一页”的函数
+   * 返回：
+   *  - boolean：true 表示“已经没有更多数据（done）”
+   *  - { done: boolean }：同上
+   */
+  onLoad: { type: Function, required: true },
+  /** pause=true 时暂停观察（例如首屏/筛选加载过程） */
+  pause: { type: Boolean, default: false },
+  /** 预取范围，默认 200px */
+  rootMargin: { type: String, default: '200px 0px' },
+  /** 触发阈值 */
+  threshold: { type: Number, default: 0 },
+})
+
+const isLoading = ref(false)
+const done = ref(false)
+const sentinel = ref(null)
+let io = null
+
+const stopObserver = () => {
+  if (io) {
+    io.disconnect()
+    io = null
+  }
+}
+
+const startObserver = () => {
+  if (!process.client || props.pause || done.value) return
+  stopObserver()
+  io = new IntersectionObserver(
+    async (entries) => {
+      const e = entries[0]
+      if (!e?.isIntersecting || isLoading.value || done.value) return
+      isLoading.value = true
+      try {
+        const res = await props.onLoad()
+        const finished = typeof res === 'boolean' ? res : !!(res && res.done)
+        if (finished) {
+          done.value = true
+          stopObserver()
+        }
+      } finally {
+        isLoading.value = false
+      }
+    },
+    { root: null, rootMargin: props.rootMargin, threshold: props.threshold },
+  )
+  if (sentinel.value) io.observe(sentinel.value)
+}
+
+onMounted(() => {
+  nextTick(startObserver)
+})
+onBeforeUnmount(stopObserver)
+
+watch(
+  () => props.pause,
+  (p) => {
+    if (p) stopObserver()
+    else nextTick(startObserver)
+  },
+)
+
+/** 父组件可选择性调用，用于外部强制重置（一般直接用 :key 重建更简单） */
+const reset = () => {
+  done.value = false
+  nextTick(startObserver)
+}
+defineExpose({ reset })
+</script>
+
+<style scoped>
+.infinite-loadmore {
+}
+
+.loading-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100px; /* 与原样式匹配 */
+}
+
+.load-more-trigger {
+  width: 100%;
+  height: 1px;
+}
+</style>

frontend_nuxt/pages/404.vue

@@ -2,7 +2,7 @@
   <div class="not-found-page">
     <h1>404 - 页面不存在</h1>
     <p>你访问的页面不存在或已被删除</p>
-    <router-link to="/">返回首页</router-link>
+    <NuxtLink to="/">返回首页</NuxtLink>
   </div>
 </template>
 

frontend_nuxt/pages/index.vue

@@ -102,25 +102,33 @@
           </div>
         </div>
       </template>
+
       <div v-else-if="selectedTopic === '热门'" class="placeholder-container">
         热门帖子功能开发中，敬请期待。
       </div>
       <div v-else class="placeholder-container">分类浏览功能开发中，敬请期待。</div>
-      <div v-if="isLoadingMore && articles.length > 0" class="loading-container bottom-loading">
-        <l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
-      </div>
+
+      <!-- ✅ 通用“底部加载更多”组件（自管 loading/observer/并发） -->
+      <InfiniteLoadMore
+        v-if="articles.length > 0"
+        :key="ioKey"
+        :on-load="fetchNextPage"
+        :pause="pendingFirst"
+        root-margin="200px 0px"
+      />
     </div>
   </div>
 </template>
+
 <script setup>
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, onMounted, onBeforeUnmount, nextTick, ref, watch } from 'vue'
 import ArticleCategory from '~/components/ArticleCategory.vue'
 import ArticleTags from '~/components/ArticleTags.vue'
 import CategorySelect from '~/components/CategorySelect.vue'
 import SearchDropdown from '~/components/SearchDropdown.vue'
 import TagSelect from '~/components/TagSelect.vue'
+import InfiniteLoadMore from '~/components/InfiniteLoadMore.vue'
 import { getToken } from '~/utils/auth'
-import { useScrollLoadMore } from '~/utils/loadMore'
 import { stripMarkdown } from '~/utils/markdown'
 import { useIsMobile } from '~/utils/screen'
 import TimeManager from '~/utils/time'
@@ -144,8 +152,6 @@ const route = useRoute()
 const tagOptions = ref([])
 const categoryOptions = ref([])
 
-const isLoadingMore = ref(false)
-
 const topics = ref(['最新回复', '最新', '排行榜' /*, '热门', '类别'*/])
 const selectedTopicCookie = useCookie('homeTab')
 const selectedTopic = ref(
@@ -162,7 +168,6 @@ const articles = ref([])
 const page = ref(0)
 const pageSize = 10
 const isMobile = useIsMobile()
-const allLoaded = ref(false)
 
 /** URL 参数 -> 本地筛选值 **/
 const selectedCategorySet = (category) => {
@@ -286,80 +291,54 @@ const {
   },
 )
 
-/** 首屏/筛选变更：重置分页并灌入 firstPage **/
+/** 首屏/筛选变更：重置分页并灌入 firstPage（InfiniteLoadMore 会凭 key 重建状态） **/
 watch(
   firstPage,
   (data) => {
     page.value = 0
     articles.value = [...(data || [])]
-    allLoaded.value = (data?.length || 0) < pageSize
   },
   { immediate: true },
 )
 
-/** —— 滚动加载更多 —— **/
-let inflight = null
+/** —— 提供给 InfiniteLoadMore 的加载函数 —— **/
 const fetchNextPage = async () => {
-  if (allLoaded.value || pendingFirst.value || inflight) return
+  // 若首屏仍在 pending，由组件 pause 控制，这里兜底返回“未完成”
+  if (pendingFirst.value) return false
+
   const nextPage = page.value + 1
-  isLoadingMore.value = true
-  inflight = $fetch(buildUrl({ pageNo: nextPage }), { headers: tokenHeader.value })
-    .then((res) => {
-      const data = Array.isArray(res) ? res : []
-      const mapped = data.map((p) => ({
-        id: p.id,
-        title: p.title,
-        description: p.content,
-        category: p.category,
-        tags: p.tags || [],
-        members: (p.participants || []).map((m) => ({ id: m.id, avatar: m.avatar })),
-        comments: p.commentCount,
-        views: p.views,
-        time: TimeManager.format(
-          selectedTopic.value === '最新回复' ? p.lastReplyAt || p.createdAt : p.createdAt,
-        ),
-        pinned: Boolean(p.pinned ?? p.pinnedAt ?? p.pinned_at),
-        type: p.type,
-      }))
-      articles.value.push(...mapped)
-      if (data.length < pageSize) {
-        allLoaded.value = true
-      } else {
-        page.value = nextPage
-      }
-    })
-    .finally(() => {
-      inflight = null
-      isLoadingMore.value = false
-    })
+  const res = await $fetch(buildUrl({ pageNo: nextPage }), { headers: tokenHeader.value })
+  const data = Array.isArray(res) ? res : []
+  const mapped = data.map((p) => ({
+    id: p.id,
+    title: p.title,
+    description: p.content,
+    category: p.category,
+    tags: p.tags || [],
+    members: (p.participants || []).map((m) => ({ id: m.id, avatar: m.avatar })),
+    comments: p.commentCount,
+    views: p.views,
+    time: TimeManager.format(
+      selectedTopic.value === '最新回复' ? p.lastReplyAt || p.createdAt : p.createdAt,
+    ),
+    pinned: Boolean(p.pinned ?? p.pinnedAt ?? p.pinned_at),
+    type: p.type,
+  }))
+  articles.value.push(...mapped)
+
+  const done = data.length < pageSize
+  if (!done) page.value = nextPage
+  return done // ✅ 返回给组件，决定是否停止观察
 }
 
-/** 绑定滚动加载（避免挂载瞬间触发） **/
-let initialReady = false
-const loadMoreGuarded = async () => {
-  if (!initialReady) return
-  await fetchNextPage()
-}
-useScrollLoadMore(loadMoreGuarded)
-watch(
-  articles,
-  () => {
-    if (!initialReady && articles.value.length) initialReady = true
-  },
-  { immediate: true },
-)
-
-/** 切换分类/标签/Tab：useAsyncData 已 watch，这里只需确保 options 加载 **/
+/** 选项首屏加载与状态持久 **/
 watch([selectedCategory, selectedTags], () => {
   loadOptions()
 })
 watch(selectedTopic, (val) => {
-  // 仅当需要额外选项时加载
   loadOptions()
   selectedTopicCookie.value = val
-  if (process.client) {
-    localStorage.setItem('homeTab', val)
-  }
+  if (process.client) localStorage.setItem('homeTab', val)
 })
 
 /** 选项首屏加载：服务端执行一次；客户端兜底 **/
@@ -368,9 +347,14 @@ if (import.meta.server) {
 }
 onMounted(() => {
   if (categoryOptions.value.length === 0 && tagOptions.value.length === 0) loadOptions()
-
   window.addEventListener('refresh-home', refreshFirst)
 })
+onBeforeUnmount(() => {
+  window.removeEventListener('refresh-home', refreshFirst)
+})
+
+/** 供 InfiniteLoadMore 重建用的 key：筛选/Tab 改变即重建内部状态 */
+const ioKey = computed(() => asyncKey.value.join('::'))
 
 /** 其他工具函数 **/
 const sanitizeDescription = (text) => stripMarkdown(text)
@@ -407,6 +391,7 @@ const sanitizeDescription = (text) => stripMarkdown(text)
   height: 200px;
 }
 
+/* 这里的 bottom-loading 可保留给首屏 loading 使用；InfiniteLoadMore 自带同名样式也兼容 */
 .bottom-loading {
   height: 100px;
 }

frontend_nuxt/pages/login.vue

@@ -35,7 +35,7 @@
     </div>
 
     <div class="other-login-page-content">
-      <div class="login-page-button" @click="googleAuthorize">
+      <div class="login-page-button" @click="loginWithGoogle">
         <img class="login-page-button-icon" src="../assets/icons/google.svg" alt="Google Logo" />
         <div class="login-page-button-text">Google 登录</div>
       </div>
@@ -106,6 +106,9 @@ const submitLogin = async () => {
   }
 }
 
+const loginWithGoogle = () => {
+  googleAuthorize()
+}
 const loginWithGithub = () => {
   githubAuthorize()
 }

frontend_nuxt/pages/message.vue

@@ -53,74 +53,74 @@
       </div>
 
       <BasePlaceholder
-        v-else-if="filteredNotifications.length === 0"
+        v-else-if="notifications.length === 0"
         text="暂时没有消息 :)"
         icon="fas fa-inbox"
       />
 
-      <div class="timeline-container" v-if="filteredNotifications.length > 0">
-        <BaseTimeline :items="filteredNotifications">
+      <div class="timeline-container" v-if="notifications.length > 0">
+        <BaseTimeline :items="notifications">
           <template #item="{ item }">
             <div class="notif-content" :class="{ read: item.read }">
               <span v-if="!item.read" class="unread-dot"></span>
               <span class="notif-type">
                 <template v-if="item.type === 'COMMENT_REPLY' && item.parentComment">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.comment.author.id}`"
                       >{{ item.comment.author.username }}
-                    </router-link>
+                    </NuxtLink>
                     对我的评论
                     <span>
-                      <router-link
+                      <NuxtLink
                         class="notif-content-text"
                         @click="markRead(item.id)"
                         :to="`/posts/${item.post.id}#comment-${item.parentComment.id}`"
                       >
                         {{ stripMarkdownLength(item.parentComment.content, 100) }}
-                      </router-link>
+                      </NuxtLink>
                     </span>
                     回复了
                     <span>
-                      <router-link
+                      <NuxtLink
                         class="notif-content-text"
                         @click="markRead(item.id)"
                         :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                       >
                         {{ stripMarkdownLength(item.comment.content, 100) }}
-                      </router-link>
+                      </NuxtLink>
                     </span>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'COMMENT_REPLY' && !item.parentComment">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.comment.author.id}`"
                       >{{ item.comment.author.username }}
-                    </router-link>
+                    </NuxtLink>
                     对我的文章
                     <span>
-                      <router-link
+                      <NuxtLink
                         class="notif-content-text"
                         @click="markRead(item.id)"
                         :to="`/posts/${item.post.id}`"
                       >
                         {{ stripMarkdownLength(item.post.title, 100) }}
-                      </router-link>
+                      </NuxtLink>
                     </span>
                     回复了
                     <span>
-                      <router-link
+                      <NuxtLink
                         class="notif-content-text"
                         @click="markRead(item.id)"
                         :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                       >
                         {{ stripMarkdownLength(item.comment.content, 100) }}
-                      </router-link>
+                      </NuxtLink>
                     </span>
                   </NotificationContainer>
                 </template>
@@ -140,310 +140,310 @@
                   <NotificationContainer :item="item" :markRead="markRead">
                     <span class="notif-user">{{ item.fromUser.username }} </span> 对我的文章
                     <span>
-                      <router-link
+                      <NuxtLink
                         class="notif-content-text"
                         @click="markRead(item.id)"
                         :to="`/posts/${item.post.id}`"
                       >
                         {{ stripMarkdownLength(item.post.title, 100) }}
-                      </router-link>
+                      </NuxtLink>
                     </span>
                     进行了表态
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'REACTION' && item.comment">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                       >{{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     对我的评论
                     <span>
-                      <router-link
+                      <NuxtLink
                         class="notif-content-text"
                         @click="markRead(item.id)"
                         :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                       >
                         {{ stripMarkdownLength(item.comment.content, 100) }}
-                      </router-link>
+                      </NuxtLink>
                     </span>
                     进行了表态
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'POST_VIEWED'">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     查看了您的帖子
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'LOTTERY_WIN'">
                   <NotificationContainer :item="item" :markRead="markRead">
                     恭喜你在抽奖贴
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     中获奖
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'LOTTERY_DRAW'">
                   <NotificationContainer :item="item" :markRead="markRead">
                     您的抽奖贴
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     已开奖
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'POST_UPDATED'">
                   <NotificationContainer :item="item" :markRead="markRead">
                     您关注的帖子
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     下面有新评论
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                     >
                       {{ stripMarkdownLength(item.comment.content, 100) }}
-                    </router-link>
+                    </NuxtLink>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'USER_ACTIVITY' && item.parentComment">
                   <NotificationContainer :item="item" :markRead="markRead">
                     你关注的
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.comment.author.id}`"
                     >
                       {{ item.comment.author.username }}
-                    </router-link>
+                    </NuxtLink>
                     在 对评论
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}#comment-${item.parentComment.id}`"
                     >
                       {{ stripMarkdownLength(item.parentComment.content, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     回复了
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                     >
                       {{ stripMarkdownLength(item.comment.content, 100) }}
-                    </router-link>
+                    </NuxtLink>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'USER_ACTIVITY'">
                   <NotificationContainer :item="item" :markRead="markRead">
                     你关注的
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.comment.author.id}`"
                     >
                       {{ item.comment.author.username }}
-                    </router-link>
+                    </NuxtLink>
                     在文章
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     下面评论了
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                     >
                       {{ stripMarkdownLength(item.comment.content, 100) }}
-                    </router-link>
+                    </NuxtLink>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'MENTION' && item.comment">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     在评论中提到了你：
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                     >
                       {{ stripMarkdownLength(item.comment.content, 100) }}
-                    </router-link>
+                    </NuxtLink>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'MENTION'">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     在帖子
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     中提到了你
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'USER_FOLLOWED'">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     开始关注你了
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'USER_UNFOLLOWED'">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     取消关注你了
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'FOLLOWED_POST'">
                   <NotificationContainer :item="item" :markRead="markRead">
                     你关注的
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     发布了文章
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'POST_SUBSCRIBED'">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     订阅了你的文章
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'POST_UNSUBSCRIBED'">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     取消订阅了你的文章
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'POST_REVIEW_REQUEST' && item.fromUser">
                   <NotificationContainer :item="item" :markRead="markRead">
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/users/${item.fromUser.id}`"
                     >
                       {{ item.fromUser.username }}
-                    </router-link>
+                    </NuxtLink>
                     发布了帖子
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     ，请审核
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'POST_REVIEW_REQUEST'">
                   <NotificationContainer :item="item" :markRead="markRead">
                     您发布的帖子
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     已提交审核
                   </NotificationContainer>
                 </template>
@@ -472,26 +472,26 @@
                 <template v-else-if="item.type === 'POST_REVIEWED' && item.approved">
                   <NotificationContainer :item="item" :markRead="markRead">
                     您发布的帖子
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     已审核通过
                   </NotificationContainer>
                 </template>
                 <template v-else-if="item.type === 'POST_REVIEWED' && item.approved === false">
                   <NotificationContainer :item="item" :markRead="markRead">
                     您发布的帖子
-                    <router-link
+                    <NuxtLink
                       class="notif-content-text"
                       @click="markRead(item.id)"
                       :to="`/posts/${item.post.id}`"
                     >
                       {{ stripMarkdownLength(item.post.title, 100) }}
-                    </router-link>
+                    </NuxtLink>
                     已被管理员拒绝
                   </NotificationContainer>
                 </template>
@@ -505,16 +505,18 @@
             </div>
           </template>
         </BaseTimeline>
+        <InfiniteLoadMore :key="selectedTab" :on-load="loadMore" :pause="isLoadingMessage" />
       </div>
     </template>
   </div>
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { ref, watch, onActivated } from 'vue'
 import BasePlaceholder from '~/components/BasePlaceholder.vue'
 import BaseTimeline from '~/components/BaseTimeline.vue'
 import NotificationContainer from '~/components/NotificationContainer.vue'
+import InfiniteLoadMore from '~/components/InfiniteLoadMore.vue'
 import { toast } from '~/main'
 import { authState, getToken } from '~/utils/auth'
 import { stripMarkdownLength } from '~/utils/markdown'
@@ -525,6 +527,9 @@ import {
   markRead,
   notifications,
   markAllRead,
+  hasMore,
+  fetchNotificationPreferences,
+  updateNotificationPreference,
 } from '~/utils/notification'
 import TimeManager from '~/utils/time'
 
@@ -535,9 +540,25 @@ const selectedTab = ref(
   ['all', 'unread', 'control'].includes(route.query.tab) ? route.query.tab : 'unread',
 )
 const notificationPrefs = ref([])
-const filteredNotifications = computed(() =>
-  selectedTab.value === 'all' ? notifications.value : notifications.value.filter((n) => !n.read),
-)
+const page = ref(0)
+const pageSize = 30
+
+const loadMore = async () => {
+  if (!hasMore.value) return true
+  page.value++
+  await fetchNotifications({
+    page: page.value,
+    size: pageSize,
+    unread: selectedTab.value === 'unread',
+    append: true,
+  })
+  return !hasMore.value
+}
+
+watch(selectedTab, async (tab) => {
+  page.value = 0
+  await fetchNotifications({ page: 0, size: pageSize, unread: tab === 'unread' })
+})
 
 const fetchPrefs = async () => {
   notificationPrefs.value = await fetchNotificationPreferences()
@@ -547,7 +568,11 @@ const togglePref = async (pref) => {
   const ok = await updateNotificationPreference(pref.type, !pref.enabled)
   if (ok) {
     pref.enabled = !pref.enabled
-    await fetchNotifications()
+    await fetchNotifications({
+      page: page.value,
+      size: pageSize,
+      unread: selectedTab.value === 'unread',
+    })
     await fetchUnreadCount()
   } else {
     toast.error('操作失败')
@@ -627,8 +652,9 @@ const formatType = (t) => {
   }
 }
 
-onActivated(() => {
-  fetchNotifications()
+onActivated(async () => {
+  page.value = 0
+  await fetchNotifications({ page: 0, size: pageSize, unread: selectedTab.value === 'unread' })
   fetchPrefs()
 })
 </script>
@@ -644,8 +670,6 @@ onActivated(() => {
 .message-page {
   background-color: var(--background-color);
   overflow-x: hidden;
-  height: calc(100vh - var(--header-height));
-  overflow-y: auto;
 }
 
 .message-page-header {

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

@@ -52,11 +52,11 @@
             <div class="user-name">
               {{ author.username }}
               <i class="fas fa-medal medal-icon"></i>
-              <router-link
+              <NuxtLink
                 v-if="author.displayMedal"
                 class="user-medal"
                 :to="`/users/${author.id}?tab=achievements`"
-                >{{ getMedalTitle(author.displayMedal) }}</router-link
+                >{{ getMedalTitle(author.displayMedal) }}</NuxtLink
               >
             </div>
             <div class="post-time">{{ postTime }}</div>
@@ -68,11 +68,11 @@
             <div class="user-name">
               {{ author.username }}
               <i class="fas fa-medal medal-icon"></i>
-              <router-link
+              <NuxtLink
                 v-if="author.displayMedal"
                 class="user-medal"
                 :to="`/users/${author.id}?tab=achievements`"
-                >{{ getMedalTitle(author.displayMedal) }}</router-link
+                >{{ getMedalTitle(author.displayMedal) }}</NuxtLink
               >
             </div>
             <div class="post-time">{{ postTime }}</div>
@@ -268,6 +268,7 @@ const postReactions = ref([])
 const comments = ref([])
 const status = ref('PUBLISHED')
 const pinnedAt = ref(null)
+const rssExcluded = ref(false)
 const isWaitingPostingComment = ref(false)
 const postTime = ref('')
 const postItems = ref([])
@@ -356,6 +357,11 @@ const articleMenuItems = computed(() => {
     } else {
       items.push({ text: '置顶', onClick: () => pinPost() })
     }
+    if (rssExcluded.value) {
+      items.push({ text: 'rss推荐', onClick: () => includeRss() })
+    } else {
+      items.push({ text: '取消rss推荐', onClick: () => excludeRss() })
+    }
   }
   if (isAdmin.value && status.value === 'PENDING') {
     items.push({ text: '通过审核', onClick: () => approvePost() })
@@ -480,6 +486,7 @@ watchEffect(() => {
   subscribed.value = !!data.subscribed
   status.value = data.status
   pinnedAt.value = data.pinnedAt
+  rssExcluded.value = data.rssExcluded
   postTime.value = TimeManager.format(data.createdAt)
   lottery.value = data.lottery || null
   if (lottery.value && lottery.value.endTime) startCountdown()
@@ -645,6 +652,36 @@ const unpinPost = async () => {
   }
 }
 
+const excludeRss = async () => {
+  const token = getToken()
+  if (!token) return
+  const res = await fetch(`${API_BASE_URL}/api/admin/posts/${postId}/rss-exclude`, {
+    method: 'POST',
+    headers: { Authorization: `Bearer ${token}` },
+  })
+  if (res.ok) {
+    rssExcluded.value = true
+    toast.success('已标记为rss不推荐')
+  } else {
+    toast.error('操作失败')
+  }
+}
+
+const includeRss = async () => {
+  const token = getToken()
+  if (!token) return
+  const res = await fetch(`${API_BASE_URL}/api/admin/posts/${postId}/rss-include`, {
+    method: 'POST',
+    headers: { Authorization: `Bearer ${token}` },
+  })
+  if (res.ok) {
+    rssExcluded.value = false
+    toast.success('已标记为rss推荐')
+  } else {
+    toast.error('操作失败')
+  }
+}
+
 const editPost = () => {
   navigateTo(`/posts/${postId}/edit`, { replace: true })
 }

frontend_nuxt/pages/users/[id].vue

@@ -130,26 +130,26 @@
                 <BaseTimeline :items="hotReplies">
                   <template #item="{ item }">
                     在
-                    <router-link :to="`/posts/${item.comment.post.id}`" class="timeline-link">
+                    <NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link">
                       {{ item.comment.post.title }}
-                    </router-link>
+                    </NuxtLink>
                     <template v-if="item.comment.parentComment">
                       下对
-                      <router-link
+                      <NuxtLink
                         :to="`/posts/${item.comment.post.id}#comment-${item.comment.parentComment.id}`"
                         class="timeline-link"
                       >
                         {{ stripMarkdownLength(item.comment.parentComment.content, 200) }}
-                      </router-link>
+                      </NuxtLink>
                       回复了
                     </template>
                     <template v-else> 下评论了 </template>
-                    <router-link
+                    <NuxtLink
                       :to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
                       class="timeline-link"
                     >
                       {{ stripMarkdownLength(item.comment.content, 200) }}
-                    </router-link>
+                    </NuxtLink>
                     <div class="timeline-date">
                       {{ formatDate(item.comment.createdAt) }}
                     </div>
@@ -165,9 +165,9 @@
               <div class="summary-content" v-if="hotPosts.length > 0">
                 <BaseTimeline :items="hotPosts">
                   <template #item="{ item }">
-                    <router-link :to="`/posts/${item.post.id}`" class="timeline-link">
+                    <NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
                       {{ item.post.title }}
-                    </router-link>
+                    </NuxtLink>
                     <div class="timeline-snippet">
                       {{ stripMarkdown(item.post.snippet) }}
                     </div>
@@ -236,44 +236,44 @@
               <template #item="{ item }">
                 <template v-if="item.type === 'post'">
                   发布了文章
-                  <router-link :to="`/posts/${item.post.id}`" class="timeline-link">
+                  <NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
                     {{ item.post.title }}
-                  </router-link>
+                  </NuxtLink>
                   <div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
                 </template>
                 <template v-else-if="item.type === 'comment'">
                   在
-                  <router-link :to="`/posts/${item.comment.post.id}`" class="timeline-link">
+                  <NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link">
                     {{ item.comment.post.title }}
-                  </router-link>
+                  </NuxtLink>
                   下评论了
-                  <router-link
+                  <NuxtLink
                     :to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
                     class="timeline-link"
                   >
                     {{ stripMarkdownLength(item.comment.content, 200) }}
-                  </router-link>
+                  </NuxtLink>
                   <div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
                 </template>
                 <template v-else-if="item.type === 'reply'">
                   在
-                  <router-link :to="`/posts/${item.comment.post.id}`" class="timeline-link">
+                  <NuxtLink :to="`/posts/${item.comment.post.id}`" class="timeline-link">
                     {{ item.comment.post.title }}
-                  </router-link>
+                  </NuxtLink>
                   下对
-                  <router-link
+                  <NuxtLink
                     :to="`/posts/${item.comment.post.id}#comment-${item.comment.parentComment.id}`"
                     class="timeline-link"
                   >
                     {{ stripMarkdownLength(item.comment.parentComment.content, 200) }}
-                  </router-link>
+                  </NuxtLink>
                   回复了
-                  <router-link
+                  <NuxtLink
                     :to="`/posts/${item.comment.post.id}#comment-${item.comment.id}`"
                     class="timeline-link"
                   >
                     {{ stripMarkdownLength(item.comment.content, 200) }}
-                  </router-link>
+                  </NuxtLink>
                   <div class="timeline-date">{{ formatDate(item.createdAt) }}</div>
                 </template>
                 <template v-else-if="item.type === 'tag'">

frontend_nuxt/utils/loadMore.js

@@ -1,38 +0,0 @@
-import { ref, onMounted, onUnmounted, onActivated, nextTick } from 'vue'
-
-export function useScrollLoadMore(loadMore, offset = 50) {
-  const savedScrollTop = ref(0)
-
-  const handleScroll = () => {
-    if (!process.client) return
-    const scrollTop = window.scrollY || document.documentElement.scrollTop
-    const scrollHeight = document.documentElement.scrollHeight
-    const windowHeight = window.innerHeight
-    savedScrollTop.value = scrollTop
-    if (scrollHeight - (scrollTop + windowHeight) <= offset) {
-      loadMore()
-    }
-  }
-
-  onMounted(() => {
-    if (process.client) {
-      window.addEventListener('scroll', handleScroll, { passive: true })
-    }
-  })
-
-  onUnmounted(() => {
-    if (process.client) {
-      window.removeEventListener('scroll', handleScroll)
-    }
-  })
-
-  onActivated(() => {
-    if (process.client) {
-      nextTick(() => {
-        window.scrollTo({ top: savedScrollTop.value })
-      })
-    }
-  })
-
-  return { savedScrollTop }
-}

frontend_nuxt/utils/notification.js

@@ -118,175 +118,162 @@ export async function updateNotificationPreference(type, enabled) {
 function createFetchNotifications() {
   const notifications = ref([])
   const isLoadingMessage = ref(false)
-  const fetchNotifications = async () => {
+  const hasMore = ref(true)
+
+  const fetchNotifications = async ({
+    page = 0,
+    size = 30,
+    unread = false,
+    append = false,
+  } = {}) => {
     const config = useRuntimeConfig()
     const API_BASE_URL = config.public.apiBaseUrl
-    if (isLoadingMessage && notifications && markRead) {
-      try {
-        const token = getToken()
-        if (!token) {
-          toast.error('请先登录')
-          return
-        }
-        isLoadingMessage.value = true
-        notifications.value = []
-        const res = await fetch(`${API_BASE_URL}/api/notifications`, {
+    try {
+      const token = getToken()
+      if (!token) {
+        toast.error('请先登录')
+        return
+      }
+      if (!append) notifications.value = []
+      isLoadingMessage.value = true
+      const res = await fetch(
+        `${API_BASE_URL}/api/notifications${unread ? '/unread' : ''}?page=${page}&size=${size}`,
+        {
           headers: {
             Authorization: `Bearer ${token}`,
           },
-        })
-        isLoadingMessage.value = false
-        if (!res.ok) {
-          toast.error('获取通知失败')
-          return
-        }
-        const data = await res.json()
-
-        for (const n of data) {
-          if (n.type === 'COMMENT_REPLY') {
-            notifications.value.push({
-              ...n,
-              src: n.comment.author.avatar,
-              iconClick: () => {
-                markRead(n.id)
-                navigateTo(`/users/${n.comment.author.id}`, { replace: true })
-              },
-            })
-          } else if (n.type === 'REACTION') {
-            notifications.value.push({
-              ...n,
-              emoji: reactionEmojiMap[n.reactionType],
-              iconClick: () => {
-                if (n.fromUser) {
-                  markRead(n.id)
-                  navigateTo(`/users/${n.fromUser.id}`, { replace: true })
-                }
-              },
-            })
-          } else if (n.type === 'POST_VIEWED') {
-            notifications.value.push({
-              ...n,
-              src: n.fromUser ? n.fromUser.avatar : null,
-              icon: n.fromUser ? undefined : iconMap[n.type],
-              iconClick: () => {
-                if (n.fromUser) {
-                  markRead(n.id)
-                  navigateTo(`/users/${n.fromUser.id}`, { replace: true })
-                }
-              },
-            })
-          } 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,
-              src: n.comment.author.avatar,
-              iconClick: () => {
-                markRead(n.id)
-                navigateTo(`/users/${n.comment.author.id}`, { replace: true })
-              },
-            })
-          } else if (n.type === 'USER_ACTIVITY') {
-            notifications.value.push({
-              ...n,
-              src: n.comment.author.avatar,
-              iconClick: () => {
-                markRead(n.id)
-                navigateTo(`/users/${n.comment.author.id}`, { replace: true })
-              },
-            })
-          } else if (n.type === 'MENTION') {
-            notifications.value.push({
-              ...n,
-              icon: iconMap[n.type],
-              iconClick: () => {
-                if (n.fromUser) {
-                  markRead(n.id)
-                  navigateTo(`/users/${n.fromUser.id}`, { replace: true })
-                }
-              },
-            })
-          } else if (n.type === 'USER_FOLLOWED' || n.type === 'USER_UNFOLLOWED') {
-            notifications.value.push({
-              ...n,
-              icon: iconMap[n.type],
-              iconClick: () => {
-                if (n.fromUser) {
-                  markRead(n.id)
-                  navigateTo(`/users/${n.fromUser.id}`, { replace: true })
-                }
-              },
-            })
-          } else if (n.type === 'FOLLOWED_POST') {
-            notifications.value.push({
-              ...n,
-              icon: iconMap[n.type],
-              iconClick: () => {
-                if (n.post) {
-                  markRead(n.id)
-                  navigateTo(`/posts/${n.post.id}`, { replace: true })
-                }
-              },
-            })
-          } else if (n.type === 'POST_SUBSCRIBED' || n.type === 'POST_UNSUBSCRIBED') {
-            notifications.value.push({
-              ...n,
-              icon: iconMap[n.type],
-              iconClick: () => {
-                if (n.post) {
-                  markRead(n.id)
-                  navigateTo(`/posts/${n.post.id}`, { replace: true })
-                }
-              },
-            })
-          } else if (n.type === 'POST_REVIEW_REQUEST') {
-            notifications.value.push({
-              ...n,
-              src: n.fromUser ? n.fromUser.avatar : null,
-              icon: n.fromUser ? undefined : iconMap[n.type],
-              iconClick: () => {
-                if (n.post) {
-                  markRead(n.id)
-                  navigateTo(`/posts/${n.post.id}`, { replace: true })
-                }
-              },
-            })
-          } else if (n.type === 'REGISTER_REQUEST') {
-            notifications.value.push({
-              ...n,
-              icon: iconMap[n.type],
-              iconClick: () => {},
-            })
-          } else {
-            notifications.value.push({
-              ...n,
-              icon: iconMap[n.type],
-            })
-          }
-        }
-      } catch (e) {
-        console.error(e)
+        },
+      )
+      isLoadingMessage.value = false
+      if (!res.ok) {
+        toast.error('获取通知失败')
+        return
       }
+      const data = await res.json()
+      const arr = []
+
+      for (const n of data) {
+        if (n.type === 'COMMENT_REPLY') {
+          arr.push({
+            ...n,
+            src: n.comment.author.avatar,
+            iconClick: () => {
+              markRead(n.id)
+              navigateTo(`/users/${n.comment.author.id}`, { replace: true })
+            },
+          })
+        } else if (n.type === 'REACTION') {
+          arr.push({
+            ...n,
+            emoji: reactionEmojiMap[n.reactionType],
+            iconClick: () => {
+              if (n.fromUser) {
+                markRead(n.id)
+                navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+              }
+            },
+          })
+        } else if (n.type === 'POST_VIEWED') {
+          arr.push({
+            ...n,
+            src: n.fromUser ? n.fromUser.avatar : null,
+            icon: n.fromUser ? undefined : iconMap[n.type],
+            iconClick: () => {
+              if (n.fromUser) {
+                markRead(n.id)
+                navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+              }
+            },
+          })
+        } else if (n.type === 'LOTTERY_WIN' || n.type === 'LOTTERY_DRAW') {
+          arr.push({
+            ...n,
+            icon: iconMap[n.type],
+            iconClick: () => {
+              if (n.post) {
+                markRead(n.id)
+                navigateTo(`/posts/${n.post.id}`)
+              }
+            },
+          })
+        } else if (n.type === 'POST_UPDATED' || n.type === 'USER_ACTIVITY') {
+          arr.push({
+            ...n,
+            src: n.comment.author.avatar,
+            iconClick: () => {
+              markRead(n.id)
+              navigateTo(`/users/${n.comment.author.id}`, { replace: true })
+            },
+          })
+        } else if (n.type === 'MENTION') {
+          arr.push({
+            ...n,
+            icon: iconMap[n.type],
+            iconClick: () => {
+              if (n.fromUser) {
+                markRead(n.id)
+                navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+              }
+            },
+          })
+        } else if (n.type === 'USER_FOLLOWED' || n.type === 'USER_UNFOLLOWED') {
+          arr.push({
+            ...n,
+            icon: iconMap[n.type],
+            iconClick: () => {
+              if (n.fromUser) {
+                markRead(n.id)
+                navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+              }
+            },
+          })
+        } else if (
+          n.type === 'FOLLOWED_POST' ||
+          n.type === 'POST_SUBSCRIBED' ||
+          n.type === 'POST_UNSUBSCRIBED'
+        ) {
+          arr.push({
+            ...n,
+            icon: iconMap[n.type],
+            iconClick: () => {
+              if (n.post) {
+                markRead(n.id)
+                navigateTo(`/posts/${n.post.id}`, { replace: true })
+              }
+            },
+          })
+        } else if (n.type === 'POST_REVIEW_REQUEST') {
+          arr.push({
+            ...n,
+            src: n.fromUser ? n.fromUser.avatar : null,
+            icon: n.fromUser ? undefined : iconMap[n.type],
+            iconClick: () => {
+              if (n.post) {
+                markRead(n.id)
+                navigateTo(`/posts/${n.post.id}`, { replace: true })
+              }
+            },
+          })
+        } else if (n.type === 'REGISTER_REQUEST') {
+          arr.push({
+            ...n,
+            icon: iconMap[n.type],
+            iconClick: () => {},
+          })
+        } else {
+          arr.push({
+            ...n,
+            icon: iconMap[n.type],
+          })
+        }
+      }
+
+      if (append) notifications.value.push(...arr)
+      else notifications.value = arr
+      hasMore.value = data.length === size
+    } catch (e) {
+      console.error(e)
+      isLoadingMessage.value = false
     }
   }
 
@@ -335,10 +322,16 @@ function createFetchNotifications() {
     markRead,
     notifications,
     isLoadingMessage,
-    markRead,
     markAllRead,
+    hasMore,
   }
 }
 
-export const { fetchNotifications, markRead, notifications, isLoadingMessage, markAllRead } =
-  createFetchNotifications()
+export const {
+  fetchNotifications,
+  markRead,
+  notifications,
+  isLoadingMessage,
+  markAllRead,
+  hasMore,
+} = createFetchNotifications()