mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-02-18 21:10:57 +08:00
Compare commits
178 Commits
codex/rss
...
feature/me
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f93f58b055 | ||
|
|
d427a41f6d | ||
|
|
fff59e800d | ||
|
|
6fd663d983 | ||
|
|
fd6fc11630 | ||
|
|
d7bfeed259 | ||
|
|
c5e4da5e07 | ||
|
|
b87932560b | ||
|
|
58ff8b177e | ||
|
|
4f6b585735 | ||
|
|
ac81bccd20 | ||
|
|
351447e3d1 | ||
|
|
453d8fa68b | ||
|
|
2c5b38ee9e | ||
|
|
b5fd5a3edc | ||
|
|
ee717aced2 | ||
|
|
9a9152593e | ||
|
|
856d3dd513 | ||
|
|
0e42a3335a | ||
|
|
d96aae59d2 | ||
|
|
122722d0e9 | ||
|
|
0c2264e509 | ||
|
|
1e503e26f2 | ||
|
|
ec0fd63e30 | ||
|
|
dfd4c70b6e | ||
|
|
d79dc8877d | ||
|
|
e979350d40 | ||
|
|
99bf80a47a | ||
|
|
bfadda1e7d | ||
|
|
906998a07f | ||
|
|
02287c05be | ||
|
|
56aed4603e | ||
|
|
a1fa7b2d5b | ||
|
|
083c7980c6 | ||
|
|
3d51f29be7 | ||
|
|
d243e3a9d6 | ||
|
|
2b3c60f9a7 | ||
|
|
8b948a20cd | ||
|
|
5053ac213d | ||
|
|
e5ec801785 | ||
|
|
31e25232d0 | ||
|
|
cdc92aeebe | ||
|
|
d2c2213197 | ||
|
|
c687ffed54 | ||
|
|
5bc9ff45d7 | ||
|
|
78c7681bc8 | ||
|
|
5eb206a358 | ||
|
|
18179cca22 | ||
|
|
2b28cb2ac1 | ||
|
|
610a645092 | ||
|
|
504ca55cad | ||
|
|
0fc1415a14 | ||
|
|
50a84220fe | ||
|
|
af3e049c23 | ||
|
|
c33b411659 | ||
|
|
e8a162d859 | ||
|
|
e819926cf3 | ||
|
|
013d47e8e4 | ||
|
|
6cc76593e4 | ||
|
|
a2a08331e2 | ||
|
|
3eabafadf8 | ||
|
|
62c1983fd5 | ||
|
|
689b719e18 | ||
|
|
c6eccb01b9 | ||
|
|
cdf7e61157 | ||
|
|
d23511ecb9 | ||
|
|
c76708d2ff | ||
|
|
d978bd428e | ||
|
|
e5954cfb62 | ||
|
|
cb614b9739 | ||
|
|
88ce6b682d | ||
|
|
e02db635c4 | ||
|
|
231379181a | ||
|
|
bd9ce67d4b | ||
|
|
6527b3790e | ||
|
|
f01e8c942a | ||
|
|
1e1ae29d32 | ||
|
|
d31a8bfee4 | ||
|
|
29a96595f7 | ||
|
|
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 | ||
|
|
8ee1347b17 | ||
|
|
7e95120341 | ||
|
|
2f261983ac | ||
|
|
e8e7b9a245 | ||
|
|
d2bd949ac8 | ||
|
|
605654ec99 | ||
|
|
88127fcf34 | ||
|
|
0a82f0036b | ||
|
|
3a979277e4 | ||
|
|
1c582fbbf1 | ||
|
|
92452da19a | ||
|
|
a2ccaae7aa | ||
|
|
23371d4433 | ||
|
|
e05d65cf49 | ||
|
|
809a78fee3 | ||
|
|
aaf9b35a45 | ||
|
|
61c0336a78 | ||
|
|
69c913394f | ||
|
|
0ed9ad2f2a | ||
|
|
67e912381b | ||
|
|
a6a1c72a37 | ||
|
|
d77baa8a93 | ||
|
|
fce4832407 | ||
|
|
91c8cc9607 | ||
|
|
02273e018f | ||
|
|
4af10ecf79 | ||
|
|
d34ed3c058 | ||
|
|
8372e06949 | ||
|
|
a74cb0c272 | ||
|
|
5388767a2f | ||
|
|
97dda9601e | ||
|
|
cddbb602bf | ||
|
|
f21ed1f062 | ||
|
|
c009616f74 | ||
|
|
84ab87878a | ||
|
|
c53f91913c | ||
|
|
feed97154a | ||
|
|
f69562516d | ||
|
|
0b8e550097 | ||
|
|
cf722f5707 | ||
|
|
67e54c5106 | ||
|
|
d3dcc98122 | ||
|
|
c648d4cf39 | ||
|
|
41a5eda311 | ||
|
|
c6e0dc6a1d | ||
|
|
92e630df22 | ||
|
|
c6b0f32b09 |
@@ -1,4 +1 @@
|
|||||||
#!/usr/bin/env sh
|
|
||||||
. "$(dirname -- "$0")/_/husky.sh"
|
|
||||||
|
|
||||||
npx lint-staged
|
npx lint-staged
|
||||||
|
|||||||
@@ -58,6 +58,8 @@ cp open-isle.env.example open-isle.env
|
|||||||
|
|
||||||
> Step3 前端部署
|
> Step3 前端部署
|
||||||
|
|
||||||
|
**⚠️ 环境要求:Node.js 版本最低 20.0.0(因为 Nuxt 框架要求)**
|
||||||
|
|
||||||
前端可以依赖本机部署的后端,也可以直接调用线上的后端接口
|
前端可以依赖本机部署的后端,也可以直接调用线上的后端接口
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<img alt="OpenIsle" src="https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png" width="200">
|
<img alt="OpenIsle" src="https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png" width="200">
|
||||||
<br>
|
<br>
|
||||||
高效的开源社区前后端端平台
|
高效的开源社区前后端平台
|
||||||
<br><br><br>
|
<br><br><br>
|
||||||
<img alt="Image" src="https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/22752cfac5a04a9c90c41995b9f55fed.png" width="1200">
|
<img alt="Image" src="https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/22752cfac5a04a9c90c41995b9f55fed.png" width="1200">
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -26,6 +26,10 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-websocket</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -99,11 +99,13 @@ public class SecurityConfig {
|
|||||||
@Bean
|
@Bean
|
||||||
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
||||||
http.csrf(csrf -> csrf.disable())
|
http.csrf(csrf -> csrf.disable())
|
||||||
.cors(Customizer.withDefaults()) // 让 Spring 自带 CorsFilter 处理预检
|
.cors(Customizer.withDefaults())
|
||||||
.sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
|
.headers(h -> h.frameOptions(f -> f.sameOrigin()))
|
||||||
|
.sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
|
||||||
.exceptionHandling(eh -> eh.accessDeniedHandler(customAccessDeniedHandler))
|
.exceptionHandling(eh -> eh.accessDeniedHandler(customAccessDeniedHandler))
|
||||||
.authorizeHttpRequests(auth -> auth
|
.authorizeHttpRequests(auth -> auth
|
||||||
.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
|
.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
|
||||||
|
.requestMatchers("/api/ws/**", "/api/sockjs/**").permitAll()
|
||||||
.requestMatchers(HttpMethod.POST, "/api/auth/**").permitAll()
|
.requestMatchers(HttpMethod.POST, "/api/auth/**").permitAll()
|
||||||
.requestMatchers(HttpMethod.GET, "/api/posts/**").permitAll()
|
.requestMatchers(HttpMethod.GET, "/api/posts/**").permitAll()
|
||||||
.requestMatchers(HttpMethod.GET, "/api/comments/**").permitAll()
|
.requestMatchers(HttpMethod.GET, "/api/comments/**").permitAll()
|
||||||
@@ -119,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()
|
||||||
@@ -154,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"));
|
||||||
|
|
||||||
@@ -172,7 +175,8 @@ public class SecurityConfig {
|
|||||||
response.getWriter().write("{\"error\": \"Invalid or expired token\"}");
|
response.getWriter().write("{\"error\": \"Invalid or expired token\"}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else if (!uri.startsWith("/api/auth") && !publicGet) {
|
} else if (!uri.startsWith("/api/auth") && !publicGet
|
||||||
|
&& !uri.startsWith("/api/ws") && !uri.startsWith("/api/sockjs")) {
|
||||||
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
|
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
|
||||||
response.setContentType("application/json");
|
response.setContentType("application/json");
|
||||||
response.getWriter().write("{\"error\": \"Missing token\"}");
|
response.getWriter().write("{\"error\": \"Missing token\"}");
|
||||||
|
|||||||
110
backend/src/main/java/com/openisle/config/WebSocketConfig.java
Normal file
110
backend/src/main/java/com/openisle/config/WebSocketConfig.java
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
package com.openisle.config;
|
||||||
|
|
||||||
|
import com.openisle.service.JwtService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.messaging.Message;
|
||||||
|
import org.springframework.messaging.MessageChannel;
|
||||||
|
import org.springframework.messaging.simp.config.ChannelRegistration;
|
||||||
|
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
|
||||||
|
import org.springframework.messaging.simp.stomp.StompCommand;
|
||||||
|
import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
|
||||||
|
import org.springframework.messaging.support.ChannelInterceptor;
|
||||||
|
import org.springframework.messaging.support.MessageHeaderAccessor;
|
||||||
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
|
import org.springframework.security.core.Authentication;
|
||||||
|
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||||
|
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
|
||||||
|
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
|
||||||
|
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableWebSocketMessageBroker
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
|
||||||
|
|
||||||
|
private final JwtService jwtService;
|
||||||
|
private final UserDetailsService userDetailsService;
|
||||||
|
@Value("${app.website-url}")
|
||||||
|
private String websiteUrl;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void configureMessageBroker(MessageBrokerRegistry config) {
|
||||||
|
// Enable a simple memory-based message broker to carry the messages back to the client on destinations prefixed with "/topic" and "/queue"
|
||||||
|
config.enableSimpleBroker("/topic", "/queue");
|
||||||
|
// Set user destination prefix for personal messages
|
||||||
|
config.setUserDestinationPrefix("/user");
|
||||||
|
// Designates the "/app" prefix for messages that are bound for @MessageMapping-annotated methods.
|
||||||
|
config.setApplicationDestinationPrefixes("/app");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void registerStompEndpoints(StompEndpointRegistry registry) {
|
||||||
|
// 1) 原生 WebSocket(不带 SockJS)
|
||||||
|
registry.addEndpoint("/api/ws")
|
||||||
|
.setAllowedOriginPatterns(
|
||||||
|
"https://staging.open-isle.com",
|
||||||
|
"https://www.staging.open-isle.com",
|
||||||
|
websiteUrl,
|
||||||
|
websiteUrl.replace("://www.", "://"),
|
||||||
|
"http://localhost:*",
|
||||||
|
"http://127.0.0.1:*",
|
||||||
|
"http://192.168.7.98:*",
|
||||||
|
"http://30.211.97.238:*"
|
||||||
|
);
|
||||||
|
|
||||||
|
// 2) SockJS 回退:单独路径
|
||||||
|
registry.addEndpoint("/api/sockjs")
|
||||||
|
.setAllowedOriginPatterns(
|
||||||
|
"https://staging.open-isle.com",
|
||||||
|
"https://www.staging.open-isle.com",
|
||||||
|
websiteUrl,
|
||||||
|
websiteUrl.replace("://www.", "://"),
|
||||||
|
"http://localhost:*",
|
||||||
|
"http://127.0.0.1:*",
|
||||||
|
"http://192.168.7.98:*",
|
||||||
|
"http://30.211.97.238:*"
|
||||||
|
)
|
||||||
|
.withSockJS()
|
||||||
|
.setWebSocketEnabled(true)
|
||||||
|
.setSessionCookieNeeded(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void configureClientInboundChannel(ChannelRegistration registration) {
|
||||||
|
registration.interceptors(new ChannelInterceptor() {
|
||||||
|
@Override
|
||||||
|
public Message<?> preSend(Message<?> message, MessageChannel channel) {
|
||||||
|
StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
|
||||||
|
|
||||||
|
if (StompCommand.CONNECT.equals(accessor.getCommand())) {
|
||||||
|
System.out.println("WebSocket CONNECT command received");
|
||||||
|
String authHeader = accessor.getFirstNativeHeader("Authorization");
|
||||||
|
System.out.println("Authorization header: " + (authHeader != null ? "present" : "missing"));
|
||||||
|
|
||||||
|
if (authHeader != null && authHeader.startsWith("Bearer ")) {
|
||||||
|
String token = authHeader.substring(7);
|
||||||
|
try {
|
||||||
|
String username = jwtService.validateAndGetSubject(token);
|
||||||
|
System.out.println("JWT validated for user: " + username);
|
||||||
|
var userDetails = userDetailsService.loadUserByUsername(username);
|
||||||
|
Authentication auth = new UsernamePasswordAuthenticationToken(
|
||||||
|
userDetails, null, userDetails.getAuthorities());
|
||||||
|
accessor.setUser(auth);
|
||||||
|
System.out.println("WebSocket user set: " + username);
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.err.println("JWT validation failed: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (StompCommand.SUBSCRIBE.equals(accessor.getCommand())) {
|
||||||
|
System.out.println("WebSocket SUBSCRIBE to: " + accessor.getDestination());
|
||||||
|
System.out.println("WebSocket user during subscribe: " + (accessor.getUser() != null ? accessor.getUser().getName() : "null"));
|
||||||
|
}
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
package com.openisle.controller;
|
||||||
|
|
||||||
|
import com.openisle.dto.ConversationDetailDto;
|
||||||
|
import com.openisle.dto.ConversationDto;
|
||||||
|
import com.openisle.dto.CreateConversationRequest;
|
||||||
|
import com.openisle.dto.CreateConversationResponse;
|
||||||
|
import com.openisle.dto.MessageDto;
|
||||||
|
import com.openisle.model.Message;
|
||||||
|
import com.openisle.model.MessageConversation;
|
||||||
|
import com.openisle.model.User;
|
||||||
|
import com.openisle.repository.UserRepository;
|
||||||
|
import com.openisle.service.MessageService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.PageRequest;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.domain.Sort;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.security.core.Authentication;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/messages")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class MessageController {
|
||||||
|
|
||||||
|
private final MessageService messageService;
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
|
// This is a placeholder for getting the current user's ID
|
||||||
|
private Long getCurrentUserId(Authentication auth) {
|
||||||
|
User user = userRepository.findByUsername(auth.getName()).orElseThrow(() -> new IllegalArgumentException("Sender not found"));
|
||||||
|
// In a real application, you would get this from the Authentication object
|
||||||
|
return user.getId();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/conversations")
|
||||||
|
public ResponseEntity<List<ConversationDto>> getConversations(Authentication auth) {
|
||||||
|
List<ConversationDto> conversations = messageService.getConversations(getCurrentUserId(auth));
|
||||||
|
return ResponseEntity.ok(conversations);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/conversations/{conversationId}")
|
||||||
|
public ResponseEntity<ConversationDetailDto> getMessages(@PathVariable Long conversationId,
|
||||||
|
@RequestParam(defaultValue = "0") int page,
|
||||||
|
@RequestParam(defaultValue = "20") int size,
|
||||||
|
Authentication auth) {
|
||||||
|
Pageable pageable = PageRequest.of(page, size, Sort.by("createdAt").descending());
|
||||||
|
ConversationDetailDto conversationDetails = messageService.getConversationDetails(conversationId, getCurrentUserId(auth), pageable);
|
||||||
|
return ResponseEntity.ok(conversationDetails);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public ResponseEntity<MessageDto> sendMessage(@RequestBody MessageRequest req, Authentication auth) {
|
||||||
|
Message message = messageService.sendMessage(getCurrentUserId(auth), req.getRecipientId(), req.getContent(), req.getReplyToId());
|
||||||
|
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")
|
||||||
|
public ResponseEntity<Void> markAsRead(@PathVariable Long conversationId, Authentication auth) {
|
||||||
|
messageService.markConversationAsRead(conversationId, getCurrentUserId(auth));
|
||||||
|
return ResponseEntity.ok().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/conversations")
|
||||||
|
public ResponseEntity<CreateConversationResponse> findOrCreateConversation(@RequestBody CreateConversationRequest req, Authentication auth) {
|
||||||
|
MessageConversation conversation = messageService.findOrCreateConversation(getCurrentUserId(auth), req.getRecipientId());
|
||||||
|
return ResponseEntity.ok(new CreateConversationResponse(conversation.getId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/unread-count")
|
||||||
|
public ResponseEntity<Long> getUnreadCount(Authentication auth) {
|
||||||
|
return ResponseEntity.ok(messageService.getUnreadMessageCount(getCurrentUserId(auth)));
|
||||||
|
}
|
||||||
|
|
||||||
|
// A simple request DTO
|
||||||
|
static class MessageRequest {
|
||||||
|
private Long recipientId;
|
||||||
|
private String content;
|
||||||
|
private Long replyToId;
|
||||||
|
|
||||||
|
public Long getRecipientId() {
|
||||||
|
return recipientId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRecipientId(Long recipientId) {
|
||||||
|
this.recipientId = recipientId;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,9 +7,11 @@ import lombok.RequiredArgsConstructor;
|
|||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@@ -25,4 +27,10 @@ public class PointHistoryController {
|
|||||||
.map(pointHistoryMapper::toDto)
|
.map(pointHistoryMapper::toDto)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/trend")
|
||||||
|
public List<Map<String, Object>> trend(Authentication auth,
|
||||||
|
@RequestParam(value = "days", defaultValue = "30") int days) {
|
||||||
|
return pointService.trend(auth.getName(), days);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,8 @@ public class PostController {
|
|||||||
Post post = postService.createPost(auth.getName(), req.getCategoryId(),
|
Post post = postService.createPost(auth.getName(), req.getCategoryId(),
|
||||||
req.getTitle(), req.getContent(), req.getTagIds(),
|
req.getTitle(), req.getContent(), req.getTagIds(),
|
||||||
req.getType(), req.getPrizeDescription(), req.getPrizeIcon(),
|
req.getType(), req.getPrizeDescription(), req.getPrizeIcon(),
|
||||||
req.getPrizeCount(), req.getStartTime(), req.getEndTime());
|
req.getPrizeCount(), req.getPointCost(),
|
||||||
|
req.getStartTime(), req.getEndTime());
|
||||||
draftService.deleteDraft(auth.getName());
|
draftService.deleteDraft(auth.getName());
|
||||||
PostDetailDto dto = postMapper.toDetailDto(post, auth.getName());
|
PostDetailDto dto = postMapper.toDetailDto(post, auth.getName());
|
||||||
dto.setReward(levelService.awardForPost(auth.getName()));
|
dto.setReward(levelService.awardForPost(auth.getName()));
|
||||||
@@ -171,4 +172,27 @@ public class PostController {
|
|||||||
return postService.listPostsByLatestReply(ids, tids, page, pageSize)
|
return postService.listPostsByLatestReply(ids, tids, page, pageSize)
|
||||||
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
|
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/featured")
|
||||||
|
public List<PostSummaryDto> featuredPosts(@RequestParam(value = "categoryId", required = false) Long categoryId,
|
||||||
|
@RequestParam(value = "categoryIds", required = false) List<Long> categoryIds,
|
||||||
|
@RequestParam(value = "tagId", required = false) Long tagId,
|
||||||
|
@RequestParam(value = "tagIds", required = false) List<Long> tagIds,
|
||||||
|
@RequestParam(value = "page", required = false) Integer page,
|
||||||
|
@RequestParam(value = "pageSize", required = false) Integer pageSize,
|
||||||
|
Authentication auth) {
|
||||||
|
List<Long> ids = categoryIds;
|
||||||
|
if (categoryId != null) {
|
||||||
|
ids = java.util.List.of(categoryId);
|
||||||
|
}
|
||||||
|
List<Long> tids = tagIds;
|
||||||
|
if (tagId != null) {
|
||||||
|
tids = java.util.List.of(tagId);
|
||||||
|
}
|
||||||
|
if (auth != null) {
|
||||||
|
userVisitService.recordVisit(auth.getName());
|
||||||
|
}
|
||||||
|
return postService.listFeaturedPosts(ids, tids, page, pageSize)
|
||||||
|
.stream().map(postMapper::toSummaryDto).collect(Collectors.toList());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ public class ReactionController {
|
|||||||
Authentication auth) {
|
Authentication auth) {
|
||||||
Reaction reaction = reactionService.reactToPost(auth.getName(), postId, req.getType());
|
Reaction reaction = reactionService.reactToPost(auth.getName(), postId, req.getType());
|
||||||
if (reaction == null) {
|
if (reaction == null) {
|
||||||
|
pointService.deductForReactionOfPost(auth.getName(), postId);
|
||||||
return ResponseEntity.noContent().build();
|
return ResponseEntity.noContent().build();
|
||||||
}
|
}
|
||||||
ReactionDto dto = reactionMapper.toDto(reaction);
|
ReactionDto dto = reactionMapper.toDto(reaction);
|
||||||
@@ -50,6 +51,7 @@ public class ReactionController {
|
|||||||
Authentication auth) {
|
Authentication auth) {
|
||||||
Reaction reaction = reactionService.reactToComment(auth.getName(), commentId, req.getType());
|
Reaction reaction = reactionService.reactToComment(auth.getName(), commentId, req.getType());
|
||||||
if (reaction == null) {
|
if (reaction == null) {
|
||||||
|
pointService.deductForReactionOfComment(auth.getName(), commentId);
|
||||||
return ResponseEntity.noContent().build();
|
return ResponseEntity.noContent().build();
|
||||||
}
|
}
|
||||||
ReactionDto dto = reactionMapper.toDto(reaction);
|
ReactionDto dto = reactionMapper.toDto(reaction);
|
||||||
@@ -57,4 +59,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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public class RssController {
|
|||||||
|
|
||||||
// 兼容 Markdown/HTML 两类图片写法(用于 enclosure)
|
// 兼容 Markdown/HTML 两类图片写法(用于 enclosure)
|
||||||
private static final Pattern MD_IMAGE = Pattern.compile("!\\[[^\\]]*\\]\\(([^)]+)\\)");
|
private static final Pattern MD_IMAGE = Pattern.compile("!\\[[^\\]]*\\]\\(([^)]+)\\)");
|
||||||
private static final Pattern HTML_IMAGE = Pattern.compile("<img[^>]+src=[\"']?([^\"'>]+)[\"']?[^>]*>");
|
private static final Pattern HTML_IMAGE = Pattern.compile("<BaseImage[^>]+src=[\"']?([^\"'>]+)[\"']?[^>]*>");
|
||||||
|
|
||||||
private static final DateTimeFormatter RFC1123 = DateTimeFormatter.RFC_1123_DATE_TIME;
|
private static final DateTimeFormatter RFC1123 = DateTimeFormatter.RFC_1123_DATE_TIME;
|
||||||
|
|
||||||
@@ -107,18 +107,11 @@ public class RssController {
|
|||||||
enclosure = absolutifyUrl(enclosure, base);
|
enclosure = absolutifyUrl(enclosure, base);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Top comments in Markdown
|
// 6) 构造优雅的附加区块(原文链接 + 精选评论),编入 <content:encoded>
|
||||||
List<Comment> topComments = commentService
|
List<Comment> topComments = commentService
|
||||||
.getCommentsForPost(p.getId(), CommentSort.MOST_INTERACTIONS);
|
.getCommentsForPost(p.getId(), CommentSort.MOST_INTERACTIONS);
|
||||||
topComments = topComments.subList(0, Math.min(10, topComments.size()));
|
topComments = topComments.subList(0, Math.min(10, topComments.size()));
|
||||||
StringBuilder commentMd = new StringBuilder();
|
String footerHtml = buildFooterHtml(base, link, topComments);
|
||||||
for (Comment c : topComments) {
|
|
||||||
commentMd.append("> @")
|
|
||||||
.append(nullSafe(c.getAuthor().getUsername()))
|
|
||||||
.append(": ")
|
|
||||||
.append(nullSafe(c.getContent()).replace("\r", ""))
|
|
||||||
.append("\n\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
sb.append("<item>");
|
sb.append("<item>");
|
||||||
elem(sb, "title", cdata(nullSafe(p.getTitle())));
|
elem(sb, "title", cdata(nullSafe(p.getTitle())));
|
||||||
@@ -127,18 +120,16 @@ public class RssController {
|
|||||||
elem(sb, "pubDate", toRfc1123Gmt(p.getCreatedAt().atZone(ZoneId.systemDefault())));
|
elem(sb, "pubDate", toRfc1123Gmt(p.getCreatedAt().atZone(ZoneId.systemDefault())));
|
||||||
// 摘要
|
// 摘要
|
||||||
elem(sb, "description", cdata(plain));
|
elem(sb, "description", cdata(plain));
|
||||||
// 全文(HTML)
|
// 全文(HTML):正文 + 优雅的 Markdown 区块(已转 HTML)
|
||||||
sb.append("<content:encoded><![CDATA[").append(absHtml).append("]]></content:encoded>");
|
sb.append("<content:encoded><![CDATA[")
|
||||||
|
.append(absHtml)
|
||||||
|
.append(footerHtml)
|
||||||
|
.append("]]></content:encoded>");
|
||||||
// 首图 enclosure(图片类型)
|
// 首图 enclosure(图片类型)
|
||||||
if (enclosure != null) {
|
if (enclosure != null) {
|
||||||
sb.append("<enclosure url=\"").append(escapeXml(enclosure)).append("\" type=\"")
|
sb.append("<enclosure url=\"").append(escapeXml(enclosure)).append("\" type=\"")
|
||||||
.append(getMimeType(enclosure)).append("\" />");
|
.append(getMimeType(enclosure)).append("\" />");
|
||||||
}
|
}
|
||||||
// Markdown comments
|
|
||||||
elem(sb, "commentsMarkdown", cdata(commentMd.toString()));
|
|
||||||
// Markdown original link
|
|
||||||
elem(sb, "originalLinkMarkdown", cdata("[原文链接](" + link + ")"));
|
|
||||||
|
|
||||||
sb.append("</item>");
|
sb.append("</item>");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,8 +149,12 @@ public class RssController {
|
|||||||
private static String sanitizeHtml(String html) {
|
private static String sanitizeHtml(String html) {
|
||||||
if (html == null) return "";
|
if (html == null) return "";
|
||||||
Safelist wl = Safelist.relaxed()
|
Safelist wl = Safelist.relaxed()
|
||||||
.addTags("pre", "code", "figure", "figcaption", "picture", "source",
|
.addTags(
|
||||||
"table","thead","tbody","tr","th","td","h1","h2","h3","h4","h5","h6")
|
"pre","code","figure","figcaption","picture","source",
|
||||||
|
"table","thead","tbody","tr","th","td",
|
||||||
|
"h1","h2","h3","h4","h5","h6",
|
||||||
|
"hr","blockquote"
|
||||||
|
)
|
||||||
.addAttributes("a", "href", "title", "target", "rel")
|
.addAttributes("a", "href", "title", "target", "rel")
|
||||||
.addAttributes("img", "src", "alt", "title", "width", "height")
|
.addAttributes("img", "src", "alt", "title", "width", "height")
|
||||||
.addAttributes("source", "srcset", "type", "media")
|
.addAttributes("source", "srcset", "type", "media")
|
||||||
@@ -268,6 +263,59 @@ public class RssController {
|
|||||||
return "image/jpeg";
|
return "image/jpeg";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ===================== 附加区块(原文链接 + 精选评论) ===================== */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将“原文链接 + 精选评论(最多 10 条)”以优雅的 Markdown 形式渲染为 HTML,
|
||||||
|
* 并做 sanitize + 绝对化,然后拼入 content:encoded 尾部。
|
||||||
|
*/
|
||||||
|
private static String buildFooterHtml(String baseUrl, String originalLink, List<Comment> topComments) {
|
||||||
|
StringBuilder md = new StringBuilder(256);
|
||||||
|
|
||||||
|
// 分割线
|
||||||
|
md.append("\n\n---\n\n");
|
||||||
|
|
||||||
|
// 原文链接(强调 + 可点击)
|
||||||
|
md.append("**原文链接:** ")
|
||||||
|
.append("[").append(originalLink).append("](").append(originalLink).append(")")
|
||||||
|
.append("\n\n");
|
||||||
|
|
||||||
|
// 精选评论(仅当有评论时展示)
|
||||||
|
if (topComments != null && !topComments.isEmpty()) {
|
||||||
|
md.append("### 精选评论(Top ").append(Math.min(10, topComments.size())).append(")\n\n");
|
||||||
|
for (Comment c : topComments) {
|
||||||
|
String author = usernameOf(c);
|
||||||
|
String content = nullSafe(c.getContent()).replace("\r", "");
|
||||||
|
// 使用引用样式展示,提升可读性
|
||||||
|
md.append("> @").append(author).append(": ").append(content).append("\n\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 渲染为 HTML,并保持和正文一致的处理流程
|
||||||
|
String html = renderMarkdown(md.toString());
|
||||||
|
String safe = sanitizeHtml(html);
|
||||||
|
return absolutifyHtml(safe, baseUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String usernameOf(Comment c) {
|
||||||
|
if (c == null) return "匿名";
|
||||||
|
try {
|
||||||
|
Object authorObj = c.getAuthor();
|
||||||
|
if (authorObj == null) return "匿名";
|
||||||
|
// 反射避免直接依赖实体字段名变化(也可直接强转到具体类型)
|
||||||
|
String username;
|
||||||
|
try {
|
||||||
|
username = (String) authorObj.getClass().getMethod("getUsername").invoke(authorObj);
|
||||||
|
} catch (Exception e) {
|
||||||
|
username = null;
|
||||||
|
}
|
||||||
|
if (username == null || username.isEmpty()) return "匿名";
|
||||||
|
return username;
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
return "匿名";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* ===================== 时间/字符串/XML ===================== */
|
/* ===================== 时间/字符串/XML ===================== */
|
||||||
|
|
||||||
private static String toRfc1123Gmt(ZonedDateTime zdt) {
|
private static String toRfc1123Gmt(ZonedDateTime zdt) {
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ConversationDetailDto {
|
||||||
|
private Long id;
|
||||||
|
private String name;
|
||||||
|
private boolean channel;
|
||||||
|
private String avatar;
|
||||||
|
private List<UserSummaryDto> participants;
|
||||||
|
private Page<MessageDto> messages;
|
||||||
|
}
|
||||||
20
backend/src/main/java/com/openisle/dto/ConversationDto.java
Normal file
20
backend/src/main/java/com/openisle/dto/ConversationDto.java
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class ConversationDto {
|
||||||
|
private Long id;
|
||||||
|
private String name;
|
||||||
|
private boolean channel;
|
||||||
|
private String avatar;
|
||||||
|
private MessageDto lastMessage;
|
||||||
|
private List<UserSummaryDto> participants;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
private long unreadCount;
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class CreateConversationRequest {
|
||||||
|
private Long recipientId;
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class CreateConversationResponse {
|
||||||
|
private Long conversationId;
|
||||||
|
}
|
||||||
12
backend/src/main/java/com/openisle/dto/FeaturedMedalDto.java
Normal file
12
backend/src/main/java/com/openisle/dto/FeaturedMedalDto.java
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class FeaturedMedalDto extends MedalDto {
|
||||||
|
private long currentFeaturedCount;
|
||||||
|
private long targetFeaturedCount;
|
||||||
|
}
|
||||||
|
|
||||||
@@ -10,6 +10,7 @@ public class LotteryDto {
|
|||||||
private String prizeDescription;
|
private String prizeDescription;
|
||||||
private String prizeIcon;
|
private String prizeIcon;
|
||||||
private int prizeCount;
|
private int prizeCount;
|
||||||
|
private int pointCost;
|
||||||
private LocalDateTime startTime;
|
private LocalDateTime startTime;
|
||||||
private LocalDateTime endTime;
|
private LocalDateTime endTime;
|
||||||
private List<AuthorDto> participants;
|
private List<AuthorDto> participants;
|
||||||
|
|||||||
16
backend/src/main/java/com/openisle/dto/MessageDto.java
Normal file
16
backend/src/main/java/com/openisle/dto/MessageDto.java
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class MessageDto {
|
||||||
|
private Long id;
|
||||||
|
private String content;
|
||||||
|
private UserSummaryDto sender;
|
||||||
|
private Long conversationId;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
private MessageDto replyTo;
|
||||||
|
private List<ReactionDto> reactions;
|
||||||
|
}
|
||||||
@@ -23,6 +23,7 @@ public class PostRequest {
|
|||||||
private String prizeDescription;
|
private String prizeDescription;
|
||||||
private String prizeIcon;
|
private String prizeIcon;
|
||||||
private Integer prizeCount;
|
private Integer prizeCount;
|
||||||
|
private Integer pointCost;
|
||||||
private LocalDateTime startTime;
|
private LocalDateTime startTime;
|
||||||
private LocalDateTime endTime;
|
private LocalDateTime endTime;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
10
backend/src/main/java/com/openisle/dto/UserSummaryDto.java
Normal file
10
backend/src/main/java/com/openisle/dto/UserSummaryDto.java
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class UserSummaryDto {
|
||||||
|
private Long id;
|
||||||
|
private String username;
|
||||||
|
private String avatar;
|
||||||
|
}
|
||||||
@@ -86,6 +86,7 @@ public class PostMapper {
|
|||||||
l.setPrizeDescription(lp.getPrizeDescription());
|
l.setPrizeDescription(lp.getPrizeDescription());
|
||||||
l.setPrizeIcon(lp.getPrizeIcon());
|
l.setPrizeIcon(lp.getPrizeIcon());
|
||||||
l.setPrizeCount(lp.getPrizeCount());
|
l.setPrizeCount(lp.getPrizeCount());
|
||||||
|
l.setPointCost(lp.getPointCost());
|
||||||
l.setStartTime(lp.getStartTime());
|
l.setStartTime(lp.getStartTime());
|
||||||
l.setEndTime(lp.getEndTime());
|
l.setEndTime(lp.getEndTime());
|
||||||
l.setParticipants(lp.getParticipants().stream().map(userMapper::toAuthorDto).collect(Collectors.toList()));
|
l.setParticipants(lp.getParticipants().stream().map(userMapper::toAuthorDto).collect(Collectors.toList()));
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class Draft {
|
|||||||
|
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
@Column(columnDefinition = "TEXT")
|
@Column(columnDefinition = "LONGTEXT")
|
||||||
private String content;
|
private String content;
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ public class LotteryPost extends Post {
|
|||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
private int prizeCount;
|
private int prizeCount;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
private int pointCost;
|
||||||
|
|
||||||
@Column
|
@Column
|
||||||
private LocalDateTime startTime;
|
private LocalDateTime startTime;
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.openisle.model;
|
|||||||
public enum MedalType {
|
public enum MedalType {
|
||||||
COMMENT,
|
COMMENT,
|
||||||
POST,
|
POST,
|
||||||
|
FEATURED,
|
||||||
CONTRIBUTOR,
|
CONTRIBUTOR,
|
||||||
SEED,
|
SEED,
|
||||||
PIONEER
|
PIONEER
|
||||||
|
|||||||
39
backend/src/main/java/com/openisle/model/Message.java
Normal file
39
backend/src/main/java/com/openisle/model/Message.java
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
package com.openisle.model;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
import org.hibernate.annotations.CreationTimestamp;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@Table(name = "messages")
|
||||||
|
public class Message {
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@ManyToOne(optional = false, fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "conversation_id")
|
||||||
|
private MessageConversation conversation;
|
||||||
|
|
||||||
|
@ManyToOne(optional = false, fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "sender_id")
|
||||||
|
private User sender;
|
||||||
|
|
||||||
|
@Column(nullable = false, columnDefinition = "TEXT")
|
||||||
|
private String content;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "reply_to_id")
|
||||||
|
private Message replyTo;
|
||||||
|
|
||||||
|
@CreationTimestamp
|
||||||
|
@Column(nullable = false, updatable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package com.openisle.model;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
import org.hibernate.annotations.CreationTimestamp;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@Table(name = "message_conversations")
|
||||||
|
public class MessageConversation {
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
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
|
||||||
|
@Column(nullable = false, updatable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
|
||||||
|
@OneToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "last_message_id")
|
||||||
|
private Message lastMessage;
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "conversation", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
private Set<MessageParticipant> participants = new HashSet<>();
|
||||||
|
|
||||||
|
@OneToMany(mappedBy = "conversation", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
private Set<Message> messages = new HashSet<>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package com.openisle.model;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@Table(name = "message_participants")
|
||||||
|
public class MessageParticipant {
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@ManyToOne(optional = false, fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "conversation_id")
|
||||||
|
private MessageConversation conversation;
|
||||||
|
|
||||||
|
@ManyToOne(optional = false, fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "user_id")
|
||||||
|
private User user;
|
||||||
|
|
||||||
|
@Column
|
||||||
|
private LocalDateTime lastReadAt;
|
||||||
|
}
|
||||||
@@ -40,6 +40,8 @@ public enum NotificationType {
|
|||||||
LOTTERY_WIN,
|
LOTTERY_WIN,
|
||||||
/** Your lottery post was drawn */
|
/** Your lottery post was drawn */
|
||||||
LOTTERY_DRAW,
|
LOTTERY_DRAW,
|
||||||
|
/** Your post was featured */
|
||||||
|
POST_FEATURED,
|
||||||
/** You were mentioned in a post or comment */
|
/** You were mentioned in a post or comment */
|
||||||
MENTION
|
MENTION
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,12 @@ public enum PointHistoryType {
|
|||||||
COMMENT,
|
COMMENT,
|
||||||
POST_LIKED,
|
POST_LIKED,
|
||||||
COMMENT_LIKED,
|
COMMENT_LIKED,
|
||||||
|
POST_LIKE_CANCELLED,
|
||||||
|
COMMENT_LIKE_CANCELLED,
|
||||||
INVITE,
|
INVITE,
|
||||||
|
FEATURE,
|
||||||
SYSTEM_ONLINE,
|
SYSTEM_ONLINE,
|
||||||
REDEEM
|
REDEEM,
|
||||||
|
LOTTERY_JOIN,
|
||||||
|
LOTTERY_REWARD
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ public class Post {
|
|||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
@Column(nullable = false, columnDefinition = "TEXT")
|
@Column(nullable = false, columnDefinition = "LONGTEXT")
|
||||||
private String content;
|
private String content;
|
||||||
|
|
||||||
@CreationTimestamp
|
@CreationTimestamp
|
||||||
|
|||||||
@@ -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,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package com.openisle.repository;
|
||||||
|
|
||||||
|
import com.openisle.model.MessageConversation;
|
||||||
|
import com.openisle.model.User;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.data.jpa.repository.Query;
|
||||||
|
import org.springframework.data.repository.query.Param;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface MessageConversationRepository extends JpaRepository<MessageConversation, Long> {
|
||||||
|
@Query("SELECT c FROM MessageConversation c " +
|
||||||
|
"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 " +
|
||||||
|
"JOIN c.participants p " +
|
||||||
|
"LEFT JOIN FETCH c.lastMessage lm " +
|
||||||
|
"LEFT JOIN FETCH lm.sender " +
|
||||||
|
"LEFT JOIN FETCH c.participants cp " +
|
||||||
|
"LEFT JOIN FETCH cp.user " +
|
||||||
|
"WHERE p.user.id = :userId " +
|
||||||
|
"ORDER BY COALESCE(lm.createdAt, c.createdAt) DESC")
|
||||||
|
List<MessageConversation> findConversationsByUserIdOrderByLastMessageDesc(@Param("userId") Long userId);
|
||||||
|
|
||||||
|
List<MessageConversation> findByChannelTrue();
|
||||||
|
|
||||||
|
long countByChannelTrue();
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package com.openisle.repository;
|
||||||
|
|
||||||
|
import com.openisle.model.MessageParticipant;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface MessageParticipantRepository extends JpaRepository<MessageParticipant, Long> {
|
||||||
|
Optional<MessageParticipant> findByConversationIdAndUserId(Long conversationId, Long userId);
|
||||||
|
List<MessageParticipant> findByUserId(Long userId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package com.openisle.repository;
|
||||||
|
|
||||||
|
import com.openisle.model.Message;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface MessageRepository extends JpaRepository<Message, Long> {
|
||||||
|
List<Message> findByConversationIdOrderByCreatedAtAsc(Long conversationId);
|
||||||
|
|
||||||
|
Page<Message> findByConversationId(Long conversationId, Pageable pageable);
|
||||||
|
|
||||||
|
long countByConversationIdAndCreatedAtAfter(Long conversationId, java.time.LocalDateTime createdAt);
|
||||||
|
|
||||||
|
// 只计算不是指定用户发送的消息(即别人发给当前用户的消息)
|
||||||
|
long countByConversationIdAndCreatedAtAfterAndSenderIdNot(Long conversationId, java.time.LocalDateTime createdAt, Long senderId);
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@ import com.openisle.model.User;
|
|||||||
import com.openisle.model.Post;
|
import com.openisle.model.Post;
|
||||||
import com.openisle.model.Comment;
|
import com.openisle.model.Comment;
|
||||||
import com.openisle.model.NotificationType;
|
import com.openisle.model.NotificationType;
|
||||||
|
import com.openisle.model.ReactionType;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
@@ -29,4 +30,8 @@ public interface NotificationRepository extends JpaRepository<Notification, Long
|
|||||||
List<Notification> findByTypeAndFromUser(NotificationType type, User fromUser);
|
List<Notification> findByTypeAndFromUser(NotificationType type, User fromUser);
|
||||||
|
|
||||||
void deleteByTypeAndFromUserAndPost(NotificationType type, User fromUser, Post post);
|
void deleteByTypeAndFromUserAndPost(NotificationType type, User fromUser, Post post);
|
||||||
|
|
||||||
|
void deleteByTypeAndFromUserAndPostAndReactionType(NotificationType type, User fromUser, Post post, ReactionType reactionType);
|
||||||
|
|
||||||
|
void deleteByTypeAndFromUserAndCommentAndReactionType(NotificationType type, User fromUser, Comment comment, ReactionType reactionType);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,12 @@ import com.openisle.model.PointHistory;
|
|||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public interface PointHistoryRepository extends JpaRepository<PointHistory, Long> {
|
public interface PointHistoryRepository extends JpaRepository<PointHistory, Long> {
|
||||||
List<PointHistory> findByUserOrderByIdDesc(User user);
|
List<PointHistory> findByUserOrderByIdDesc(User user);
|
||||||
long countByUser(User user);
|
long countByUser(User user);
|
||||||
|
|
||||||
|
List<PointHistory> findByUserAndCreatedAtAfterOrderByCreatedAtDesc(User user, LocalDateTime createdAt);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -97,6 +97,8 @@ public interface PostRepository extends JpaRepository<Post, Long> {
|
|||||||
|
|
||||||
long countDistinctByTags_Id(Long tagId);
|
long countDistinctByTags_Id(Long tagId);
|
||||||
|
|
||||||
|
long countByAuthor_IdAndRssExcludedFalse(Long userId);
|
||||||
|
|
||||||
@Query("SELECT t.id, COUNT(DISTINCT p) FROM Post p JOIN p.tags t WHERE t.id IN :tagIds GROUP BY t.id")
|
@Query("SELECT t.id, COUNT(DISTINCT p) FROM Post p JOIN p.tags t WHERE t.id IN :tagIds GROUP BY t.id")
|
||||||
List<Object[]> countPostsByTagIds(@Param("tagIds") List<Long> tagIds);
|
List<Object[]> countPostsByTagIds(@Param("tagIds") List<Long> tagIds);
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ import com.openisle.dto.MedalDto;
|
|||||||
import com.openisle.dto.PostMedalDto;
|
import com.openisle.dto.PostMedalDto;
|
||||||
import com.openisle.dto.SeedUserMedalDto;
|
import com.openisle.dto.SeedUserMedalDto;
|
||||||
import com.openisle.dto.PioneerMedalDto;
|
import com.openisle.dto.PioneerMedalDto;
|
||||||
|
import com.openisle.dto.FeaturedMedalDto;
|
||||||
import com.openisle.model.MedalType;
|
import com.openisle.model.MedalType;
|
||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
import com.openisle.repository.CommentRepository;
|
import com.openisle.repository.CommentRepository;
|
||||||
@@ -74,6 +75,23 @@ public class MedalService {
|
|||||||
postMedal.setSelected(selected == MedalType.POST);
|
postMedal.setSelected(selected == MedalType.POST);
|
||||||
medals.add(postMedal);
|
medals.add(postMedal);
|
||||||
|
|
||||||
|
FeaturedMedalDto featuredMedal = new FeaturedMedalDto();
|
||||||
|
featuredMedal.setIcon("https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/icons/achi_rss.png");
|
||||||
|
featuredMedal.setTitle("精选作者");
|
||||||
|
featuredMedal.setDescription("至少有1篇文章被收录为精选");
|
||||||
|
featuredMedal.setType(MedalType.FEATURED);
|
||||||
|
featuredMedal.setTargetFeaturedCount(1);
|
||||||
|
if (user != null) {
|
||||||
|
long count = postRepository.countByAuthor_IdAndRssExcludedFalse(user.getId());
|
||||||
|
featuredMedal.setCurrentFeaturedCount(count);
|
||||||
|
featuredMedal.setCompleted(count >= 1);
|
||||||
|
} else {
|
||||||
|
featuredMedal.setCurrentFeaturedCount(0);
|
||||||
|
featuredMedal.setCompleted(false);
|
||||||
|
}
|
||||||
|
featuredMedal.setSelected(selected == MedalType.FEATURED);
|
||||||
|
medals.add(featuredMedal);
|
||||||
|
|
||||||
ContributorMedalDto contributorMedal = new ContributorMedalDto();
|
ContributorMedalDto contributorMedal = new ContributorMedalDto();
|
||||||
contributorMedal.setIcon("https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/icons/achi_coder.png");
|
contributorMedal.setIcon("https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/icons/achi_coder.png");
|
||||||
contributorMedal.setTitle("贡献者");
|
contributorMedal.setTitle("贡献者");
|
||||||
@@ -141,6 +159,8 @@ public class MedalService {
|
|||||||
user.setDisplayMedal(MedalType.COMMENT);
|
user.setDisplayMedal(MedalType.COMMENT);
|
||||||
} else if (postRepository.countByAuthor_Id(user.getId()) >= POST_TARGET) {
|
} else if (postRepository.countByAuthor_Id(user.getId()) >= POST_TARGET) {
|
||||||
user.setDisplayMedal(MedalType.POST);
|
user.setDisplayMedal(MedalType.POST);
|
||||||
|
} else if (postRepository.countByAuthor_IdAndRssExcludedFalse(user.getId()) >= 1) {
|
||||||
|
user.setDisplayMedal(MedalType.FEATURED);
|
||||||
} else if (contributorService.getContributionLines(user.getUsername()) >= CONTRIBUTION_TARGET) {
|
} else if (contributorService.getContributionLines(user.getUsername()) >= CONTRIBUTION_TARGET) {
|
||||||
user.setDisplayMedal(MedalType.CONTRIBUTOR);
|
user.setDisplayMedal(MedalType.CONTRIBUTOR);
|
||||||
} else if (userRepository.countByCreatedAtBefore(user.getCreatedAt()) < PIONEER_LIMIT) {
|
} else if (userRepository.countByCreatedAtBefore(user.getCreatedAt()) < PIONEER_LIMIT) {
|
||||||
|
|||||||
324
backend/src/main/java/com/openisle/service/MessageService.java
Normal file
324
backend/src/main/java/com/openisle/service/MessageService.java
Normal file
@@ -0,0 +1,324 @@
|
|||||||
|
package com.openisle.service;
|
||||||
|
|
||||||
|
import com.openisle.model.Message;
|
||||||
|
import com.openisle.model.MessageConversation;
|
||||||
|
import com.openisle.model.MessageParticipant;
|
||||||
|
import com.openisle.model.User;
|
||||||
|
import com.openisle.model.Reaction;
|
||||||
|
import com.openisle.repository.MessageConversationRepository;
|
||||||
|
import com.openisle.repository.MessageParticipantRepository;
|
||||||
|
import com.openisle.repository.MessageRepository;
|
||||||
|
import com.openisle.repository.UserRepository;
|
||||||
|
import com.openisle.repository.ReactionRepository;
|
||||||
|
import com.openisle.dto.ConversationDetailDto;
|
||||||
|
import com.openisle.dto.ConversationDto;
|
||||||
|
import com.openisle.dto.MessageDto;
|
||||||
|
import com.openisle.dto.ReactionDto;
|
||||||
|
import com.openisle.dto.UserSummaryDto;
|
||||||
|
import com.openisle.mapper.ReactionMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.messaging.simp.SimpMessagingTemplate;
|
||||||
|
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
|
||||||
|
@Slf4j
|
||||||
|
public class MessageService {
|
||||||
|
|
||||||
|
private final MessageRepository messageRepository;
|
||||||
|
private final MessageConversationRepository conversationRepository;
|
||||||
|
private final MessageParticipantRepository participantRepository;
|
||||||
|
private final UserRepository userRepository;
|
||||||
|
private final SimpMessagingTemplate messagingTemplate;
|
||||||
|
private final ReactionRepository reactionRepository;
|
||||||
|
private final ReactionMapper reactionMapper;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public Message sendMessage(Long senderId, Long recipientId, String content, Long replyToId) {
|
||||||
|
log.info("Attempting to send message from user {} to user {}", senderId, recipientId);
|
||||||
|
User sender = userRepository.findById(senderId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Sender not found"));
|
||||||
|
User recipient = userRepository.findById(recipientId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Recipient not found"));
|
||||||
|
|
||||||
|
log.info("Finding or creating conversation for users {} and {}", sender.getUsername(), recipient.getUsername());
|
||||||
|
MessageConversation conversation = findOrCreateConversation(sender, recipient);
|
||||||
|
log.info("Conversation found or created with ID: {}", conversation.getId());
|
||||||
|
|
||||||
|
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);
|
||||||
|
log.info("Message saved with ID: {}", message.getId());
|
||||||
|
|
||||||
|
conversation.setLastMessage(message);
|
||||||
|
conversationRepository.save(conversation);
|
||||||
|
log.info("Conversation {} updated with last message ID {}", conversation.getId(), message.getId());
|
||||||
|
|
||||||
|
// Broadcast the new message to subscribed clients
|
||||||
|
MessageDto messageDto = toDto(message);
|
||||||
|
String conversationDestination = "/topic/conversation/" + conversation.getId();
|
||||||
|
messagingTemplate.convertAndSend(conversationDestination, messageDto);
|
||||||
|
log.info("Message {} broadcasted to destination: {}", message.getId(), conversationDestination);
|
||||||
|
|
||||||
|
// Also notify the recipient on their personal channel to update the conversation list
|
||||||
|
String userDestination = "/topic/user/" + recipient.getId() + "/messages";
|
||||||
|
messagingTemplate.convertAndSend(userDestination, messageDto);
|
||||||
|
log.info("Message {} notification sent to destination: {}", message.getId(), userDestination);
|
||||||
|
|
||||||
|
// Notify recipient of new unread count
|
||||||
|
long unreadCount = getUnreadMessageCount(recipientId);
|
||||||
|
log.info("Calculating unread count for user {}: {}", recipientId, unreadCount);
|
||||||
|
|
||||||
|
// Send using username instead of user ID for WebSocket routing
|
||||||
|
String recipientUsername = recipient.getUsername();
|
||||||
|
messagingTemplate.convertAndSendToUser(recipientUsername, "/queue/unread-count", unreadCount);
|
||||||
|
log.info("Sent unread count {} to user {} (username: {}) via WebSocket destination: /user/{}/queue/unread-count",
|
||||||
|
unreadCount, recipientId, recipientUsername, recipientUsername);
|
||||||
|
|
||||||
|
return 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();
|
||||||
|
dto.setId(message.getId());
|
||||||
|
dto.setContent(message.getContent());
|
||||||
|
dto.setConversationId(message.getConversation().getId());
|
||||||
|
dto.setCreatedAt(message.getCreatedAt());
|
||||||
|
|
||||||
|
UserSummaryDto userSummaryDto = new UserSummaryDto();
|
||||||
|
userSummaryDto.setId(message.getSender().getId());
|
||||||
|
userSummaryDto.setUsername(message.getSender().getUsername());
|
||||||
|
userSummaryDto.setAvatar(message.getSender().getAvatar());
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MessageConversation findOrCreateConversation(Long user1Id, Long user2Id) {
|
||||||
|
User user1 = userRepository.findById(user1Id)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("User1 not found"));
|
||||||
|
User user2 = userRepository.findById(user2Id)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("User2 not found"));
|
||||||
|
return findOrCreateConversation(user1, user2);
|
||||||
|
}
|
||||||
|
|
||||||
|
private MessageConversation findOrCreateConversation(User user1, User user2) {
|
||||||
|
log.info("Searching for existing conversation between {} and {}", user1.getUsername(), user2.getUsername());
|
||||||
|
return conversationRepository.findConversationsByUsers(user1, user2).stream()
|
||||||
|
.findFirst()
|
||||||
|
.orElseGet(() -> {
|
||||||
|
log.info("No existing conversation found. Creating a new one.");
|
||||||
|
MessageConversation conversation = new MessageConversation();
|
||||||
|
conversation = conversationRepository.save(conversation);
|
||||||
|
log.info("New conversation created with ID: {}", conversation.getId());
|
||||||
|
|
||||||
|
MessageParticipant participant1 = new MessageParticipant();
|
||||||
|
participant1.setConversation(conversation);
|
||||||
|
participant1.setUser(user1);
|
||||||
|
participantRepository.save(participant1);
|
||||||
|
log.info("Participant {} added to conversation {}", user1.getUsername(), conversation.getId());
|
||||||
|
|
||||||
|
MessageParticipant participant2 = new MessageParticipant();
|
||||||
|
participant2.setConversation(conversation);
|
||||||
|
participant2.setUser(user2);
|
||||||
|
participantRepository.save(participant2);
|
||||||
|
log.info("Participant {} added to conversation {}", user2.getUsername(), conversation.getId());
|
||||||
|
|
||||||
|
return conversation;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public List<ConversationDto> getConversations(Long userId) {
|
||||||
|
List<MessageConversation> conversations = conversationRepository.findConversationsByUserIdOrderByLastMessageDesc(userId);
|
||||||
|
return conversations.stream()
|
||||||
|
.filter(c -> !c.isChannel())
|
||||||
|
.map(c -> toDto(c, userId))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
private ConversationDto toDto(MessageConversation conversation, Long userId) {
|
||||||
|
ConversationDto dto = new ConversationDto();
|
||||||
|
dto.setId(conversation.getId());
|
||||||
|
dto.setChannel(conversation.isChannel());
|
||||||
|
dto.setName(conversation.getName());
|
||||||
|
dto.setAvatar(conversation.getAvatar());
|
||||||
|
dto.setCreatedAt(conversation.getCreatedAt());
|
||||||
|
if (conversation.getLastMessage() != null) {
|
||||||
|
dto.setLastMessage(toDto(conversation.getLastMessage()));
|
||||||
|
}
|
||||||
|
dto.setParticipants(conversation.getParticipants().stream()
|
||||||
|
.map(p -> {
|
||||||
|
UserSummaryDto userDto = new UserSummaryDto();
|
||||||
|
userDto.setId(p.getUser().getId());
|
||||||
|
userDto.setUsername(p.getUser().getUsername());
|
||||||
|
userDto.setAvatar(p.getUser().getAvatar());
|
||||||
|
return userDto;
|
||||||
|
})
|
||||||
|
.collect(Collectors.toList()));
|
||||||
|
|
||||||
|
MessageParticipant self = conversation.getParticipants().stream()
|
||||||
|
.filter(p -> p.getUser().getId().equals(userId))
|
||||||
|
.findFirst()
|
||||||
|
.orElseThrow(() -> new IllegalStateException("Participant not found in conversation"));
|
||||||
|
|
||||||
|
LocalDateTime lastRead = self.getLastReadAt() == null ? LocalDateTime.of(1970, 1, 1, 0, 0) : self.getLastReadAt();
|
||||||
|
// 只计算别人发送给当前用户的未读消息
|
||||||
|
long unreadCount = messageRepository.countByConversationIdAndCreatedAtAfterAndSenderIdNot(conversation.getId(), lastRead, userId);
|
||||||
|
dto.setUnreadCount(unreadCount);
|
||||||
|
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public ConversationDetailDto getConversationDetails(Long conversationId, Long userId, Pageable pageable) {
|
||||||
|
markConversationAsRead(conversationId, userId);
|
||||||
|
|
||||||
|
MessageConversation conversation = conversationRepository.findById(conversationId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Conversation not found"));
|
||||||
|
|
||||||
|
Page<Message> messagesPage = messageRepository.findByConversationId(conversationId, pageable);
|
||||||
|
Page<MessageDto> messageDtoPage = messagesPage.map(this::toDto);
|
||||||
|
|
||||||
|
List<UserSummaryDto> participants = conversation.getParticipants().stream()
|
||||||
|
.map(p -> {
|
||||||
|
UserSummaryDto userDto = new UserSummaryDto();
|
||||||
|
userDto.setId(p.getUser().getId());
|
||||||
|
userDto.setUsername(p.getUser().getUsername());
|
||||||
|
userDto.setAvatar(p.getUser().getAvatar());
|
||||||
|
return userDto;
|
||||||
|
})
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
ConversationDetailDto detailDto = new ConversationDetailDto();
|
||||||
|
detailDto.setId(conversation.getId());
|
||||||
|
detailDto.setName(conversation.getName());
|
||||||
|
detailDto.setChannel(conversation.isChannel());
|
||||||
|
detailDto.setAvatar(conversation.getAvatar());
|
||||||
|
detailDto.setParticipants(participants);
|
||||||
|
detailDto.setMessages(messageDtoPage);
|
||||||
|
|
||||||
|
return detailDto;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public void markConversationAsRead(Long conversationId, Long userId) {
|
||||||
|
MessageParticipant participant = participantRepository.findByConversationIdAndUserId(conversationId, userId)
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Participant not found"));
|
||||||
|
participant.setLastReadAt(LocalDateTime.now());
|
||||||
|
participantRepository.save(participant);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public long getUnreadMessageCount(Long userId) {
|
||||||
|
List<MessageParticipant> participations = participantRepository.findByUserId(userId);
|
||||||
|
long totalUnreadCount = 0;
|
||||||
|
for (MessageParticipant p : participations) {
|
||||||
|
if (p.getConversation().isChannel()) continue;
|
||||||
|
LocalDateTime lastRead = p.getLastReadAt() == null ? LocalDateTime.of(1970, 1, 1, 0, 0) : p.getLastReadAt();
|
||||||
|
// 只计算别人发送给当前用户的未读消息
|
||||||
|
totalUnreadCount += messageRepository.countByConversationIdAndCreatedAtAfterAndSenderIdNot(p.getConversation().getId(), lastRead, userId);
|
||||||
|
}
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -114,6 +114,14 @@ public class NotificationService {
|
|||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void deleteReactionNotification(User fromUser, Post post, Comment comment, ReactionType reactionType) {
|
||||||
|
if (post != null) {
|
||||||
|
notificationRepository.deleteByTypeAndFromUserAndPostAndReactionType(NotificationType.REACTION, fromUser, post, reactionType);
|
||||||
|
} else if (comment != null) {
|
||||||
|
notificationRepository.deleteByTypeAndFromUserAndCommentAndReactionType(NotificationType.REACTION, fromUser, comment, reactionType);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create notifications for all admins when a user submits a register request.
|
* Create notifications for all admins when a user submits a register request.
|
||||||
* Old register request notifications from the same applicant are removed first.
|
* Old register request notifications from the same applicant are removed first.
|
||||||
|
|||||||
@@ -2,10 +2,15 @@ package com.openisle.service;
|
|||||||
|
|
||||||
import com.openisle.model.*;
|
import com.openisle.model.*;
|
||||||
import com.openisle.repository.*;
|
import com.openisle.repository.*;
|
||||||
|
import com.openisle.exception.FieldException;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -33,6 +38,23 @@ public class PointService {
|
|||||||
return addPoint(user, 500, PointHistoryType.INVITE, null, null, invitee);
|
return addPoint(user, 500, PointHistoryType.INVITE, null, null, invitee);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int awardForFeatured(String userName, Long postId) {
|
||||||
|
User user = userRepository.findByUsername(userName).orElseThrow();
|
||||||
|
Post post = postRepository.findById(postId).orElseThrow();
|
||||||
|
return addPoint(user, 500, PointHistoryType.FEATURE, post, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void processLotteryJoin(User participant, LotteryPost post) {
|
||||||
|
int cost = post.getPointCost();
|
||||||
|
if (cost > 0) {
|
||||||
|
if (participant.getPoint() < cost) {
|
||||||
|
throw new FieldException("point", "积分不足");
|
||||||
|
}
|
||||||
|
addPoint(participant, -cost, PointHistoryType.LOTTERY_JOIN, post, null, post.getAuthor());
|
||||||
|
addPoint(post.getAuthor(), cost, PointHistoryType.LOTTERY_REWARD, post, null, participant);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private PointLog getTodayLog(User user) {
|
private PointLog getTodayLog(User user) {
|
||||||
LocalDate today = LocalDate.now();
|
LocalDate today = LocalDate.now();
|
||||||
return pointLogRepository.findByUserAndLogDate(user, today)
|
return pointLogRepository.findByUserAndLogDate(user, today)
|
||||||
@@ -128,6 +150,16 @@ public class PointService {
|
|||||||
return addPoint(poster, 10, PointHistoryType.POST_LIKED, post, null, reactioner);
|
return addPoint(poster, 10, PointHistoryType.POST_LIKED, post, null, reactioner);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int deductForReactionOfPost(String reactionerName, Long postId) {
|
||||||
|
User poster = postRepository.findById(postId).orElseThrow().getAuthor();
|
||||||
|
User reactioner = userRepository.findByUsername(reactionerName).orElseThrow();
|
||||||
|
if (poster.getId().equals(reactioner.getId())) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
Post post = postRepository.findById(postId).orElseThrow();
|
||||||
|
return addPoint(poster, -10, PointHistoryType.POST_LIKE_CANCELLED, post, null, reactioner);
|
||||||
|
}
|
||||||
|
|
||||||
// 考虑点赞者和评论者是同一个的情况
|
// 考虑点赞者和评论者是同一个的情况
|
||||||
public int awardForReactionOfComment(String reactionerName, Long commentId) {
|
public int awardForReactionOfComment(String reactionerName, Long commentId) {
|
||||||
// 根据帖子id找到评论者
|
// 根据帖子id找到评论者
|
||||||
@@ -147,6 +179,17 @@ public class PointService {
|
|||||||
return addPoint(commenter, 10, PointHistoryType.COMMENT_LIKED, post, comment, reactioner);
|
return addPoint(commenter, 10, PointHistoryType.COMMENT_LIKED, post, comment, reactioner);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int deductForReactionOfComment(String reactionerName, Long commentId) {
|
||||||
|
User commenter = commentRepository.findById(commentId).orElseThrow().getAuthor();
|
||||||
|
User reactioner = userRepository.findByUsername(reactionerName).orElseThrow();
|
||||||
|
if (commenter.getId().equals(reactioner.getId())) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
Comment comment = commentRepository.findById(commentId).orElseThrow();
|
||||||
|
Post post = comment.getPost();
|
||||||
|
return addPoint(commenter, -10, PointHistoryType.COMMENT_LIKE_CANCELLED, post, comment, reactioner);
|
||||||
|
}
|
||||||
|
|
||||||
public java.util.List<PointHistory> listHistory(String userName) {
|
public java.util.List<PointHistory> listHistory(String userName) {
|
||||||
User user = userRepository.findByUsername(userName).orElseThrow();
|
User user = userRepository.findByUsername(userName).orElseThrow();
|
||||||
if (pointHistoryRepository.countByUser(user) == 0) {
|
if (pointHistoryRepository.countByUser(user) == 0) {
|
||||||
@@ -155,4 +198,25 @@ public class PointService {
|
|||||||
return pointHistoryRepository.findByUserOrderByIdDesc(user);
|
return pointHistoryRepository.findByUserOrderByIdDesc(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Map<String, Object>> trend(String userName, int days) {
|
||||||
|
if (days < 1) days = 1;
|
||||||
|
User user = userRepository.findByUsername(userName).orElseThrow();
|
||||||
|
LocalDate end = LocalDate.now();
|
||||||
|
LocalDate start = end.minusDays(days - 1L);
|
||||||
|
var histories = pointHistoryRepository.findByUserAndCreatedAtAfterOrderByCreatedAtDesc(
|
||||||
|
user, start.atStartOfDay());
|
||||||
|
int idx = 0;
|
||||||
|
int balance = user.getPoint();
|
||||||
|
List<Map<String, Object>> result = new ArrayList<>();
|
||||||
|
for (LocalDate day = end; !day.isBefore(start); day = day.minusDays(1)) {
|
||||||
|
result.add(Map.of("date", day.toString(), "value", balance));
|
||||||
|
while (idx < histories.size() && histories.get(idx).getCreatedAt().toLocalDate().isEqual(day)) {
|
||||||
|
balance -= histories.get(idx).getAmount();
|
||||||
|
idx++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Collections.reverse(result);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ public class PostService {
|
|||||||
private final TaskScheduler taskScheduler;
|
private final TaskScheduler taskScheduler;
|
||||||
private final EmailSender emailSender;
|
private final EmailSender emailSender;
|
||||||
private final ApplicationContext applicationContext;
|
private final ApplicationContext applicationContext;
|
||||||
|
private final PointService pointService;
|
||||||
private final ConcurrentMap<Long, ScheduledFuture<?>> scheduledFinalizations = new ConcurrentHashMap<>();
|
private final ConcurrentMap<Long, ScheduledFuture<?>> scheduledFinalizations = new ConcurrentHashMap<>();
|
||||||
@Value("${app.website-url:https://www.open-isle.com}")
|
@Value("${app.website-url:https://www.open-isle.com}")
|
||||||
private String websiteUrl;
|
private String websiteUrl;
|
||||||
@@ -89,6 +90,7 @@ public class PostService {
|
|||||||
TaskScheduler taskScheduler,
|
TaskScheduler taskScheduler,
|
||||||
EmailSender emailSender,
|
EmailSender emailSender,
|
||||||
ApplicationContext applicationContext,
|
ApplicationContext applicationContext,
|
||||||
|
PointService pointService,
|
||||||
@Value("${app.post.publish-mode:DIRECT}") PublishMode publishMode) {
|
@Value("${app.post.publish-mode:DIRECT}") PublishMode publishMode) {
|
||||||
this.postRepository = postRepository;
|
this.postRepository = postRepository;
|
||||||
this.userRepository = userRepository;
|
this.userRepository = userRepository;
|
||||||
@@ -107,6 +109,7 @@ public class PostService {
|
|||||||
this.taskScheduler = taskScheduler;
|
this.taskScheduler = taskScheduler;
|
||||||
this.emailSender = emailSender;
|
this.emailSender = emailSender;
|
||||||
this.applicationContext = applicationContext;
|
this.applicationContext = applicationContext;
|
||||||
|
this.pointService = pointService;
|
||||||
this.publishMode = publishMode;
|
this.publishMode = publishMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,7 +149,10 @@ public class PostService {
|
|||||||
public Post includeInRss(Long id) {
|
public Post includeInRss(Long id) {
|
||||||
Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||||
post.setRssExcluded(false);
|
post.setRssExcluded(false);
|
||||||
return postRepository.save(post);
|
post = postRepository.save(post);
|
||||||
|
notificationService.createNotification(post.getAuthor(), NotificationType.POST_FEATURED, post, null, null, null, null, null);
|
||||||
|
pointService.awardForFeatured(post.getAuthor().getUsername(), post.getId());
|
||||||
|
return post;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Post createPost(String username,
|
public Post createPost(String username,
|
||||||
@@ -158,6 +164,7 @@ public class PostService {
|
|||||||
String prizeDescription,
|
String prizeDescription,
|
||||||
String prizeIcon,
|
String prizeIcon,
|
||||||
Integer prizeCount,
|
Integer prizeCount,
|
||||||
|
Integer pointCost,
|
||||||
LocalDateTime startTime,
|
LocalDateTime startTime,
|
||||||
LocalDateTime endTime) {
|
LocalDateTime endTime) {
|
||||||
long recent = postRepository.countByAuthorAfter(username,
|
long recent = postRepository.countByAuthorAfter(username,
|
||||||
@@ -182,10 +189,14 @@ public class PostService {
|
|||||||
PostType actualType = type != null ? type : PostType.NORMAL;
|
PostType actualType = type != null ? type : PostType.NORMAL;
|
||||||
Post post;
|
Post post;
|
||||||
if (actualType == PostType.LOTTERY) {
|
if (actualType == PostType.LOTTERY) {
|
||||||
|
if (pointCost != null && (pointCost < 0 || pointCost > 100)) {
|
||||||
|
throw new IllegalArgumentException("pointCost must be between 0 and 100");
|
||||||
|
}
|
||||||
LotteryPost lp = new LotteryPost();
|
LotteryPost lp = new LotteryPost();
|
||||||
lp.setPrizeDescription(prizeDescription);
|
lp.setPrizeDescription(prizeDescription);
|
||||||
lp.setPrizeIcon(prizeIcon);
|
lp.setPrizeIcon(prizeIcon);
|
||||||
lp.setPrizeCount(prizeCount != null ? prizeCount : 0);
|
lp.setPrizeCount(prizeCount != null ? prizeCount : 0);
|
||||||
|
lp.setPointCost(pointCost != null ? pointCost : 0);
|
||||||
lp.setStartTime(startTime);
|
lp.setStartTime(startTime);
|
||||||
lp.setEndTime(endTime);
|
lp.setEndTime(endTime);
|
||||||
post = lp;
|
post = lp;
|
||||||
@@ -244,8 +255,10 @@ public class PostService {
|
|||||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||||
User user = userRepository.findByUsername(username)
|
User user = userRepository.findByUsername(username)
|
||||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||||
post.getParticipants().add(user);
|
if (post.getParticipants().add(user)) {
|
||||||
lotteryPostRepository.save(post);
|
pointService.processLotteryJoin(user, post);
|
||||||
|
lotteryPostRepository.save(post);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
@@ -458,6 +471,34 @@ public class PostService {
|
|||||||
return paginate(sortByPinnedAndCreated(posts), page, pageSize);
|
return paginate(sortByPinnedAndCreated(posts), page, pageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Post> listFeaturedPosts(List<Long> categoryIds,
|
||||||
|
List<Long> tagIds,
|
||||||
|
Integer page,
|
||||||
|
Integer pageSize) {
|
||||||
|
List<Post> posts;
|
||||||
|
boolean hasCategories = categoryIds != null && !categoryIds.isEmpty();
|
||||||
|
boolean hasTags = tagIds != null && !tagIds.isEmpty();
|
||||||
|
|
||||||
|
if (hasCategories && hasTags) {
|
||||||
|
posts = listPostsByCategoriesAndTags(categoryIds, tagIds, null, null);
|
||||||
|
} else if (hasCategories) {
|
||||||
|
posts = listPostsByCategories(categoryIds, null, null);
|
||||||
|
} else if (hasTags) {
|
||||||
|
posts = listPostsByTags(tagIds, null, null);
|
||||||
|
} else {
|
||||||
|
posts = listPosts();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 仅保留 getRssExcluded 为 0 且不为空
|
||||||
|
// 若字段类型是 Boolean(包装类型),0 等价于 false:
|
||||||
|
posts = posts.stream()
|
||||||
|
.filter(p -> p.getRssExcluded() != null && !p.getRssExcluded())
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
return paginate(sortByPinnedAndCreated(posts), page, pageSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<Post> listPendingPosts() {
|
public List<Post> listPendingPosts() {
|
||||||
return postRepository.findByStatus(PostStatus.PENDING);
|
return postRepository.findByStatus(PostStatus.PENDING);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
@@ -39,6 +42,7 @@ public class ReactionService {
|
|||||||
java.util.Optional<Reaction> existing =
|
java.util.Optional<Reaction> existing =
|
||||||
reactionRepository.findByUserAndPostAndType(user, post, type);
|
reactionRepository.findByUserAndPostAndType(user, post, type);
|
||||||
if (existing.isPresent()) {
|
if (existing.isPresent()) {
|
||||||
|
notificationService.deleteReactionNotification(user, post, null, type);
|
||||||
reactionRepository.delete(existing.get());
|
reactionRepository.delete(existing.get());
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -62,6 +66,7 @@ public class ReactionService {
|
|||||||
java.util.Optional<Reaction> existing =
|
java.util.Optional<Reaction> existing =
|
||||||
reactionRepository.findByUserAndCommentAndType(user, comment, type);
|
reactionRepository.findByUserAndCommentAndType(user, comment, type);
|
||||||
if (existing.isPresent()) {
|
if (existing.isPresent()) {
|
||||||
|
notificationService.deleteReactionNotification(user, null, comment, type);
|
||||||
reactionRepository.delete(existing.get());
|
reactionRepository.delete(existing.get());
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -77,6 +82,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();
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE lottery_posts ADD COLUMN point_cost INT NOT NULL DEFAULT 0;
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package com.openisle.controller;
|
||||||
|
|
||||||
|
import com.openisle.config.CustomAccessDeniedHandler;
|
||||||
|
import com.openisle.config.SecurityConfig;
|
||||||
|
import com.openisle.service.PointService;
|
||||||
|
import com.openisle.mapper.PointHistoryMapper;
|
||||||
|
import com.openisle.service.JwtService;
|
||||||
|
import com.openisle.repository.UserRepository;
|
||||||
|
import com.openisle.model.User;
|
||||||
|
import com.openisle.model.Role;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.mockito.Mockito;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
|
||||||
|
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
|
||||||
|
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||||
|
import org.springframework.context.annotation.Import;
|
||||||
|
import org.springframework.test.web.servlet.MockMvc;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||||
|
|
||||||
|
@WebMvcTest(PointHistoryController.class)
|
||||||
|
@AutoConfigureMockMvc
|
||||||
|
@Import({SecurityConfig.class, CustomAccessDeniedHandler.class})
|
||||||
|
class PointHistoryControllerTest {
|
||||||
|
@Autowired
|
||||||
|
private MockMvc mockMvc;
|
||||||
|
|
||||||
|
@MockBean
|
||||||
|
private JwtService jwtService;
|
||||||
|
@MockBean
|
||||||
|
private UserRepository userRepository;
|
||||||
|
@MockBean
|
||||||
|
private PointService pointService;
|
||||||
|
@MockBean
|
||||||
|
private PointHistoryMapper pointHistoryMapper;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void trendReturnsSeries() throws Exception {
|
||||||
|
Mockito.when(jwtService.validateAndGetSubject("token")).thenReturn("user");
|
||||||
|
User user = new User();
|
||||||
|
user.setUsername("user");
|
||||||
|
user.setPassword("p");
|
||||||
|
user.setEmail("u@example.com");
|
||||||
|
user.setRole(Role.USER);
|
||||||
|
Mockito.when(userRepository.findByUsername("user")).thenReturn(Optional.of(user));
|
||||||
|
List<Map<String, Object>> data = List.of(
|
||||||
|
Map.of("date", java.time.LocalDate.now().minusDays(1).toString(), "value", 100),
|
||||||
|
Map.of("date", java.time.LocalDate.now().toString(), "value", 110)
|
||||||
|
);
|
||||||
|
Mockito.when(pointService.trend(Mockito.eq("user"), Mockito.anyInt())).thenReturn(data);
|
||||||
|
|
||||||
|
mockMvc.perform(get("/api/point-histories/trend").param("days", "2")
|
||||||
|
.header("Authorization", "Bearer token"))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$[0].value").value(100))
|
||||||
|
.andExpect(jsonPath("$[1].value").value(110));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -76,7 +76,7 @@ class PostControllerTest {
|
|||||||
post.setTags(Set.of(tag));
|
post.setTags(Set.of(tag));
|
||||||
|
|
||||||
when(postService.createPost(eq("alice"), eq(1L), eq("t"), eq("c"), eq(List.of(1L)),
|
when(postService.createPost(eq("alice"), eq(1L), eq("t"), eq("c"), eq(List.of(1L)),
|
||||||
isNull(), isNull(), isNull(), isNull(), isNull(), isNull())).thenReturn(post);
|
isNull(), isNull(), isNull(), isNull(), isNull(), isNull(), isNull())).thenReturn(post);
|
||||||
when(postService.viewPost(eq(1L), any())).thenReturn(post);
|
when(postService.viewPost(eq(1L), any())).thenReturn(post);
|
||||||
when(commentService.getCommentsForPost(eq(1L), any())).thenReturn(List.of());
|
when(commentService.getCommentsForPost(eq(1L), any())).thenReturn(List.of());
|
||||||
when(commentService.getParticipants(anyLong(), anyInt())).thenReturn(List.of());
|
when(commentService.getParticipants(anyLong(), anyInt())).thenReturn(List.of());
|
||||||
@@ -187,7 +187,7 @@ class PostControllerTest {
|
|||||||
.andExpect(status().isBadRequest());
|
.andExpect(status().isBadRequest());
|
||||||
|
|
||||||
verify(postService, never()).createPost(any(), any(), any(), any(), any(),
|
verify(postService, never()).createPost(any(), any(), any(), any(), any(),
|
||||||
any(), any(), any(), any(), any(), any());
|
any(), any(), any(), any(), any(), any(), any());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class MedalServiceTest {
|
|||||||
|
|
||||||
List<MedalDto> medals = service.getMedals(null);
|
List<MedalDto> medals = service.getMedals(null);
|
||||||
medals.forEach(m -> assertFalse(m.isCompleted()));
|
medals.forEach(m -> assertFalse(m.isCompleted()));
|
||||||
assertEquals(5, medals.size());
|
assertEquals(6, medals.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -34,11 +34,12 @@ class PostServiceTest {
|
|||||||
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
||||||
EmailSender emailSender = mock(EmailSender.class);
|
EmailSender emailSender = mock(EmailSender.class);
|
||||||
ApplicationContext context = mock(ApplicationContext.class);
|
ApplicationContext context = mock(ApplicationContext.class);
|
||||||
|
PointService pointService = mock(PointService.class);
|
||||||
|
|
||||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||||
notifService, subService, commentService, commentRepo,
|
notifService, subService, commentService, commentRepo,
|
||||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||||
imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
|
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||||
when(context.getBean(PostService.class)).thenReturn(service);
|
when(context.getBean(PostService.class)).thenReturn(service);
|
||||||
|
|
||||||
Post post = new Post();
|
Post post = new Post();
|
||||||
@@ -80,11 +81,12 @@ class PostServiceTest {
|
|||||||
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
||||||
EmailSender emailSender = mock(EmailSender.class);
|
EmailSender emailSender = mock(EmailSender.class);
|
||||||
ApplicationContext context = mock(ApplicationContext.class);
|
ApplicationContext context = mock(ApplicationContext.class);
|
||||||
|
PointService pointService = mock(PointService.class);
|
||||||
|
|
||||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||||
notifService, subService, commentService, commentRepo,
|
notifService, subService, commentService, commentRepo,
|
||||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||||
imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
|
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||||
when(context.getBean(PostService.class)).thenReturn(service);
|
when(context.getBean(PostService.class)).thenReturn(service);
|
||||||
|
|
||||||
Post post = new Post();
|
Post post = new Post();
|
||||||
@@ -132,18 +134,19 @@ class PostServiceTest {
|
|||||||
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
||||||
EmailSender emailSender = mock(EmailSender.class);
|
EmailSender emailSender = mock(EmailSender.class);
|
||||||
ApplicationContext context = mock(ApplicationContext.class);
|
ApplicationContext context = mock(ApplicationContext.class);
|
||||||
|
PointService pointService = mock(PointService.class);
|
||||||
|
|
||||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||||
notifService, subService, commentService, commentRepo,
|
notifService, subService, commentService, commentRepo,
|
||||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||||
imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
|
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||||
when(context.getBean(PostService.class)).thenReturn(service);
|
when(context.getBean(PostService.class)).thenReturn(service);
|
||||||
|
|
||||||
when(postRepo.countByAuthorAfter(eq("alice"), any())).thenReturn(1L);
|
when(postRepo.countByAuthorAfter(eq("alice"), any())).thenReturn(1L);
|
||||||
|
|
||||||
assertThrows(RateLimitException.class,
|
assertThrows(RateLimitException.class,
|
||||||
() -> service.createPost("alice", 1L, "t", "c", List.of(1L),
|
() -> service.createPost("alice", 1L, "t", "c", List.of(1L),
|
||||||
null, null, null, null, null, null));
|
null, null, null, null, null, null, null));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -165,11 +168,12 @@ class PostServiceTest {
|
|||||||
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
||||||
EmailSender emailSender = mock(EmailSender.class);
|
EmailSender emailSender = mock(EmailSender.class);
|
||||||
ApplicationContext context = mock(ApplicationContext.class);
|
ApplicationContext context = mock(ApplicationContext.class);
|
||||||
|
PointService pointService = mock(PointService.class);
|
||||||
|
|
||||||
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||||
notifService, subService, commentService, commentRepo,
|
notifService, subService, commentService, commentRepo,
|
||||||
reactionRepo, subRepo, notificationRepo, postReadService,
|
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||||
imageUploader, taskScheduler, emailSender, context, PublishMode.DIRECT);
|
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||||
when(context.getBean(PostService.class)).thenReturn(service);
|
when(context.getBean(PostService.class)).thenReturn(service);
|
||||||
|
|
||||||
User author = new User();
|
User author = 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') {
|
||||||
@@ -127,7 +138,7 @@ const goToNewPost = () => {
|
|||||||
height: 60px;
|
height: 60px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 40px;
|
bottom: 70px;
|
||||||
right: 20px;
|
right: 20px;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
--background-color-blur: rgba(255, 255, 255, 0.57);
|
--background-color-blur: rgba(255, 255, 255, 0.57);
|
||||||
--menu-border-color: lightgray;
|
--menu-border-color: lightgray;
|
||||||
--normal-border-color: lightgray;
|
--normal-border-color: lightgray;
|
||||||
--menu-selected-background-color: rgba(208, 250, 255, 0.659);
|
--menu-selected-background-color: rgba(242, 242, 242, 0.884);
|
||||||
--menu-text-color: black;
|
--menu-text-color: rgb(99, 99, 99);
|
||||||
--scroller-background-color: rgba(130, 175, 180, 0.5);
|
--scroller-background-color: rgba(130, 175, 180, 0.5);
|
||||||
/* --normal-background-color: rgb(241, 241, 241); */
|
/* --normal-background-color: rgb(241, 241, 241); */
|
||||||
--normal-background-color: white;
|
--normal-background-color: white;
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
--code-highlight-background-color: rgb(241, 241, 241);
|
--code-highlight-background-color: rgb(241, 241, 241);
|
||||||
--login-background-color: rgb(248, 248, 248);
|
--login-background-color: rgb(248, 248, 248);
|
||||||
--login-background-color-hover: #e0e0e0;
|
--login-background-color-hover: #e0e0e0;
|
||||||
--text-color: black;
|
--text-color: rgb(70, 70, 70);
|
||||||
--blockquote-text-color: #6a737d;
|
--blockquote-text-color: #6a737d;
|
||||||
--menu-width: 200px;
|
--menu-width: 200px;
|
||||||
--page-max-width: 1400px;
|
--page-max-width: 1400px;
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
--menu-border-color: #555;
|
--menu-border-color: #555;
|
||||||
--normal-border-color: #555;
|
--normal-border-color: #555;
|
||||||
--menu-selected-background-color: rgba(255, 255, 255, 0.1);
|
--menu-selected-background-color: rgba(255, 255, 255, 0.1);
|
||||||
--menu-text-color: white;
|
--menu-text-color: rgb(173, 173, 173);
|
||||||
/* --normal-background-color: #000000; */
|
/* --normal-background-color: #000000; */
|
||||||
--normal-background-color: #333;
|
--normal-background-color: #333;
|
||||||
--lottery-background-color: #4e4e4e;
|
--lottery-background-color: #4e4e4e;
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
body {
|
body {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
font-family: 'Roboto', sans-serif;
|
font-family: 'WenQuanYi Micro Hei', 'Helvetica Neue', Arial, sans-serif;
|
||||||
background-color: var(--normal-background-color);
|
background-color: var(--normal-background-color);
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
/* 禁止滚动 */
|
/* 禁止滚动 */
|
||||||
@@ -139,6 +139,10 @@ body {
|
|||||||
margin-bottom: 0.8em;
|
margin-bottom: 0.8em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.info-content-text video {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.info-content-text {
|
.info-content-text {
|
||||||
word-break: break-word;
|
word-break: break-word;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
@@ -158,6 +162,7 @@ body {
|
|||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
line-height: 1.5;
|
line-height: 1.5;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
white-space: break-spaces;
|
||||||
}
|
}
|
||||||
|
|
||||||
.info-content-text pre .line-numbers {
|
.info-content-text pre .line-numbers {
|
||||||
@@ -184,7 +189,6 @@ body {
|
|||||||
font-family: 'Maple Mono', monospace;
|
font-family: 'Maple Mono', monospace;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
white-space: break-spaces;
|
|
||||||
background-color: var(--code-highlight-background-color);
|
background-color: var(--code-highlight-background-color);
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
]"
|
]"
|
||||||
@click="selectMedal(medal)"
|
@click="selectMedal(medal)"
|
||||||
>
|
>
|
||||||
<img
|
<BaseImage
|
||||||
:src="medal.icon"
|
:src="medal.icon"
|
||||||
:alt="medal.title"
|
:alt="medal.title"
|
||||||
:class="['achievements-list-item-icon', { not_completed: !medal.completed }]"
|
:class="['achievements-list-item-icon', { not_completed: !medal.completed }]"
|
||||||
@@ -26,6 +26,9 @@
|
|||||||
<template v-else-if="medal.type === 'POST'">
|
<template v-else-if="medal.type === 'POST'">
|
||||||
{{ medal.currentPostCount }}/{{ medal.targetPostCount }}
|
{{ medal.currentPostCount }}/{{ medal.targetPostCount }}
|
||||||
</template>
|
</template>
|
||||||
|
<template v-else-if="medal.type === 'FEATURED'">
|
||||||
|
{{ medal.currentFeaturedCount }}/{{ medal.targetFeaturedCount }}
|
||||||
|
</template>
|
||||||
<template v-else-if="medal.type === 'CONTRIBUTOR'">
|
<template v-else-if="medal.type === 'CONTRIBUTOR'">
|
||||||
{{ medal.currentContributionLines }}/{{ medal.targetContributionLines }}
|
{{ medal.currentContributionLines }}/{{ medal.targetContributionLines }}
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<BasePopup :visible="visible" @close="close">
|
<BasePopup :visible="visible" @close="close">
|
||||||
<div class="activity-popup">
|
<div class="activity-popup">
|
||||||
<img v-if="icon" :src="icon" class="activity-popup-icon" alt="activity icon" />
|
<BaseImage v-if="icon" :src="icon" class="activity-popup-icon" alt="activity icon" />
|
||||||
<div class="activity-popup-text">{{ text }}</div>
|
<div class="activity-popup-text">{{ text }}</div>
|
||||||
<div class="activity-popup-actions">
|
<div class="activity-popup-actions">
|
||||||
<div class="activity-popup-button" @click="gotoActivity">立即前往</div>
|
<div class="activity-popup-button" @click="gotoActivity">立即前往</div>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="article-category-container" v-if="category">
|
<div class="article-category-container" v-if="category">
|
||||||
<div class="article-info-item" @click="gotoCategory">
|
<div class="article-info-item" @click="gotoCategory">
|
||||||
<img
|
<BaseImage
|
||||||
v-if="category.smallIcon"
|
v-if="category.smallIcon"
|
||||||
class="article-info-item-img"
|
class="article-info-item-img"
|
||||||
:src="category.smallIcon"
|
:src="category.smallIcon"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
:key="tag.id || tag.name"
|
:key="tag.id || tag.name"
|
||||||
@click="gotoTag(tag)"
|
@click="gotoTag(tag)"
|
||||||
>
|
>
|
||||||
<img
|
<BaseImage
|
||||||
v-if="tag.smallIcon"
|
v-if="tag.smallIcon"
|
||||||
class="article-info-item-img"
|
class="article-info-item-img"
|
||||||
:src="tag.smallIcon"
|
:src="tag.smallIcon"
|
||||||
|
|||||||
66
frontend_nuxt/components/BaseImage.vue
Normal file
66
frontend_nuxt/components/BaseImage.vue
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
<template>
|
||||||
|
<NuxtImg
|
||||||
|
v-bind="passAttrs"
|
||||||
|
:src="src"
|
||||||
|
:alt="alt"
|
||||||
|
loading="lazy"
|
||||||
|
:placeholder="placeholder"
|
||||||
|
placeholder-class="base-image-ph"
|
||||||
|
@load="onLoad"
|
||||||
|
@error="onError"
|
||||||
|
:class="['base-image', passAttrs.class, { 'is-loaded': loaded }]"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { computed, ref } from 'vue'
|
||||||
|
import { useAttrs } from 'vue'
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
src: { type: String, required: true },
|
||||||
|
alt: { type: String, default: '' },
|
||||||
|
})
|
||||||
|
|
||||||
|
const attrs = useAttrs()
|
||||||
|
|
||||||
|
const passAttrs = computed(() => {
|
||||||
|
const { placeholder, ...rest } = attrs
|
||||||
|
return rest
|
||||||
|
})
|
||||||
|
|
||||||
|
const loaded = ref(false)
|
||||||
|
const img = useImage()
|
||||||
|
|
||||||
|
const placeholder = computed(() => {
|
||||||
|
if (!props.src) return undefined
|
||||||
|
return img(props.src, { w: 16, h: 16, f: 'webp', q: 20, blur: 1 })
|
||||||
|
})
|
||||||
|
|
||||||
|
function onLoad() {
|
||||||
|
loaded.value = true
|
||||||
|
}
|
||||||
|
function onError() {
|
||||||
|
loaded.value = true
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.base-image {
|
||||||
|
transition:
|
||||||
|
filter 0.35s ease,
|
||||||
|
transform 0.35s ease,
|
||||||
|
opacity 0.35s ease;
|
||||||
|
opacity: 0.92;
|
||||||
|
}
|
||||||
|
|
||||||
|
.base-image-ph {
|
||||||
|
filter: blur(20px);
|
||||||
|
transform: scale(0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.base-image.is-loaded {
|
||||||
|
/* Allow filters from parent classes (e.g. grayscale for unfinished medals) */
|
||||||
|
transform: none;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
92
frontend_nuxt/components/BaseTabs.vue
Normal file
92
frontend_nuxt/components/BaseTabs.vue
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
<template>
|
||||||
|
<div class="base-tabs">
|
||||||
|
<div class="base-tabs-header">
|
||||||
|
<div class="base-tabs-items">
|
||||||
|
<div
|
||||||
|
v-for="tab in tabs"
|
||||||
|
:key="tab.key"
|
||||||
|
:class="['base-tabs-item', { selected: modelValue === tab.key }]"
|
||||||
|
@click="$emit('update:modelValue', tab.key)"
|
||||||
|
>
|
||||||
|
<i v-if="tab.icon" :class="tab.icon"></i>
|
||||||
|
<div class="base-tabs-item-label">{{ tab.label }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="base-tabs-header-right">
|
||||||
|
<slot name="right"></slot>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="base-tabs-content" @touchstart="onTouchStart" @touchend="onTouchEnd">
|
||||||
|
<slot></slot>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
const props = defineProps({
|
||||||
|
modelValue: { type: String, required: true },
|
||||||
|
tabs: { type: Array, default: () => [] },
|
||||||
|
})
|
||||||
|
|
||||||
|
const emit = defineEmits(['update:modelValue'])
|
||||||
|
|
||||||
|
let touchStartX = 0
|
||||||
|
|
||||||
|
function onTouchStart(e) {
|
||||||
|
touchStartX = e.touches[0].clientX
|
||||||
|
}
|
||||||
|
|
||||||
|
function onTouchEnd(e) {
|
||||||
|
const diffX = e.changedTouches[0].clientX - touchStartX
|
||||||
|
if (Math.abs(diffX) > 50) {
|
||||||
|
const index = props.tabs.findIndex((t) => t.key === props.modelValue)
|
||||||
|
if (diffX < 0 && index < props.tabs.length - 1) {
|
||||||
|
emit('update:modelValue', props.tabs[index + 1].key)
|
||||||
|
} else if (diffX > 0 && index > 0) {
|
||||||
|
emit('update:modelValue', props.tabs[index - 1].key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.base-tabs-header {
|
||||||
|
display: flex;
|
||||||
|
border-bottom: 1px solid var(--normal-border-color);
|
||||||
|
align-items: center;
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
|
||||||
|
.base-tabs-items {
|
||||||
|
display: flex;
|
||||||
|
overflow-x: auto;
|
||||||
|
scrollbar-width: none;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.base-tabs-item {
|
||||||
|
padding: 10px 20px;
|
||||||
|
cursor: pointer;
|
||||||
|
white-space: nowrap;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.base-tabs-item i {
|
||||||
|
margin-right: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.base-tabs-item.selected {
|
||||||
|
color: var(--primary-color);
|
||||||
|
border-bottom: 2px solid var(--primary-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.base-tabs-header-right {
|
||||||
|
display: flex;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.base-tabs-content {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,14 +1,14 @@
|
|||||||
<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"
|
||||||
:class="{ clickable: !!item.iconClick }"
|
:class="{ clickable: !!item.iconClick }"
|
||||||
@click="item.iconClick && item.iconClick()"
|
@click="item.iconClick && item.iconClick()"
|
||||||
>
|
>
|
||||||
<img v-if="item.src" :src="item.src" class="timeline-img" alt="timeline item" />
|
<BaseImage 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>
|
<BaseImage 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,6 +42,12 @@ export default {
|
|||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hover-enabled .timeline-item:hover {
|
||||||
|
background-color: var(--menu-selected-background-color);
|
||||||
|
transition: background-color 0.2s;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.timeline-icon {
|
.timeline-icon {
|
||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
@@ -67,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 {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<div class="option-container">
|
<div class="option-container">
|
||||||
<div class="option-main">
|
<div class="option-main">
|
||||||
<template v-if="option.icon">
|
<template v-if="option.icon">
|
||||||
<img
|
<BaseImage
|
||||||
v-if="isImageIcon(option.icon)"
|
v-if="isImageIcon(option.icon)"
|
||||||
:src="option.icon"
|
:src="option.icon"
|
||||||
class="option-icon"
|
class="option-icon"
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
>
|
>
|
||||||
<!-- <div class="user-avatar-container">
|
<!-- <div class="user-avatar-container">
|
||||||
<div class="user-avatar-item">
|
<div class="user-avatar-item">
|
||||||
<img class="user-avatar-item-img" :src="comment.avatar" alt="avatar" />
|
<BaseImage class="user-avatar-item-img" :src="comment.avatar" alt="avatar" />
|
||||||
</div>
|
</div>
|
||||||
</div> -->
|
</div> -->
|
||||||
<div class="info-content">
|
<div class="info-content">
|
||||||
@@ -23,9 +23,13 @@
|
|||||||
>{{ getMedalTitle(comment.medal) }}</NuxtLink
|
>{{ getMedalTitle(comment.medal) }}</NuxtLink
|
||||||
>
|
>
|
||||||
<i v-if="comment.pinned" class="fas fa-thumbtack pin-icon"></i>
|
<i v-if="comment.pinned" class="fas fa-thumbtack pin-icon"></i>
|
||||||
<span v-if="level >= 2">
|
<span v-if="level >= 2" class="reply-item">
|
||||||
<i class="fas fa-reply reply-icon"></i>
|
<i class="fas fa-reply reply-icon"></i>
|
||||||
<span class="user-name reply-user-name">{{ comment.parentUserName }}</span>
|
<span class="reply-info">
|
||||||
|
<BaseImage class="reply-avatar" :src="comment.parentUserAvatar || '/default-avatar.svg'" alt="avatar"
|
||||||
|
@click="comment.parentUserClick && comment.parentUserClick()" />
|
||||||
|
<span class="reply-user-name">{{ comment.parentUserName }}</span>
|
||||||
|
</span>
|
||||||
</span>
|
</span>
|
||||||
<div class="post-time">{{ comment.time }}</div>
|
<div class="post-time">{{ comment.time }}</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -250,6 +254,7 @@ const submitReply = async (parentUserName, text, clear) => {
|
|||||||
medal: data.author.displayMedal,
|
medal: data.author.displayMedal,
|
||||||
text: data.content,
|
text: data.content,
|
||||||
parentUserName: parentUserName,
|
parentUserName: parentUserName,
|
||||||
|
parentUserAvatar: props.comment.avatar,
|
||||||
reactions: [],
|
reactions: [],
|
||||||
reply: (data.replies || []).map((r) => ({
|
reply: (data.replies || []).map((r) => ({
|
||||||
id: r.id,
|
id: r.id,
|
||||||
@@ -376,7 +381,22 @@ const handleContentClick = (e) => {
|
|||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.reply-item, .reply-info {
|
||||||
|
display: inline-flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reply-avatar {
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
border-radius: 50%;
|
||||||
|
margin-right: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.reply-icon {
|
.reply-icon {
|
||||||
|
color: var(--primary-color);
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<template v-for="(label, idx) in selectedLabels" :key="label.id">
|
<template v-for="(label, idx) in selectedLabels" :key="label.id">
|
||||||
<div class="selected-label">
|
<div class="selected-label">
|
||||||
<template v-if="label.icon">
|
<template v-if="label.icon">
|
||||||
<img
|
<BaseImage
|
||||||
v-if="isImageIcon(label.icon)"
|
v-if="isImageIcon(label.icon)"
|
||||||
:src="label.icon"
|
:src="label.icon"
|
||||||
class="option-icon"
|
class="option-icon"
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
<span v-if="selectedLabels.length">
|
<span v-if="selectedLabels.length">
|
||||||
<div class="selected-label">
|
<div class="selected-label">
|
||||||
<template v-if="selectedLabels[0].icon">
|
<template v-if="selectedLabels[0].icon">
|
||||||
<img
|
<BaseImage
|
||||||
v-if="isImageIcon(selectedLabels[0].icon)"
|
v-if="isImageIcon(selectedLabels[0].icon)"
|
||||||
:src="selectedLabels[0].icon"
|
:src="selectedLabels[0].icon"
|
||||||
class="option-icon"
|
class="option-icon"
|
||||||
@@ -69,7 +69,12 @@
|
|||||||
>
|
>
|
||||||
<slot name="option" :option="o" :isSelected="isSelected(o.id)">
|
<slot name="option" :option="o" :isSelected="isSelected(o.id)">
|
||||||
<template v-if="o.icon">
|
<template v-if="o.icon">
|
||||||
<img v-if="isImageIcon(o.icon)" :src="o.icon" class="option-icon" :alt="o.name" />
|
<BaseImage
|
||||||
|
v-if="isImageIcon(o.icon)"
|
||||||
|
:src="o.icon"
|
||||||
|
class="option-icon"
|
||||||
|
:alt="o.name"
|
||||||
|
/>
|
||||||
<i v-else :class="['option-icon', o.icon]"></i>
|
<i v-else :class="['option-icon', o.icon]"></i>
|
||||||
</template>
|
</template>
|
||||||
<span>{{ o.name }}</span>
|
<span>{{ o.name }}</span>
|
||||||
@@ -100,7 +105,12 @@
|
|||||||
>
|
>
|
||||||
<slot name="option" :option="o" :isSelected="isSelected(o.id)">
|
<slot name="option" :option="o" :isSelected="isSelected(o.id)">
|
||||||
<template v-if="o.icon">
|
<template v-if="o.icon">
|
||||||
<img v-if="isImageIcon(o.icon)" :src="o.icon" class="option-icon" :alt="o.name" />
|
<BaseImage
|
||||||
|
v-if="isImageIcon(o.icon)"
|
||||||
|
:src="o.icon"
|
||||||
|
class="option-icon"
|
||||||
|
:alt="o.name"
|
||||||
|
/>
|
||||||
<i v-else :class="['option-icon', o.icon]"></i>
|
<i v-else :class="['option-icon', o.icon]"></i>
|
||||||
</template>
|
</template>
|
||||||
<span>{{ o.name }}</span>
|
<span>{{ o.name }}</span>
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -4,12 +4,15 @@
|
|||||||
<div class="header-content-left">
|
<div class="header-content-left">
|
||||||
<div v-if="showMenuBtn" class="menu-btn-wrapper">
|
<div v-if="showMenuBtn" class="menu-btn-wrapper">
|
||||||
<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 micon"></i>
|
||||||
</button>
|
</button>
|
||||||
<span v-if="isMobile && unreadCount > 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
|
<BaseImage
|
||||||
alt="OpenIsle"
|
alt="OpenIsle"
|
||||||
src="https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png"
|
src="https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/image.png"
|
||||||
width="60"
|
width="60"
|
||||||
@@ -47,6 +50,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</ToolTip>
|
</ToolTip>
|
||||||
|
|
||||||
|
<ToolTip v-if="isLogin" content="站内信和频道" placement="bottom">
|
||||||
|
<div class="messages-icon" @click="goToMessages">
|
||||||
|
<i class="fas fa-comments"></i>
|
||||||
|
<span v-if="unreadMessageCount > 0" class="unread-badge">{{
|
||||||
|
unreadMessageCount
|
||||||
|
}}</span>
|
||||||
|
<span v-else-if="hasChannelUnread" class="unread-dot"></span>
|
||||||
|
</div>
|
||||||
|
</ToolTip>
|
||||||
|
|
||||||
<DropdownMenu v-if="isLogin" ref="userMenu" :items="headerMenuItems">
|
<DropdownMenu v-if="isLogin" ref="userMenu" :items="headerMenuItems">
|
||||||
<template #trigger>
|
<template #trigger>
|
||||||
<div class="avatar-container">
|
<div class="avatar-container">
|
||||||
@@ -62,7 +75,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ClientOnly>
|
</ClientOnly>
|
||||||
|
|
||||||
<SearchDropdown ref="searchDropdown" v-if="isMobile && showSearch" @close="closeSearch" />
|
<SearchDropdown ref="searchDropdown" v-if="isMobile && showSearch" @close="closeSearch" />
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
@@ -75,7 +87,8 @@ import DropdownMenu from '~/components/DropdownMenu.vue'
|
|||||||
import ToolTip from '~/components/ToolTip.vue'
|
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 { fetchUnreadCount, notificationState } from '~/utils/notification'
|
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'
|
||||||
@@ -93,7 +106,8 @@ const props = defineProps({
|
|||||||
|
|
||||||
const isLogin = computed(() => authState.loggedIn)
|
const isLogin = computed(() => authState.loggedIn)
|
||||||
const isMobile = useIsMobile()
|
const isMobile = useIsMobile()
|
||||||
const unreadCount = computed(() => notificationState.unreadCount)
|
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)
|
||||||
@@ -134,8 +148,21 @@ 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 || '生成邀请链接失败')
|
||||||
@@ -182,10 +209,13 @@ const goToNewPost = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const refrechData = async () => {
|
const refrechData = async () => {
|
||||||
await fetchUnreadCount()
|
|
||||||
window.dispatchEvent(new Event('refresh-home'))
|
window.dispatchEvent(new Event('refresh-home'))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const goToMessages = () => {
|
||||||
|
navigateTo('/message-box')
|
||||||
|
}
|
||||||
|
|
||||||
const headerMenuItems = computed(() => [
|
const headerMenuItems = computed(() => [
|
||||||
{ text: '设置', onClick: goToSettings },
|
{ text: '设置', onClick: goToSettings },
|
||||||
{ text: '个人主页', onClick: goToProfile },
|
{ text: '个人主页', onClick: goToProfile },
|
||||||
@@ -215,9 +245,10 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
const updateUnread = async () => {
|
const updateUnread = async () => {
|
||||||
if (authState.loggedIn) {
|
if (authState.loggedIn) {
|
||||||
await fetchUnreadCount()
|
fetchUnreadCount()
|
||||||
|
fetchChannelUnread()
|
||||||
} else {
|
} else {
|
||||||
notificationState.unreadCount = 0
|
fetchChannelUnread()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,7 +257,7 @@ onMounted(async () => {
|
|||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => authState.loggedIn,
|
() => authState.loggedIn,
|
||||||
async () => {
|
async (isLoggedIn) => {
|
||||||
await updateAvatar()
|
await updateAvatar()
|
||||||
await updateUnread()
|
await updateUnread()
|
||||||
},
|
},
|
||||||
@@ -287,6 +318,10 @@ onMounted(async () => {
|
|||||||
gap: 20px;
|
gap: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.micon {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.menu-btn {
|
.menu-btn {
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
background: none;
|
background: none;
|
||||||
@@ -339,6 +374,7 @@ onMounted(async () => {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.avatar-img {
|
.avatar-img {
|
||||||
@@ -379,9 +415,37 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.rss-icon,
|
.rss-icon,
|
||||||
.new-post-icon {
|
.new-post-icon,
|
||||||
|
.messages-icon {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.unread-badge {
|
||||||
|
position: absolute;
|
||||||
|
top: -5px;
|
||||||
|
right: -10px;
|
||||||
|
background-color: #ff4d4f;
|
||||||
|
color: white;
|
||||||
|
border-radius: 50%;
|
||||||
|
padding: 2px 5px;
|
||||||
|
font-size: 10px;
|
||||||
|
font-weight: bold;
|
||||||
|
line-height: 1;
|
||||||
|
min-width: 16px;
|
||||||
|
text-align: center;
|
||||||
|
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 {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<div class="medal-popup-title">恭喜你获得以下勋章</div>
|
<div class="medal-popup-title">恭喜你获得以下勋章</div>
|
||||||
<div class="medal-popup-list">
|
<div class="medal-popup-list">
|
||||||
<div v-for="medal in medals" :key="medal.type" class="medal-popup-item">
|
<div v-for="medal in medals" :key="medal.type" class="medal-popup-item">
|
||||||
<img :src="medal.icon" :alt="medal.title" class="medal-popup-item-icon" />
|
<BaseImage :src="medal.icon" :alt="medal.title" class="medal-popup-item-icon" />
|
||||||
<div class="medal-popup-item-title">{{ medal.title }}</div>
|
<div class="medal-popup-item-title">{{ medal.title }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -88,7 +88,7 @@
|
|||||||
@click="gotoCategory(c)"
|
@click="gotoCategory(c)"
|
||||||
>
|
>
|
||||||
<template v-if="c.smallIcon || c.icon">
|
<template v-if="c.smallIcon || c.icon">
|
||||||
<img
|
<BaseImage
|
||||||
v-if="isImageIcon(c.smallIcon || c.icon)"
|
v-if="isImageIcon(c.smallIcon || c.icon)"
|
||||||
:src="c.smallIcon || c.icon"
|
:src="c.smallIcon || c.icon"
|
||||||
class="section-item-icon"
|
class="section-item-icon"
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
|
|
||||||
<div class="menu-section">
|
<div class="menu-section">
|
||||||
<div class="section-header" @click="tagOpen = !tagOpen">
|
<div class="section-header" @click="tagOpen = !tagOpen">
|
||||||
<span>tag</span>
|
<span>标签</span>
|
||||||
<i :class="tagOpen ? 'fas fa-chevron-up' : 'fas fa-chevron-down'"></i>
|
<i :class="tagOpen ? 'fas fa-chevron-up' : 'fas fa-chevron-down'"></i>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="tagOpen" class="section-items">
|
<div v-if="tagOpen" class="section-items">
|
||||||
@@ -114,7 +114,7 @@
|
|||||||
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||||
</div>
|
</div>
|
||||||
<div v-else v-for="t in tagData" :key="t.id" class="section-item" @click="gotoTag(t)">
|
<div v-else v-for="t in tagData" :key="t.id" class="section-item" @click="gotoTag(t)">
|
||||||
<img
|
<BaseImage
|
||||||
v-if="isImageIcon(t.smallIcon || t.icon)"
|
v-if="isImageIcon(t.smallIcon || t.icon)"
|
||||||
:src="t.smallIcon || t.icon"
|
:src="t.smallIcon || t.icon"
|
||||||
class="section-item-icon"
|
class="section-item-icon"
|
||||||
@@ -262,7 +262,7 @@ const gotoTag = (t) => {
|
|||||||
top: var(--header-height);
|
top: var(--header-height);
|
||||||
width: 220px;
|
width: 220px;
|
||||||
background-color: var(--app-menu-background-color);
|
background-color: var(--app-menu-background-color);
|
||||||
height: calc(100vh - 20px - var(--header-height));
|
height: calc(100vh - var(--header-height));
|
||||||
border-right: 1px solid var(--menu-border-color);
|
border-right: 1px solid var(--menu-border-color);
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -279,12 +279,29 @@ const gotoTag = (t) => {
|
|||||||
padding: 10px 10px 0 10px;
|
padding: 10px 10px 0 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.menu-content::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-content {
|
||||||
|
-ms-overflow-style: none;
|
||||||
|
scrollbar-width: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-item-container {
|
||||||
|
border-bottom: 1px solid var(--menu-border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-item:last-child {
|
||||||
|
margin-bottom: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
/* .menu-item-container { */
|
/* .menu-item-container { */
|
||||||
/**/
|
/**/
|
||||||
/* } */
|
/* } */
|
||||||
|
|
||||||
.menu-item {
|
.menu-item {
|
||||||
padding: 4px 10px;
|
padding: 6px 12px;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: var(--menu-text-color);
|
color: var(--menu-text-color);
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
@@ -298,7 +315,7 @@ const gotoTag = (t) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.menu-item-text {
|
.menu-item-text {
|
||||||
font-size: 16px;
|
font-size: 14px;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: var(--menu-text-color);
|
color: var(--menu-text-color);
|
||||||
}
|
}
|
||||||
@@ -348,19 +365,21 @@ const gotoTag = (t) => {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu-section {
|
.menu-section {
|
||||||
margin-top: 10px;
|
border-bottom: 1px solid var(--menu-border-color);
|
||||||
|
padding-bottom: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.section-header {
|
.section-header {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
font-weight: bold;
|
font-size: 14px;
|
||||||
opacity: 0.5;
|
padding: 6px 12px 0 12px;
|
||||||
padding: 4px 10px;
|
color: var(--menu-text-color);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -372,7 +391,7 @@ const gotoTag = (t) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.section-item {
|
.section-item {
|
||||||
padding: 4px 10px;
|
padding: 6px 12px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 5px;
|
gap: 5px;
|
||||||
@@ -392,6 +411,8 @@ const gotoTag = (t) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.section-item-text {
|
.section-item-text {
|
||||||
|
font-size: 14px;
|
||||||
|
text-decoration: none;
|
||||||
color: var(--menu-text-color);
|
color: var(--menu-text-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
182
frontend_nuxt/components/MessageEditor.vue
Normal file
182
frontend_nuxt/components/MessageEditor.vue
Normal file
@@ -0,0 +1,182 @@
|
|||||||
|
<template>
|
||||||
|
<div class="message-editor-container">
|
||||||
|
<div class="message-editor-wrapper">
|
||||||
|
<div :id="editorId" ref="vditorElement"></div>
|
||||||
|
</div>
|
||||||
|
<div class="message-bottom-container">
|
||||||
|
<div class="message-submit" :class="{ disabled: isDisabled }" @click="submit">
|
||||||
|
<template v-if="!loading"> 发送 </template>
|
||||||
|
<template v-else> <i class="fa-solid fa-spinner fa-spin"></i> 发送中... </template>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { computed, onMounted, onUnmounted, ref, useId, watch } from 'vue'
|
||||||
|
import { clearVditorStorage } from '~/utils/clearVditorStorage'
|
||||||
|
import { themeState } from '~/utils/theme'
|
||||||
|
import {
|
||||||
|
createVditor,
|
||||||
|
getEditorTheme as getEditorThemeUtil,
|
||||||
|
getPreviewTheme as getPreviewThemeUtil,
|
||||||
|
} from '~/utils/vditor'
|
||||||
|
import '~/assets/global.css'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'MessageEditor',
|
||||||
|
emits: ['submit'],
|
||||||
|
props: {
|
||||||
|
editorId: {
|
||||||
|
type: String,
|
||||||
|
default: '',
|
||||||
|
},
|
||||||
|
loading: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
disabled: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
setup(props, { emit }) {
|
||||||
|
const vditorInstance = ref(null)
|
||||||
|
const text = ref('')
|
||||||
|
const editorId = ref(props.editorId)
|
||||||
|
if (!editorId.value) {
|
||||||
|
editorId.value = 'editor-' + useId()
|
||||||
|
}
|
||||||
|
const getEditorTheme = getEditorThemeUtil
|
||||||
|
const getPreviewTheme = getPreviewThemeUtil
|
||||||
|
const applyTheme = () => {
|
||||||
|
if (vditorInstance.value) {
|
||||||
|
vditorInstance.value.setTheme(getEditorTheme(), getPreviewTheme())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const isDisabled = computed(() => props.loading || props.disabled || !text.value.trim())
|
||||||
|
|
||||||
|
const submit = () => {
|
||||||
|
if (!vditorInstance.value || isDisabled.value) return
|
||||||
|
const value = vditorInstance.value.getValue()
|
||||||
|
emit('submit', value, () => {
|
||||||
|
if (!vditorInstance.value) return
|
||||||
|
vditorInstance.value.setValue('')
|
||||||
|
text.value = ''
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
vditorInstance.value = createVditor(editorId.value, {
|
||||||
|
placeholder: '输入消息...',
|
||||||
|
height: 150,
|
||||||
|
toolbar: [
|
||||||
|
'emoji',
|
||||||
|
'bold',
|
||||||
|
'italic',
|
||||||
|
'strike',
|
||||||
|
'link',
|
||||||
|
'|',
|
||||||
|
'list',
|
||||||
|
'|',
|
||||||
|
'line',
|
||||||
|
'quote',
|
||||||
|
'code',
|
||||||
|
'inline-code',
|
||||||
|
'|',
|
||||||
|
'upload',
|
||||||
|
],
|
||||||
|
preview: {
|
||||||
|
actions: [],
|
||||||
|
markdown: { toc: false },
|
||||||
|
},
|
||||||
|
input(value) {
|
||||||
|
text.value = value
|
||||||
|
},
|
||||||
|
after() {
|
||||||
|
if (props.loading || props.disabled) {
|
||||||
|
vditorInstance.value.disabled()
|
||||||
|
}
|
||||||
|
applyTheme()
|
||||||
|
},
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
clearVditorStorage()
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.loading,
|
||||||
|
(val) => {
|
||||||
|
if (!vditorInstance.value) return
|
||||||
|
if (val) {
|
||||||
|
vditorInstance.value.disabled()
|
||||||
|
} else if (!props.disabled) {
|
||||||
|
vditorInstance.value.enable()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.disabled,
|
||||||
|
(val) => {
|
||||||
|
if (!vditorInstance.value) return
|
||||||
|
if (val) {
|
||||||
|
vditorInstance.value.disabled()
|
||||||
|
} else if (!props.loading) {
|
||||||
|
vditorInstance.value.enable()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => themeState.mode,
|
||||||
|
() => {
|
||||||
|
applyTheme()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
return { submit, isDisabled, editorId }
|
||||||
|
},
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.message-editor-container {
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-bottom-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: flex-end;
|
||||||
|
padding: 10px;
|
||||||
|
background-color: var(--bg-color-soft);
|
||||||
|
border-top: 1px solid var(--border-color);
|
||||||
|
border-bottom-left-radius: 8px;
|
||||||
|
border-bottom-right-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-submit {
|
||||||
|
background-color: var(--primary-color);
|
||||||
|
color: #fff;
|
||||||
|
padding: 8px 16px;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 14px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background-color 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-submit.disabled {
|
||||||
|
background-color: var(--primary-color-disabled);
|
||||||
|
opacity: 0.6;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-submit:not(.disabled):hover {
|
||||||
|
background-color: var(--primary-color-hover);
|
||||||
|
}
|
||||||
|
</style>
|
||||||
115
frontend_nuxt/components/MessageFloatWindow.vue
Normal file
115
frontend_nuxt/components/MessageFloatWindow.vue
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
<template>
|
||||||
|
<div v-if="floatRoute" class="message-float-window" :style="{ height: floatHeight }">
|
||||||
|
<iframe :src="iframeSrc" frameborder="0" ref="iframeRef" @load="injectBaseTag"></iframe>
|
||||||
|
|
||||||
|
<div class="float-actions">
|
||||||
|
<i
|
||||||
|
class="fas fa-chevron-down"
|
||||||
|
v-if="floatHeight !== MINI_HEIGHT"
|
||||||
|
title="收起至 100px"
|
||||||
|
@click="collapseToMini"
|
||||||
|
></i>
|
||||||
|
<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>
|
||||||
|
<i class="fas fa-times" title="关闭" @click="close"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
const floatRoute = useState('messageFloatRoute')
|
||||||
|
|
||||||
|
const DEFAULT_HEIGHT = '60vh'
|
||||||
|
const MINI_HEIGHT = '45px'
|
||||||
|
const floatHeight = ref(DEFAULT_HEIGHT)
|
||||||
|
|
||||||
|
const iframeRef = ref(null)
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
function close() {
|
||||||
|
floatRoute.value = null
|
||||||
|
}
|
||||||
|
|
||||||
|
function injectBaseTag() {
|
||||||
|
if (!iframeRef.value) return
|
||||||
|
|
||||||
|
const iframeDoc = iframeRef.value.contentDocument || iframeRef.value.contentWindow.document
|
||||||
|
if (iframeDoc && !iframeDoc.querySelector('base')) {
|
||||||
|
const base = iframeDoc.createElement('base')
|
||||||
|
base.target = '_top'
|
||||||
|
iframeDoc.head.appendChild(base)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => floatRoute.value,
|
||||||
|
(v) => {
|
||||||
|
if (v) floatHeight.value = DEFAULT_HEIGHT
|
||||||
|
},
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.message-float-window {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
right: 0;
|
||||||
|
width: 400px;
|
||||||
|
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="Object.keys(counts).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)"
|
||||||
|
>
|
||||||
|
<BaseImage :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"
|
||||||
|
>
|
||||||
|
<BaseImage :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>
|
<BaseImage :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);
|
||||||
}
|
}
|
||||||
|
|||||||
198
frontend_nuxt/components/SearchPersonDropdown.vue
Normal file
198
frontend_nuxt/components/SearchPersonDropdown.vue
Normal file
@@ -0,0 +1,198 @@
|
|||||||
|
<template>
|
||||||
|
<div class="search-dropdown">
|
||||||
|
<Dropdown
|
||||||
|
ref="dropdown"
|
||||||
|
v-model="selected"
|
||||||
|
:fetch-options="fetchResults"
|
||||||
|
remote
|
||||||
|
menu-class="search-menu"
|
||||||
|
option-class="search-option"
|
||||||
|
:show-search="isMobile"
|
||||||
|
@update:search="keyword = $event"
|
||||||
|
@close="onClose"
|
||||||
|
>
|
||||||
|
<template #display="{ setSearch }">
|
||||||
|
<div class="search-input">
|
||||||
|
<i class="search-input-icon fas fa-search"></i>
|
||||||
|
<input
|
||||||
|
class="text-input"
|
||||||
|
v-model="keyword"
|
||||||
|
placeholder="Search users"
|
||||||
|
@input="setSearch(keyword)"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
<template #option="{ option }">
|
||||||
|
<div class="search-option-item">
|
||||||
|
<BaseImage
|
||||||
|
:src="option.avatar || '/default-avatar.svg'"
|
||||||
|
class="avatar"
|
||||||
|
@error="handleAvatarError"
|
||||||
|
/>
|
||||||
|
<div class="result-body">
|
||||||
|
<div class="result-main" v-html="highlight(option.username)"></div>
|
||||||
|
<div
|
||||||
|
v-if="option.introduction"
|
||||||
|
class="result-sub"
|
||||||
|
v-html="highlight(option.introduction)"
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</Dropdown>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { ref, watch } from 'vue'
|
||||||
|
import Dropdown from '~/components/Dropdown.vue'
|
||||||
|
import { stripMarkdown } from '~/utils/markdown'
|
||||||
|
import { useIsMobile } from '~/utils/screen'
|
||||||
|
import { getToken } from '~/utils/auth'
|
||||||
|
const config = useRuntimeConfig()
|
||||||
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
|
||||||
|
const emit = defineEmits(['close'])
|
||||||
|
|
||||||
|
const keyword = ref('')
|
||||||
|
const selected = ref(null)
|
||||||
|
const results = ref([])
|
||||||
|
const dropdown = ref(null)
|
||||||
|
const isMobile = useIsMobile()
|
||||||
|
|
||||||
|
const toggle = () => {
|
||||||
|
dropdown.value.toggle()
|
||||||
|
}
|
||||||
|
|
||||||
|
const onClose = () => emit('close')
|
||||||
|
|
||||||
|
const fetchResults = async (kw) => {
|
||||||
|
if (!kw) return []
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/search/users?keyword=${encodeURIComponent(kw)}`)
|
||||||
|
if (!res.ok) return []
|
||||||
|
const data = await res.json()
|
||||||
|
results.value = data.map((u) => ({
|
||||||
|
id: u.id,
|
||||||
|
username: u.username,
|
||||||
|
avatar: u.avatar,
|
||||||
|
introduction: u.introduction,
|
||||||
|
}))
|
||||||
|
return results.value
|
||||||
|
}
|
||||||
|
|
||||||
|
const highlight = (text) => {
|
||||||
|
text = stripMarkdown(text || '')
|
||||||
|
if (!keyword.value) return text
|
||||||
|
const reg = new RegExp(keyword.value, 'gi')
|
||||||
|
return text.replace(reg, (m) => `<span class="highlight">${m}</span>`)
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleAvatarError = (e) => {
|
||||||
|
e.target.src = '/default-avatar.svg'
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(selected, async (val) => {
|
||||||
|
if (!val) return
|
||||||
|
const user = results.value.find((u) => u.id === val)
|
||||||
|
if (!user) return
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
navigateTo('/login', { replace: true })
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/messages/conversations`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ recipientId: user.id }),
|
||||||
|
})
|
||||||
|
if (res.ok) {
|
||||||
|
const data = await res.json()
|
||||||
|
navigateTo(`/message-box/${data.conversationId}`, { replace: true })
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
selected.value = null
|
||||||
|
keyword.value = ''
|
||||||
|
})
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
toggle,
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.search-dropdown {
|
||||||
|
margin-top: 20px;
|
||||||
|
width: 500px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-input {
|
||||||
|
padding: 10px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.text-input {
|
||||||
|
background-color: var(--app-menu-background-color);
|
||||||
|
color: var(--text-color);
|
||||||
|
border: none;
|
||||||
|
outline: none;
|
||||||
|
width: 100%;
|
||||||
|
margin-left: 10px;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-menu {
|
||||||
|
width: 100%;
|
||||||
|
max-width: 600px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.search-dropdown {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-option-item {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-option {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 10px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.highlight) {
|
||||||
|
color: var(--primary-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar {
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
border-radius: 50%;
|
||||||
|
object-fit: cover;
|
||||||
|
}
|
||||||
|
|
||||||
|
.result-body {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.result-main {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.result-sub {
|
||||||
|
font-size: 12px;
|
||||||
|
color: #666;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<div class="option-container">
|
<div class="option-container">
|
||||||
<div class="option-main">
|
<div class="option-main">
|
||||||
<template v-if="option.icon">
|
<template v-if="option.icon">
|
||||||
<img
|
<BaseImage
|
||||||
v-if="isImageIcon(option.icon)"
|
v-if="isImageIcon(option.icon)"
|
||||||
:src="option.icon"
|
:src="option.icon"
|
||||||
class="option-icon"
|
class="option-icon"
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div class="user-list">
|
<div class="user-list">
|
||||||
<BasePlaceholder v-if="users.length === 0" text="暂无用户" icon="fas fa-inbox" />
|
<BasePlaceholder v-if="users.length === 0" text="暂无用户" icon="fas fa-inbox" />
|
||||||
<div v-for="u in users" :key="u.id" class="user-item" @click="handleUserClick(u)">
|
<div v-for="u in users" :key="u.id" class="user-item" @click="handleUserClick(u)">
|
||||||
<img :src="u.avatar" alt="avatar" class="user-avatar" />
|
<BaseImage :src="u.avatar" alt="avatar" class="user-avatar" />
|
||||||
<div class="user-info">
|
<div class="user-info">
|
||||||
<div class="user-name">{{ u.username }}</div>
|
<div class="user-name">{{ u.username }}</div>
|
||||||
<div v-if="u.introduction" class="user-intro">{{ u.introduction }}</div>
|
<div v-if="u.introduction" class="user-intro">{{ u.introduction }}</div>
|
||||||
|
|||||||
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,
|
||||||
|
}
|
||||||
|
}
|
||||||
93
frontend_nuxt/composables/useUnreadCount.js
Normal file
93
frontend_nuxt/composables/useUnreadCount.js
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
import { ref, watch, onMounted } from 'vue';
|
||||||
|
import { useWebSocket } from './useWebSocket';
|
||||||
|
import { getToken } from '~/utils/auth';
|
||||||
|
|
||||||
|
const count = ref(0);
|
||||||
|
let isInitialized = false;
|
||||||
|
let wsSubscription = null;
|
||||||
|
|
||||||
|
export function useUnreadCount() {
|
||||||
|
const config = useRuntimeConfig();
|
||||||
|
const API_BASE_URL = config.public.apiBaseUrl;
|
||||||
|
const { subscribe, isConnected, connect } = useWebSocket();
|
||||||
|
|
||||||
|
const fetchUnreadCount = async () => {
|
||||||
|
const token = getToken();
|
||||||
|
if (!token) {
|
||||||
|
count.value = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/api/messages/unread-count`, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
});
|
||||||
|
if (response.ok) {
|
||||||
|
const data = await response.json();
|
||||||
|
count.value = data;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to fetch unread count:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const initialize = async () => {
|
||||||
|
const token = getToken();
|
||||||
|
if (!token) {
|
||||||
|
count.value = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 总是获取最新的未读数量
|
||||||
|
fetchUnreadCount();
|
||||||
|
|
||||||
|
// 确保WebSocket连接
|
||||||
|
if (!isConnected.value) {
|
||||||
|
connect(token);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置WebSocket监听
|
||||||
|
await setupWebSocketListener();
|
||||||
|
};
|
||||||
|
|
||||||
|
const setupWebSocketListener = async () => {
|
||||||
|
// 只有在还没有订阅的情况下才设置监听
|
||||||
|
if (!wsSubscription) {
|
||||||
|
|
||||||
|
watch(isConnected, (newValue) => {
|
||||||
|
if (newValue && !wsSubscription) {
|
||||||
|
const destination = `/user/queue/unread-count`;
|
||||||
|
wsSubscription = subscribe(destination, (message) => {
|
||||||
|
const unreadCount = parseInt(message.body, 10);
|
||||||
|
if (!isNaN(unreadCount)) {
|
||||||
|
count.value = unreadCount;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, { immediate: true });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// 自动初始化逻辑 - 确保每次调用都能获取到未读数量并设置监听
|
||||||
|
const token = getToken();
|
||||||
|
if (token) {
|
||||||
|
if (!isInitialized) {
|
||||||
|
isInitialized = true;
|
||||||
|
initialize(); // 完整初始化,包括WebSocket监听
|
||||||
|
} else {
|
||||||
|
// 即使已经初始化,也要确保获取最新的未读数量并确保WebSocket监听存在
|
||||||
|
fetchUnreadCount();
|
||||||
|
|
||||||
|
// 确保WebSocket连接和监听都存在
|
||||||
|
if (!isConnected.value) {
|
||||||
|
connect(token);
|
||||||
|
}
|
||||||
|
setupWebSocketListener();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
count,
|
||||||
|
fetchUnreadCount,
|
||||||
|
initialize,
|
||||||
|
};
|
||||||
|
}
|
||||||
86
frontend_nuxt/composables/useWebSocket.js
Normal file
86
frontend_nuxt/composables/useWebSocket.js
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
import { ref } from 'vue'
|
||||||
|
import { Client } from '@stomp/stompjs'
|
||||||
|
import SockJS from 'sockjs-client/dist/sockjs.min.js'
|
||||||
|
import { useRuntimeConfig } from '#app'
|
||||||
|
|
||||||
|
const client = ref(null)
|
||||||
|
const isConnected = ref(false)
|
||||||
|
|
||||||
|
const connect = (token) => {
|
||||||
|
if (isConnected.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const config = useRuntimeConfig()
|
||||||
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
const socketUrl = `${API_BASE_URL}/api/sockjs`
|
||||||
|
|
||||||
|
const socket = new SockJS(socketUrl)
|
||||||
|
const stompClient = new Client({
|
||||||
|
webSocketFactory: () => socket,
|
||||||
|
connectHeaders: {
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
},
|
||||||
|
debug: function (str) {},
|
||||||
|
reconnectDelay: 5000,
|
||||||
|
heartbeatIncoming: 4000,
|
||||||
|
heartbeatOutgoing: 4000,
|
||||||
|
})
|
||||||
|
|
||||||
|
stompClient.onConnect = (frame) => {
|
||||||
|
isConnected.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
stompClient.onStompError = (frame) => {
|
||||||
|
console.error('WebSocket STOMP error:', frame)
|
||||||
|
}
|
||||||
|
|
||||||
|
stompClient.activate()
|
||||||
|
client.value = stompClient
|
||||||
|
}
|
||||||
|
|
||||||
|
const disconnect = () => {
|
||||||
|
if (client.value) {
|
||||||
|
isConnected.value = false
|
||||||
|
client.value.deactivate()
|
||||||
|
client.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const subscribe = (destination, callback) => {
|
||||||
|
if (!isConnected.value || !client.value || !client.value.connected) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const subscription = client.value.subscribe(destination, (message) => {
|
||||||
|
try {
|
||||||
|
if (
|
||||||
|
destination.includes('/queue/unread-count') ||
|
||||||
|
destination.includes('/queue/channel-unread')
|
||||||
|
) {
|
||||||
|
callback(message)
|
||||||
|
} else {
|
||||||
|
const parsedMessage = JSON.parse(message.body)
|
||||||
|
callback(parsedMessage)
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
callback(message)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return subscription
|
||||||
|
} catch (error) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useWebSocket() {
|
||||||
|
return {
|
||||||
|
client,
|
||||||
|
isConnected,
|
||||||
|
connect,
|
||||||
|
disconnect,
|
||||||
|
subscribe,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ import { defineNuxtConfig } from 'nuxt/config'
|
|||||||
|
|
||||||
export default defineNuxtConfig({
|
export default defineNuxtConfig({
|
||||||
ssr: true,
|
ssr: true,
|
||||||
|
modules: ['@nuxt/image'],
|
||||||
runtimeConfig: {
|
runtimeConfig: {
|
||||||
public: {
|
public: {
|
||||||
apiBaseUrl: process.env.NUXT_PUBLIC_API_BASE_URL || '',
|
apiBaseUrl: process.env.NUXT_PUBLIC_API_BASE_URL || '',
|
||||||
@@ -87,24 +88,24 @@ export default defineNuxtConfig({
|
|||||||
vite: {
|
vite: {
|
||||||
build: {
|
build: {
|
||||||
// increase warning limit and split large libraries into separate chunks
|
// increase warning limit and split large libraries into separate chunks
|
||||||
chunkSizeWarningLimit: 1024,
|
// chunkSizeWarningLimit: 1024,
|
||||||
rollupOptions: {
|
// rollupOptions: {
|
||||||
output: {
|
// output: {
|
||||||
manualChunks(id) {
|
// manualChunks(id) {
|
||||||
if (id.includes('node_modules')) {
|
// if (id.includes('node_modules')) {
|
||||||
if (id.includes('vditor')) {
|
// if (id.includes('vditor')) {
|
||||||
return 'vditor'
|
// return 'vditor'
|
||||||
}
|
// }
|
||||||
if (id.includes('echarts')) {
|
// if (id.includes('echarts')) {
|
||||||
return 'echarts'
|
// return 'echarts'
|
||||||
}
|
// }
|
||||||
if (id.includes('highlight.js')) {
|
// if (id.includes('highlight.js')) {
|
||||||
return 'highlight'
|
// return 'highlight'
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
3912
frontend_nuxt/package-lock.json
generated
3912
frontend_nuxt/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,18 +9,24 @@
|
|||||||
"generate": "nuxt generate"
|
"generate": "nuxt generate"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@nuxt/image": "^1.11.0",
|
||||||
|
"@stomp/stompjs": "^7.0.0",
|
||||||
"cropperjs": "^1.6.2",
|
"cropperjs": "^1.6.2",
|
||||||
"echarts": "^5.6.0",
|
"echarts": "^5.6.0",
|
||||||
|
"flatpickr": "^4.6.13",
|
||||||
"highlight.js": "^11.11.1",
|
"highlight.js": "^11.11.1",
|
||||||
|
"ipx": "^3.1.1",
|
||||||
"ldrs": "^1.0.0",
|
"ldrs": "^1.0.0",
|
||||||
"markdown-it": "^14.1.0",
|
"markdown-it": "^14.1.0",
|
||||||
"nuxt": "latest",
|
"mermaid": "^10.9.4",
|
||||||
"nprogress": "^0.2.0",
|
"nprogress": "^0.2.0",
|
||||||
|
"nuxt": "latest",
|
||||||
|
"sanitize-html": "^2.17.0",
|
||||||
|
"sockjs-client": "^1.6.1",
|
||||||
"vditor": "^3.11.1",
|
"vditor": "^3.11.1",
|
||||||
"vue-easy-lightbox": "^1.19.0",
|
"vue-easy-lightbox": "^1.19.0",
|
||||||
"vue-echarts": "^7.0.3",
|
"vue-echarts": "^7.0.3",
|
||||||
"vue-toastification": "^2.0.0-rc.5",
|
"vue-flatpickr-component": "^12.0.0",
|
||||||
"flatpickr": "^4.6.13",
|
"vue-toastification": "^2.0.0-rc.5"
|
||||||
"vue-flatpickr-component": "^12.0.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,30 +1,23 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="about-page">
|
<div class="about-page">
|
||||||
<div class="about-tabs">
|
<BaseTabs v-model="selectedTab" :tabs="tabs">
|
||||||
<div
|
<div class="about-loading" v-if="isFetching">
|
||||||
v-for="tab in tabs"
|
<l-hatch-spinner size="100" stroke="10" speed="1" color="var(--primary-color)" />
|
||||||
:key="tab.name"
|
|
||||||
:class="['about-tabs-item', { selected: selectedTab === tab.name }]"
|
|
||||||
@click="selectTab(tab.name)"
|
|
||||||
>
|
|
||||||
<div class="about-tabs-item-label">{{ tab.label }}</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div
|
||||||
<div class="about-loading" v-if="isFetching">
|
v-else
|
||||||
<l-hatch-spinner size="100" stroke="10" speed="1" color="var(--primary-color)" />
|
class="about-content"
|
||||||
</div>
|
v-html="renderMarkdown(content)"
|
||||||
<div
|
@click="handleContentClick"
|
||||||
v-else
|
></div>
|
||||||
class="about-content"
|
</BaseTabs>
|
||||||
v-html="renderMarkdown(content)"
|
|
||||||
@click="handleContentClick"
|
|
||||||
></div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { onMounted, ref } from 'vue'
|
import { onMounted, ref, watch } from 'vue'
|
||||||
import { handleMarkdownClick, renderMarkdown } from '~/utils/markdown'
|
import { handleMarkdownClick, renderMarkdown } from '~/utils/markdown'
|
||||||
|
import BaseTabs from '~/components/BaseTabs.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'AboutPageView',
|
name: 'AboutPageView',
|
||||||
@@ -32,27 +25,27 @@ export default {
|
|||||||
const isFetching = ref(false)
|
const isFetching = ref(false)
|
||||||
const tabs = [
|
const tabs = [
|
||||||
{
|
{
|
||||||
name: 'about',
|
key: 'about',
|
||||||
label: '关于',
|
label: '关于',
|
||||||
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/about.md',
|
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/about.md',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'agreement',
|
key: 'agreement',
|
||||||
label: '用户协议',
|
label: '用户协议',
|
||||||
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/agreement.md',
|
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/agreement.md',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'guideline',
|
key: 'guideline',
|
||||||
label: '创作准则',
|
label: '创作准则',
|
||||||
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/guideline.md',
|
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/guideline.md',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: 'privacy',
|
key: 'privacy',
|
||||||
label: '隐私政策',
|
label: '隐私政策',
|
||||||
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/privacy.md',
|
file: 'https://openisle-1307107697.cos.ap-guangzhou.myqcloud.com/assert/about/privacy.md',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
const selectedTab = ref(tabs[0].name)
|
const selectedTab = ref(tabs[0].key)
|
||||||
const content = ref('')
|
const content = ref('')
|
||||||
|
|
||||||
const loadContent = async (file) => {
|
const loadContent = async (file) => {
|
||||||
@@ -71,21 +64,20 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const selectTab = (name) => {
|
|
||||||
selectedTab.value = name
|
|
||||||
const tab = tabs.find((t) => t.name === name)
|
|
||||||
if (tab) loadContent(tab.file)
|
|
||||||
}
|
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
loadContent(tabs[0].file)
|
loadContent(tabs[0].file)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
watch(selectedTab, (name) => {
|
||||||
|
const tab = tabs.find((t) => t.key === name)
|
||||||
|
if (tab) loadContent(tab.file)
|
||||||
|
})
|
||||||
|
|
||||||
const handleContentClick = (e) => {
|
const handleContentClick = (e) => {
|
||||||
handleMarkdownClick(e)
|
handleMarkdownClick(e)
|
||||||
}
|
}
|
||||||
|
|
||||||
return { tabs, selectedTab, content, renderMarkdown, selectTab, isFetching, handleContentClick }
|
return { tabs, selectedTab, content, renderMarkdown, isFetching, handleContentClick }
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -97,30 +89,6 @@ export default {
|
|||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.about-tabs {
|
|
||||||
position: sticky;
|
|
||||||
top: calc(var(--header-height) + 1px);
|
|
||||||
z-index: 200;
|
|
||||||
background-color: var(--background-color-blur);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
border-bottom: 1px solid var(--normal-border-color);
|
|
||||||
margin-bottom: 20px;
|
|
||||||
overflow-x: auto;
|
|
||||||
scrollbar-width: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.about-tabs-item {
|
|
||||||
padding: 10px 20px;
|
|
||||||
cursor: pointer;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.about-tabs-item.selected {
|
|
||||||
color: var(--primary-color);
|
|
||||||
border-bottom: 2px solid var(--primary-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.about-content {
|
.about-content {
|
||||||
line-height: 1.6;
|
line-height: 1.6;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
|
|||||||
@@ -33,23 +33,11 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { LineChart } from 'echarts/charts'
|
|
||||||
import {
|
|
||||||
DataZoomComponent,
|
|
||||||
GridComponent,
|
|
||||||
TitleComponent,
|
|
||||||
TooltipComponent,
|
|
||||||
} from 'echarts/components'
|
|
||||||
import { use } from 'echarts/core'
|
|
||||||
import { CanvasRenderer } from 'echarts/renderers'
|
|
||||||
import { onMounted, ref } from 'vue'
|
import { onMounted, ref } from 'vue'
|
||||||
import VChart from 'vue-echarts'
|
|
||||||
import { getToken } from '~/utils/auth'
|
import { getToken } from '~/utils/auth'
|
||||||
const config = useRuntimeConfig()
|
const config = useRuntimeConfig()
|
||||||
const API_BASE_URL = config.public.apiBaseUrl
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
|
||||||
use([LineChart, TitleComponent, TooltipComponent, GridComponent, DataZoomComponent, CanvasRenderer])
|
|
||||||
|
|
||||||
const dauOption = ref(null)
|
const dauOption = ref(null)
|
||||||
const newUserOption = ref(null)
|
const newUserOption = ref(null)
|
||||||
const postOption = ref(null)
|
const postOption = ref(null)
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<div class="activity-list-page-card" v-for="a in activities" :key="a.id">
|
<div class="activity-list-page-card" v-for="a in activities" :key="a.id">
|
||||||
<div class="activity-list-page-card-normal">
|
<div class="activity-list-page-card-normal">
|
||||||
<div v-if="a.icon" class="activity-card-normal-left">
|
<div v-if="a.icon" class="activity-card-normal-left">
|
||||||
<img :src="a.icon" alt="avatar" class="activity-card-left-avatar-img" />
|
<BaseImage :src="a.icon" alt="avatar" class="activity-card-left-avatar-img" />
|
||||||
</div>
|
</div>
|
||||||
<div class="activity-card-normal-right">
|
<div class="activity-card-normal-right">
|
||||||
<div class="activity-card-normal-right-header">
|
<div class="activity-card-normal-right-header">
|
||||||
|
|||||||
@@ -26,7 +26,10 @@
|
|||||||
<div class="article-container">
|
<div class="article-container">
|
||||||
<template
|
<template
|
||||||
v-if="
|
v-if="
|
||||||
selectedTopic === '最新' || selectedTopic === '排行榜' || selectedTopic === '最新回复'
|
selectedTopic === '最新' ||
|
||||||
|
selectedTopic === '排行榜' ||
|
||||||
|
selectedTopic === '最新回复' ||
|
||||||
|
selectedTopic === '精选'
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div class="article-header-container">
|
<div class="article-header-container">
|
||||||
@@ -69,9 +72,9 @@
|
|||||||
<i v-if="article.type === 'LOTTERY'" class="fa-solid fa-gift lottery-icon"></i>
|
<i v-if="article.type === 'LOTTERY'" class="fa-solid fa-gift lottery-icon"></i>
|
||||||
{{ article.title }}
|
{{ article.title }}
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
<div class="article-item-description main-item">
|
<NuxtLink class="article-item-description main-item" :to="`/posts/${article.id}`">
|
||||||
{{ sanitizeDescription(article.description) }}
|
{{ sanitizeDescription(article.description) }}
|
||||||
</div>
|
</NuxtLink>
|
||||||
<div class="article-info-container main-item">
|
<div class="article-info-container main-item">
|
||||||
<ArticleCategory :category="article.category" />
|
<ArticleCategory :category="article.category" />
|
||||||
<ArticleTags :tags="article.tags" />
|
<ArticleTags :tags="article.tags" />
|
||||||
@@ -85,7 +88,7 @@
|
|||||||
class="article-member-avatar-item"
|
class="article-member-avatar-item"
|
||||||
:to="`/users/${member.id}`"
|
:to="`/users/${member.id}`"
|
||||||
>
|
>
|
||||||
<img class="article-member-avatar-item-img" :src="member.avatar" alt="avatar" />
|
<BaseImage class="article-member-avatar-item-img" :src="member.avatar" alt="avatar" />
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -122,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'
|
||||||
@@ -152,17 +156,22 @@ const route = useRoute()
|
|||||||
const tagOptions = ref([])
|
const tagOptions = ref([])
|
||||||
const categoryOptions = ref([])
|
const categoryOptions = ref([])
|
||||||
|
|
||||||
const topics = ref(['最新回复', '最新', '排行榜' /*, '热门', '类别'*/])
|
const topics = ref(['最新回复', '最新', '精选', '排行榜' /*, '热门', '类别'*/])
|
||||||
const selectedTopicCookie = useCookie('homeTab')
|
const selectedTopicCookie = useCookie('homeTab')
|
||||||
const selectedTopic = ref(
|
|
||||||
selectedTopicCookie.value
|
let defaultTopic = '最新回复'
|
||||||
? selectedTopicCookie.value
|
|
||||||
: route.query.view === 'ranking'
|
if (selectedTopicCookie.value) {
|
||||||
? '排行榜'
|
defaultTopic = selectedTopicCookie.value
|
||||||
: route.query.view === 'latest'
|
} else if (route.query.view === 'ranking') {
|
||||||
? '最新'
|
defaultTopic = '排行榜'
|
||||||
: '最新回复',
|
} else if (route.query.view === 'latest') {
|
||||||
)
|
defaultTopic = '最新'
|
||||||
|
} else if (route.query.view === 'featured') {
|
||||||
|
defaultTopic = '精选'
|
||||||
|
}
|
||||||
|
const selectedTopic = ref(defaultTopic)
|
||||||
|
|
||||||
if (!selectedTopicCookie.value) selectedTopicCookie.value = selectedTopic.value
|
if (!selectedTopicCookie.value) selectedTopicCookie.value = selectedTopic.value
|
||||||
const articles = ref([])
|
const articles = ref([])
|
||||||
const page = ref(0)
|
const page = ref(0)
|
||||||
@@ -236,6 +245,7 @@ const baseQuery = computed(() => ({
|
|||||||
const listApiPath = computed(() => {
|
const listApiPath = computed(() => {
|
||||||
if (selectedTopic.value === '排行榜') return '/api/posts/ranking'
|
if (selectedTopic.value === '排行榜') return '/api/posts/ranking'
|
||||||
if (selectedTopic.value === '最新回复') return '/api/posts/latest-reply'
|
if (selectedTopic.value === '最新回复') return '/api/posts/latest-reply'
|
||||||
|
if (selectedTopic.value === '精选') return '/api/posts/featured'
|
||||||
return '/api/posts'
|
return '/api/posts'
|
||||||
})
|
})
|
||||||
const buildUrl = ({ pageNo }) => {
|
const buildUrl = ({ pageNo }) => {
|
||||||
@@ -440,7 +450,7 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
|||||||
}
|
}
|
||||||
|
|
||||||
.topic-item {
|
.topic-item {
|
||||||
padding: 2px 10px;
|
padding: 6px 20px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -517,15 +527,18 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
|||||||
|
|
||||||
.article-item-title {
|
.article-item-title {
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
font-size: 20px;
|
font-size: 18px;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: var(--text-color);
|
color: var(--text-color);
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
|
font-weight: bold;
|
||||||
|
transition: color 0.2s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.article-item-title:hover {
|
.article-item-title:hover {
|
||||||
color: var(--primary-color);
|
color: var(--primary-color);
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
|
transition: color 0.2s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pinned-icon,
|
.pinned-icon,
|
||||||
@@ -537,13 +550,23 @@ const sanitizeDescription = (text) => stripMarkdown(text)
|
|||||||
.article-item-description {
|
.article-item-description {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
font-size: 14px;
|
font-size: 13px;
|
||||||
color: gray;
|
color: rgba(140, 140, 140, 0.888);
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
line-clamp: 3;
|
line-clamp: 3;
|
||||||
-webkit-line-clamp: 3;
|
-webkit-line-clamp: 3;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
letter-spacing: 0.01em;
|
||||||
|
font-weight: 400;
|
||||||
|
text-decoration: none;
|
||||||
|
transition: color 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.article-item-description:hover {
|
||||||
|
color: var(--primary-color);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: color 0.2s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.article-info-container {
|
.article-info-container {
|
||||||
@@ -643,6 +666,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);
|
||||||
@@ -700,6 +727,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>
|
||||||
|
|||||||
641
frontend_nuxt/pages/message-box/[id].vue
Normal file
641
frontend_nuxt/pages/message-box/[id].vue
Normal file
@@ -0,0 +1,641 @@
|
|||||||
|
<template>
|
||||||
|
<div class="chat-container" :class="{ float: isFloatMode }">
|
||||||
|
<div v-if="!loading" class="chat-header">
|
||||||
|
<div class="header-main">
|
||||||
|
<div class="back-button" @click="goBack">
|
||||||
|
<i class="fas fa-arrow-left"></i>
|
||||||
|
</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 class="messages-list" ref="messagesListEl">
|
||||||
|
<div v-if="loading" class="loading-container">
|
||||||
|
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||||
|
</div>
|
||||||
|
<div v-else-if="error" class="error-container">{{ error }}</div>
|
||||||
|
<template v-else>
|
||||||
|
<div class="load-more-container" v-if="hasMoreMessages">
|
||||||
|
<div @click="loadMoreMessages" :disabled="loadingMore" class="load-more-button">
|
||||||
|
{{ loadingMore ? '加载中...' : '查看更多消息' }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<BaseTimeline :items="messages">
|
||||||
|
<template #item="{ item }">
|
||||||
|
<div class="message-header">
|
||||||
|
<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 info-content-text">
|
||||||
|
<div class="reply-author">{{ item.replyTo.sender.username }}</div>
|
||||||
|
<div class="reply-content" v-html="renderMarkdown(item.replyTo.content)"></div>
|
||||||
|
</div>
|
||||||
|
<div class="message-content">
|
||||||
|
<div class="info-content-text" v-html="renderMarkdown(item.content)"></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>
|
||||||
|
</BaseTimeline>
|
||||||
|
<div class="empty-container">
|
||||||
|
<BasePlaceholder
|
||||||
|
v-if="messages.length === 0"
|
||||||
|
text="暂无会话,发送消息试试 🎉"
|
||||||
|
icon="fas fa-inbox"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import {
|
||||||
|
ref,
|
||||||
|
onMounted,
|
||||||
|
onUnmounted,
|
||||||
|
nextTick,
|
||||||
|
computed,
|
||||||
|
watch,
|
||||||
|
onActivated,
|
||||||
|
onDeactivated,
|
||||||
|
} from 'vue'
|
||||||
|
import { useRoute } from 'vue-router'
|
||||||
|
import { getToken, fetchCurrentUser } from '~/utils/auth'
|
||||||
|
import { toast } from '~/main'
|
||||||
|
import { renderMarkdown, stripMarkdownLength } from '~/utils/markdown'
|
||||||
|
import MessageEditor from '~/components/MessageEditor.vue'
|
||||||
|
import ReactionsGroup from '~/components/ReactionsGroup.vue'
|
||||||
|
import { useWebSocket } from '~/composables/useWebSocket'
|
||||||
|
import { useUnreadCount } from '~/composables/useUnreadCount'
|
||||||
|
import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
|
||||||
|
import TimeManager from '~/utils/time'
|
||||||
|
import BaseTimeline from '~/components/BaseTimeline.vue'
|
||||||
|
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
||||||
|
|
||||||
|
const config = useRuntimeConfig()
|
||||||
|
const route = useRoute()
|
||||||
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
|
||||||
|
const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
|
||||||
|
const { fetchChannelUnread: refreshChannelUnread } = useChannelsUnreadCount()
|
||||||
|
let subscription = null
|
||||||
|
|
||||||
|
const messages = ref([])
|
||||||
|
const participants = ref([])
|
||||||
|
const loading = ref(true)
|
||||||
|
const sending = ref(false)
|
||||||
|
const error = ref(null)
|
||||||
|
const conversationId = route.params.id
|
||||||
|
const currentUser = ref(null)
|
||||||
|
const messagesListEl = ref(null)
|
||||||
|
const currentPage = ref(0)
|
||||||
|
const totalPages = ref(0)
|
||||||
|
const loadingMore = ref(false)
|
||||||
|
const conversationName = ref('')
|
||||||
|
const isChannel = ref(false)
|
||||||
|
const isFloatMode = computed(() => route.query.float !== undefined)
|
||||||
|
const floatRoute = useState('messageFloatRoute')
|
||||||
|
const replyTo = ref(null)
|
||||||
|
|
||||||
|
const isUserNearBottom = ref(true)
|
||||||
|
function updateNearBottom() {
|
||||||
|
const el = messagesListEl.value
|
||||||
|
if (!el) return
|
||||||
|
const threshold = 40 // px
|
||||||
|
isUserNearBottom.value = el.scrollHeight - el.scrollTop - el.clientHeight <= threshold
|
||||||
|
}
|
||||||
|
|
||||||
|
const hasMoreMessages = computed(() => currentPage.value < totalPages.value - 1)
|
||||||
|
|
||||||
|
const otherParticipant = computed(() => {
|
||||||
|
if (isChannel.value || !currentUser.value || participants.value.length === 0) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
return participants.value.find((p) => p.id !== currentUser.value.id)
|
||||||
|
})
|
||||||
|
|
||||||
|
function setReply(message) {
|
||||||
|
replyTo.value = message
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 改造:滚动函数 —— smooth & instant */
|
||||||
|
function scrollToBottomSmooth() {
|
||||||
|
const el = messagesListEl.value
|
||||||
|
if (!el) return
|
||||||
|
// 优先使用原生 smooth,失败则降级
|
||||||
|
try {
|
||||||
|
el.scrollTo({ top: el.scrollHeight, behavior: 'smooth' })
|
||||||
|
} catch {
|
||||||
|
// 降级:简易动画
|
||||||
|
const start = el.scrollTop
|
||||||
|
const end = el.scrollHeight
|
||||||
|
const duration = 200
|
||||||
|
const startTs = performance.now()
|
||||||
|
function step(now) {
|
||||||
|
const p = Math.min(1, (now - startTs) / duration)
|
||||||
|
el.scrollTop = start + (end - start) * p
|
||||||
|
if (p < 1) requestAnimationFrame(step)
|
||||||
|
}
|
||||||
|
requestAnimationFrame(step)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function scrollToBottomInstant() {
|
||||||
|
const el = messagesListEl.value
|
||||||
|
if (!el) return
|
||||||
|
el.scrollTop = el.scrollHeight
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchMessages(page = 0) {
|
||||||
|
if (page === 0) {
|
||||||
|
loading.value = true
|
||||||
|
messages.value = []
|
||||||
|
} else {
|
||||||
|
loadingMore.value = true
|
||||||
|
}
|
||||||
|
error.value = null
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
toast.error('请先登录')
|
||||||
|
loading.value = false
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(
|
||||||
|
`${API_BASE_URL}/api/messages/conversations/${conversationId}?page=${page}&size=20`,
|
||||||
|
{
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
},
|
||||||
|
)
|
||||||
|
if (!response.ok) throw new Error('无法加载消息')
|
||||||
|
|
||||||
|
const conversationData = await response.json()
|
||||||
|
const pageData = conversationData.messages
|
||||||
|
|
||||||
|
if (page === 0) {
|
||||||
|
participants.value = conversationData.participants
|
||||||
|
conversationName.value = conversationData.name
|
||||||
|
isChannel.value = conversationData.channel
|
||||||
|
}
|
||||||
|
|
||||||
|
const newMessages = pageData.content.reverse().map((item) => ({
|
||||||
|
...item,
|
||||||
|
src: item.sender.avatar,
|
||||||
|
iconClick: () => {
|
||||||
|
openUser(item.sender.id)
|
||||||
|
},
|
||||||
|
}))
|
||||||
|
|
||||||
|
const list = messagesListEl.value
|
||||||
|
const oldScrollHeight = list ? list.scrollHeight : 0
|
||||||
|
|
||||||
|
if (page === 0) {
|
||||||
|
messages.value = newMessages
|
||||||
|
} else {
|
||||||
|
messages.value = [...newMessages, ...messages.value]
|
||||||
|
}
|
||||||
|
|
||||||
|
currentPage.value = pageData.number
|
||||||
|
totalPages.value = pageData.totalPages
|
||||||
|
|
||||||
|
await nextTick()
|
||||||
|
if (page > 0 && list) {
|
||||||
|
// 加载更多:保持原视口位置
|
||||||
|
const newScrollHeight = list.scrollHeight
|
||||||
|
list.scrollTop = newScrollHeight - oldScrollHeight
|
||||||
|
} else if (page === 0) {
|
||||||
|
// 首次加载:定位到底部(不用动画,避免“闪动感”)
|
||||||
|
scrollToBottomInstant()
|
||||||
|
}
|
||||||
|
updateNearBottom()
|
||||||
|
} catch (e) {
|
||||||
|
error.value = e.message
|
||||||
|
toast.error(e.message)
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
loadingMore.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadMoreMessages() {
|
||||||
|
if (hasMoreMessages.value && !loadingMore.value) {
|
||||||
|
await fetchMessages(currentPage.value + 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function sendMessage(content, clearInput) {
|
||||||
|
if (!content.trim()) return
|
||||||
|
sending.value = true
|
||||||
|
const token = getToken()
|
||||||
|
try {
|
||||||
|
let response
|
||||||
|
if (isChannel.value) {
|
||||||
|
response = await fetch(
|
||||||
|
`${API_BASE_URL}/api/messages/conversations/${conversationId}/messages`,
|
||||||
|
{
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
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('发送失败')
|
||||||
|
|
||||||
|
const newMessage = await response.json()
|
||||||
|
messages.value.push({
|
||||||
|
...newMessage,
|
||||||
|
src: newMessage.sender.avatar,
|
||||||
|
iconClick: () => {
|
||||||
|
openUser(newMessage.sender.id)
|
||||||
|
},
|
||||||
|
})
|
||||||
|
clearInput()
|
||||||
|
replyTo.value = null
|
||||||
|
|
||||||
|
await nextTick()
|
||||||
|
// 仅“发送消息成功后”才平滑滚动到底部
|
||||||
|
scrollToBottomSmooth()
|
||||||
|
} catch (e) {
|
||||||
|
toast.error(e.message)
|
||||||
|
} finally {
|
||||||
|
sending.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function markConversationAsRead() {
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) return
|
||||||
|
try {
|
||||||
|
await fetch(`${API_BASE_URL}/api/messages/conversations/${conversationId}/read`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
})
|
||||||
|
refreshGlobalUnreadCount()
|
||||||
|
refreshChannelUnread()
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Failed to mark conversation as read', e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
// 监听列表滚动,实时感知是否接近底部
|
||||||
|
if (messagesListEl.value) {
|
||||||
|
messagesListEl.value.addEventListener('scroll', updateNearBottom, { passive: true })
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUser.value = await fetchCurrentUser()
|
||||||
|
if (currentUser.value) {
|
||||||
|
await fetchMessages(0)
|
||||||
|
await markConversationAsRead()
|
||||||
|
const token = getToken()
|
||||||
|
if (token && !isConnected.value) {
|
||||||
|
connect(token)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
toast.error('请先登录')
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(isConnected, (newValue) => {
|
||||||
|
if (newValue) {
|
||||||
|
setTimeout(() => {
|
||||||
|
subscription = subscribe(`/topic/conversation/${conversationId}`, async (message) => {
|
||||||
|
// 避免重复显示当前用户发送的消息
|
||||||
|
if (message.sender.id !== currentUser.value.id) {
|
||||||
|
messages.value.push({
|
||||||
|
...message,
|
||||||
|
src: message.sender.avatar,
|
||||||
|
iconClick: () => {
|
||||||
|
openUser(message.sender.id)
|
||||||
|
},
|
||||||
|
})
|
||||||
|
// 收到消息后只标记已读,不强制滚动(符合“非发送不拉底”)
|
||||||
|
markConversationAsRead()
|
||||||
|
await nextTick()
|
||||||
|
updateNearBottom()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}, 500)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
onActivated(async () => {
|
||||||
|
// 返回页面时:刷新数据与已读,不做强制滚动,保持用户当前位置
|
||||||
|
if (currentUser.value) {
|
||||||
|
await fetchMessages(0)
|
||||||
|
await markConversationAsRead()
|
||||||
|
await nextTick()
|
||||||
|
updateNearBottom()
|
||||||
|
if (!isConnected.value) {
|
||||||
|
const token = getToken()
|
||||||
|
if (token) connect(token)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
onDeactivated(() => {
|
||||||
|
if (subscription) {
|
||||||
|
subscription.unsubscribe()
|
||||||
|
subscription = null
|
||||||
|
}
|
||||||
|
disconnect()
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (subscription) {
|
||||||
|
subscription.unsubscribe()
|
||||||
|
subscription = null
|
||||||
|
}
|
||||||
|
if (messagesListEl.value) {
|
||||||
|
messagesListEl.value.removeEventListener('scroll', updateNearBottom)
|
||||||
|
}
|
||||||
|
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>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.chat-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
margin: 0 auto;
|
||||||
|
overflow: auto;
|
||||||
|
height: calc(100vh - var(--header-height));
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-container.float {
|
||||||
|
height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chat-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
position: sticky;
|
||||||
|
top: 0;
|
||||||
|
z-index: 100;
|
||||||
|
align-items: center;
|
||||||
|
padding: 10px 20px;
|
||||||
|
border-bottom: 1px solid var(--normal-border-color);
|
||||||
|
background-color: var(--background-color-blur);
|
||||||
|
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 {
|
||||||
|
font-size: 18px;
|
||||||
|
color: var(--text-color-primary);
|
||||||
|
margin-right: 15px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.participant-name {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.messages-list {
|
||||||
|
overflow-y: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
padding: 20px;
|
||||||
|
padding-bottom: 100px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.load-more-container {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.load-more-button {
|
||||||
|
color: var(--primary-color);
|
||||||
|
font-size: 12px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.load-more-button:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-item {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-avatar {
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
border-radius: 50%;
|
||||||
|
align-self: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-timestamp {
|
||||||
|
font-size: 11px;
|
||||||
|
color: var(--text-color-secondary);
|
||||||
|
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 {
|
||||||
|
align-self: flex-end;
|
||||||
|
flex-direction: row-reverse;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-item.sent .message-timestamp {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Received messages */
|
||||||
|
.message-item.received {
|
||||||
|
align-self: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-item.received .message-content {
|
||||||
|
align-items: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-item.received .message-bubble {
|
||||||
|
background-color: var(--bg-color-soft);
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-bottom-left-radius: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-input-area {
|
||||||
|
margin-left: 20px;
|
||||||
|
margin-right: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-container {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
height: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-container {
|
||||||
|
text-align: center;
|
||||||
|
padding: 50px;
|
||||||
|
color: var(--text-color-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-input-area {
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.reply-preview {
|
||||||
|
margin-top: 10px;
|
||||||
|
padding: 10px;
|
||||||
|
border-left: 5px solid var(--primary-color);
|
||||||
|
margin-bottom: 5px;
|
||||||
|
font-size: 13px;
|
||||||
|
background-color: var(--menu-selected-background-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.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) {
|
||||||
|
.messages-list {
|
||||||
|
padding: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
548
frontend_nuxt/pages/message-box/index.vue
Normal file
548
frontend_nuxt/pages/message-box/index.vue
Normal file
@@ -0,0 +1,548 @@
|
|||||||
|
<template>
|
||||||
|
<div class="messages-container">
|
||||||
|
<div class="page-title">
|
||||||
|
<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>
|
||||||
|
<BaseTabs v-model="activeTab" :tabs="tabs">
|
||||||
|
<div v-if="activeTab === 'messages'">
|
||||||
|
<div v-if="loading" class="loading-message">
|
||||||
|
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-else-if="error" class="error-container">
|
||||||
|
<div class="error-text">{{ error }}</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="!loading && !isFloatMode" 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">
|
||||||
|
<BaseImage
|
||||||
|
:src="getOtherParticipant(convo)?.avatar || '/default-avatar.svg'"
|
||||||
|
:alt="getOtherParticipant(convo)?.username || '用户'"
|
||||||
|
class="avatar-img"
|
||||||
|
@error="handleAvatarError"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="conversation-content">
|
||||||
|
<div class="conversation-header">
|
||||||
|
<div class="participant-name">
|
||||||
|
{{ getOtherParticipant(convo)?.username || '未知用户' }}
|
||||||
|
</div>
|
||||||
|
<div class="message-time">
|
||||||
|
{{ formatTime(convo.lastMessage?.createdAt || convo.createdAt) }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<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">
|
||||||
|
<BaseImage
|
||||||
|
: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>
|
||||||
|
</BaseTabs>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { ref, onUnmounted, watch, onActivated, computed } from 'vue'
|
||||||
|
import { useRoute } from 'vue-router'
|
||||||
|
import { getToken, fetchCurrentUser } from '~/utils/auth'
|
||||||
|
import { toast } from '~/main'
|
||||||
|
import { useWebSocket } from '~/composables/useWebSocket'
|
||||||
|
import { useUnreadCount } from '~/composables/useUnreadCount'
|
||||||
|
import { useChannelsUnreadCount } from '~/composables/useChannelsUnreadCount'
|
||||||
|
import TimeManager from '~/utils/time'
|
||||||
|
import { stripMarkdownLength } from '~/utils/markdown'
|
||||||
|
import SearchPersonDropdown from '~/components/SearchPersonDropdown.vue'
|
||||||
|
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
||||||
|
import BaseTabs from '~/components/BaseTabs.vue'
|
||||||
|
|
||||||
|
const config = useRuntimeConfig()
|
||||||
|
const conversations = ref([])
|
||||||
|
const loading = ref(true)
|
||||||
|
const error = ref(null)
|
||||||
|
|
||||||
|
const route = useRoute()
|
||||||
|
const currentUser = ref(null)
|
||||||
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
|
||||||
|
const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
|
||||||
|
const { fetchChannelUnread: refreshChannelUnread, setFromList: setChannelUnreadFromList } =
|
||||||
|
useChannelsUnreadCount()
|
||||||
|
let subscription = null
|
||||||
|
|
||||||
|
const activeTab = ref('channels')
|
||||||
|
const tabs = [
|
||||||
|
{ key: 'messages', label: '站内信' },
|
||||||
|
{ key: 'channels', label: '频道' },
|
||||||
|
]
|
||||||
|
const channels = ref([])
|
||||||
|
const loadingChannels = ref(false)
|
||||||
|
const isFloatMode = computed(() => route.query.float === '1')
|
||||||
|
const floatRoute = useState('messageFloatRoute')
|
||||||
|
|
||||||
|
async function fetchConversations() {
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
toast.error('请先登录')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/api/messages/conversations`, {
|
||||||
|
method: 'GET',
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`HTTP error! status: ${response.status}`)
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
conversations.value = data
|
||||||
|
} catch (e) {
|
||||||
|
error.value = '无法加载会话列表。'
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取对话中的另一个参与者(非当前用户)
|
||||||
|
function getOtherParticipant(conversation) {
|
||||||
|
if (!currentUser.value || !conversation.participants) return null
|
||||||
|
return conversation.participants.find((p) => p.id !== currentUser.value.id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 格式化时间
|
||||||
|
function formatTime(timeString) {
|
||||||
|
if (!timeString) return ''
|
||||||
|
return TimeManager.format(timeString)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 头像加载失败处理
|
||||||
|
function handleAvatarError(event) {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(activeTab, (tab) => {
|
||||||
|
if (tab === 'messages') {
|
||||||
|
fetchConversations()
|
||||||
|
} else {
|
||||||
|
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 () => {
|
||||||
|
currentUser.value = await fetchCurrentUser()
|
||||||
|
|
||||||
|
if (currentUser.value) {
|
||||||
|
if (activeTab.value === 'messages') {
|
||||||
|
await fetchConversations()
|
||||||
|
} else {
|
||||||
|
await fetchChannels()
|
||||||
|
}
|
||||||
|
refreshGlobalUnreadCount()
|
||||||
|
refreshChannelUnread()
|
||||||
|
const token = getToken()
|
||||||
|
if (token && !isConnected.value) {
|
||||||
|
connect(token)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(isConnected, (newValue) => {
|
||||||
|
if (newValue && currentUser.value) {
|
||||||
|
const destination = `/topic/user/${currentUser.value.id}/messages`
|
||||||
|
|
||||||
|
// 清理旧的订阅
|
||||||
|
if (subscription) {
|
||||||
|
subscription.unsubscribe()
|
||||||
|
}
|
||||||
|
|
||||||
|
subscription = subscribe(destination, (message) => {
|
||||||
|
fetchConversations()
|
||||||
|
if (activeTab.value === 'channels') {
|
||||||
|
fetchChannels()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
if (subscription) {
|
||||||
|
subscription.unsubscribe()
|
||||||
|
}
|
||||||
|
disconnect()
|
||||||
|
})
|
||||||
|
|
||||||
|
function goToConversation(id) {
|
||||||
|
if (isFloatMode.value) {
|
||||||
|
navigateTo(`/message-box/${id}?float=1`)
|
||||||
|
} else {
|
||||||
|
navigateTo(`/message-box/${id}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function minimize() {
|
||||||
|
floatRoute.value = route.fullPath
|
||||||
|
navigateTo('/')
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.messages-container {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.float-control {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
text-align: right;
|
||||||
|
padding: 12px 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.float-control i {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.base-tabs-header) {
|
||||||
|
display: flex;
|
||||||
|
border-bottom: 1px solid var(--normal-border-color);
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.base-tabs-item) {
|
||||||
|
padding: 10px 20px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.base-tabs-item.selected) {
|
||||||
|
border-bottom: 2px solid var(--primary-color);
|
||||||
|
color: var(--primary-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-message {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
height: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-container {
|
||||||
|
margin-bottom: 24px;
|
||||||
|
margin-left: 20px;
|
||||||
|
margin-right: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.messages-header {
|
||||||
|
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 {
|
||||||
|
font-size: 28px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #1a1a1a;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-container,
|
||||||
|
.error-container,
|
||||||
|
.empty-container {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
min-height: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-text,
|
||||||
|
.error-text,
|
||||||
|
.empty-text {
|
||||||
|
font-size: 16px;
|
||||||
|
color: #666;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error-text {
|
||||||
|
color: #e53e3e;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversations-list {
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
margin-left: 20px;
|
||||||
|
margin-right: 20px;
|
||||||
|
padding: 8px 10px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background-color 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-item:hover {
|
||||||
|
background-color: var(--menu-selected-background-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-avatar {
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-right: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar-img {
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
border-radius: 50%;
|
||||||
|
object-fit: cover;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-content {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-header {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.participant-name {
|
||||||
|
font-size: 16px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.member-count {
|
||||||
|
font-size: 12px;
|
||||||
|
color: gray;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-time {
|
||||||
|
font-size: 12px;
|
||||||
|
color: gray;
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-left: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.last-message-row {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.last-message {
|
||||||
|
font-size: 14px;
|
||||||
|
color: gray;
|
||||||
|
line-height: 1.4;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
flex-grow: 1;
|
||||||
|
padding-right: 10px; /* Add some space between message and badge */
|
||||||
|
}
|
||||||
|
|
||||||
|
.unread-count-badge {
|
||||||
|
background-color: #f56c6c;
|
||||||
|
color: white;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: bold;
|
||||||
|
padding: 2px 8px;
|
||||||
|
border-radius: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.base-tabs-header),
|
||||||
|
.loading-message,
|
||||||
|
.error-container,
|
||||||
|
.search-container,
|
||||||
|
.empty-container,
|
||||||
|
.conversation-item {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.conversation-item {
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.messages-title {
|
||||||
|
font-size: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversations-list {
|
||||||
|
max-height: 500px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.conversation-item {
|
||||||
|
padding: 6px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar-img {
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.participant-name {
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.message-time {
|
||||||
|
font-size: 11px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.last-message {
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -16,7 +16,7 @@
|
|||||||
<div class="post-clear" @click="clearPost"><i class="fa-solid fa-eraser"></i> 清空</div>
|
<div class="post-clear" @click="clearPost"><i class="fa-solid fa-eraser"></i> 清空</div>
|
||||||
<div class="ai-generate" @click="aiGenerate">
|
<div class="ai-generate" @click="aiGenerate">
|
||||||
<i class="fa-solid fa-robot"></i>
|
<i class="fa-solid fa-robot"></i>
|
||||||
md格式优化
|
MD 格式优化
|
||||||
</div>
|
</div>
|
||||||
<div class="post-draft" @click="saveDraft">
|
<div class="post-draft" @click="saveDraft">
|
||||||
<i class="fa-solid fa-floppy-disk"></i>
|
<i class="fa-solid fa-floppy-disk"></i>
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
<div class="prize-row">
|
<div class="prize-row">
|
||||||
<span class="prize-row-title">奖品图片</span>
|
<span class="prize-row-title">奖品图片</span>
|
||||||
<label class="prize-container">
|
<label class="prize-container">
|
||||||
<img v-if="prizeIcon" :src="prizeIcon" class="prize-preview" alt="prize" />
|
<BaseImage v-if="prizeIcon" :src="prizeIcon" class="prize-preview" alt="prize" />
|
||||||
<i v-else class="fa-solid fa-image default-prize-icon"></i>
|
<i v-else class="fa-solid fa-image default-prize-icon"></i>
|
||||||
<div class="prize-overlay">上传奖品图片</div>
|
<div class="prize-overlay">上传奖品图片</div>
|
||||||
<input type="file" class="prize-input" accept="image/*" @change="onPrizeIconChange" />
|
<input type="file" class="prize-input" accept="image/*" @change="onPrizeIconChange" />
|
||||||
@@ -66,6 +66,18 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="prize-point-row">
|
||||||
|
<span class="prize-row-title">参与所需积分</span>
|
||||||
|
<div class="prize-count-input">
|
||||||
|
<input
|
||||||
|
class="prize-count-input-field"
|
||||||
|
type="number"
|
||||||
|
v-model.number="pointCost"
|
||||||
|
min="0"
|
||||||
|
max="100"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="prize-time-row">
|
<div class="prize-time-row">
|
||||||
<span class="prize-row-title">抽奖结束时间</span>
|
<span class="prize-row-title">抽奖结束时间</span>
|
||||||
<client-only>
|
<client-only>
|
||||||
@@ -105,6 +117,7 @@ const showPrizeCropper = ref(false)
|
|||||||
const prizeName = ref('')
|
const prizeName = ref('')
|
||||||
const prizeCount = ref(1)
|
const prizeCount = ref(1)
|
||||||
const prizeDescription = ref('')
|
const prizeDescription = ref('')
|
||||||
|
const pointCost = ref(0)
|
||||||
const endTime = ref(null)
|
const endTime = ref(null)
|
||||||
const startTime = ref(null)
|
const startTime = ref(null)
|
||||||
const dateConfig = { enableTime: true, time_24hr: true, dateFormat: 'Y-m-d H:i' }
|
const dateConfig = { enableTime: true, time_24hr: true, dateFormat: 'Y-m-d H:i' }
|
||||||
@@ -133,6 +146,11 @@ watch(prizeCount, (val) => {
|
|||||||
if (!val || val < 1) prizeCount.value = 1
|
if (!val || val < 1) prizeCount.value = 1
|
||||||
})
|
})
|
||||||
|
|
||||||
|
watch(pointCost, (val) => {
|
||||||
|
if (val === undefined || val === null || val < 0) pointCost.value = 0
|
||||||
|
if (val > 100) pointCost.value = 100
|
||||||
|
})
|
||||||
|
|
||||||
const loadDraft = async () => {
|
const loadDraft = async () => {
|
||||||
const token = getToken()
|
const token = getToken()
|
||||||
if (!token) return
|
if (!token) return
|
||||||
@@ -168,6 +186,7 @@ const clearPost = async () => {
|
|||||||
showPrizeCropper.value = false
|
showPrizeCropper.value = false
|
||||||
prizeDescription.value = ''
|
prizeDescription.value = ''
|
||||||
prizeCount.value = 1
|
prizeCount.value = 1
|
||||||
|
pointCost.value = 0
|
||||||
endTime.value = null
|
endTime.value = null
|
||||||
startTime.value = null
|
startTime.value = null
|
||||||
|
|
||||||
@@ -315,6 +334,10 @@ const submitPost = async () => {
|
|||||||
toast.error('请选择抽奖结束时间')
|
toast.error('请选择抽奖结束时间')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if (pointCost.value < 0 || pointCost.value > 100) {
|
||||||
|
toast.error('参与积分需在0到100之间')
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const token = getToken()
|
const token = getToken()
|
||||||
@@ -354,6 +377,7 @@ const submitPost = async () => {
|
|||||||
prizeDescription: postType.value === 'LOTTERY' ? prizeDescription.value : undefined,
|
prizeDescription: postType.value === 'LOTTERY' ? prizeDescription.value : undefined,
|
||||||
startTime:
|
startTime:
|
||||||
postType.value === 'LOTTERY' ? new Date(startTime.value).toISOString() : undefined,
|
postType.value === 'LOTTERY' ? new Date(startTime.value).toISOString() : undefined,
|
||||||
|
pointCost: postType.value === 'LOTTERY' ? pointCost.value : undefined,
|
||||||
// 将时间转换为 UTC+8.5 时区 todo: 需要优化
|
// 将时间转换为 UTC+8.5 时区 todo: 需要优化
|
||||||
endTime:
|
endTime:
|
||||||
postType.value === 'LOTTERY'
|
postType.value === 'LOTTERY'
|
||||||
@@ -498,6 +522,8 @@ const submitPost = async () => {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 20px;
|
gap: 20px;
|
||||||
|
|
||||||
|
margin-bottom: 200px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.prize-row-title {
|
.prize-row-title {
|
||||||
|
|||||||
@@ -1,152 +1,202 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="point-mall-page">
|
<div class="point-mall-page">
|
||||||
<div class="point-tabs">
|
<BaseTabs v-model="selectedTab" :tabs="tabs">
|
||||||
<div
|
<template v-if="selectedTab === 'mall'">
|
||||||
:class="['point-tab-item', { selected: selectedTab === 'mall' }]"
|
<div class="point-mall-page-content">
|
||||||
@click="selectedTab = 'mall'"
|
<section class="rules">
|
||||||
>
|
<div class="section-title">🎉 积分规则</div>
|
||||||
积分兑换
|
<div class="section-content">
|
||||||
</div>
|
<div class="section-item" v-for="(rule, idx) in pointRules" :key="idx">
|
||||||
<div
|
{{ rule }}
|
||||||
:class="['point-tab-item', { selected: selectedTab === 'history' }]"
|
</div>
|
||||||
@click="selectedTab = 'history'"
|
</div>
|
||||||
>
|
</section>
|
||||||
积分历史
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<template v-if="selectedTab === 'mall'">
|
<section class="trend" v-if="trendOption">
|
||||||
<div class="point-mall-page-content">
|
<div class="section-title">积分走势</div>
|
||||||
<section class="rules">
|
<ClientOnly>
|
||||||
<div class="section-title">🎉 积分规则</div>
|
<VChart :option="trendOption" :autoresize="true" style="height: 300px" />
|
||||||
<div class="section-content">
|
</ClientOnly>
|
||||||
<div class="section-item" v-for="(rule, idx) in pointRules" :key="idx">{{ rule }}</div>
|
</section>
|
||||||
|
|
||||||
|
<div class="loading-points-container" v-if="isLoading">
|
||||||
|
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
|
||||||
|
|
||||||
<div class="loading-points-container" v-if="isLoading">
|
<div class="point-info">
|
||||||
|
<p v-if="authState.loggedIn && point !== null">
|
||||||
|
<span><i class="fas fa-coins coin-icon"></i></span>我的积分:<span
|
||||||
|
class="point-value"
|
||||||
|
>{{ point }}</span
|
||||||
|
>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<section class="goods">
|
||||||
|
<div class="goods-item" v-for="(good, idx) in goods" :key="idx">
|
||||||
|
<BaseImage class="goods-item-image" :src="good.image" alt="good.name" />
|
||||||
|
<div class="goods-item-name">{{ good.name }}</div>
|
||||||
|
<div class="goods-item-cost">
|
||||||
|
<i class="fas fa-coins"></i>
|
||||||
|
{{ good.cost }} 积分
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="goods-item-button"
|
||||||
|
:class="{ disabled: !authState.loggedIn || point === null || point < good.cost }"
|
||||||
|
@click="openRedeem(good)"
|
||||||
|
>
|
||||||
|
兑换
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<RedeemPopup
|
||||||
|
:visible="dialogVisible"
|
||||||
|
v-model="contact"
|
||||||
|
:loading="loading"
|
||||||
|
@close="closeRedeem"
|
||||||
|
@submit="submitRedeem"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template v-else>
|
||||||
|
<div class="loading-points-container" v-if="historyLoading">
|
||||||
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||||
</div>
|
</div>
|
||||||
|
<BasePlaceholder
|
||||||
<div class="point-info">
|
v-else-if="histories.length === 0"
|
||||||
<p v-if="authState.loggedIn && point !== null">
|
text="暂无积分记录"
|
||||||
<span><i class="fas fa-coins coin-icon"></i></span>我的积分:<span
|
icon="fas fa-inbox"
|
||||||
class="point-value"
|
|
||||||
>{{ point }}</span
|
|
||||||
>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<section class="goods">
|
|
||||||
<div class="goods-item" v-for="(good, idx) in goods" :key="idx">
|
|
||||||
<img class="goods-item-image" :src="good.image" alt="good.name" />
|
|
||||||
<div class="goods-item-name">{{ good.name }}</div>
|
|
||||||
<div class="goods-item-cost">
|
|
||||||
<i class="fas fa-coins"></i>
|
|
||||||
{{ good.cost }} 积分
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="goods-item-button"
|
|
||||||
:class="{ disabled: !authState.loggedIn || point === null || point < good.cost }"
|
|
||||||
@click="openRedeem(good)"
|
|
||||||
>
|
|
||||||
兑换
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
<RedeemPopup
|
|
||||||
:visible="dialogVisible"
|
|
||||||
v-model="contact"
|
|
||||||
:loading="loading"
|
|
||||||
@close="closeRedeem"
|
|
||||||
@submit="submitRedeem"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
<div class="timeline-container" v-else>
|
||||||
</template>
|
<BaseTimeline :items="histories">
|
||||||
|
<template #item="{ item }">
|
||||||
<template v-else>
|
<div class="history-content">
|
||||||
<div class="loading-points-container" v-if="historyLoading">
|
<template v-if="item.type === 'POST'">
|
||||||
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
发送帖子
|
||||||
</div>
|
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
||||||
<BasePlaceholder v-else-if="histories.length === 0" text="暂无积分记录" icon="fas fa-inbox" />
|
item.postTitle
|
||||||
<div class="timeline-container" v-else>
|
}}</NuxtLink>
|
||||||
<BaseTimeline :items="histories">
|
,获得{{ item.amount }}积分
|
||||||
<template #item="{ item }">
|
</template>
|
||||||
<div class="history-content">
|
<template v-else-if="item.type === 'COMMENT'">
|
||||||
<template v-if="item.type === 'POST'">
|
在文章
|
||||||
发送帖子
|
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
||||||
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
item.postTitle
|
||||||
item.postTitle
|
}}</NuxtLink>
|
||||||
}}</NuxtLink>
|
中
|
||||||
,获得{{ item.amount }}积分
|
<template v-if="!item.fromUserId">
|
||||||
</template>
|
发送评论
|
||||||
<template v-else-if="item.type === 'COMMENT'">
|
<NuxtLink
|
||||||
在文章
|
:to="`/posts/${item.postId}#comment-${item.commentId}`"
|
||||||
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
class="timeline-link"
|
||||||
item.postTitle
|
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
|
||||||
}}</NuxtLink>
|
>
|
||||||
中
|
,获得{{ item.amount }}积分
|
||||||
<template v-if="!item.fromUserId">
|
</template>
|
||||||
发送评论
|
<template v-else>
|
||||||
|
被评论
|
||||||
|
<NuxtLink
|
||||||
|
:to="`/posts/${item.postId}#comment-${item.commentId}`"
|
||||||
|
class="timeline-link"
|
||||||
|
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
|
||||||
|
>
|
||||||
|
,获得{{ item.amount }}积分
|
||||||
|
</template>
|
||||||
|
</template>
|
||||||
|
<template v-else-if="item.type === 'POST_LIKE_CANCELLED' && item.fromUserId">
|
||||||
|
你的帖子
|
||||||
|
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">
|
||||||
|
{{ item.postTitle }}
|
||||||
|
</NuxtLink>
|
||||||
|
被
|
||||||
|
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">
|
||||||
|
{{ item.fromUserName }}
|
||||||
|
</NuxtLink>
|
||||||
|
取消点赞,扣除{{ -item.amount }}积分
|
||||||
|
</template>
|
||||||
|
<template v-else-if="item.type === 'COMMENT_LIKE_CANCELLED' && item.fromUserId">
|
||||||
|
你的评论
|
||||||
|
<NuxtLink
|
||||||
|
:to="`/posts/${item.postId}#comment-${item.commentId}`"
|
||||||
|
class="timeline-link"
|
||||||
|
>
|
||||||
|
{{ stripMarkdownLength(item.commentContent, 100) }}
|
||||||
|
</NuxtLink>
|
||||||
|
被
|
||||||
|
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">
|
||||||
|
{{ item.fromUserName }}
|
||||||
|
</NuxtLink>
|
||||||
|
取消点赞,扣除{{ -item.amount }}积分
|
||||||
|
</template>
|
||||||
|
<template v-else-if="item.type === 'POST_LIKED' && item.fromUserId">
|
||||||
|
帖子
|
||||||
|
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
||||||
|
item.postTitle
|
||||||
|
}}</NuxtLink>
|
||||||
|
被
|
||||||
|
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
|
||||||
|
item.fromUserName
|
||||||
|
}}</NuxtLink>
|
||||||
|
按赞,获得{{ item.amount }}积分
|
||||||
|
</template>
|
||||||
|
<template v-else-if="item.type === 'COMMENT_LIKED' && item.fromUserId">
|
||||||
|
评论
|
||||||
<NuxtLink
|
<NuxtLink
|
||||||
:to="`/posts/${item.postId}#comment-${item.commentId}`"
|
:to="`/posts/${item.postId}#comment-${item.commentId}`"
|
||||||
class="timeline-link"
|
class="timeline-link"
|
||||||
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
|
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
|
||||||
>
|
>
|
||||||
,获得{{ item.amount }}积分
|
被
|
||||||
|
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
|
||||||
|
item.fromUserName
|
||||||
|
}}</NuxtLink>
|
||||||
|
按赞,获得{{ item.amount }}积分
|
||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else-if="item.type === 'INVITE' && item.fromUserId">
|
||||||
被评论
|
邀请了好友
|
||||||
<NuxtLink
|
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
|
||||||
:to="`/posts/${item.postId}#comment-${item.commentId}`"
|
item.fromUserName
|
||||||
class="timeline-link"
|
}}</NuxtLink>
|
||||||
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
|
加入社区 🎉,获得 {{ item.amount }} 积分
|
||||||
>
|
|
||||||
,获得{{ item.amount }}积分
|
|
||||||
</template>
|
</template>
|
||||||
</template>
|
<template v-else-if="item.type === 'FEATURE'">
|
||||||
<template v-else-if="item.type === 'POST_LIKED' && item.fromUserId">
|
文章
|
||||||
帖子
|
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
||||||
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
item.postTitle
|
||||||
item.postTitle
|
}}</NuxtLink>
|
||||||
}}</NuxtLink>
|
被收录为精选,获得 {{ item.amount }} 积分
|
||||||
被
|
</template>
|
||||||
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
|
<template v-else-if="item.type === 'REDEEM'">
|
||||||
item.fromUserName
|
兑换商品,消耗 {{ -item.amount }} 积分
|
||||||
}}</NuxtLink>
|
</template>
|
||||||
按赞,获得{{ item.amount }}积分
|
<template v-else-if="item.type === 'LOTTERY_JOIN'">
|
||||||
</template>
|
参与抽奖帖
|
||||||
<template v-else-if="item.type === 'COMMENT_LIKED' && item.fromUserId">
|
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
||||||
评论
|
item.postTitle
|
||||||
<NuxtLink
|
}}</NuxtLink>
|
||||||
:to="`/posts/${item.postId}#comment-${item.commentId}`"
|
,消耗 {{ -item.amount }} 积分
|
||||||
class="timeline-link"
|
</template>
|
||||||
>{{ stripMarkdownLength(item.commentContent, 100) }}</NuxtLink
|
<template v-else-if="item.type === 'LOTTERY_REWARD'">
|
||||||
>
|
你的抽奖帖
|
||||||
被
|
<NuxtLink :to="`/posts/${item.postId}`" class="timeline-link">{{
|
||||||
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
|
item.postTitle
|
||||||
item.fromUserName
|
}}</NuxtLink>
|
||||||
}}</NuxtLink>
|
被
|
||||||
按赞,获得{{ item.amount }}积分
|
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
|
||||||
</template>
|
item.fromUserName
|
||||||
<template v-else-if="item.type === 'INVITE' && item.fromUserId">
|
}}</NuxtLink>
|
||||||
邀请了好友
|
参与,获得 {{ item.amount }} 积分
|
||||||
<NuxtLink :to="`/users/${item.fromUserId}`" class="timeline-link">{{
|
</template>
|
||||||
item.fromUserName
|
<template v-else-if="item.type === 'SYSTEM_ONLINE'"> 积分历史系统上线 </template>
|
||||||
}}</NuxtLink>
|
<i class="fas fa-coins"></i> 你目前的积分是 {{ item.balance }}
|
||||||
加入社区 🎉,获得 {{ item.amount }} 积分
|
</div>
|
||||||
</template>
|
<div class="history-time">{{ TimeManager.format(item.createdAt) }}</div>
|
||||||
<template v-else-if="item.type === 'REDEEM'">
|
</template>
|
||||||
兑换商品,消耗 {{ -item.amount }} 积分
|
</BaseTimeline>
|
||||||
</template>
|
</div>
|
||||||
<template v-else-if="item.type === 'SYSTEM_ONLINE'"> 积分历史系统上线 </template>
|
</template>
|
||||||
<i class="fas fa-coins"></i> 你目前的积分是 {{ item.balance }}
|
</BaseTabs>
|
||||||
</div>
|
|
||||||
<div class="history-time">{{ TimeManager.format(item.createdAt) }}</div>
|
|
||||||
</template>
|
|
||||||
</BaseTimeline>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -159,16 +209,22 @@ import BaseTimeline from '~/components/BaseTimeline.vue'
|
|||||||
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
import BasePlaceholder from '~/components/BasePlaceholder.vue'
|
||||||
import { stripMarkdownLength } from '~/utils/markdown'
|
import { stripMarkdownLength } from '~/utils/markdown'
|
||||||
import TimeManager from '~/utils/time'
|
import TimeManager from '~/utils/time'
|
||||||
|
import BaseTabs from '~/components/BaseTabs.vue'
|
||||||
|
|
||||||
const config = useRuntimeConfig()
|
const config = useRuntimeConfig()
|
||||||
const API_BASE_URL = config.public.apiBaseUrl
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
|
||||||
const selectedTab = ref('mall')
|
const selectedTab = ref('mall')
|
||||||
|
const tabs = [
|
||||||
|
{ key: 'mall', label: '积分兑换' },
|
||||||
|
{ key: 'history', label: '积分历史' },
|
||||||
|
]
|
||||||
const point = ref(null)
|
const point = ref(null)
|
||||||
const isLoading = ref(false)
|
const isLoading = ref(false)
|
||||||
const histories = ref([])
|
const histories = ref([])
|
||||||
const historyLoading = ref(false)
|
const historyLoading = ref(false)
|
||||||
const historyLoaded = ref(false)
|
const historyLoaded = ref(false)
|
||||||
|
const trendOption = ref(null)
|
||||||
|
|
||||||
const pointRules = [
|
const pointRules = [
|
||||||
'发帖:每天前两次,每次 30 积分',
|
'发帖:每天前两次,每次 30 积分',
|
||||||
@@ -176,6 +232,7 @@ const pointRules = [
|
|||||||
'帖子被点赞:每次 10 积分',
|
'帖子被点赞:每次 10 积分',
|
||||||
'评论被点赞:每次 10 积分',
|
'评论被点赞:每次 10 积分',
|
||||||
'邀请好友加入可获得 500 积分/次,注意需要使用邀请链接注册',
|
'邀请好友加入可获得 500 积分/次,注意需要使用邀请链接注册',
|
||||||
|
'文章被收录至精选:每次 500 积分',
|
||||||
]
|
]
|
||||||
|
|
||||||
const goods = ref([])
|
const goods = ref([])
|
||||||
@@ -192,6 +249,31 @@ const iconMap = {
|
|||||||
INVITE: 'fas fa-user-plus',
|
INVITE: 'fas fa-user-plus',
|
||||||
SYSTEM_ONLINE: 'fas fa-clock',
|
SYSTEM_ONLINE: 'fas fa-clock',
|
||||||
REDEEM: 'fas fa-gift',
|
REDEEM: 'fas fa-gift',
|
||||||
|
FEATURE: 'fas fa-star',
|
||||||
|
LOTTERY_JOIN: 'fas fa-ticket-alt',
|
||||||
|
LOTTERY_REWARD: 'fas fa-ticket-alt',
|
||||||
|
POST_LIKE_CANCELLED: 'fas fa-thumbs-down',
|
||||||
|
COMMENT_LIKE_CANCELLED: 'fas fa-thumbs-down',
|
||||||
|
}
|
||||||
|
|
||||||
|
const loadTrend = async () => {
|
||||||
|
if (!authState.loggedIn) return
|
||||||
|
const token = getToken()
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/point-histories/trend?days=30`, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
})
|
||||||
|
if (res.ok) {
|
||||||
|
const data = await res.json()
|
||||||
|
const dates = data.map((d) => d.date)
|
||||||
|
const values = data.map((d) => d.value)
|
||||||
|
trendOption.value = {
|
||||||
|
tooltip: { trigger: 'axis' },
|
||||||
|
xAxis: { type: 'category', data: dates, boundaryGap: false },
|
||||||
|
yAxis: { type: 'value' },
|
||||||
|
series: [{ type: 'line', areaStyle: {}, smooth: true, data: values }],
|
||||||
|
dataZoom: [{ type: 'slider', start: 80 }, { type: 'inside' }],
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
@@ -199,8 +281,10 @@ onMounted(async () => {
|
|||||||
if (authState.loggedIn) {
|
if (authState.loggedIn) {
|
||||||
const user = await fetchCurrentUser()
|
const user = await fetchCurrentUser()
|
||||||
point.value = user ? user.point : null
|
point.value = user ? user.point : null
|
||||||
|
await Promise.all([loadGoods(), loadTrend()])
|
||||||
|
} else {
|
||||||
|
await loadGoods()
|
||||||
}
|
}
|
||||||
await loadGoods()
|
|
||||||
isLoading.value = false
|
isLoading.value = false
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -286,17 +370,17 @@ const submitRedeem = async () => {
|
|||||||
padding: 0 20px;
|
padding: 0 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.point-tabs {
|
:deep(.base-tabs-header) {
|
||||||
display: flex;
|
display: flex;
|
||||||
border-bottom: 1px solid var(--normal-border-color);
|
border-bottom: 1px solid var(--normal-border-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
.point-tab-item {
|
:deep(.base-tabs-item) {
|
||||||
padding: 10px 15px;
|
padding: 10px 15px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.point-tab-item.selected {
|
:deep(.base-tabs-item.selected) {
|
||||||
border-bottom: 2px solid var(--primary-color);
|
border-bottom: 2px solid var(--primary-color);
|
||||||
color: var(--primary-color);
|
color: var(--primary-color);
|
||||||
}
|
}
|
||||||
@@ -336,7 +420,8 @@ const submitRedeem = async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.rules,
|
.rules,
|
||||||
.goods {
|
.goods,
|
||||||
|
.trend {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
<div class="post-clear" @click="clearPost"><i class="fa-solid fa-eraser"></i> 清空</div>
|
<div class="post-clear" @click="clearPost"><i class="fa-solid fa-eraser"></i> 清空</div>
|
||||||
<div class="ai-generate" @click="aiGenerate">
|
<div class="ai-generate" @click="aiGenerate">
|
||||||
<i class="fa-solid fa-robot"></i>
|
<i class="fa-solid fa-robot"></i>
|
||||||
md格式优化
|
MD 格式优化
|
||||||
</div>
|
</div>
|
||||||
<div class="post-cancel" @click="cancelEdit">取消</div>
|
<div class="post-cancel" @click="cancelEdit">取消</div>
|
||||||
<div
|
<div
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user