mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-02-24 23:20:49 +08:00
Compare commits
54 Commits
codex/crea
...
codex/add-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd9ce67d4b | ||
|
|
2b242367d7 | ||
|
|
3f0cd2bf0f | ||
|
|
a98a631378 | ||
|
|
7701d359dc | ||
|
|
ffd9ef8a32 | ||
|
|
36cd5ab171 | ||
|
|
58d86fa065 | ||
|
|
df71cf901b | ||
|
|
ac3fc6702a | ||
|
|
b0eef220a6 | ||
|
|
02d366e2c7 | ||
|
|
6409531a64 | ||
|
|
175ab79b27 | ||
|
|
b543953d22 | ||
|
|
b4fef68af5 | ||
|
|
6c48a38212 | ||
|
|
8a3e4d8e98 | ||
|
|
cd73747164 | ||
|
|
0ee58df868 | ||
|
|
6fed8131f6 | ||
|
|
d75c08396a | ||
|
|
3a742fbb00 | ||
|
|
9c2b1f6e98 | ||
|
|
28b33d8c44 | ||
|
|
1f99a10322 | ||
|
|
743c3dbc72 | ||
|
|
d46a446f2b | ||
|
|
75a785f612 | ||
|
|
e79b75f340 | ||
|
|
1f6f470ab5 | ||
|
|
583d4042f5 | ||
|
|
8437c1c714 | ||
|
|
2613fe6cf1 | ||
|
|
a15d541b72 | ||
|
|
8657a06f52 | ||
|
|
09900b34aa | ||
|
|
4e1c3f5839 | ||
|
|
d97cc7df5e | ||
|
|
151242f3ba | ||
|
|
b2783a0168 | ||
|
|
c79bcac217 | ||
|
|
9a06da3bc1 | ||
|
|
98bbc36453 | ||
|
|
4a04f4ec17 | ||
|
|
77be2bfebb | ||
|
|
cf4ca89e19 | ||
|
|
094fc78d92 | ||
|
|
da3d2a6a71 | ||
|
|
15cba0c96e | ||
|
|
98a79acad9 | ||
|
|
4947978f81 | ||
|
|
24cc479a56 | ||
|
|
809a78fee3 |
@@ -0,0 +1,32 @@
|
|||||||
|
package com.openisle.config;
|
||||||
|
|
||||||
|
import com.openisle.model.MessageConversation;
|
||||||
|
import com.openisle.repository.MessageConversationRepository;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.boot.CommandLineRunner;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ChannelInitializer implements CommandLineRunner {
|
||||||
|
private final MessageConversationRepository conversationRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run(String... args) {
|
||||||
|
if (conversationRepository.countByChannelTrue() == 0) {
|
||||||
|
MessageConversation chat = new MessageConversation();
|
||||||
|
chat.setChannel(true);
|
||||||
|
chat.setName("吹水群");
|
||||||
|
chat.setDescription("吹水聊天");
|
||||||
|
chat.setAvatar("https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/32647273e2334d14adfd4a6ce9db0643.jpeg");
|
||||||
|
conversationRepository.save(chat);
|
||||||
|
|
||||||
|
MessageConversation tech = new MessageConversation();
|
||||||
|
tech.setChannel(true);
|
||||||
|
tech.setName("技术讨论群");
|
||||||
|
tech.setDescription("讨论技术相关话题");
|
||||||
|
tech.setAvatar("https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/5edde9a5864e471caa32491dbcdaa8b2.png");
|
||||||
|
conversationRepository.save(tech);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -121,6 +121,7 @@ public class SecurityConfig {
|
|||||||
.requestMatchers(HttpMethod.GET, "/api/reaction-types").permitAll()
|
.requestMatchers(HttpMethod.GET, "/api/reaction-types").permitAll()
|
||||||
.requestMatchers(HttpMethod.GET, "/api/activities/**").permitAll()
|
.requestMatchers(HttpMethod.GET, "/api/activities/**").permitAll()
|
||||||
.requestMatchers(HttpMethod.GET, "/api/sitemap.xml").permitAll()
|
.requestMatchers(HttpMethod.GET, "/api/sitemap.xml").permitAll()
|
||||||
|
.requestMatchers(HttpMethod.GET, "/api/channels").permitAll()
|
||||||
.requestMatchers(HttpMethod.GET, "/api/rss").permitAll()
|
.requestMatchers(HttpMethod.GET, "/api/rss").permitAll()
|
||||||
.requestMatchers(HttpMethod.GET, "/api/point-goods").permitAll()
|
.requestMatchers(HttpMethod.GET, "/api/point-goods").permitAll()
|
||||||
.requestMatchers(HttpMethod.POST, "/api/point-goods").permitAll()
|
.requestMatchers(HttpMethod.POST, "/api/point-goods").permitAll()
|
||||||
@@ -156,7 +157,7 @@ public class SecurityConfig {
|
|||||||
uri.startsWith("/api/search") || uri.startsWith("/api/users") ||
|
uri.startsWith("/api/search") || uri.startsWith("/api/users") ||
|
||||||
uri.startsWith("/api/reaction-types") || uri.startsWith("/api/config") ||
|
uri.startsWith("/api/reaction-types") || uri.startsWith("/api/config") ||
|
||||||
uri.startsWith("/api/activities") || uri.startsWith("/api/push/public-key") ||
|
uri.startsWith("/api/activities") || uri.startsWith("/api/push/public-key") ||
|
||||||
uri.startsWith("/api/point-goods") ||
|
uri.startsWith("/api/point-goods") || uri.startsWith("/api/channels") ||
|
||||||
uri.startsWith("/api/sitemap.xml") || uri.startsWith("/api/medals") ||
|
uri.startsWith("/api/sitemap.xml") || uri.startsWith("/api/medals") ||
|
||||||
uri.startsWith("/api/rss"));
|
uri.startsWith("/api/rss"));
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package com.openisle.controller;
|
||||||
|
|
||||||
|
import com.openisle.dto.ChannelDto;
|
||||||
|
import com.openisle.model.User;
|
||||||
|
import com.openisle.repository.UserRepository;
|
||||||
|
import com.openisle.service.ChannelService;
|
||||||
|
import com.openisle.service.MessageService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.security.core.Authentication;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/channels")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ChannelController {
|
||||||
|
private final ChannelService channelService;
|
||||||
|
private final MessageService messageService;
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
|
private Long getCurrentUserId(Authentication auth) {
|
||||||
|
User user = userRepository.findByUsername(auth.getName())
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("User not found"));
|
||||||
|
return user.getId();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public List<ChannelDto> listChannels(Authentication auth) {
|
||||||
|
return channelService.listChannels(getCurrentUserId(auth));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/{channelId}/join")
|
||||||
|
public ChannelDto joinChannel(@PathVariable Long channelId, Authentication auth) {
|
||||||
|
return channelService.joinChannel(channelId, getCurrentUserId(auth));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/unread-count")
|
||||||
|
public long unreadCount(Authentication auth) {
|
||||||
|
return messageService.getUnreadChannelCount(getCurrentUserId(auth));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,7 +5,6 @@ import com.openisle.dto.ConversationDto;
|
|||||||
import com.openisle.dto.CreateConversationRequest;
|
import com.openisle.dto.CreateConversationRequest;
|
||||||
import com.openisle.dto.CreateConversationResponse;
|
import com.openisle.dto.CreateConversationResponse;
|
||||||
import com.openisle.dto.MessageDto;
|
import com.openisle.dto.MessageDto;
|
||||||
import com.openisle.dto.UserSummaryDto;
|
|
||||||
import com.openisle.model.Message;
|
import com.openisle.model.Message;
|
||||||
import com.openisle.model.MessageConversation;
|
import com.openisle.model.MessageConversation;
|
||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
@@ -55,8 +54,16 @@ public class MessageController {
|
|||||||
|
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public ResponseEntity<MessageDto> sendMessage(@RequestBody MessageRequest req, Authentication auth) {
|
public ResponseEntity<MessageDto> sendMessage(@RequestBody MessageRequest req, Authentication auth) {
|
||||||
Message message = messageService.sendMessage(getCurrentUserId(auth), req.getRecipientId(), req.getContent());
|
Message message = messageService.sendMessage(getCurrentUserId(auth), req.getRecipientId(), req.getContent(), req.getReplyToId());
|
||||||
return ResponseEntity.ok(toDto(message));
|
return ResponseEntity.ok(messageService.toDto(message));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/conversations/{conversationId}/messages")
|
||||||
|
public ResponseEntity<MessageDto> sendMessageToConversation(@PathVariable Long conversationId,
|
||||||
|
@RequestBody ChannelMessageRequest req,
|
||||||
|
Authentication auth) {
|
||||||
|
Message message = messageService.sendMessageToConversation(getCurrentUserId(auth), conversationId, req.getContent(), req.getReplyToId());
|
||||||
|
return ResponseEntity.ok(messageService.toDto(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/conversations/{conversationId}/read")
|
@PostMapping("/conversations/{conversationId}/read")
|
||||||
@@ -71,23 +78,6 @@ public class MessageController {
|
|||||||
return ResponseEntity.ok(new CreateConversationResponse(conversation.getId()));
|
return ResponseEntity.ok(new CreateConversationResponse(conversation.getId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private MessageDto toDto(Message message) {
|
|
||||||
MessageDto dto = new MessageDto();
|
|
||||||
dto.setId(message.getId());
|
|
||||||
dto.setContent(message.getContent());
|
|
||||||
dto.setCreatedAt(message.getCreatedAt());
|
|
||||||
|
|
||||||
dto.setConversationId(message.getConversation().getId());
|
|
||||||
|
|
||||||
UserSummaryDto senderDto = new UserSummaryDto();
|
|
||||||
senderDto.setId(message.getSender().getId());
|
|
||||||
senderDto.setUsername(message.getSender().getUsername());
|
|
||||||
senderDto.setAvatar(message.getSender().getAvatar());
|
|
||||||
dto.setSender(senderDto);
|
|
||||||
|
|
||||||
return dto;
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/unread-count")
|
@GetMapping("/unread-count")
|
||||||
public ResponseEntity<Long> getUnreadCount(Authentication auth) {
|
public ResponseEntity<Long> getUnreadCount(Authentication auth) {
|
||||||
return ResponseEntity.ok(messageService.getUnreadMessageCount(getCurrentUserId(auth)));
|
return ResponseEntity.ok(messageService.getUnreadMessageCount(getCurrentUserId(auth)));
|
||||||
@@ -97,6 +87,7 @@ public class MessageController {
|
|||||||
static class MessageRequest {
|
static class MessageRequest {
|
||||||
private Long recipientId;
|
private Long recipientId;
|
||||||
private String content;
|
private String content;
|
||||||
|
private Long replyToId;
|
||||||
|
|
||||||
public Long getRecipientId() {
|
public Long getRecipientId() {
|
||||||
return recipientId;
|
return recipientId;
|
||||||
@@ -113,5 +104,34 @@ public class MessageController {
|
|||||||
public void setContent(String content) {
|
public void setContent(String content) {
|
||||||
this.content = content;
|
this.content = content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Long getReplyToId() {
|
||||||
|
return replyToId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setReplyToId(Long replyToId) {
|
||||||
|
this.replyToId = replyToId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static class ChannelMessageRequest {
|
||||||
|
private String content;
|
||||||
|
private Long replyToId;
|
||||||
|
|
||||||
|
public String getContent() {
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setContent(String content) {
|
||||||
|
this.content = content;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long getReplyToId() {
|
||||||
|
return replyToId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setReplyToId(Long replyToId) {
|
||||||
|
this.replyToId = replyToId;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -57,4 +57,17 @@ public class ReactionController {
|
|||||||
pointService.awardForReactionOfComment(auth.getName(), commentId);
|
pointService.awardForReactionOfComment(auth.getName(), commentId);
|
||||||
return ResponseEntity.ok(dto);
|
return ResponseEntity.ok(dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/messages/{messageId}/reactions")
|
||||||
|
public ResponseEntity<ReactionDto> reactToMessage(@PathVariable Long messageId,
|
||||||
|
@RequestBody ReactionRequest req,
|
||||||
|
Authentication auth) {
|
||||||
|
Reaction reaction = reactionService.reactToMessage(auth.getName(), messageId, req.getType());
|
||||||
|
if (reaction == null) {
|
||||||
|
return ResponseEntity.noContent().build();
|
||||||
|
}
|
||||||
|
ReactionDto dto = reactionMapper.toDto(reaction);
|
||||||
|
dto.setReward(levelService.awardForReaction(auth.getName()));
|
||||||
|
return ResponseEntity.ok(dto);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -105,6 +105,17 @@ public class UserController {
|
|||||||
.collect(java.util.stream.Collectors.toList());
|
.collect(java.util.stream.Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{identifier}/subscribed-posts")
|
||||||
|
public java.util.List<PostMetaDto> subscribedPosts(@PathVariable("identifier") String identifier,
|
||||||
|
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||||
|
int l = limit != null ? limit : defaultPostsLimit;
|
||||||
|
User user = userService.findByIdentifier(identifier).orElseThrow();
|
||||||
|
return subscriptionService.getSubscribedPosts(user.getUsername()).stream()
|
||||||
|
.limit(l)
|
||||||
|
.map(userMapper::toMetaDto)
|
||||||
|
.collect(java.util.stream.Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/{identifier}/replies")
|
@GetMapping("/{identifier}/replies")
|
||||||
public java.util.List<CommentInfoDto> userReplies(@PathVariable("identifier") String identifier,
|
public java.util.List<CommentInfoDto> userReplies(@PathVariable("identifier") String identifier,
|
||||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||||
|
|||||||
17
backend/src/main/java/com/openisle/dto/ChannelDto.java
Normal file
17
backend/src/main/java/com/openisle/dto/ChannelDto.java
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class ChannelDto {
|
||||||
|
private Long id;
|
||||||
|
private String name;
|
||||||
|
private String description;
|
||||||
|
private String avatar;
|
||||||
|
private MessageDto lastMessage;
|
||||||
|
private long memberCount;
|
||||||
|
private boolean joined;
|
||||||
|
private long unreadCount;
|
||||||
|
}
|
||||||
@@ -8,6 +8,9 @@ import java.util.List;
|
|||||||
@Data
|
@Data
|
||||||
public class ConversationDetailDto {
|
public class ConversationDetailDto {
|
||||||
private Long id;
|
private Long id;
|
||||||
|
private String name;
|
||||||
|
private boolean channel;
|
||||||
|
private String avatar;
|
||||||
private List<UserSummaryDto> participants;
|
private List<UserSummaryDto> participants;
|
||||||
private Page<MessageDto> messages;
|
private Page<MessageDto> messages;
|
||||||
}
|
}
|
||||||
@@ -10,6 +10,9 @@ import java.util.List;
|
|||||||
@Setter
|
@Setter
|
||||||
public class ConversationDto {
|
public class ConversationDto {
|
||||||
private Long id;
|
private Long id;
|
||||||
|
private String name;
|
||||||
|
private boolean channel;
|
||||||
|
private String avatar;
|
||||||
private MessageDto lastMessage;
|
private MessageDto lastMessage;
|
||||||
private List<UserSummaryDto> participants;
|
private List<UserSummaryDto> participants;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.openisle.dto;
|
|||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class MessageDto {
|
public class MessageDto {
|
||||||
@@ -10,4 +11,6 @@ public class MessageDto {
|
|||||||
private UserSummaryDto sender;
|
private UserSummaryDto sender;
|
||||||
private Long conversationId;
|
private Long conversationId;
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
|
private MessageDto replyTo;
|
||||||
|
private List<ReactionDto> reactions;
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,7 @@ import com.openisle.model.ReactionType;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DTO representing a reaction on a post or comment.
|
* DTO representing a reaction on a post, comment or message.
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class ReactionDto {
|
public class ReactionDto {
|
||||||
@@ -13,6 +13,7 @@ public class ReactionDto {
|
|||||||
private String user;
|
private String user;
|
||||||
private Long postId;
|
private Long postId;
|
||||||
private Long commentId;
|
private Long commentId;
|
||||||
|
private Long messageId;
|
||||||
private int reward;
|
private int reward;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ public class ReactionMapper {
|
|||||||
if (reaction.getComment() != null) {
|
if (reaction.getComment() != null) {
|
||||||
dto.setCommentId(reaction.getComment().getId());
|
dto.setCommentId(reaction.getComment().getId());
|
||||||
}
|
}
|
||||||
|
if (reaction.getMessage() != null) {
|
||||||
|
dto.setMessageId(reaction.getMessage().getId());
|
||||||
|
}
|
||||||
dto.setReward(0);
|
dto.setReward(0);
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ public class Message {
|
|||||||
@Column(nullable = false, columnDefinition = "TEXT")
|
@Column(nullable = false, columnDefinition = "TEXT")
|
||||||
private String content;
|
private String content;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "reply_to_id")
|
||||||
|
private Message replyTo;
|
||||||
|
|
||||||
@CreationTimestamp
|
@CreationTimestamp
|
||||||
@Column(nullable = false, updatable = false)
|
@Column(nullable = false, updatable = false)
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
|
|||||||
@@ -20,6 +20,18 @@ public class MessageConversation {
|
|||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
// Indicates whether this conversation represents a public channel
|
||||||
|
@Column(nullable = false)
|
||||||
|
private boolean channel = false;
|
||||||
|
|
||||||
|
// Channel metadata
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@Column(columnDefinition = "TEXT")
|
||||||
|
private String description;
|
||||||
|
|
||||||
|
private String avatar;
|
||||||
|
|
||||||
@CreationTimestamp
|
@CreationTimestamp
|
||||||
@Column(nullable = false, updatable = false)
|
@Column(nullable = false, updatable = false)
|
||||||
private LocalDateTime createdAt;
|
private LocalDateTime createdAt;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import lombok.Setter;
|
|||||||
import org.hibernate.annotations.CreationTimestamp;
|
import org.hibernate.annotations.CreationTimestamp;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reaction entity representing a user's reaction to a post or comment.
|
* Reaction entity representing a user's reaction to a post, comment or message.
|
||||||
*/
|
*/
|
||||||
@Entity
|
@Entity
|
||||||
@Getter
|
@Getter
|
||||||
@@ -16,7 +16,8 @@ import org.hibernate.annotations.CreationTimestamp;
|
|||||||
@Table(name = "reactions",
|
@Table(name = "reactions",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(columnNames = {"user_id", "post_id", "type"}),
|
@UniqueConstraint(columnNames = {"user_id", "post_id", "type"}),
|
||||||
@UniqueConstraint(columnNames = {"user_id", "comment_id", "type"})
|
@UniqueConstraint(columnNames = {"user_id", "comment_id", "type"}),
|
||||||
|
@UniqueConstraint(columnNames = {"user_id", "message_id", "type"})
|
||||||
})
|
})
|
||||||
public class Reaction {
|
public class Reaction {
|
||||||
@Id
|
@Id
|
||||||
@@ -39,6 +40,10 @@ public class Reaction {
|
|||||||
@JoinColumn(name = "comment_id")
|
@JoinColumn(name = "comment_id")
|
||||||
private Comment comment;
|
private Comment comment;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "message_id")
|
||||||
|
private Message message;
|
||||||
|
|
||||||
@CreationTimestamp
|
@CreationTimestamp
|
||||||
@Column(nullable = false, updatable = false,
|
@Column(nullable = false, updatable = false,
|
||||||
columnDefinition = "DATETIME(6) DEFAULT CURRENT_TIMESTAMP(6)")
|
columnDefinition = "DATETIME(6) DEFAULT CURRENT_TIMESTAMP(6)")
|
||||||
|
|||||||
@@ -6,7 +6,9 @@ package com.openisle.model;
|
|||||||
public enum ReactionType {
|
public enum ReactionType {
|
||||||
LIKE,
|
LIKE,
|
||||||
DISLIKE,
|
DISLIKE,
|
||||||
|
SMILE,
|
||||||
RECOMMEND,
|
RECOMMEND,
|
||||||
|
CONGRATULATIONS,
|
||||||
ANGRY,
|
ANGRY,
|
||||||
FLUSHED,
|
FLUSHED,
|
||||||
STAR_STRUCK,
|
STAR_STRUCK,
|
||||||
@@ -26,5 +28,5 @@ public enum ReactionType {
|
|||||||
CHINA,
|
CHINA,
|
||||||
USA,
|
USA,
|
||||||
JAPAN,
|
JAPAN,
|
||||||
KOREA
|
KOREA,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,23 +1,22 @@
|
|||||||
package com.openisle.repository;
|
package com.openisle.repository;
|
||||||
|
|
||||||
import com.openisle.model.MessageConversation;
|
import com.openisle.model.MessageConversation;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
|
||||||
import org.springframework.stereotype.Repository;
|
|
||||||
|
|
||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
import java.util.List;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.Query;
|
import org.springframework.data.jpa.repository.Query;
|
||||||
import org.springframework.data.repository.query.Param;
|
import org.springframework.data.repository.query.Param;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
import com.openisle.model.User;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface MessageConversationRepository extends JpaRepository<MessageConversation, Long> {
|
public interface MessageConversationRepository extends JpaRepository<MessageConversation, Long> {
|
||||||
@Query("SELECT c FROM MessageConversation c JOIN c.participants p1 JOIN c.participants p2 WHERE p1.user = :user1 AND p2.user = :user2")
|
@Query("SELECT c FROM MessageConversation c " +
|
||||||
Optional<MessageConversation> findConversationByUsers(@Param("user1") User user1, @Param("user2") User user2);
|
"WHERE c.channel = false AND size(c.participants) = 2 " +
|
||||||
|
"AND EXISTS (SELECT 1 FROM c.participants p1 WHERE p1.user = :user1) " +
|
||||||
|
"AND EXISTS (SELECT 1 FROM c.participants p2 WHERE p2.user = :user2) " +
|
||||||
|
"ORDER BY c.createdAt DESC")
|
||||||
|
List<MessageConversation> findConversationsByUsers(@Param("user1") User user1, @Param("user2") User user2);
|
||||||
|
|
||||||
@Query("SELECT DISTINCT c FROM MessageConversation c " +
|
@Query("SELECT DISTINCT c FROM MessageConversation c " +
|
||||||
"JOIN c.participants p " +
|
"JOIN c.participants p " +
|
||||||
@@ -28,4 +27,8 @@ public interface MessageConversationRepository extends JpaRepository<MessageConv
|
|||||||
"WHERE p.user.id = :userId " +
|
"WHERE p.user.id = :userId " +
|
||||||
"ORDER BY COALESCE(lm.createdAt, c.createdAt) DESC")
|
"ORDER BY COALESCE(lm.createdAt, c.createdAt) DESC")
|
||||||
List<MessageConversation> findConversationsByUserIdOrderByLastMessageDesc(@Param("userId") Long userId);
|
List<MessageConversation> findConversationsByUserIdOrderByLastMessageDesc(@Param("userId") Long userId);
|
||||||
}
|
|
||||||
|
List<MessageConversation> findByChannelTrue();
|
||||||
|
|
||||||
|
long countByChannelTrue();
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.openisle.repository;
|
package com.openisle.repository;
|
||||||
|
|
||||||
import com.openisle.model.Comment;
|
import com.openisle.model.Comment;
|
||||||
|
import com.openisle.model.Message;
|
||||||
import com.openisle.model.Post;
|
import com.openisle.model.Post;
|
||||||
import com.openisle.model.Reaction;
|
import com.openisle.model.Reaction;
|
||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
@@ -15,8 +16,10 @@ import java.util.Optional;
|
|||||||
public interface ReactionRepository extends JpaRepository<Reaction, Long> {
|
public interface ReactionRepository extends JpaRepository<Reaction, Long> {
|
||||||
Optional<Reaction> findByUserAndPostAndType(User user, Post post, com.openisle.model.ReactionType type);
|
Optional<Reaction> findByUserAndPostAndType(User user, Post post, com.openisle.model.ReactionType type);
|
||||||
Optional<Reaction> findByUserAndCommentAndType(User user, Comment comment, com.openisle.model.ReactionType type);
|
Optional<Reaction> findByUserAndCommentAndType(User user, Comment comment, com.openisle.model.ReactionType type);
|
||||||
|
Optional<Reaction> findByUserAndMessageAndType(User user, Message message, com.openisle.model.ReactionType type);
|
||||||
List<Reaction> findByPost(Post post);
|
List<Reaction> findByPost(Post post);
|
||||||
List<Reaction> findByComment(Comment comment);
|
List<Reaction> findByComment(Comment comment);
|
||||||
|
List<Reaction> findByMessage(Message message);
|
||||||
|
|
||||||
@Query("SELECT r.post.id FROM Reaction r WHERE r.post IS NOT NULL AND r.post.author.username = :username AND r.type = com.openisle.model.ReactionType.LIKE GROUP BY r.post.id ORDER BY COUNT(r.id) DESC")
|
@Query("SELECT r.post.id FROM Reaction r WHERE r.post IS NOT NULL AND r.post.author.username = :username AND r.type = com.openisle.model.ReactionType.LIKE GROUP BY r.post.id ORDER BY COUNT(r.id) DESC")
|
||||||
List<Long> findTopPostIds(@Param("username") String username, Pageable pageable);
|
List<Long> findTopPostIds(@Param("username") String username, Pageable pageable);
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
package com.openisle.service;
|
||||||
|
|
||||||
|
import com.openisle.dto.ChannelDto;
|
||||||
|
import com.openisle.dto.MessageDto;
|
||||||
|
import com.openisle.dto.UserSummaryDto;
|
||||||
|
import com.openisle.model.Message;
|
||||||
|
import com.openisle.model.MessageConversation;
|
||||||
|
import com.openisle.model.MessageParticipant;
|
||||||
|
import com.openisle.model.User;
|
||||||
|
import com.openisle.repository.MessageConversationRepository;
|
||||||
|
import com.openisle.repository.MessageParticipantRepository;
|
||||||
|
import com.openisle.repository.MessageRepository;
|
||||||
|
import com.openisle.repository.UserRepository;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ChannelService {
|
||||||
|
private final MessageConversationRepository conversationRepository;
|
||||||
|
private final MessageParticipantRepository participantRepository;
|
||||||
|
private final MessageRepository messageRepository;
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public List<ChannelDto> listChannels(Long userId) {
|
||||||
|
List<MessageConversation> channels = conversationRepository.findByChannelTrue();
|
||||||
|
return channels.stream().map(c -> toDto(c, userId)).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public ChannelDto joinChannel(Long channelId, Long userId) {
|
||||||
|
MessageConversation channel = conversationRepository.findById(channelId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Channel not found"));
|
||||||
|
User user = userRepository.findById(userId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("User not found"));
|
||||||
|
participantRepository.findByConversationIdAndUserId(channelId, userId)
|
||||||
|
.orElseGet(() -> {
|
||||||
|
MessageParticipant p = new MessageParticipant();
|
||||||
|
p.setConversation(channel);
|
||||||
|
p.setUser(user);
|
||||||
|
MessageParticipant saved = participantRepository.save(p);
|
||||||
|
channel.getParticipants().add(saved);
|
||||||
|
return saved;
|
||||||
|
});
|
||||||
|
return toDto(channel, userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ChannelDto toDto(MessageConversation channel, Long userId) {
|
||||||
|
ChannelDto dto = new ChannelDto();
|
||||||
|
dto.setId(channel.getId());
|
||||||
|
dto.setName(channel.getName());
|
||||||
|
dto.setDescription(channel.getDescription());
|
||||||
|
dto.setAvatar(channel.getAvatar());
|
||||||
|
if (channel.getLastMessage() != null) {
|
||||||
|
dto.setLastMessage(toMessageDto(channel.getLastMessage()));
|
||||||
|
}
|
||||||
|
dto.setMemberCount(channel.getParticipants().size());
|
||||||
|
boolean joined = channel.getParticipants().stream()
|
||||||
|
.anyMatch(p -> p.getUser().getId().equals(userId));
|
||||||
|
dto.setJoined(joined);
|
||||||
|
if (joined) {
|
||||||
|
MessageParticipant participant = channel.getParticipants().stream()
|
||||||
|
.filter(p -> p.getUser().getId().equals(userId))
|
||||||
|
.findFirst().orElse(null);
|
||||||
|
LocalDateTime lastRead = participant.getLastReadAt() == null
|
||||||
|
? LocalDateTime.of(1970, 1, 1, 0, 0)
|
||||||
|
: participant.getLastReadAt();
|
||||||
|
long unread = messageRepository
|
||||||
|
.countByConversationIdAndCreatedAtAfterAndSenderIdNot(channel.getId(), lastRead, userId);
|
||||||
|
dto.setUnreadCount(unread);
|
||||||
|
} else {
|
||||||
|
dto.setUnreadCount(0);
|
||||||
|
}
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
|
||||||
|
private MessageDto toMessageDto(Message message) {
|
||||||
|
MessageDto dto = new MessageDto();
|
||||||
|
dto.setId(message.getId());
|
||||||
|
dto.setContent(message.getContent());
|
||||||
|
dto.setConversationId(message.getConversation().getId());
|
||||||
|
dto.setCreatedAt(message.getCreatedAt());
|
||||||
|
|
||||||
|
UserSummaryDto userDto = new UserSummaryDto();
|
||||||
|
userDto.setId(message.getSender().getId());
|
||||||
|
userDto.setUsername(message.getSender().getUsername());
|
||||||
|
userDto.setAvatar(message.getSender().getAvatar());
|
||||||
|
dto.setSender(userDto);
|
||||||
|
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,14 +4,18 @@ import com.openisle.model.Message;
|
|||||||
import com.openisle.model.MessageConversation;
|
import com.openisle.model.MessageConversation;
|
||||||
import com.openisle.model.MessageParticipant;
|
import com.openisle.model.MessageParticipant;
|
||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
|
import com.openisle.model.Reaction;
|
||||||
import com.openisle.repository.MessageConversationRepository;
|
import com.openisle.repository.MessageConversationRepository;
|
||||||
import com.openisle.repository.MessageParticipantRepository;
|
import com.openisle.repository.MessageParticipantRepository;
|
||||||
import com.openisle.repository.MessageRepository;
|
import com.openisle.repository.MessageRepository;
|
||||||
import com.openisle.repository.UserRepository;
|
import com.openisle.repository.UserRepository;
|
||||||
|
import com.openisle.repository.ReactionRepository;
|
||||||
import com.openisle.dto.ConversationDetailDto;
|
import com.openisle.dto.ConversationDetailDto;
|
||||||
import com.openisle.dto.ConversationDto;
|
import com.openisle.dto.ConversationDto;
|
||||||
import com.openisle.dto.MessageDto;
|
import com.openisle.dto.MessageDto;
|
||||||
|
import com.openisle.dto.ReactionDto;
|
||||||
import com.openisle.dto.UserSummaryDto;
|
import com.openisle.dto.UserSummaryDto;
|
||||||
|
import com.openisle.mapper.ReactionMapper;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
@@ -34,9 +38,11 @@ public class MessageService {
|
|||||||
private final MessageParticipantRepository participantRepository;
|
private final MessageParticipantRepository participantRepository;
|
||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
private final SimpMessagingTemplate messagingTemplate;
|
private final SimpMessagingTemplate messagingTemplate;
|
||||||
|
private final ReactionRepository reactionRepository;
|
||||||
|
private final ReactionMapper reactionMapper;
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public Message sendMessage(Long senderId, Long recipientId, String content) {
|
public Message sendMessage(Long senderId, Long recipientId, String content, Long replyToId) {
|
||||||
log.info("Attempting to send message from user {} to user {}", senderId, recipientId);
|
log.info("Attempting to send message from user {} to user {}", senderId, recipientId);
|
||||||
User sender = userRepository.findById(senderId)
|
User sender = userRepository.findById(senderId)
|
||||||
.orElseThrow(() -> new IllegalArgumentException("Sender not found"));
|
.orElseThrow(() -> new IllegalArgumentException("Sender not found"));
|
||||||
@@ -51,6 +57,11 @@ public class MessageService {
|
|||||||
message.setConversation(conversation);
|
message.setConversation(conversation);
|
||||||
message.setSender(sender);
|
message.setSender(sender);
|
||||||
message.setContent(content);
|
message.setContent(content);
|
||||||
|
if (replyToId != null) {
|
||||||
|
Message replyTo = messageRepository.findById(replyToId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Message not found"));
|
||||||
|
message.setReplyTo(replyTo);
|
||||||
|
}
|
||||||
message = messageRepository.save(message);
|
message = messageRepository.save(message);
|
||||||
log.info("Message saved with ID: {}", message.getId());
|
log.info("Message saved with ID: {}", message.getId());
|
||||||
|
|
||||||
@@ -82,7 +93,58 @@ public class MessageService {
|
|||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
private MessageDto toDto(Message message) {
|
@Transactional
|
||||||
|
public Message sendMessageToConversation(Long senderId, Long conversationId, String content, Long replyToId) {
|
||||||
|
User sender = userRepository.findById(senderId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Sender not found"));
|
||||||
|
MessageConversation conversation = conversationRepository.findById(conversationId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Conversation not found"));
|
||||||
|
|
||||||
|
// Join the conversation if not already a participant (useful for channels)
|
||||||
|
participantRepository.findByConversationIdAndUserId(conversationId, senderId)
|
||||||
|
.orElseGet(() -> {
|
||||||
|
MessageParticipant p = new MessageParticipant();
|
||||||
|
p.setConversation(conversation);
|
||||||
|
p.setUser(sender);
|
||||||
|
return participantRepository.save(p);
|
||||||
|
});
|
||||||
|
|
||||||
|
Message message = new Message();
|
||||||
|
message.setConversation(conversation);
|
||||||
|
message.setSender(sender);
|
||||||
|
message.setContent(content);
|
||||||
|
if (replyToId != null) {
|
||||||
|
Message replyTo = messageRepository.findById(replyToId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Message not found"));
|
||||||
|
message.setReplyTo(replyTo);
|
||||||
|
}
|
||||||
|
message = messageRepository.save(message);
|
||||||
|
|
||||||
|
conversation.setLastMessage(message);
|
||||||
|
conversationRepository.save(conversation);
|
||||||
|
|
||||||
|
MessageDto messageDto = toDto(message);
|
||||||
|
String conversationDestination = "/topic/conversation/" + conversation.getId();
|
||||||
|
messagingTemplate.convertAndSend(conversationDestination, messageDto);
|
||||||
|
|
||||||
|
// Notify all participants except sender for updates
|
||||||
|
for (MessageParticipant participant : conversation.getParticipants()) {
|
||||||
|
if (participant.getUser().getId().equals(senderId)) continue;
|
||||||
|
String userDestination = "/topic/user/" + participant.getUser().getId() + "/messages";
|
||||||
|
messagingTemplate.convertAndSend(userDestination, messageDto);
|
||||||
|
|
||||||
|
long unreadCount = getUnreadMessageCount(participant.getUser().getId());
|
||||||
|
String username = participant.getUser().getUsername();
|
||||||
|
messagingTemplate.convertAndSendToUser(username, "/queue/unread-count", unreadCount);
|
||||||
|
|
||||||
|
long channelUnread = getUnreadChannelCount(participant.getUser().getId());
|
||||||
|
messagingTemplate.convertAndSendToUser(username, "/queue/channel-unread", channelUnread);
|
||||||
|
}
|
||||||
|
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MessageDto toDto(Message message) {
|
||||||
MessageDto dto = new MessageDto();
|
MessageDto dto = new MessageDto();
|
||||||
dto.setId(message.getId());
|
dto.setId(message.getId());
|
||||||
dto.setContent(message.getContent());
|
dto.setContent(message.getContent());
|
||||||
@@ -95,6 +157,25 @@ public class MessageService {
|
|||||||
userSummaryDto.setAvatar(message.getSender().getAvatar());
|
userSummaryDto.setAvatar(message.getSender().getAvatar());
|
||||||
dto.setSender(userSummaryDto);
|
dto.setSender(userSummaryDto);
|
||||||
|
|
||||||
|
if (message.getReplyTo() != null) {
|
||||||
|
Message reply = message.getReplyTo();
|
||||||
|
MessageDto replyDto = new MessageDto();
|
||||||
|
replyDto.setId(reply.getId());
|
||||||
|
replyDto.setContent(reply.getContent());
|
||||||
|
UserSummaryDto replySender = new UserSummaryDto();
|
||||||
|
replySender.setId(reply.getSender().getId());
|
||||||
|
replySender.setUsername(reply.getSender().getUsername());
|
||||||
|
replySender.setAvatar(reply.getSender().getAvatar());
|
||||||
|
replyDto.setSender(replySender);
|
||||||
|
dto.setReplyTo(replyDto);
|
||||||
|
}
|
||||||
|
|
||||||
|
java.util.List<Reaction> reactions = reactionRepository.findByMessage(message);
|
||||||
|
java.util.List<ReactionDto> reactionDtos = reactions.stream()
|
||||||
|
.map(reactionMapper::toDto)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
dto.setReactions(reactionDtos);
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,7 +189,8 @@ public class MessageService {
|
|||||||
|
|
||||||
private MessageConversation findOrCreateConversation(User user1, User user2) {
|
private MessageConversation findOrCreateConversation(User user1, User user2) {
|
||||||
log.info("Searching for existing conversation between {} and {}", user1.getUsername(), user2.getUsername());
|
log.info("Searching for existing conversation between {} and {}", user1.getUsername(), user2.getUsername());
|
||||||
return conversationRepository.findConversationByUsers(user1, user2)
|
return conversationRepository.findConversationsByUsers(user1, user2).stream()
|
||||||
|
.findFirst()
|
||||||
.orElseGet(() -> {
|
.orElseGet(() -> {
|
||||||
log.info("No existing conversation found. Creating a new one.");
|
log.info("No existing conversation found. Creating a new one.");
|
||||||
MessageConversation conversation = new MessageConversation();
|
MessageConversation conversation = new MessageConversation();
|
||||||
@@ -134,12 +216,18 @@ public class MessageService {
|
|||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
public List<ConversationDto> getConversations(Long userId) {
|
public List<ConversationDto> getConversations(Long userId) {
|
||||||
List<MessageConversation> conversations = conversationRepository.findConversationsByUserIdOrderByLastMessageDesc(userId);
|
List<MessageConversation> conversations = conversationRepository.findConversationsByUserIdOrderByLastMessageDesc(userId);
|
||||||
return conversations.stream().map(c -> toDto(c, userId)).collect(Collectors.toList());
|
return conversations.stream()
|
||||||
|
.filter(c -> !c.isChannel())
|
||||||
|
.map(c -> toDto(c, userId))
|
||||||
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
private ConversationDto toDto(MessageConversation conversation, Long userId) {
|
private ConversationDto toDto(MessageConversation conversation, Long userId) {
|
||||||
ConversationDto dto = new ConversationDto();
|
ConversationDto dto = new ConversationDto();
|
||||||
dto.setId(conversation.getId());
|
dto.setId(conversation.getId());
|
||||||
|
dto.setChannel(conversation.isChannel());
|
||||||
|
dto.setName(conversation.getName());
|
||||||
|
dto.setAvatar(conversation.getAvatar());
|
||||||
dto.setCreatedAt(conversation.getCreatedAt());
|
dto.setCreatedAt(conversation.getCreatedAt());
|
||||||
if (conversation.getLastMessage() != null) {
|
if (conversation.getLastMessage() != null) {
|
||||||
dto.setLastMessage(toDto(conversation.getLastMessage()));
|
dto.setLastMessage(toDto(conversation.getLastMessage()));
|
||||||
@@ -189,6 +277,9 @@ public class MessageService {
|
|||||||
|
|
||||||
ConversationDetailDto detailDto = new ConversationDetailDto();
|
ConversationDetailDto detailDto = new ConversationDetailDto();
|
||||||
detailDto.setId(conversation.getId());
|
detailDto.setId(conversation.getId());
|
||||||
|
detailDto.setName(conversation.getName());
|
||||||
|
detailDto.setChannel(conversation.isChannel());
|
||||||
|
detailDto.setAvatar(conversation.getAvatar());
|
||||||
detailDto.setParticipants(participants);
|
detailDto.setParticipants(participants);
|
||||||
detailDto.setMessages(messageDtoPage);
|
detailDto.setMessages(messageDtoPage);
|
||||||
|
|
||||||
@@ -208,10 +299,26 @@ public class MessageService {
|
|||||||
List<MessageParticipant> participations = participantRepository.findByUserId(userId);
|
List<MessageParticipant> participations = participantRepository.findByUserId(userId);
|
||||||
long totalUnreadCount = 0;
|
long totalUnreadCount = 0;
|
||||||
for (MessageParticipant p : participations) {
|
for (MessageParticipant p : participations) {
|
||||||
|
if (p.getConversation().isChannel()) continue;
|
||||||
LocalDateTime lastRead = p.getLastReadAt() == null ? LocalDateTime.of(1970, 1, 1, 0, 0) : p.getLastReadAt();
|
LocalDateTime lastRead = p.getLastReadAt() == null ? LocalDateTime.of(1970, 1, 1, 0, 0) : p.getLastReadAt();
|
||||||
// 只计算别人发送给当前用户的未读消息
|
// 只计算别人发送给当前用户的未读消息
|
||||||
totalUnreadCount += messageRepository.countByConversationIdAndCreatedAtAfterAndSenderIdNot(p.getConversation().getId(), lastRead, userId);
|
totalUnreadCount += messageRepository.countByConversationIdAndCreatedAtAfterAndSenderIdNot(p.getConversation().getId(), lastRead, userId);
|
||||||
}
|
}
|
||||||
return totalUnreadCount;
|
return totalUnreadCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public long getUnreadChannelCount(Long userId) {
|
||||||
|
List<MessageParticipant> participations = participantRepository.findByUserId(userId);
|
||||||
|
long unreadChannelCount = 0;
|
||||||
|
for (MessageParticipant p : participations) {
|
||||||
|
if (!p.getConversation().isChannel()) continue;
|
||||||
|
LocalDateTime lastRead = p.getLastReadAt() == null ? LocalDateTime.of(1970, 1, 1, 0, 0) : p.getLastReadAt();
|
||||||
|
long unread = messageRepository.countByConversationIdAndCreatedAtAfterAndSenderIdNot(p.getConversation().getId(), lastRead, userId);
|
||||||
|
if (unread > 0) {
|
||||||
|
unreadChannelCount++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return unreadChannelCount;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -6,10 +6,12 @@ import com.openisle.model.Reaction;
|
|||||||
import com.openisle.model.ReactionType;
|
import com.openisle.model.ReactionType;
|
||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
import com.openisle.model.NotificationType;
|
import com.openisle.model.NotificationType;
|
||||||
|
import com.openisle.model.Message;
|
||||||
import com.openisle.repository.CommentRepository;
|
import com.openisle.repository.CommentRepository;
|
||||||
import com.openisle.repository.PostRepository;
|
import com.openisle.repository.PostRepository;
|
||||||
import com.openisle.repository.ReactionRepository;
|
import com.openisle.repository.ReactionRepository;
|
||||||
import com.openisle.repository.UserRepository;
|
import com.openisle.repository.UserRepository;
|
||||||
|
import com.openisle.repository.MessageRepository;
|
||||||
import com.openisle.service.NotificationService;
|
import com.openisle.service.NotificationService;
|
||||||
import com.openisle.service.EmailSender;
|
import com.openisle.service.EmailSender;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -24,6 +26,7 @@ public class ReactionService {
|
|||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
private final PostRepository postRepository;
|
private final PostRepository postRepository;
|
||||||
private final CommentRepository commentRepository;
|
private final CommentRepository commentRepository;
|
||||||
|
private final MessageRepository messageRepository;
|
||||||
private final NotificationService notificationService;
|
private final NotificationService notificationService;
|
||||||
private final EmailSender emailSender;
|
private final EmailSender emailSender;
|
||||||
|
|
||||||
@@ -77,6 +80,26 @@ public class ReactionService {
|
|||||||
return reaction;
|
return reaction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public Reaction reactToMessage(String username, Long messageId, ReactionType type) {
|
||||||
|
User user = userRepository.findByUsername(username)
|
||||||
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||||
|
Message message = messageRepository.findById(messageId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Message not found"));
|
||||||
|
java.util.Optional<Reaction> existing =
|
||||||
|
reactionRepository.findByUserAndMessageAndType(user, message, type);
|
||||||
|
if (existing.isPresent()) {
|
||||||
|
reactionRepository.delete(existing.get());
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
Reaction reaction = new Reaction();
|
||||||
|
reaction.setUser(user);
|
||||||
|
reaction.setMessage(message);
|
||||||
|
reaction.setType(type);
|
||||||
|
reaction = reactionRepository.save(reaction);
|
||||||
|
return reaction;
|
||||||
|
}
|
||||||
|
|
||||||
public java.util.List<Reaction> getReactionsForPost(Long postId) {
|
public java.util.List<Reaction> getReactionsForPost(Long postId) {
|
||||||
Post post = postRepository.findById(postId)
|
Post post = postRepository.findById(postId)
|
||||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||||
|
|||||||
@@ -107,6 +107,11 @@ public class SubscriptionService {
|
|||||||
return commentSubRepo.findByComment(c).stream().map(CommentSubscription::getUser).toList();
|
return commentSubRepo.findByComment(c).stream().map(CommentSubscription::getUser).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Post> getSubscribedPosts(String username) {
|
||||||
|
User user = userRepo.findByUsername(username).orElseThrow();
|
||||||
|
return postSubRepo.findByUser(user).stream().map(PostSubscription::getPost).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public long countSubscribers(String username) {
|
public long countSubscribers(String username) {
|
||||||
User user = userRepo.findByUsername(username).orElseThrow();
|
User user = userRepo.findByUsername(username).orElseThrow();
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.openisle.model.Post;
|
|||||||
import com.openisle.model.Reaction;
|
import com.openisle.model.Reaction;
|
||||||
import com.openisle.model.ReactionType;
|
import com.openisle.model.ReactionType;
|
||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
|
import com.openisle.model.Message;
|
||||||
import com.openisle.service.ReactionService;
|
import com.openisle.service.ReactionService;
|
||||||
import com.openisle.service.LevelService;
|
import com.openisle.service.LevelService;
|
||||||
import com.openisle.mapper.ReactionMapper;
|
import com.openisle.mapper.ReactionMapper;
|
||||||
@@ -78,6 +79,27 @@ class ReactionControllerTest {
|
|||||||
.andExpect(jsonPath("$.commentId").value(2));
|
.andExpect(jsonPath("$.commentId").value(2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void reactToMessage() throws Exception {
|
||||||
|
User user = new User();
|
||||||
|
user.setUsername("u3");
|
||||||
|
Message message = new Message();
|
||||||
|
message.setId(3L);
|
||||||
|
Reaction reaction = new Reaction();
|
||||||
|
reaction.setId(3L);
|
||||||
|
reaction.setUser(user);
|
||||||
|
reaction.setMessage(message);
|
||||||
|
reaction.setType(ReactionType.LIKE);
|
||||||
|
Mockito.when(reactionService.reactToMessage(eq("u3"), eq(3L), eq(ReactionType.LIKE))).thenReturn(reaction);
|
||||||
|
|
||||||
|
mockMvc.perform(post("/api/messages/3/reactions")
|
||||||
|
.contentType("application/json")
|
||||||
|
.content("{\"type\":\"LIKE\"}")
|
||||||
|
.principal(new UsernamePasswordAuthenticationToken("u3", "p")))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$.messageId").value(3));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void listReactionTypes() throws Exception {
|
void listReactionTypes() throws Exception {
|
||||||
mockMvc.perform(get("/api/reaction-types"))
|
mockMvc.perform(get("/api/reaction-types"))
|
||||||
|
|||||||
@@ -136,6 +136,30 @@ class UserControllerTest {
|
|||||||
.andExpect(jsonPath("$[0].title").value("hello"));
|
.andExpect(jsonPath("$[0].title").value("hello"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void listSubscribedPosts() throws Exception {
|
||||||
|
User user = new User();
|
||||||
|
user.setUsername("bob");
|
||||||
|
com.openisle.model.Category cat = new com.openisle.model.Category();
|
||||||
|
cat.setName("tech");
|
||||||
|
com.openisle.model.Post post = new com.openisle.model.Post();
|
||||||
|
post.setId(6L);
|
||||||
|
post.setTitle("fav");
|
||||||
|
post.setCreatedAt(java.time.LocalDateTime.now());
|
||||||
|
post.setCategory(cat);
|
||||||
|
post.setAuthor(user);
|
||||||
|
Mockito.when(userService.findByIdentifier("bob")).thenReturn(Optional.of(user));
|
||||||
|
Mockito.when(subscriptionService.getSubscribedPosts("bob")).thenReturn(java.util.List.of(post));
|
||||||
|
PostMetaDto meta = new PostMetaDto();
|
||||||
|
meta.setId(6L);
|
||||||
|
meta.setTitle("fav");
|
||||||
|
Mockito.when(userMapper.toMetaDto(post)).thenReturn(meta);
|
||||||
|
|
||||||
|
mockMvc.perform(get("/api/users/bob/subscribed-posts"))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$[0].title").value("fav"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void listUserReplies() throws Exception {
|
void listUserReplies() throws Exception {
|
||||||
User user = new User();
|
User user = new User();
|
||||||
|
|||||||
@@ -15,9 +15,10 @@ class ReactionServiceTest {
|
|||||||
UserRepository userRepo = mock(UserRepository.class);
|
UserRepository userRepo = mock(UserRepository.class);
|
||||||
PostRepository postRepo = mock(PostRepository.class);
|
PostRepository postRepo = mock(PostRepository.class);
|
||||||
CommentRepository commentRepo = mock(CommentRepository.class);
|
CommentRepository commentRepo = mock(CommentRepository.class);
|
||||||
|
MessageRepository messageRepo = mock(MessageRepository.class);
|
||||||
NotificationService notif = mock(NotificationService.class);
|
NotificationService notif = mock(NotificationService.class);
|
||||||
EmailSender email = mock(EmailSender.class);
|
EmailSender email = mock(EmailSender.class);
|
||||||
ReactionService service = new ReactionService(reactionRepo, userRepo, postRepo, commentRepo, notif, email);
|
ReactionService service = new ReactionService(reactionRepo, userRepo, postRepo, commentRepo, messageRepo, notif, email);
|
||||||
org.springframework.test.util.ReflectionTestUtils.setField(service, "websiteUrl", "https://ex.com");
|
org.springframework.test.util.ReflectionTestUtils.setField(service, "websiteUrl", "https://ex.com");
|
||||||
|
|
||||||
User user = new User();
|
User user = new User();
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<div class="header-container">
|
<div v-if="!isFloatMode" class="header-container">
|
||||||
<HeaderComponent
|
<HeaderComponent
|
||||||
ref="header"
|
ref="header"
|
||||||
@toggle-menu="menuVisible = !menuVisible"
|
@toggle-menu="menuVisible = !menuVisible"
|
||||||
@@ -9,19 +9,28 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="main-container">
|
<div class="main-container">
|
||||||
<div class="menu-container" v-click-outside="handleMenuOutside">
|
<div v-if="!isFloatMode" class="menu-container" v-click-outside="handleMenuOutside">
|
||||||
<MenuComponent :visible="!hideMenu && menuVisible" @item-click="menuVisible = false" />
|
<MenuComponent :visible="!hideMenu && menuVisible" @item-click="menuVisible = false" />
|
||||||
</div>
|
</div>
|
||||||
<div class="content" :class="{ 'menu-open': menuVisible && !hideMenu }">
|
<div
|
||||||
|
class="content"
|
||||||
|
:class="{ 'menu-open': menuVisible && !hideMenu && !isFloatMode }"
|
||||||
|
:style="isFloatMode ? { paddingTop: '0px', minHeight: '100vh' } : {}"
|
||||||
|
>
|
||||||
<NuxtPage keepalive />
|
<NuxtPage keepalive />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="showNewPostIcon && isMobile" class="app-new-post-icon" @click="goToNewPost">
|
<div
|
||||||
|
v-if="showNewPostIcon && isMobile && !isFloatMode"
|
||||||
|
class="app-new-post-icon"
|
||||||
|
@click="goToNewPost"
|
||||||
|
>
|
||||||
<i class="fas fa-edit"></i>
|
<i class="fas fa-edit"></i>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<GlobalPopups />
|
<GlobalPopups />
|
||||||
<ConfirmDialog />
|
<ConfirmDialog />
|
||||||
|
<MessageFloatWindow v-if="!isFloatMode" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -30,6 +39,7 @@ import HeaderComponent from '~/components/HeaderComponent.vue'
|
|||||||
import MenuComponent from '~/components/MenuComponent.vue'
|
import MenuComponent from '~/components/MenuComponent.vue'
|
||||||
import GlobalPopups from '~/components/GlobalPopups.vue'
|
import GlobalPopups from '~/components/GlobalPopups.vue'
|
||||||
import ConfirmDialog from '~/components/ConfirmDialog.vue'
|
import ConfirmDialog from '~/components/ConfirmDialog.vue'
|
||||||
|
import MessageFloatWindow from '~/components/MessageFloatWindow.vue'
|
||||||
import { useIsMobile } from '~/utils/screen'
|
import { useIsMobile } from '~/utils/screen'
|
||||||
|
|
||||||
const isMobile = useIsMobile()
|
const isMobile = useIsMobile()
|
||||||
@@ -52,6 +62,7 @@ const hideMenu = computed(() => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const header = useTemplateRef('header')
|
const header = useTemplateRef('header')
|
||||||
|
const isFloatMode = computed(() => useRoute().query.float !== undefined)
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
if (typeof window !== 'undefined') {
|
if (typeof window !== 'undefined') {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="timeline">
|
<div class="timeline" :class="{ 'hover-enabled': hover }">
|
||||||
<div class="timeline-item" v-for="(item, idx) in items" :key="idx">
|
<div class="timeline-item" v-for="(item, idx) in items" :key="idx">
|
||||||
<div
|
<div
|
||||||
class="timeline-icon"
|
class="timeline-icon"
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
>
|
>
|
||||||
<img v-if="item.src" :src="item.src" class="timeline-img" alt="timeline item" />
|
<img v-if="item.src" :src="item.src" class="timeline-img" alt="timeline item" />
|
||||||
<i v-else-if="item.icon" :class="item.icon"></i>
|
<i v-else-if="item.icon" :class="item.icon"></i>
|
||||||
<span v-else-if="item.emoji" class="timeline-emoji">{{ item.emoji }}</span>
|
<img v-else-if="item.emoji" :src="item.emoji" class="timeline-emoji" alt="emoji" />
|
||||||
</div>
|
</div>
|
||||||
<div class="timeline-content">
|
<div class="timeline-content">
|
||||||
<slot name="item" :item="item">{{ item.content }}</slot>
|
<slot name="item" :item="item">{{ item.content }}</slot>
|
||||||
@@ -22,6 +22,7 @@ export default {
|
|||||||
name: 'BaseTimeline',
|
name: 'BaseTimeline',
|
||||||
props: {
|
props: {
|
||||||
items: { type: Array, default: () => [] },
|
items: { type: Array, default: () => [] },
|
||||||
|
hover: { type: Boolean, default: false },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -41,7 +42,7 @@ export default {
|
|||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.timeline-item:hover {
|
.hover-enabled .timeline-item:hover {
|
||||||
background-color: var(--menu-selected-background-color);
|
background-color: var(--menu-selected-background-color);
|
||||||
transition: background-color 0.2s;
|
transition: background-color 0.2s;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
@@ -73,8 +74,9 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.timeline-emoji {
|
.timeline-emoji {
|
||||||
font-size: 20px;
|
width: 20px;
|
||||||
line-height: 1;
|
height: 20px;
|
||||||
|
object-fit: contain;
|
||||||
}
|
}
|
||||||
|
|
||||||
.timeline-item::before {
|
.timeline-item::before {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
@close="closeMilkTeaPopup"
|
@close="closeMilkTeaPopup"
|
||||||
/>
|
/>
|
||||||
<NotificationSettingPopup :visible="showNotificationPopup" @close="closeNotificationPopup" />
|
<NotificationSettingPopup :visible="showNotificationPopup" @close="closeNotificationPopup" />
|
||||||
|
<MessagePopup :visible="showMessagePopup" @close="closeMessagePopup" />
|
||||||
<MedalPopup :visible="showMedalPopup" :medals="newMedals" @close="closeMedalPopup" />
|
<MedalPopup :visible="showMedalPopup" :medals="newMedals" @close="closeMedalPopup" />
|
||||||
|
|
||||||
<ActivityPopup
|
<ActivityPopup
|
||||||
@@ -22,6 +23,7 @@
|
|||||||
import ActivityPopup from '~/components/ActivityPopup.vue'
|
import ActivityPopup from '~/components/ActivityPopup.vue'
|
||||||
import MedalPopup from '~/components/MedalPopup.vue'
|
import MedalPopup from '~/components/MedalPopup.vue'
|
||||||
import NotificationSettingPopup from '~/components/NotificationSettingPopup.vue'
|
import NotificationSettingPopup from '~/components/NotificationSettingPopup.vue'
|
||||||
|
import MessagePopup from '~/components/MessagePopup.vue'
|
||||||
import { authState } from '~/utils/auth'
|
import { authState } from '~/utils/auth'
|
||||||
|
|
||||||
const config = useRuntimeConfig()
|
const config = useRuntimeConfig()
|
||||||
@@ -33,6 +35,7 @@ const milkTeaIcon = ref('')
|
|||||||
const inviteCodeIcon = ref('')
|
const inviteCodeIcon = ref('')
|
||||||
|
|
||||||
const showNotificationPopup = ref(false)
|
const showNotificationPopup = ref(false)
|
||||||
|
const showMessagePopup = ref(false)
|
||||||
const showMedalPopup = ref(false)
|
const showMedalPopup = ref(false)
|
||||||
const newMedals = ref([])
|
const newMedals = ref([])
|
||||||
|
|
||||||
@@ -43,6 +46,9 @@ onMounted(async () => {
|
|||||||
await checkInviteCodeActivity()
|
await checkInviteCodeActivity()
|
||||||
if (showInviteCodePopup.value) return
|
if (showInviteCodePopup.value) return
|
||||||
|
|
||||||
|
await checkMessageFeature()
|
||||||
|
if (showMessagePopup.value) return
|
||||||
|
|
||||||
await checkNotificationSetting()
|
await checkNotificationSetting()
|
||||||
if (showNotificationPopup.value) return
|
if (showNotificationPopup.value) return
|
||||||
|
|
||||||
@@ -97,6 +103,18 @@ const closeMilkTeaPopup = () => {
|
|||||||
showMilkTeaPopup.value = false
|
showMilkTeaPopup.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const checkMessageFeature = async () => {
|
||||||
|
if (!import.meta.client) return
|
||||||
|
if (!authState.loggedIn) return
|
||||||
|
if (localStorage.getItem('messageFeaturePopupShown')) return
|
||||||
|
showMessagePopup.value = true
|
||||||
|
}
|
||||||
|
const closeMessagePopup = () => {
|
||||||
|
if (!import.meta.client) return
|
||||||
|
localStorage.setItem('messageFeaturePopupShown', 'true')
|
||||||
|
showMessagePopup.value = false
|
||||||
|
}
|
||||||
|
|
||||||
const checkNotificationSetting = async () => {
|
const checkNotificationSetting = async () => {
|
||||||
if (!import.meta.client) return
|
if (!import.meta.client) return
|
||||||
if (!authState.loggedIn) return
|
if (!authState.loggedIn) return
|
||||||
|
|||||||
@@ -6,7 +6,10 @@
|
|||||||
<button class="menu-btn" ref="menuBtn" @click="$emit('toggle-menu')">
|
<button class="menu-btn" ref="menuBtn" @click="$emit('toggle-menu')">
|
||||||
<i class="fas fa-bars"></i>
|
<i class="fas fa-bars"></i>
|
||||||
</button>
|
</button>
|
||||||
<span v-if="isMobile && unreadMessageCount > 0" class="menu-unread-dot"></span>
|
<span
|
||||||
|
v-if="isMobile && (unreadMessageCount > 0 || hasChannelUnread)"
|
||||||
|
class="menu-unread-dot"
|
||||||
|
></span>
|
||||||
</div>
|
</div>
|
||||||
<NuxtLink class="logo-container" :to="`/`" @click="refrechData">
|
<NuxtLink class="logo-container" :to="`/`" @click="refrechData">
|
||||||
<img
|
<img
|
||||||
@@ -53,6 +56,7 @@
|
|||||||
<span v-if="unreadMessageCount > 0" class="unread-badge">{{
|
<span v-if="unreadMessageCount > 0" class="unread-badge">{{
|
||||||
unreadMessageCount
|
unreadMessageCount
|
||||||
}}</span>
|
}}</span>
|
||||||
|
<span v-else-if="hasChannelUnread" class="unread-dot"></span>
|
||||||
</div>
|
</div>
|
||||||
</ToolTip>
|
</ToolTip>
|
||||||
|
|
||||||
@@ -85,6 +89,7 @@ import ToolTip from '~/components/ToolTip.vue'
|
|||||||
import SearchDropdown from '~/components/SearchDropdown.vue'
|
import SearchDropdown from '~/components/SearchDropdown.vue'
|
||||||
import { authState, clearToken, loadCurrentUser } from '~/utils/auth'
|
import { authState, clearToken, loadCurrentUser } from '~/utils/auth'
|
||||||
import { useUnreadCount } from '~/composables/useUnreadCount'
|
import { useUnreadCount } from '~/composables/useUnreadCount'
|
||||||
|
import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
|
||||||
import { useIsMobile } from '~/utils/screen'
|
import { useIsMobile } from '~/utils/screen'
|
||||||
import { themeState, cycleTheme, ThemeMode } from '~/utils/theme'
|
import { themeState, cycleTheme, ThemeMode } from '~/utils/theme'
|
||||||
import { toast } from '~/main'
|
import { toast } from '~/main'
|
||||||
@@ -103,6 +108,7 @@ const props = defineProps({
|
|||||||
const isLogin = computed(() => authState.loggedIn)
|
const isLogin = computed(() => authState.loggedIn)
|
||||||
const isMobile = useIsMobile()
|
const isMobile = useIsMobile()
|
||||||
const { count: unreadMessageCount, fetchUnreadCount } = useUnreadCount()
|
const { count: unreadMessageCount, fetchUnreadCount } = useUnreadCount()
|
||||||
|
const { hasUnread: hasChannelUnread, fetchChannelUnread } = useChannelsUnreadCount()
|
||||||
const avatar = ref('')
|
const avatar = ref('')
|
||||||
const showSearch = ref(false)
|
const showSearch = ref(false)
|
||||||
const searchDropdown = ref(null)
|
const searchDropdown = ref(null)
|
||||||
@@ -143,8 +149,20 @@ const copyInviteLink = async () => {
|
|||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
const data = await res.json()
|
const data = await res.json()
|
||||||
const inviteLink = data.token ? `${WEBSITE_BASE_URL}/signup?invite_token=${data.token}` : ''
|
const inviteLink = data.token ? `${WEBSITE_BASE_URL}/signup?invite_token=${data.token}` : ''
|
||||||
await navigator.clipboard.writeText(inviteLink)
|
/**
|
||||||
toast.success('邀请链接已复制')
|
* navigator.clipboard在webkit中有点奇怪的行为
|
||||||
|
* https://stackoverflow.com/questions/62327358/javascript-clipboard-api-safari-ios-notallowederror-message
|
||||||
|
* https://webkit.org/blog/10247/new-webkit-features-in-safari-13-1/
|
||||||
|
*/
|
||||||
|
setTimeout(() => {
|
||||||
|
navigator.clipboard.writeText(inviteLink)
|
||||||
|
.then(() => {
|
||||||
|
toast.success('邀请链接已复制')
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
toast.error('邀请链接复制失败')
|
||||||
|
})
|
||||||
|
}, 0)
|
||||||
} else {
|
} else {
|
||||||
const data = await res.json().catch(() => ({}))
|
const data = await res.json().catch(() => ({}))
|
||||||
toast.error(data.error || '生成邀请链接失败')
|
toast.error(data.error || '生成邀请链接失败')
|
||||||
@@ -227,8 +245,10 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
const updateUnread = async () => {
|
const updateUnread = async () => {
|
||||||
if (authState.loggedIn) {
|
if (authState.loggedIn) {
|
||||||
// Initialize the unread count composable
|
|
||||||
fetchUnreadCount()
|
fetchUnreadCount()
|
||||||
|
fetchChannelUnread()
|
||||||
|
} else {
|
||||||
|
fetchChannelUnread()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -413,6 +433,16 @@ onMounted(async () => {
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.unread-dot {
|
||||||
|
position: absolute;
|
||||||
|
top: -2px;
|
||||||
|
right: -4px;
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background-color: #ff4d4f;
|
||||||
|
}
|
||||||
|
|
||||||
.rss-icon {
|
.rss-icon {
|
||||||
animation: rss-glow 2s 3;
|
animation: rss-glow 2s 3;
|
||||||
}
|
}
|
||||||
|
|||||||
101
frontend_nuxt/components/MessageFloatWindow.vue
Normal file
101
frontend_nuxt/components/MessageFloatWindow.vue
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
<template>
|
||||||
|
<div v-if="floatRoute" class="message-float-window" :style="{ height: floatHeight }">
|
||||||
|
<iframe :src="iframeSrc" frameborder="0"></iframe>
|
||||||
|
|
||||||
|
<div class="float-actions">
|
||||||
|
<i
|
||||||
|
class="fas fa-chevron-down"
|
||||||
|
v-if="floatHeight !== MINI_HEIGHT"
|
||||||
|
title="收起至 100px"
|
||||||
|
@click="collapseToMini"
|
||||||
|
></i>
|
||||||
|
<!-- 回弹:60vh -->
|
||||||
|
<i
|
||||||
|
class="fas fa-chevron-up"
|
||||||
|
v-if="floatHeight !== DEFAULT_HEIGHT"
|
||||||
|
title="回弹至 60vh"
|
||||||
|
@click="reboundToDefault"
|
||||||
|
></i>
|
||||||
|
<!-- 全屏打开(原有逻辑) -->
|
||||||
|
<i class="fas fa-expand" title="在页面中打开" @click="expand"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
const floatRoute = useState('messageFloatRoute')
|
||||||
|
|
||||||
|
const DEFAULT_HEIGHT = '60vh'
|
||||||
|
const MINI_HEIGHT = '45px'
|
||||||
|
const floatHeight = ref(DEFAULT_HEIGHT)
|
||||||
|
|
||||||
|
const iframeSrc = computed(() => {
|
||||||
|
if (!floatRoute.value) return ''
|
||||||
|
return floatRoute.value + (floatRoute.value.includes('?') ? '&' : '?') + 'float=1'
|
||||||
|
})
|
||||||
|
|
||||||
|
function collapseToMini() {
|
||||||
|
floatHeight.value = MINI_HEIGHT
|
||||||
|
}
|
||||||
|
|
||||||
|
function reboundToDefault() {
|
||||||
|
floatHeight.value = DEFAULT_HEIGHT
|
||||||
|
}
|
||||||
|
|
||||||
|
function expand() {
|
||||||
|
if (!floatRoute.value) return
|
||||||
|
const target = floatRoute.value
|
||||||
|
floatRoute.value = null
|
||||||
|
navigateTo(target)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 当浮窗重新出现时,恢复默认高度
|
||||||
|
watch(
|
||||||
|
() => floatRoute.value,
|
||||||
|
(v) => {
|
||||||
|
if (v) floatHeight.value = DEFAULT_HEIGHT
|
||||||
|
},
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.message-float-window {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
right: 0;
|
||||||
|
width: 400px;
|
||||||
|
/* 高度由内联样式绑定控制:60vh / 100px */
|
||||||
|
max-height: 90vh;
|
||||||
|
background-color: var(--background-color);
|
||||||
|
border: 1px solid var(--normal-border-color);
|
||||||
|
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||||
|
z-index: 2000;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
transition: height 0.25s ease; /* 平滑过渡 */
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-float-window iframe {
|
||||||
|
width: 100%;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.float-actions {
|
||||||
|
position: absolute;
|
||||||
|
top: 4px;
|
||||||
|
right: 8px;
|
||||||
|
padding: 12px;
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.float-actions i {
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 14px;
|
||||||
|
opacity: 0.9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.float-actions i:hover {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
74
frontend_nuxt/components/MessagePopup.vue
Normal file
74
frontend_nuxt/components/MessagePopup.vue
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
<template>
|
||||||
|
<BasePopup :visible="visible" @close="close">
|
||||||
|
<div class="message-popup">
|
||||||
|
<div class="message-popup-title">📨 站内信上线啦</div>
|
||||||
|
<div class="message-popup-text">现在可以在右上角使用站内信功能</div>
|
||||||
|
<div class="message-popup-actions">
|
||||||
|
<div class="message-popup-close" @click="close">知道了</div>
|
||||||
|
<div class="message-popup-button" @click="gotoMessage">去看看</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</BasePopup>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import BasePopup from '~/components/BasePopup.vue'
|
||||||
|
|
||||||
|
defineProps({
|
||||||
|
visible: { type: Boolean, default: false },
|
||||||
|
})
|
||||||
|
const emit = defineEmits(['close'])
|
||||||
|
|
||||||
|
const gotoMessage = () => {
|
||||||
|
emit('close')
|
||||||
|
navigateTo('/message-box', { replace: true })
|
||||||
|
}
|
||||||
|
const close = () => emit('close')
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.message-popup {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
text-align: center;
|
||||||
|
gap: 10px;
|
||||||
|
min-width: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-popup-title {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: bold;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-popup-actions {
|
||||||
|
margin-top: 10px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-popup-button {
|
||||||
|
background-color: var(--primary-color);
|
||||||
|
color: #fff;
|
||||||
|
padding: 8px 16px;
|
||||||
|
border-radius: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-popup-button:hover {
|
||||||
|
background-color: var(--primary-color-hover);
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-popup-close {
|
||||||
|
cursor: pointer;
|
||||||
|
color: var(--primary-color);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-popup-close:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -3,24 +3,45 @@
|
|||||||
<div class="reactions-viewer">
|
<div class="reactions-viewer">
|
||||||
<div
|
<div
|
||||||
class="reactions-viewer-item-container"
|
class="reactions-viewer-item-container"
|
||||||
@click="openPanel"
|
|
||||||
@mouseenter="cancelHide"
|
@mouseenter="cancelHide"
|
||||||
@mouseleave="scheduleHide"
|
@mouseleave="scheduleHide"
|
||||||
>
|
>
|
||||||
<template v-if="displayedReactions.length">
|
<template v-if="reactions.length < 4">
|
||||||
<div v-for="r in displayedReactions" :key="r.type" class="reactions-viewer-item">
|
<div
|
||||||
{{ reactionEmojiMap[r.type] }}
|
v-for="r in displayedReactions"
|
||||||
|
:key="r.type"
|
||||||
|
class="reactions-viewer-single-item"
|
||||||
|
:class="{ selected: userReacted(r.type) }"
|
||||||
|
@click="toggleReaction(r.type)"
|
||||||
|
>
|
||||||
|
<img :src="reactionEmojiMap[r.type]" class="emoji" alt="emoji" />
|
||||||
|
<div>{{ counts[r.type] }}</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="reactions-viewer-item placeholder" @click="openPanel">
|
||||||
|
<i class="far fa-smile reactions-viewer-item-placeholder-icon"></i>
|
||||||
|
<!-- <span class="reactions-viewer-item-placeholder-text">点击以表态</span> -->
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<template v-else-if="displayedReactions.length">
|
||||||
|
<div
|
||||||
|
v-for="r in displayedReactions"
|
||||||
|
:key="r.type"
|
||||||
|
class="reactions-viewer-item"
|
||||||
|
@click="openPanel"
|
||||||
|
>
|
||||||
|
<img :src="reactionEmojiMap[r.type]" class="emoji" alt="emoji" />
|
||||||
</div>
|
</div>
|
||||||
<div class="reactions-count">{{ totalCount }}</div>
|
<div class="reactions-count">{{ totalCount }}</div>
|
||||||
</template>
|
</template>
|
||||||
<div v-else class="reactions-viewer-item placeholder">
|
|
||||||
<i class="far fa-smile"></i>
|
|
||||||
<span class="reactions-viewer-item-placeholder-text">点击以表态</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="make-reaction-container">
|
<div class="make-reaction-container">
|
||||||
<div class="make-reaction-item like-reaction" @click="toggleReaction('LIKE')">
|
<div
|
||||||
|
v-if="props.contentType !== 'message'"
|
||||||
|
class="make-reaction-item like-reaction"
|
||||||
|
@click="toggleReaction('LIKE')"
|
||||||
|
>
|
||||||
<i v-if="!userReacted('LIKE')" class="far fa-heart"></i>
|
<i v-if="!userReacted('LIKE')" class="far fa-heart"></i>
|
||||||
<i v-else class="fas fa-heart"></i>
|
<i v-else class="fas fa-heart"></i>
|
||||||
<span class="reactions-count" v-if="likeCount">{{ likeCount }}</span>
|
<span class="reactions-count" v-if="likeCount">{{ likeCount }}</span>
|
||||||
@@ -40,7 +61,9 @@
|
|||||||
@click="toggleReaction(t)"
|
@click="toggleReaction(t)"
|
||||||
:class="{ selected: userReacted(t) }"
|
:class="{ selected: userReacted(t) }"
|
||||||
>
|
>
|
||||||
{{ reactionEmojiMap[t] }}<span v-if="counts[t]">{{ counts[t] }}</span>
|
<img :src="reactionEmojiMap[t]" class="emoji" alt="emoji" /><span v-if="counts[t]">{{
|
||||||
|
counts[t]
|
||||||
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -119,7 +142,9 @@ const toggleReaction = async (type) => {
|
|||||||
const url =
|
const url =
|
||||||
props.contentType === 'post'
|
props.contentType === 'post'
|
||||||
? `${API_BASE_URL}/api/posts/${props.contentId}/reactions`
|
? `${API_BASE_URL}/api/posts/${props.contentId}/reactions`
|
||||||
: `${API_BASE_URL}/api/comments/${props.contentId}/reactions`
|
: props.contentType === 'comment'
|
||||||
|
? `${API_BASE_URL}/api/comments/${props.contentId}/reactions`
|
||||||
|
: `${API_BASE_URL}/api/messages/${props.contentId}/reactions`
|
||||||
|
|
||||||
// optimistic update
|
// optimistic update
|
||||||
const existingIdx = reactions.value.findIndex(
|
const existingIdx = reactions.value.findIndex(
|
||||||
@@ -217,11 +242,8 @@ onMounted(async () => {
|
|||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.reactions-viewer-item.placeholder {
|
.reactions-viewer-item-placeholder-icon {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
align-items: center;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.reactions-viewer-item-placeholder-text {
|
.reactions-viewer-item-placeholder-text {
|
||||||
@@ -262,18 +284,16 @@ onMounted(async () => {
|
|||||||
|
|
||||||
.reactions-panel {
|
.reactions-panel {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 40px;
|
bottom: 50px;
|
||||||
left: -20px;
|
|
||||||
background-color: var(--background-color);
|
background-color: var(--background-color);
|
||||||
border: 1px solid var(--normal-border-color);
|
border: 1px solid var(--normal-border-color);
|
||||||
border-radius: 5px;
|
border-radius: 20px;
|
||||||
padding: 5px;
|
padding: 5px 10px;
|
||||||
max-width: 240px;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
gap: 2px;
|
gap: 5px;
|
||||||
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
|
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -287,6 +307,27 @@ onMounted(async () => {
|
|||||||
gap: 2px;
|
gap: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.reactions-viewer-item.placeholder,
|
||||||
|
.reactions-viewer-single-item {
|
||||||
|
display: flex;
|
||||||
|
cursor: pointer;
|
||||||
|
flex-direction: row;
|
||||||
|
padding: 2px 10px;
|
||||||
|
gap: 5px;
|
||||||
|
border: 1px solid var(--normal-border-color);
|
||||||
|
border-radius: 10px;
|
||||||
|
margin-right: 5px;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--text-color);
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reactions-viewer-item.placeholder,
|
||||||
|
.reactions-viewer-single-item.selected {
|
||||||
|
background-color: var(--menu-selected-background-color);
|
||||||
|
}
|
||||||
|
|
||||||
.reaction-option.selected {
|
.reaction-option.selected {
|
||||||
background-color: var(--menu-selected-background-color);
|
background-color: var(--menu-selected-background-color);
|
||||||
}
|
}
|
||||||
|
|||||||
92
frontend_nuxt/composables/useChannelsUnreadCount.js
Normal file
92
frontend_nuxt/composables/useChannelsUnreadCount.js
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
import { ref, computed, watch } from 'vue'
|
||||||
|
import { useWebSocket } from './useWebSocket'
|
||||||
|
import { getToken } from '~/utils/auth'
|
||||||
|
|
||||||
|
const count = ref(0)
|
||||||
|
let isInitialized = false
|
||||||
|
let wsSubscription = null
|
||||||
|
|
||||||
|
export function useChannelsUnreadCount() {
|
||||||
|
const config = useRuntimeConfig()
|
||||||
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
const { subscribe, isConnected, connect } = useWebSocket()
|
||||||
|
|
||||||
|
const fetchChannelUnread = async () => {
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
count.value = 0
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/api/channels/unread-count`, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
})
|
||||||
|
if (response.ok) {
|
||||||
|
const data = await response.json()
|
||||||
|
count.value = data
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Failed to fetch channel unread count:', e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const initialize = () => {
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
count.value = 0
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fetchChannelUnread()
|
||||||
|
if (!isConnected.value) {
|
||||||
|
connect(token)
|
||||||
|
}
|
||||||
|
setupWebSocketListener()
|
||||||
|
}
|
||||||
|
|
||||||
|
const setupWebSocketListener = () => {
|
||||||
|
if (!wsSubscription) {
|
||||||
|
watch(
|
||||||
|
isConnected,
|
||||||
|
(newValue) => {
|
||||||
|
if (newValue && !wsSubscription) {
|
||||||
|
wsSubscription = subscribe('/user/queue/channel-unread', (message) => {
|
||||||
|
const unread = parseInt(message.body, 10)
|
||||||
|
if (!isNaN(unread)) {
|
||||||
|
count.value = unread
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ immediate: true },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const setFromList = (channels) => {
|
||||||
|
count.value = Array.isArray(channels) ? channels.filter((c) => c.unreadCount > 0).length : 0
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasUnread = computed(() => count.value > 0)
|
||||||
|
|
||||||
|
const token = getToken()
|
||||||
|
if (token) {
|
||||||
|
if (!isInitialized) {
|
||||||
|
isInitialized = true
|
||||||
|
initialize()
|
||||||
|
} else {
|
||||||
|
fetchChannelUnread()
|
||||||
|
if (!isConnected.value) {
|
||||||
|
connect(token)
|
||||||
|
}
|
||||||
|
setupWebSocketListener()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
count,
|
||||||
|
hasUnread,
|
||||||
|
fetchChannelUnread,
|
||||||
|
initialize,
|
||||||
|
setFromList,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -55,7 +55,10 @@ const subscribe = (destination, callback) => {
|
|||||||
try {
|
try {
|
||||||
const subscription = client.value.subscribe(destination, (message) => {
|
const subscription = client.value.subscribe(destination, (message) => {
|
||||||
try {
|
try {
|
||||||
if (destination.includes('/queue/unread-count')) {
|
if (
|
||||||
|
destination.includes('/queue/unread-count') ||
|
||||||
|
destination.includes('/queue/channel-unread')
|
||||||
|
) {
|
||||||
callback(message)
|
callback(message)
|
||||||
} else {
|
} else {
|
||||||
const parsedMessage = JSON.parse(message.body)
|
const parsedMessage = JSON.parse(message.body)
|
||||||
|
|||||||
@@ -125,6 +125,7 @@
|
|||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, onMounted, onBeforeUnmount, nextTick, ref, watch } from 'vue'
|
import { computed, onMounted, onBeforeUnmount, nextTick, ref, watch } from 'vue'
|
||||||
|
import { useRoute } from 'vue-router'
|
||||||
import ArticleCategory from '~/components/ArticleCategory.vue'
|
import ArticleCategory from '~/components/ArticleCategory.vue'
|
||||||
import ArticleTags from '~/components/ArticleTags.vue'
|
import ArticleTags from '~/components/ArticleTags.vue'
|
||||||
import CategorySelect from '~/components/CategorySelect.vue'
|
import CategorySelect from '~/components/CategorySelect.vue'
|
||||||
@@ -652,6 +653,10 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
|||||||
}
|
}
|
||||||
|
|
||||||
@container home-page (max-width: 768px) {
|
@container home-page (max-width: 768px) {
|
||||||
|
.topic-item-container {
|
||||||
|
margin-left: 0px;
|
||||||
|
gap: 0px;
|
||||||
|
}
|
||||||
.article-main-container,
|
.article-main-container,
|
||||||
.header-item.main-item {
|
.header-item.main-item {
|
||||||
width: calc(70% - 20px);
|
width: calc(70% - 20px);
|
||||||
@@ -709,6 +714,16 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
|||||||
|
|
||||||
.topic-container {
|
.topic-container {
|
||||||
position: initial;
|
position: initial;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.topic-item {
|
||||||
|
padding: 10px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.topic-select-container {
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,10 +1,17 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="chat-container">
|
<div class="chat-container" :class="{ float: isFloatMode }">
|
||||||
<div v-if="!loading && otherParticipant" class="chat-header">
|
<div v-if="!loading" class="chat-header">
|
||||||
<NuxtLink to="/message-box" class="back-button">
|
<div class="header-main">
|
||||||
<i class="fas fa-arrow-left"></i>
|
<div class="back-button" @click="goBack">
|
||||||
</NuxtLink>
|
<i class="fas fa-arrow-left"></i>
|
||||||
<h2 class="participant-name">{{ otherParticipant.username }}</h2>
|
</div>
|
||||||
|
<h2 class="participant-name">
|
||||||
|
{{ isChannel ? conversationName : otherParticipant?.username }}
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
<div v-if="!isFloatMode" class="float-control">
|
||||||
|
<i class="fas fa-compress" @click="minimize" title="最小化"></i>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="messages-list" ref="messagesListEl">
|
<div class="messages-list" ref="messagesListEl">
|
||||||
@@ -18,14 +25,31 @@
|
|||||||
{{ loadingMore ? '加载中...' : '查看更多消息' }}
|
{{ loadingMore ? '加载中...' : '查看更多消息' }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<BaseTimeline :items="messages">
|
<BaseTimeline :items="messages" hover>
|
||||||
<template #item="{ item }">
|
<template #item="{ item }">
|
||||||
<div class="message-timestamp">
|
<div class="message-header">
|
||||||
{{ TimeManager.format(item.createdAt) }}
|
<div class="user-name">
|
||||||
|
{{ item.sender.username }}
|
||||||
|
</div>
|
||||||
|
<div class="message-timestamp">
|
||||||
|
{{ TimeManager.format(item.createdAt) }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="item.replyTo" class="reply-preview">
|
||||||
|
<div class="reply-author">{{ item.replyTo.sender.username }}</div>
|
||||||
|
<div class="reply-content" v-html="renderMarkdown(item.replyTo.content)"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="message-content">
|
<div class="message-content">
|
||||||
<div class="info-content-text" v-html="renderMarkdown(item.content)"></div>
|
<div class="info-content-text" v-html="renderMarkdown(item.content)"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<ReactionsGroup
|
||||||
|
:model-value="item.reactions"
|
||||||
|
content-type="message"
|
||||||
|
:content-id="item.id"
|
||||||
|
@update:modelValue="(v) => (item.reactions = v)"
|
||||||
|
>
|
||||||
|
<i class="fas fa-reply reply-btn" @click="setReply(item)"> 写个回复...</i>
|
||||||
|
</ReactionsGroup>
|
||||||
</template>
|
</template>
|
||||||
</BaseTimeline>
|
</BaseTimeline>
|
||||||
<div class="empty-container">
|
<div class="empty-container">
|
||||||
@@ -39,6 +63,11 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="message-input-area">
|
<div class="message-input-area">
|
||||||
|
<div v-if="replyTo" class="active-reply">
|
||||||
|
正在回复 {{ replyTo.sender.username }}:
|
||||||
|
{{ stripMarkdownLength(replyTo.content, 50) }}
|
||||||
|
<i class="fas fa-times close-reply" @click="replyTo = null"></i>
|
||||||
|
</div>
|
||||||
<MessageEditor :loading="sending" @submit="sendMessage" />
|
<MessageEditor :loading="sending" @submit="sendMessage" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -58,10 +87,12 @@ import {
|
|||||||
import { useRoute } from 'vue-router'
|
import { useRoute } from 'vue-router'
|
||||||
import { getToken, fetchCurrentUser } from '~/utils/auth'
|
import { getToken, fetchCurrentUser } from '~/utils/auth'
|
||||||
import { toast } from '~/main'
|
import { toast } from '~/main'
|
||||||
import { renderMarkdown } from '~/utils/markdown'
|
import { renderMarkdown, stripMarkdownLength } from '~/utils/markdown'
|
||||||
import MessageEditor from '~/components/MessageEditor.vue'
|
import MessageEditor from '~/components/MessageEditor.vue'
|
||||||
|
import ReactionsGroup from '~/components/ReactionsGroup.vue'
|
||||||
import { useWebSocket } from '~/composables/useWebSocket'
|
import { useWebSocket } from '~/composables/useWebSocket'
|
||||||
import { useUnreadCount } from '~/composables/useUnreadCount'
|
import { useUnreadCount } from '~/composables/useUnreadCount'
|
||||||
|
import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
|
||||||
import TimeManager from '~/utils/time'
|
import TimeManager from '~/utils/time'
|
||||||
import BaseTimeline from '~/components/BaseTimeline.vue'
|
import BaseTimeline from '~/components/BaseTimeline.vue'
|
||||||
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
||||||
@@ -71,6 +102,7 @@ const route = useRoute()
|
|||||||
const API_BASE_URL = config.public.apiBaseUrl
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
|
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
|
||||||
const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
|
const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
|
||||||
|
const { fetchChannelUnread: refreshChannelUnread } = useChannelsUnreadCount()
|
||||||
let subscription = null
|
let subscription = null
|
||||||
|
|
||||||
const messages = ref([])
|
const messages = ref([])
|
||||||
@@ -86,11 +118,16 @@ const currentPage = ref(0)
|
|||||||
const totalPages = ref(0)
|
const totalPages = ref(0)
|
||||||
const loadingMore = ref(false)
|
const loadingMore = ref(false)
|
||||||
let scrollInterval = null
|
let scrollInterval = null
|
||||||
|
const conversationName = ref('')
|
||||||
|
const isChannel = ref(false)
|
||||||
|
const isFloatMode = computed(() => route.query.float !== undefined)
|
||||||
|
const floatRoute = useState('messageFloatRoute')
|
||||||
|
const replyTo = ref(null)
|
||||||
|
|
||||||
const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1)
|
const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1)
|
||||||
|
|
||||||
const otherParticipant = computed(() => {
|
const otherParticipant = computed(() => {
|
||||||
if (!currentUser.value || participants.value.length === 0) {
|
if (isChannel.value || !currentUser.value || participants.value.length === 0) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
return participants.value.find((p) => p.id !== currentUser.value.id)
|
return participants.value.find((p) => p.id !== currentUser.value.id)
|
||||||
@@ -104,6 +141,10 @@ function handleAvatarError(event) {
|
|||||||
event.target.src = '/default-avatar.svg'
|
event.target.src = '/default-avatar.svg'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function setReply(message) {
|
||||||
|
replyTo.value = message
|
||||||
|
}
|
||||||
|
|
||||||
// No changes needed here, as renderMarkdown is now imported.
|
// No changes needed here, as renderMarkdown is now imported.
|
||||||
// The old function is removed.
|
// The old function is removed.
|
||||||
|
|
||||||
@@ -136,6 +177,8 @@ async function fetchMessages(page = 0) {
|
|||||||
|
|
||||||
if (page === 0) {
|
if (page === 0) {
|
||||||
participants.value = conversationData.participants
|
participants.value = conversationData.participants
|
||||||
|
conversationName.value = conversationData.name
|
||||||
|
isChannel.value = conversationData.channel
|
||||||
}
|
}
|
||||||
|
|
||||||
// Since the backend sorts by descending, we need to reverse for correct chat order
|
// Since the backend sorts by descending, we need to reverse for correct chat order
|
||||||
@@ -143,7 +186,7 @@ async function fetchMessages(page = 0) {
|
|||||||
...item,
|
...item,
|
||||||
src: item.sender.avatar,
|
src: item.sender.avatar,
|
||||||
iconClick: () => {
|
iconClick: () => {
|
||||||
navigateTo(`/users/${item.sender.id}`, { replace: true })
|
openUser(item.sender.id)
|
||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -182,27 +225,41 @@ async function loadMoreMessages() {
|
|||||||
|
|
||||||
async function sendMessage(content, clearInput) {
|
async function sendMessage(content, clearInput) {
|
||||||
if (!content.trim()) return
|
if (!content.trim()) return
|
||||||
|
|
||||||
const recipient = otherParticipant.value
|
|
||||||
if (!recipient) {
|
|
||||||
toast.error('无法确定收信人')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
sending.value = true
|
sending.value = true
|
||||||
const token = getToken()
|
const token = getToken()
|
||||||
try {
|
try {
|
||||||
const response = await fetch(`${API_BASE_URL}/api/messages`, {
|
let response
|
||||||
method: 'POST',
|
if (isChannel.value) {
|
||||||
headers: {
|
response = await fetch(
|
||||||
'Content-Type': 'application/json',
|
`${API_BASE_URL}/api/messages/conversations/${conversationId}/messages`,
|
||||||
Authorization: `Bearer ${token}`,
|
{
|
||||||
},
|
method: 'POST',
|
||||||
body: JSON.stringify({
|
headers: {
|
||||||
recipientId: recipient.id,
|
'Content-Type': 'application/json',
|
||||||
content: content,
|
Authorization: `Bearer ${token}`,
|
||||||
}),
|
},
|
||||||
})
|
body: JSON.stringify({ content, replyToId: replyTo.value?.id }),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
const recipient = otherParticipant.value
|
||||||
|
if (!recipient) {
|
||||||
|
toast.error('无法确定收信人')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
response = await fetch(`${API_BASE_URL}/api/messages`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
recipientId: recipient.id,
|
||||||
|
content: content,
|
||||||
|
replyToId: replyTo.value?.id,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
}
|
||||||
if (!response.ok) throw new Error('发送失败')
|
if (!response.ok) throw new Error('发送失败')
|
||||||
|
|
||||||
const newMessage = await response.json()
|
const newMessage = await response.json()
|
||||||
@@ -210,10 +267,11 @@ async function sendMessage(content, clearInput) {
|
|||||||
...newMessage,
|
...newMessage,
|
||||||
src: newMessage.sender.avatar,
|
src: newMessage.sender.avatar,
|
||||||
iconClick: () => {
|
iconClick: () => {
|
||||||
navigateTo(`/users/${newMessage.sender.id}`, { replace: true })
|
openUser(newMessage.sender.id)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
clearInput()
|
clearInput()
|
||||||
|
replyTo.value = null
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
scrollToBottom()
|
scrollToBottom()
|
||||||
}, 100)
|
}, 100)
|
||||||
@@ -234,6 +292,7 @@ async function markConversationAsRead() {
|
|||||||
})
|
})
|
||||||
// After marking as read, refresh the global unread count
|
// After marking as read, refresh the global unread count
|
||||||
refreshGlobalUnreadCount()
|
refreshGlobalUnreadCount()
|
||||||
|
refreshChannelUnread()
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('Failed to mark conversation as read', e)
|
console.error('Failed to mark conversation as read', e)
|
||||||
}
|
}
|
||||||
@@ -295,7 +354,7 @@ watch(isConnected, (newValue) => {
|
|||||||
...message,
|
...message,
|
||||||
src: message.sender.avatar,
|
src: message.sender.avatar,
|
||||||
iconClick: () => {
|
iconClick: () => {
|
||||||
navigateTo(`/users/${message.sender.id}`, { replace: true })
|
openUser(message.sender.id)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
// 实时收到消息时自动标记为已读
|
// 实时收到消息时自动标记为已读
|
||||||
@@ -349,6 +408,28 @@ onUnmounted(() => {
|
|||||||
}
|
}
|
||||||
disconnect()
|
disconnect()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
function minimize() {
|
||||||
|
floatRoute.value = route.fullPath
|
||||||
|
navigateTo('/')
|
||||||
|
}
|
||||||
|
|
||||||
|
function openUser(id) {
|
||||||
|
if (isFloatMode.value) {
|
||||||
|
// 先不处理...
|
||||||
|
// navigateTo(`/users/${id}?float=1`)
|
||||||
|
} else {
|
||||||
|
navigateTo(`/users/${id}`, { replace: true })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function goBack() {
|
||||||
|
if (isFloatMode.value) {
|
||||||
|
navigateTo('/message-box?float=1')
|
||||||
|
} else {
|
||||||
|
navigateTo('/message-box')
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
@@ -361,8 +442,13 @@ onUnmounted(() => {
|
|||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.chat-container.float {
|
||||||
|
height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
.chat-header {
|
.chat-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
@@ -373,6 +459,24 @@ onUnmounted(() => {
|
|||||||
backdrop-filter: var(--blur-10);
|
backdrop-filter: var(--blur-10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header-main {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.float-control {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
text-align: right;
|
||||||
|
padding: 12px 12px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.float-control i {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.back-button {
|
.back-button {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
color: var(--text-color-primary);
|
color: var(--text-color-primary);
|
||||||
@@ -429,10 +533,22 @@ onUnmounted(() => {
|
|||||||
.message-timestamp {
|
.message-timestamp {
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
color: var(--text-color-secondary);
|
color: var(--text-color-secondary);
|
||||||
margin-top: 5px;
|
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message-header {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-name {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
.message-item.sent {
|
.message-item.sent {
|
||||||
align-self: flex-end;
|
align-self: flex-end;
|
||||||
flex-direction: row-reverse;
|
flex-direction: row-reverse;
|
||||||
@@ -475,14 +591,57 @@ onUnmounted(() => {
|
|||||||
color: var(--text-color-secondary);
|
color: var(--text-color-secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.message-input-area {
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reply-preview {
|
||||||
|
padding: 5px 10px;
|
||||||
|
border-left: 5px solid var(--primary-color);
|
||||||
|
margin-bottom: 5px;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reply-author {
|
||||||
|
font-weight: bold;
|
||||||
|
margin-bottom: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reply-btn {
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 4px;
|
||||||
|
opacity: 0.6;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reply-btn:hover {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.active-reply {
|
||||||
|
background-color: var(--bg-color-soft);
|
||||||
|
padding: 5px 10px;
|
||||||
|
border-left: 5px solid var(--primary-color);
|
||||||
|
margin-bottom: 5px;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close-reply {
|
||||||
|
margin-left: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-height: 200px) {
|
||||||
|
.messages-list,
|
||||||
|
.message-input-area {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.messages-list {
|
.messages-list {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.message-input-area {
|
|
||||||
margin-left: 10px;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,55 +1,118 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="messages-container">
|
<div class="messages-container">
|
||||||
<div v-if="loading" class="loading-message">
|
<div class="page-title">
|
||||||
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
<i class="fas fa-comments"></i>
|
||||||
|
<span class="page-title-text">选择聊天</span>
|
||||||
|
</div>
|
||||||
|
<div v-if="!isFloatMode" class="float-control">
|
||||||
|
<i class="fas fa-compress" @click="minimize" title="最小化"></i>
|
||||||
|
</div>
|
||||||
|
<div class="tabs">
|
||||||
|
<div :class="['tab', { active: activeTab === 'messages' }]" @click="switchToMessage">
|
||||||
|
站内信
|
||||||
|
</div>
|
||||||
|
<div :class="['tab', { active: activeTab === 'channels' }]" @click="switchToChannels">
|
||||||
|
频道
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-else-if="error" class="error-container">
|
<div v-if="activeTab === 'messages'">
|
||||||
<div class="error-text">{{ error }}</div>
|
<div v-if="loading" class="loading-message">
|
||||||
</div>
|
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||||
|
|
||||||
<div v-if="!loading" class="search-container">
|
|
||||||
<SearchPersonDropdown />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="!loading && conversations.length === 0" class="empty-container">
|
|
||||||
<BasePlaceholder v-if="conversations.length === 0" text="暂无会话" icon="fas fa-inbox" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="!loading"
|
|
||||||
v-for="convo in conversations"
|
|
||||||
:key="convo.id"
|
|
||||||
class="conversation-item"
|
|
||||||
@click="goToConversation(convo.id)"
|
|
||||||
>
|
|
||||||
<div class="conversation-avatar">
|
|
||||||
<img
|
|
||||||
:src="getOtherParticipant(convo)?.avatar || '/default-avatar.svg'"
|
|
||||||
:alt="getOtherParticipant(convo)?.username || '用户'"
|
|
||||||
class="avatar-img"
|
|
||||||
@error="handleAvatarError"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="conversation-content">
|
<div v-else-if="error" class="error-container">
|
||||||
<div class="conversation-header">
|
<div class="error-text">{{ error }}</div>
|
||||||
<div class="participant-name">
|
</div>
|
||||||
{{ getOtherParticipant(convo)?.username || '未知用户' }}
|
|
||||||
</div>
|
<div v-if="!loading && !isFloatMode" class="search-container">
|
||||||
<div class="message-time">
|
<SearchPersonDropdown />
|
||||||
{{ formatTime(convo.lastMessage?.createdAt || convo.createdAt) }}
|
</div>
|
||||||
</div>
|
|
||||||
|
<div v-if="!loading && conversations.length === 0" class="empty-container">
|
||||||
|
<BasePlaceholder v-if="conversations.length === 0" text="暂无会话" icon="fas fa-inbox" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="!loading"
|
||||||
|
v-for="convo in conversations"
|
||||||
|
:key="convo.id"
|
||||||
|
class="conversation-item"
|
||||||
|
@click="goToConversation(convo.id)"
|
||||||
|
>
|
||||||
|
<div class="conversation-avatar">
|
||||||
|
<img
|
||||||
|
:src="getOtherParticipant(convo)?.avatar || '/default-avatar.svg'"
|
||||||
|
:alt="getOtherParticipant(convo)?.username || '用户'"
|
||||||
|
class="avatar-img"
|
||||||
|
@error="handleAvatarError"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="last-message-row">
|
<div class="conversation-content">
|
||||||
<div class="last-message">
|
<div class="conversation-header">
|
||||||
{{
|
<div class="participant-name">
|
||||||
convo.lastMessage ? stripMarkdownLength(convo.lastMessage.content, 100) : '暂无消息'
|
{{ getOtherParticipant(convo)?.username || '未知用户' }}
|
||||||
}}
|
</div>
|
||||||
|
<div class="message-time">
|
||||||
|
{{ formatTime(convo.lastMessage?.createdAt || convo.createdAt) }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="convo.unreadCount > 0" class="unread-count-badge">
|
|
||||||
{{ convo.unreadCount }}
|
<div class="last-message-row">
|
||||||
|
<div class="last-message">
|
||||||
|
{{
|
||||||
|
convo.lastMessage ? stripMarkdownLength(convo.lastMessage.content, 100) : '暂无消息'
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
<div v-if="convo.unreadCount > 0" class="unread-count-badge">
|
||||||
|
{{ convo.unreadCount }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else>
|
||||||
|
<div v-if="loadingChannels" class="loading-message">
|
||||||
|
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
<div v-if="channels.length === 0" class="empty-container">
|
||||||
|
<BasePlaceholder text="暂无频道" icon="fas fa-inbox" />
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-for="ch in channels"
|
||||||
|
:key="ch.id"
|
||||||
|
class="conversation-item"
|
||||||
|
@click="goToChannel(ch.id)"
|
||||||
|
>
|
||||||
|
<div class="conversation-avatar">
|
||||||
|
<img
|
||||||
|
:src="ch.avatar || '/default-avatar.svg'"
|
||||||
|
:alt="ch.name"
|
||||||
|
class="avatar-img"
|
||||||
|
@error="handleAvatarError"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="conversation-content">
|
||||||
|
<div class="conversation-header">
|
||||||
|
<div class="participant-name">
|
||||||
|
{{ ch.name }}
|
||||||
|
<span v-if="ch.unreadCount > 0" class="unread-dot"></span>
|
||||||
|
</div>
|
||||||
|
<div class="message-time">
|
||||||
|
{{ formatTime(ch.lastMessage?.createdAt || ch.createdAt) }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="last-message-row">
|
||||||
|
<div class="last-message">
|
||||||
|
{{
|
||||||
|
ch.lastMessage ? stripMarkdownLength(ch.lastMessage.content, 100) : ch.description
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
<div class="member-count">成员 {{ ch.memberCount }}</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -58,12 +121,13 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onUnmounted, watch, onActivated } from 'vue'
|
import { ref, onUnmounted, watch, onActivated, computed } from 'vue'
|
||||||
import { useRouter } from 'vue-router'
|
import { useRoute } from 'vue-router'
|
||||||
import { getToken, fetchCurrentUser } from '~/utils/auth'
|
import { getToken, fetchCurrentUser } from '~/utils/auth'
|
||||||
import { toast } from '~/main'
|
import { toast } from '~/main'
|
||||||
import { useWebSocket } from '~/composables/useWebSocket'
|
import { useWebSocket } from '~/composables/useWebSocket'
|
||||||
import { useUnreadCount } from '~/composables/useUnreadCount'
|
import { useUnreadCount } from '~/composables/useUnreadCount'
|
||||||
|
import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
|
||||||
import TimeManager from '~/utils/time'
|
import TimeManager from '~/utils/time'
|
||||||
import { stripMarkdownLength } from '~/utils/markdown'
|
import { stripMarkdownLength } from '~/utils/markdown'
|
||||||
import SearchPersonDropdown from '~/components/SearchPersonDropdown.vue'
|
import SearchPersonDropdown from '~/components/SearchPersonDropdown.vue'
|
||||||
@@ -73,19 +137,29 @@ const config = useRuntimeConfig()
|
|||||||
const conversations = ref([])
|
const conversations = ref([])
|
||||||
const loading = ref(true)
|
const loading = ref(true)
|
||||||
const error = ref(null)
|
const error = ref(null)
|
||||||
const router = useRouter()
|
|
||||||
|
const route = useRoute()
|
||||||
const currentUser = ref(null)
|
const currentUser = ref(null)
|
||||||
const API_BASE_URL = config.public.apiBaseUrl
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
|
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
|
||||||
const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
|
const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
|
||||||
|
const { fetchChannelUnread: refreshChannelUnread, setFromList: setChannelUnreadFromList } =
|
||||||
|
useChannelsUnreadCount()
|
||||||
let subscription = null
|
let subscription = null
|
||||||
|
|
||||||
|
const activeTab = ref('channels')
|
||||||
|
const channels = ref([])
|
||||||
|
const loadingChannels = ref(false)
|
||||||
|
const isFloatMode = computed(() => route.query.float === '1')
|
||||||
|
const floatRoute = useState('messageFloatRoute')
|
||||||
|
|
||||||
async function fetchConversations() {
|
async function fetchConversations() {
|
||||||
const token = getToken()
|
const token = getToken()
|
||||||
if (!token) {
|
if (!token) {
|
||||||
toast.error('请先登录')
|
toast.error('请先登录')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const response = await fetch(`${API_BASE_URL}/api/messages/conversations`, {
|
const response = await fetch(`${API_BASE_URL}/api/messages/conversations`, {
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
@@ -120,13 +194,70 @@ function handleAvatarError(event) {
|
|||||||
event.target.src = '/default-avatar.svg'
|
event.target.src = '/default-avatar.svg'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function fetchChannels() {
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
toast.error('请先登录')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
loadingChannels.value = true
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/api/channels`, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
})
|
||||||
|
if (!response.ok) throw new Error('无法加载频道')
|
||||||
|
const data = await response.json()
|
||||||
|
channels.value = data
|
||||||
|
setChannelUnreadFromList(data)
|
||||||
|
} catch (e) {
|
||||||
|
toast.error(e.message)
|
||||||
|
} finally {
|
||||||
|
loadingChannels.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function switchToMessage() {
|
||||||
|
activeTab.value = 'messages'
|
||||||
|
fetchConversations()
|
||||||
|
}
|
||||||
|
|
||||||
|
function switchToChannels() {
|
||||||
|
activeTab.value = 'channels'
|
||||||
|
fetchChannels()
|
||||||
|
}
|
||||||
|
|
||||||
|
async function goToChannel(id) {
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
toast.error('请先登录')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await fetch(`${API_BASE_URL}/api/channels/${id}/join`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
})
|
||||||
|
if (isFloatMode.value) {
|
||||||
|
navigateTo(`/message-box/${id}?float=1`)
|
||||||
|
} else {
|
||||||
|
navigateTo(`/message-box/${id}`)
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
toast.error(e.message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
onActivated(async () => {
|
onActivated(async () => {
|
||||||
loading.value = true
|
|
||||||
currentUser.value = await fetchCurrentUser()
|
currentUser.value = await fetchCurrentUser()
|
||||||
|
|
||||||
if (currentUser.value) {
|
if (currentUser.value) {
|
||||||
await fetchConversations()
|
if (activeTab.value === 'messages') {
|
||||||
refreshGlobalUnreadCount() // Refresh global count when entering the list
|
await fetchConversations()
|
||||||
|
} else {
|
||||||
|
await fetchChannels()
|
||||||
|
}
|
||||||
|
refreshGlobalUnreadCount()
|
||||||
|
refreshChannelUnread()
|
||||||
const token = getToken()
|
const token = getToken()
|
||||||
if (token && !isConnected.value) {
|
if (token && !isConnected.value) {
|
||||||
connect(token)
|
connect(token)
|
||||||
@@ -147,6 +278,9 @@ watch(isConnected, (newValue) => {
|
|||||||
|
|
||||||
subscription = subscribe(destination, (message) => {
|
subscription = subscribe(destination, (message) => {
|
||||||
fetchConversations()
|
fetchConversations()
|
||||||
|
if (activeTab.value === 'channels') {
|
||||||
|
fetchChannels()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -159,14 +293,50 @@ onUnmounted(() => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
function goToConversation(id) {
|
function goToConversation(id) {
|
||||||
router.push(`/message-box/${id}`)
|
if (isFloatMode.value) {
|
||||||
|
navigateTo(`/message-box/${id}?float=1`)
|
||||||
|
} else {
|
||||||
|
navigateTo(`/message-box/${id}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function minimize() {
|
||||||
|
floatRoute.value = route.fullPath
|
||||||
|
navigateTo('/')
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.messages-container {
|
.messages-container {
|
||||||
margin: 0 auto;
|
position: relative;
|
||||||
padding: 20px;
|
}
|
||||||
|
|
||||||
|
.float-control {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
text-align: right;
|
||||||
|
padding: 12px 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.float-control i {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tabs {
|
||||||
|
display: flex;
|
||||||
|
border-bottom: 1px solid var(--normal-border-color);
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab {
|
||||||
|
padding: 10px 20px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tab.active {
|
||||||
|
border-bottom: 2px solid var(--primary-color);
|
||||||
|
color: var(--primary-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
.loading-message {
|
.loading-message {
|
||||||
@@ -178,12 +348,29 @@ function goToConversation(id) {
|
|||||||
|
|
||||||
.search-container {
|
.search-container {
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
|
margin-left: 20px;
|
||||||
|
margin-right: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.messages-header {
|
.messages-header {
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.page-title {
|
||||||
|
padding: 12px;
|
||||||
|
display: none;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-title-text {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.page-title-text:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
.messages-title {
|
.messages-title {
|
||||||
font-size: 28px;
|
font-size: 28px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
@@ -217,6 +404,8 @@ function goToConversation(id) {
|
|||||||
.conversation-item {
|
.conversation-item {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
margin-left: 20px;
|
||||||
|
margin-right: 20px;
|
||||||
padding: 8px 10px;
|
padding: 8px 10px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: background-color 0.2s ease;
|
transition: background-color 0.2s ease;
|
||||||
@@ -256,6 +445,12 @@ function goToConversation(id) {
|
|||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.member-count {
|
||||||
|
font-size: 12px;
|
||||||
|
color: gray;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.message-time {
|
.message-time {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: gray;
|
color: gray;
|
||||||
@@ -291,10 +486,34 @@ function goToConversation(id) {
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 响应式设计 */
|
.unread-dot {
|
||||||
|
display: inline-block;
|
||||||
|
width: 8px;
|
||||||
|
height: 8px;
|
||||||
|
background-color: #f56c6c;
|
||||||
|
border-radius: 50%;
|
||||||
|
margin-left: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-height: 200px) {
|
||||||
|
.page-title {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tabs,
|
||||||
|
.loading-message,
|
||||||
|
.error-container,
|
||||||
|
.search-container,
|
||||||
|
.empty-container,
|
||||||
|
.conversation-item {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.messages-container {
|
.conversation-item {
|
||||||
padding: 10px 10px;
|
margin-left: 10px;
|
||||||
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.messages-title {
|
.messages-title {
|
||||||
|
|||||||
@@ -260,7 +260,6 @@ import { getMedalTitle } from '~/utils/medal'
|
|||||||
import { toast } from '~/main'
|
import { toast } from '~/main'
|
||||||
import { getToken, authState } from '~/utils/auth'
|
import { getToken, authState } from '~/utils/auth'
|
||||||
import TimeManager from '~/utils/time'
|
import TimeManager from '~/utils/time'
|
||||||
import { useRouter } from 'vue-router'
|
|
||||||
import { useIsMobile } from '~/utils/screen'
|
import { useIsMobile } from '~/utils/screen'
|
||||||
import Dropdown from '~/components/Dropdown.vue'
|
import Dropdown from '~/components/Dropdown.vue'
|
||||||
import { ClientOnly } from '#components'
|
import { ClientOnly } from '#components'
|
||||||
@@ -272,7 +271,6 @@ const API_BASE_URL = config.public.apiBaseUrl
|
|||||||
|
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const postId = route.params.id
|
const postId = route.params.id
|
||||||
const router = useRouter()
|
|
||||||
|
|
||||||
const title = ref('')
|
const title = ref('')
|
||||||
const author = ref('')
|
const author = ref('')
|
||||||
|
|||||||
@@ -94,6 +94,13 @@
|
|||||||
<i class="fas fa-user-plus"></i>
|
<i class="fas fa-user-plus"></i>
|
||||||
<div class="profile-tabs-item-label">关注</div>
|
<div class="profile-tabs-item-label">关注</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
:class="['profile-tabs-item', { selected: selectedTab === 'favorites' }]"
|
||||||
|
@click="selectedTab = 'favorites'"
|
||||||
|
>
|
||||||
|
<i class="fas fa-bookmark"></i>
|
||||||
|
<div class="profile-tabs-item-label">收藏</div>
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
:class="['profile-tabs-item', { selected: selectedTab === 'achievements' }]"
|
:class="['profile-tabs-item', { selected: selectedTab === 'achievements' }]"
|
||||||
@click="selectedTab = 'achievements'"
|
@click="selectedTab = 'achievements'"
|
||||||
@@ -318,6 +325,23 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-else-if="selectedTab === 'favorites'" class="favorites-container">
|
||||||
|
<div v-if="favoritePosts.length > 0">
|
||||||
|
<BaseTimeline :items="favoritePosts">
|
||||||
|
<template #item="{ item }">
|
||||||
|
<NuxtLink :to="`/posts/${item.post.id}`" class="timeline-link">
|
||||||
|
{{ item.post.title }}
|
||||||
|
</NuxtLink>
|
||||||
|
<div class="timeline-snippet">
|
||||||
|
{{ stripMarkdown(item.post.snippet) }}
|
||||||
|
</div>
|
||||||
|
<div class="timeline-date">{{ formatDate(item.post.createdAt) }}</div>
|
||||||
|
</template>
|
||||||
|
</BaseTimeline>
|
||||||
|
</div>
|
||||||
|
<div v-else class="summary-empty">暂无收藏文章</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div v-else-if="selectedTab === 'achievements'" class="achievements-container">
|
<div v-else-if="selectedTab === 'achievements'" class="achievements-container">
|
||||||
<AchievementList :medals="medals" :can-select="isMine" />
|
<AchievementList :medals="medals" :can-select="isMine" />
|
||||||
</div>
|
</div>
|
||||||
@@ -328,7 +352,7 @@
|
|||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, onMounted, ref, watch } from 'vue'
|
import { computed, onMounted, ref, watch } from 'vue'
|
||||||
import { useRoute, useRouter } from 'vue-router'
|
import { useRoute } from 'vue-router'
|
||||||
import AchievementList from '~/components/AchievementList.vue'
|
import AchievementList from '~/components/AchievementList.vue'
|
||||||
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
||||||
import BaseTimeline from '~/components/BaseTimeline.vue'
|
import BaseTimeline from '~/components/BaseTimeline.vue'
|
||||||
@@ -346,13 +370,13 @@ definePageMeta({
|
|||||||
alias: ['/users/:id/'],
|
alias: ['/users/:id/'],
|
||||||
})
|
})
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const router = useRouter()
|
|
||||||
const username = route.params.id
|
const username = route.params.id
|
||||||
|
|
||||||
const user = ref({})
|
const user = ref({})
|
||||||
const hotPosts = ref([])
|
const hotPosts = ref([])
|
||||||
const hotReplies = ref([])
|
const hotReplies = ref([])
|
||||||
const hotTags = ref([])
|
const hotTags = ref([])
|
||||||
|
const favoritePosts = ref([])
|
||||||
const timelineItems = ref([])
|
const timelineItems = ref([])
|
||||||
const timelineFilter = ref('all')
|
const timelineFilter = ref('all')
|
||||||
const filteredTimelineItems = computed(() => {
|
const filteredTimelineItems = computed(() => {
|
||||||
@@ -370,7 +394,7 @@ const subscribed = ref(false)
|
|||||||
const isLoading = ref(true)
|
const isLoading = ref(true)
|
||||||
const tabLoading = ref(false)
|
const tabLoading = ref(false)
|
||||||
const selectedTab = ref(
|
const selectedTab = ref(
|
||||||
['summary', 'timeline', 'following', 'achievements'].includes(route.query.tab)
|
['summary', 'timeline', 'following', 'favorites', 'achievements'].includes(route.query.tab)
|
||||||
? route.query.tab
|
? route.query.tab
|
||||||
: 'summary',
|
: 'summary',
|
||||||
)
|
)
|
||||||
@@ -407,7 +431,7 @@ const fetchUser = async () => {
|
|||||||
user.value = data
|
user.value = data
|
||||||
subscribed.value = !!data.subscribed
|
subscribed.value = !!data.subscribed
|
||||||
} else if (res.status === 404) {
|
} else if (res.status === 404) {
|
||||||
router.replace('/404')
|
navigateTo('/404')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -473,6 +497,16 @@ const fetchFollowUsers = async () => {
|
|||||||
followings.value = followingRes.ok ? await followingRes.json() : []
|
followings.value = followingRes.ok ? await followingRes.json() : []
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const fetchFavorites = async () => {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/users/${username}/subscribed-posts`)
|
||||||
|
if (res.ok) {
|
||||||
|
const data = await res.json()
|
||||||
|
favoritePosts.value = data.map((p) => ({ icon: 'fas fa-bookmark', post: p }))
|
||||||
|
} else {
|
||||||
|
favoritePosts.value = []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const loadSummary = async () => {
|
const loadSummary = async () => {
|
||||||
tabLoading.value = true
|
tabLoading.value = true
|
||||||
await fetchSummary()
|
await fetchSummary()
|
||||||
@@ -491,6 +525,12 @@ const loadFollow = async () => {
|
|||||||
tabLoading.value = false
|
tabLoading.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const loadFavorites = async () => {
|
||||||
|
tabLoading.value = true
|
||||||
|
await fetchFavorites()
|
||||||
|
tabLoading.value = false
|
||||||
|
}
|
||||||
|
|
||||||
const fetchAchievements = async () => {
|
const fetchAchievements = async () => {
|
||||||
const res = await fetch(`${API_BASE_URL}/api/medals?userId=${user.value.id}`)
|
const res = await fetch(`${API_BASE_URL}/api/medals?userId=${user.value.id}`)
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
@@ -558,7 +598,7 @@ const sendMessage = async () => {
|
|||||||
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
|
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
|
||||||
})
|
})
|
||||||
const result = await response.json()
|
const result = await response.json()
|
||||||
router.push(`/message-box/${result.conversationId}`)
|
navigateTo(`/message-box/${result.conversationId}`)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
toast.error('无法发起私信')
|
toast.error('无法发起私信')
|
||||||
console.error(e)
|
console.error(e)
|
||||||
@@ -579,6 +619,8 @@ const init = async () => {
|
|||||||
await loadTimeline()
|
await loadTimeline()
|
||||||
} else if (selectedTab.value === 'following') {
|
} else if (selectedTab.value === 'following') {
|
||||||
await loadFollow()
|
await loadFollow()
|
||||||
|
} else if (selectedTab.value === 'favorites') {
|
||||||
|
await loadFavorites()
|
||||||
} else if (selectedTab.value === 'achievements') {
|
} else if (selectedTab.value === 'achievements') {
|
||||||
await loadAchievements()
|
await loadAchievements()
|
||||||
}
|
}
|
||||||
@@ -592,11 +634,13 @@ const init = async () => {
|
|||||||
onMounted(init)
|
onMounted(init)
|
||||||
|
|
||||||
watch(selectedTab, async (val) => {
|
watch(selectedTab, async (val) => {
|
||||||
// router.replace({ query: { ...route.query, tab: val } })
|
// navigateTo({ query: { ...route.query, tab: val } }, { replace: true })
|
||||||
if (val === 'timeline' && timelineItems.value.length === 0) {
|
if (val === 'timeline' && timelineItems.value.length === 0) {
|
||||||
await loadTimeline()
|
await loadTimeline()
|
||||||
} else if (val === 'following' && followers.value.length === 0 && followings.value.length === 0) {
|
} else if (val === 'following' && followers.value.length === 0 && followings.value.length === 0) {
|
||||||
await loadFollow()
|
await loadFollow()
|
||||||
|
} else if (val === 'favorites' && favoritePosts.value.length === 0) {
|
||||||
|
await loadFavorites()
|
||||||
} else if (val === 'achievements' && medals.value.length === 0) {
|
} else if (val === 'achievements' && medals.value.length === 0) {
|
||||||
await loadAchievements()
|
await loadAchievements()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +1,34 @@
|
|||||||
export const reactionEmojiMap = {
|
const toCdnUrl = (emoji) => {
|
||||||
LIKE: '❤️',
|
const codepoints = Array.from(emoji)
|
||||||
DISLIKE: '👎',
|
.map((c) => c.codePointAt(0).toString(16))
|
||||||
RECOMMEND: '👏',
|
.join('_')
|
||||||
ANGRY: '😡',
|
return `https://fonts.gstatic.com/s/e/notoemoji/latest/${codepoints}/emoji.svg`
|
||||||
FLUSHED: '😳',
|
}
|
||||||
STAR_STRUCK: '🤩',
|
|
||||||
ROFL: '🤣',
|
export const reactionEmojiMap = {
|
||||||
HOLDING_BACK_TEARS: '🥹',
|
LIKE: toCdnUrl('❤️'),
|
||||||
MIND_BLOWN: '🤯',
|
SMILE: toCdnUrl('😁'),
|
||||||
POOP: '💩',
|
DISLIKE: toCdnUrl('👎'),
|
||||||
CLOWN: '🤡',
|
RECOMMEND: toCdnUrl('👏'),
|
||||||
SKULL: '☠️',
|
CONGRATULATIONS: toCdnUrl('🎉'),
|
||||||
FIRE: '🔥',
|
ANGRY: toCdnUrl('😡'),
|
||||||
EYES: '👀',
|
FLUSHED: toCdnUrl('😳'),
|
||||||
FROWN: '☹️',
|
STAR_STRUCK: toCdnUrl('🤩'),
|
||||||
HOT: '🥵',
|
ROFL: toCdnUrl('🤣'),
|
||||||
EAGLE: '🦅',
|
HOLDING_BACK_TEARS: toCdnUrl('🥹'),
|
||||||
SPIDER: '🕷️',
|
MIND_BLOWN: toCdnUrl('🤯'),
|
||||||
BAT: '🦇',
|
POOP: toCdnUrl('💩'),
|
||||||
CHINA: '🇨🇳',
|
CLOWN: toCdnUrl('🤡'),
|
||||||
USA: '🇺🇸',
|
SKULL: toCdnUrl('☠️'),
|
||||||
JAPAN: '🇯🇵',
|
FIRE: toCdnUrl('🔥'),
|
||||||
KOREA: '🇰🇷',
|
EYES: toCdnUrl('👀'),
|
||||||
|
FROWN: toCdnUrl('☹️'),
|
||||||
|
HOT: toCdnUrl('🥵'),
|
||||||
|
EAGLE: toCdnUrl('🦅'),
|
||||||
|
SPIDER: toCdnUrl('🕷️'),
|
||||||
|
BAT: toCdnUrl('🦇'),
|
||||||
|
CHINA: toCdnUrl('🇨🇳'),
|
||||||
|
USA: toCdnUrl('🇺🇸'),
|
||||||
|
JAPAN: toCdnUrl('🇯🇵'),
|
||||||
|
KOREA: toCdnUrl('🇰🇷'),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import Vditor from 'vditor'
|
|||||||
import { getToken, authState } from './auth'
|
import { getToken, authState } from './auth'
|
||||||
import { searchUsers, fetchFollowings, fetchAdmins } from './user'
|
import { searchUsers, fetchFollowings, fetchAdmins } from './user'
|
||||||
import { tiebaEmoji } from './tiebaEmoji'
|
import { tiebaEmoji } from './tiebaEmoji'
|
||||||
|
import vditorPostCitation from './vditorPostCitation.js'
|
||||||
|
|
||||||
export function getEditorTheme() {
|
export function getEditorTheme() {
|
||||||
return document.documentElement.dataset.theme === 'dark' ? 'dark' : 'classic'
|
return document.documentElement.dataset.theme === 'dark' ? 'dark' : 'classic'
|
||||||
@@ -79,6 +80,7 @@ export function createVditor(editorId, options = {}) {
|
|||||||
}))
|
}))
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
vditorPostCitation(API_BASE_URL),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
cdn: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/vditor',
|
cdn: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/vditor',
|
||||||
|
|||||||
37
frontend_nuxt/utils/vditorPostCitation.js
Normal file
37
frontend_nuxt/utils/vditorPostCitation.js
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import { authState, getToken } from '~/utils/auth'
|
||||||
|
|
||||||
|
async function searchPost(apiBaseUrl, keyword) {
|
||||||
|
return await fetch(`${apiBaseUrl}/api/search/posts/title?keyword=${keyword}`, {
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Authorization: `Bearer ${getToken()}`,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export default (apiBaseUrl) => {
|
||||||
|
return {
|
||||||
|
key: '#',
|
||||||
|
hint: async (keyword) => {
|
||||||
|
if (!keyword.trim()) return []
|
||||||
|
try {
|
||||||
|
const response = await searchPost(apiBaseUrl, keyword)
|
||||||
|
if (response.ok) {
|
||||||
|
const body = await response.json()
|
||||||
|
let value = ''
|
||||||
|
return (
|
||||||
|
body.map((item) => ({
|
||||||
|
value: `[${item.title}](/posts/${item.id})`,
|
||||||
|
html: `<div>${item.title}</div>`,
|
||||||
|
})) ?? []
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user