Merge pull request #670 from nagisa77/feature/daily_bugfix_0820

daily bugfix

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

@@ -14,6 +14,8 @@ public enum NotificationType {
     POST_REVIEW_REQUEST,
     /** Your post under review was approved or rejected */
     POST_REVIEWED,
+    /** An administrator deleted your post */
+    POST_DELETED,
     /** A subscribed post received a new comment */
     POST_UPDATED,
     /** Someone subscribed to your post */

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

@@ -579,7 +579,9 @@ public class PostService {
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
-        if (!user.getId().equals(post.getAuthor().getId()) && user.getRole() != Role.ADMIN) {
+        User author = post.getAuthor();
+        boolean adminDeleting = !user.getId().equals(author.getId()) && user.getRole() == Role.ADMIN;
+        if (!user.getId().equals(author.getId()) && user.getRole() != Role.ADMIN) {
             throw new IllegalArgumentException("Unauthorized");
         }
         for (Comment c : commentRepository.findByPostAndParentIsNullOrderByCreatedAtAsc(post)) {
@@ -596,7 +598,12 @@ public class PostService {
                 future.cancel(false);
             }
         }
+        String title = post.getTitle();
         postRepository.delete(post);
+        if (adminDeleting) {
+            notificationService.createNotification(author, NotificationType.POST_DELETED,
+                    null, null, null, user, null, title);
+        }
     }
 
     public java.util.List<Post> getPostsByIds(java.util.List<Long> ids) {

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

@@ -61,6 +61,58 @@ class PostServiceTest {
         verify(postRepo).delete(post);
     }
 
+    @Test
+    void deletePostByAdminNotifiesAuthor() {
+        PostRepository postRepo = mock(PostRepository.class);
+        UserRepository userRepo = mock(UserRepository.class);
+        CategoryRepository catRepo = mock(CategoryRepository.class);
+        TagRepository tagRepo = mock(TagRepository.class);
+        LotteryPostRepository lotteryRepo = mock(LotteryPostRepository.class);
+        NotificationService notifService = mock(NotificationService.class);
+        SubscriptionService subService = mock(SubscriptionService.class);
+        CommentService commentService = mock(CommentService.class);
+        CommentRepository commentRepo = mock(CommentRepository.class);
+        ReactionRepository reactionRepo = mock(ReactionRepository.class);
+        PostSubscriptionRepository subRepo = mock(PostSubscriptionRepository.class);
+        NotificationRepository notificationRepo = mock(NotificationRepository.class);
+        PostReadService postReadService = mock(PostReadService.class);
+        ImageUploader imageUploader = mock(ImageUploader.class);
+        TaskScheduler taskScheduler = mock(TaskScheduler.class);
+        EmailSender emailSender = mock(EmailSender.class);
+        ApplicationContext context = mock(ApplicationContext.class);
+
+        PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
+                notifService, subService, commentService, commentRepo,
+                reactionRepo, subRepo, notificationRepo, postReadService,
+                imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
+        when(context.getBean(PostService.class)).thenReturn(service);
+
+        Post post = new Post();
+        post.setId(1L);
+        post.setTitle("T");
+        post.setContent("");
+        User author = new User();
+        author.setId(2L);
+        author.setRole(Role.USER);
+        post.setAuthor(author);
+
+        User admin = new User();
+        admin.setId(1L);
+        admin.setRole(Role.ADMIN);
+
+        when(postRepo.findById(1L)).thenReturn(Optional.of(post));
+        when(userRepo.findByUsername("admin")).thenReturn(Optional.of(admin));
+        when(commentRepo.findByPostAndParentIsNullOrderByCreatedAtAsc(post)).thenReturn(List.of());
+        when(reactionRepo.findByPost(post)).thenReturn(List.of());
+        when(subRepo.findByPost(post)).thenReturn(List.of());
+        when(notificationRepo.findByPost(post)).thenReturn(List.of());
+
+        service.deletePost(1L, "admin");
+
+        verify(notifService).createNotification(eq(author), eq(NotificationType.POST_DELETED), isNull(),
+                isNull(), isNull(), eq(admin), isNull(), eq("T"));
+    }
+
     @Test
     void createPostRespectsRateLimit() {
         PostRepository postRepo = mock(PostRepository.class);

frontend_nuxt/components/GlobalPopups.vue

@@ -95,7 +95,6 @@ const closeMilkTeaPopup = () => {
   if (!process.client) return
   localStorage.setItem('milkTeaActivityPopupShown', 'true')
   showMilkTeaPopup.value = false
-  checkNotificationSetting()
 }
 
 const checkNotificationSetting = async () => {
@@ -108,7 +107,6 @@ const closeNotificationPopup = () => {
   if (!process.client) return
   localStorage.setItem('notificationSettingPopupShown', 'true')
   showNotificationPopup.value = false
-  checkNewMedals()
 }
 const checkNewMedals = async () => {
   if (!process.client) return

frontend_nuxt/pages/message.vue

@@ -495,6 +495,24 @@
                     已被管理员拒绝
                   </NotificationContainer>
                 </template>
+                <template v-else-if="item.type === 'POST_DELETED'">
+                  <NotificationContainer :item="item" :markRead="markRead">
+                    管理员
+                    <template v-if="item.fromUser">
+                      <NuxtLink
+                        class="notif-content-text"
+                        @click="markRead(item.id)"
+                        :to="`/users/${item.fromUser.id}`"
+                      >
+                        {{ item.fromUser.username }}
+                      </NuxtLink>
+                    </template>
+                    删除了您的帖子
+                    <span class="notif-content-text">
+                      {{ stripMarkdownLength(item.content, 100) }}
+                    </span>
+                  </NotificationContainer>
+                </template>
                 <template v-else>
                   <NotificationContainer :item="item" :markRead="markRead">
                     {{ formatType(item.type) }}
@@ -524,7 +542,7 @@ import {
   fetchNotifications,
   fetchUnreadCount,
   isLoadingMessage,
-  markRead,
+  markNotificationRead,
   notifications,
   markAllRead,
   hasMore,
@@ -579,6 +597,14 @@ const togglePref = async (pref) => {
   }
 }
 
+const markRead = async (id) => {
+  markNotificationRead(id)
+  if (selectedTab.value === 'unread') {
+    const index = notifications.value.findIndex((n) => n.id === id)
+    if (index !== -1) notifications.value.splice(index, 1)
+  }
+}
+
 const approve = async (id, nid) => {
   const token = getToken()
   if (!token) return
@@ -647,6 +673,8 @@ const formatType = (t) => {
       return '抽奖中奖了'
     case 'LOTTERY_DRAW':
       return '抽奖已开奖'
+    case 'POST_DELETED':
+      return '帖子被删除'
     default:
       return t
   }

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

@@ -17,7 +17,7 @@
           <div v-if="status === 'REJECTED'" class="article-block-button">已拒绝</div>
           <div v-if="closed" class="article-closed-button">已关闭</div>
           <div
-            v-if="loggedIn && !isAuthor && !subscribed"
+            v-if="!closed && loggedIn && !isAuthor && !subscribed"
             class="article-subscribe-button"
             @click="subscribePost"
           >
@@ -27,7 +27,7 @@
             </div>
           </div>
           <div
-            v-if="loggedIn && !isAuthor && subscribed"
+            v-if="!closed && loggedIn && !isAuthor && subscribed"
             class="article-unsubscribe-button"
             @click="unsubscribePost"
           >
@@ -876,12 +876,7 @@ const gotoProfile = () => {
   navigateTo(`/users/${author.value.id}`, { replace: true })
 }
 
-onActivated(async () => {
-  await refreshPost()
-  await fetchComments()
-})
-
-onMounted(async () => {
+const initPage = async () => {
   await fetchComments()
   const hash = location.hash
   const id = hash.startsWith('#comment-') ? hash.substring('#comment-'.length) : null
@@ -889,6 +884,14 @@ onMounted(async () => {
   updateCurrentIndex()
   window.addEventListener('scroll', updateCurrentIndex)
   jumpToHashComment()
+}
+
+onActivated(async () => {
+  await initPage()
+})
+
+onMounted(async () => {
+  await initPage()
 })
 </script>
 
@@ -1067,6 +1070,7 @@ onMounted(async () => {
   white-space: nowrap;
 }
 
+.article-closed-button,
 .article-subscribe-button-text,
 .article-unsubscribe-button-text {
   white-space: nowrap;

frontend_nuxt/utils/notification.js

@@ -26,6 +26,7 @@ const iconMap = {
   LOTTERY_WIN: 'fas fa-trophy',
   LOTTERY_DRAW: 'fas fa-bullhorn',
   MENTION: 'fas fa-at',
+  POST_DELETED: 'fas fa-trash',
 }
 
 export async function fetchUnreadCount() {
@@ -158,7 +159,7 @@ function createFetchNotifications() {
             ...n,
             src: n.comment.author.avatar,
             iconClick: () => {
-              markRead(n.id)
+              markNotificationRead(n.id)
               navigateTo(`/users/${n.comment.author.id}`, { replace: true })
             },
           })
@@ -168,7 +169,7 @@ function createFetchNotifications() {
             emoji: reactionEmojiMap[n.reactionType],
             iconClick: () => {
               if (n.fromUser) {
-                markRead(n.id)
+                markNotificationRead(n.id)
                 navigateTo(`/users/${n.fromUser.id}`, { replace: true })
               }
             },
@@ -180,7 +181,19 @@ function createFetchNotifications() {
             icon: n.fromUser ? undefined : iconMap[n.type],
             iconClick: () => {
               if (n.fromUser) {
-                markRead(n.id)
+                markNotificationRead(n.id)
+                navigateTo(`/users/${n.fromUser.id}`, { replace: true })
+              }
+            },
+          })
+        } else if (n.type === 'POST_DELETED') {
+          arr.push({
+            ...n,
+            src: n.fromUser ? n.fromUser.avatar : null,
+            icon: n.fromUser ? undefined : iconMap[n.type],
+            iconClick: () => {
+              if (n.fromUser) {
+                markNotificationRead(n.id)
                 navigateTo(`/users/${n.fromUser.id}`, { replace: true })
               }
             },
@@ -191,7 +204,7 @@ function createFetchNotifications() {
             icon: iconMap[n.type],
             iconClick: () => {
               if (n.post) {
-                markRead(n.id)
+                markNotificationRead(n.id)
                 navigateTo(`/posts/${n.post.id}`)
               }
             },
@@ -201,7 +214,7 @@ function createFetchNotifications() {
             ...n,
             src: n.comment.author.avatar,
             iconClick: () => {
-              markRead(n.id)
+              markNotificationRead(n.id)
               navigateTo(`/users/${n.comment.author.id}`, { replace: true })
             },
           })
@@ -211,7 +224,7 @@ function createFetchNotifications() {
             icon: iconMap[n.type],
             iconClick: () => {
               if (n.fromUser) {
-                markRead(n.id)
+                markNotificationRead(n.id)
                 navigateTo(`/users/${n.fromUser.id}`, { replace: true })
               }
             },
@@ -222,7 +235,7 @@ function createFetchNotifications() {
             icon: iconMap[n.type],
             iconClick: () => {
               if (n.fromUser) {
-                markRead(n.id)
+                markNotificationRead(n.id)
                 navigateTo(`/users/${n.fromUser.id}`, { replace: true })
               }
             },
@@ -237,7 +250,7 @@ function createFetchNotifications() {
             icon: iconMap[n.type],
             iconClick: () => {
               if (n.post) {
-                markRead(n.id)
+                markNotificationRead(n.id)
                 navigateTo(`/posts/${n.post.id}`, { replace: true })
               }
             },
@@ -249,7 +262,7 @@ function createFetchNotifications() {
             icon: n.fromUser ? undefined : iconMap[n.type],
             iconClick: () => {
               if (n.post) {
-                markRead(n.id)
+                markNotificationRead(n.id)
                 navigateTo(`/posts/${n.post.id}`, { replace: true })
               }
             },
@@ -277,7 +290,7 @@ function createFetchNotifications() {
     }
   }
 
-  const markRead = async (id) => {
+  const markNotificationRead = async (id) => {
     if (!id) return
     const n = notifications.value.find((n) => n.id === id)
     if (!n || n.read) return
@@ -319,7 +332,7 @@ function createFetchNotifications() {
   }
   return {
     fetchNotifications,
-    markRead,
+    markNotificationRead,
     notifications,
     isLoadingMessage,
     markAllRead,
@@ -329,7 +342,7 @@ function createFetchNotifications() {
 
 export const {
   fetchNotifications,
-  markRead,
+  markNotificationRead,
   notifications,
   isLoadingMessage,
   markAllRead,