mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-02-09 08:30:55 +08:00
Compare commits
277 Commits
codex/impl
...
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 | ||
|
|
5f5b6f84a8 | ||
|
|
cd57d478f2 | ||
|
|
da07313df8 | ||
|
|
c08ecb5e33 | ||
|
|
0a722c81c5 | ||
|
|
15071471b2 | ||
|
|
98a9939738 | ||
|
|
9554030054 | ||
|
|
72e9a77373 | ||
|
|
ed7dcd9414 | ||
|
|
79fe8b5997 | ||
|
|
cfce4d7d1d | ||
|
|
b7f5d8485c | ||
|
|
d4677a5799 | ||
|
|
99644046fc | ||
|
|
22c9bd7d39 | ||
|
|
3fc6929075 | ||
|
|
4eed6889d6 | ||
|
|
959b0f6a48 | ||
|
|
91ffacc335 | ||
|
|
4969a759aa | ||
|
|
81e3a80d35 | ||
|
|
d717ce03c1 | ||
|
|
66035447a8 | ||
|
|
fa1148bc4e | ||
|
|
f60f184c84 | ||
|
|
06ffb180fe | ||
|
|
1b892828f1 | ||
|
|
1aa88ab0fe | ||
|
|
86126699d3 | ||
|
|
a6a07b9bda | ||
|
|
d8b3c68150 | ||
|
|
318b481c4b | ||
|
|
7338b891db | ||
|
|
eb18dc8e94 | ||
|
|
aec5321f89 | ||
|
|
2e658f37a4 | ||
|
|
7ccb2a44e3 | ||
|
|
0fa08e2260 | ||
|
|
38a49f7414 | ||
|
|
fb89c9fb25 | ||
|
|
e9458f5419 | ||
|
|
2d87c8f23d | ||
|
|
cb281e4030 | ||
|
|
9b85d77158 | ||
|
|
a3b28eafe4 | ||
|
|
805a8df7d3 | ||
|
|
02be045f55 | ||
|
|
ac3c7b7bec | ||
|
|
c344b5b4ae | ||
|
|
e7a1e1d159 | ||
|
|
30b56e54cf | ||
|
|
cc525c1c27 | ||
|
|
3f2829cd37 | ||
|
|
3258a42b44 | ||
|
|
a64fd71bbe | ||
|
|
1a12bec7b1 | ||
|
|
fbca19791a | ||
|
|
10b6fdd1cb | ||
|
|
7dd1f1b3d0 | ||
|
|
df92ff664c | ||
|
|
73168c1859 | ||
|
|
77856ff9af | ||
|
|
df49b21620 | ||
|
|
fbe2c66955 | ||
|
|
df7ca77652 | ||
|
|
fe84e3f2fa | ||
|
|
c307732696 | ||
|
|
35bcd2cdc2 | ||
|
|
a29bf7d860 | ||
|
|
27393c15f2 | ||
|
|
c91a787f29 | ||
|
|
6096712291 | ||
|
|
6d20addcde | ||
|
|
d8f9fd670c | ||
|
|
5ebe739917 | ||
|
|
022edc866a | ||
|
|
b06815cc59 | ||
|
|
f1b223a3c9 | ||
|
|
e65273daa6 | ||
|
|
d3a2acb605 | ||
|
|
bced24e47d | ||
|
|
425ad03e6f | ||
|
|
4462d8f711 | ||
|
|
1b31977ec6 | ||
|
|
42693cb1ff | ||
|
|
6b500466fc | ||
|
|
c84262eb88 | ||
|
|
fa2ffaa64a | ||
|
|
3037c856d0 | ||
|
|
7b1ce3f070 | ||
|
|
f4a15b3448 | ||
|
|
239f1f8c84 | ||
|
|
ac303184c4 | ||
|
|
7f16bbdb94 | ||
|
|
f1c83b0f68 | ||
|
|
22c2b1564d | ||
|
|
628d28c12d | ||
|
|
2577992ee3 |
@@ -1,4 +1 @@
|
|||||||
#!/usr/bin/env sh
|
|
||||||
. "$(dirname -- "$0")/_/husky.sh"
|
|
||||||
|
|
||||||
npx lint-staged
|
npx lint-staged
|
||||||
|
|||||||
118
CONTRIBUTING.md
Normal file
118
CONTRIBUTING.md
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
#### **⚠️注意:仅想修改前端的朋友可不用部署后端服务**
|
||||||
|
|
||||||
|
## 如何部署
|
||||||
|
|
||||||
|
> Step1 先克隆仓库
|
||||||
|
|
||||||
|
```shell
|
||||||
|
git clone https://github.com/nagisa77/OpenIsle.git
|
||||||
|
cd OpenIsle
|
||||||
|
```
|
||||||
|
|
||||||
|
> Step2 后端部署
|
||||||
|
|
||||||
|
```shell
|
||||||
|
cd backend
|
||||||
|
```
|
||||||
|
|
||||||
|
以IDEA编辑器为例,IDEA打开backend文件夹。
|
||||||
|
|
||||||
|
- 设置VM Option,最好运行在其他端口,非8080,这里设置8081
|
||||||
|
|
||||||
|
```shell
|
||||||
|
-Dserver.port=8081
|
||||||
|
```
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
- 设置jdk版本为java 17
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
- 本机配置MySQL服务(网上很多教程,忽略)
|
||||||
|
- 设置环境变量.env 文件 或.properties 文件(二选一)
|
||||||
|
|
||||||
|
1. 环境变量文件生成
|
||||||
|
|
||||||
|
```shell
|
||||||
|
cp open-isle.env.example open-isle.env
|
||||||
|
```
|
||||||
|
|
||||||
|
修改环境变量,留下需要的,比如你要开发Google登录业务,就需要谷歌相关的变量,数据库是一定要的
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
应用环境文件, 选择刚刚的`open-isle.env`
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
2. 直接修改 .properities 文件
|
||||||
|
|
||||||
|
位置src/main/application.properties, 数据库需要修改标红处,其他按需修改
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
处理完环境问题直接跑起来就能通了
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
> Step3 前端部署
|
||||||
|
|
||||||
|
**⚠️ 环境要求:Node.js 版本最低 20.0.0(因为 Nuxt 框架要求)**
|
||||||
|
|
||||||
|
前端可以依赖本机部署的后端,也可以直接调用线上的后端接口
|
||||||
|
|
||||||
|
```shell
|
||||||
|
cd ../frontend_nuxt/
|
||||||
|
```
|
||||||
|
|
||||||
|
copy环境.env文件
|
||||||
|
|
||||||
|
```shell
|
||||||
|
cp .env.staging.example .env
|
||||||
|
```
|
||||||
|
|
||||||
|
1. 依赖本机部署的后端:打开本文件夹,修改.env 修改为瞄准本机后端端口
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
; 本地部署后端
|
||||||
|
NUXT_PUBLIC_API_BASE_URL=https://127.0.0.1:8081
|
||||||
|
; 预发环境后端
|
||||||
|
; NUXT_PUBLIC_API_BASE_URL=https://staging.open-isle.com
|
||||||
|
; 生产环境后端
|
||||||
|
; NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com
|
||||||
|
```
|
||||||
|
|
||||||
|
2. 依赖预发环境后台环境
|
||||||
|
|
||||||
|
**(⚠️强烈推荐只部署前端的朋友使用该环境)**
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
; 本地部署后端
|
||||||
|
; NUXT_PUBLIC_API_BASE_URL=https://127.0.0.1:8081
|
||||||
|
; 预发环境后端
|
||||||
|
NUXT_PUBLIC_API_BASE_URL=https://staging.open-isle.com
|
||||||
|
; 生产环境后端
|
||||||
|
; NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com
|
||||||
|
```
|
||||||
|
|
||||||
|
4. 依赖线上后台环境
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
; 本地部署后端
|
||||||
|
; NUXT_PUBLIC_API_BASE_URL=https://127.0.0.1:8081
|
||||||
|
; 预发环境后端
|
||||||
|
; NUXT_PUBLIC_API_BASE_URL=https://staging.open-isle.com
|
||||||
|
; 生产环境后端
|
||||||
|
NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com
|
||||||
|
```
|
||||||
|
|
||||||
|
```shell
|
||||||
|
# 安装依赖
|
||||||
|
npm install --verbose
|
||||||
|
|
||||||
|
# 运行前端服务
|
||||||
|
npm run dev
|
||||||
|
```
|
||||||
|
|
||||||
|
如此一来,浏览器访问 http://127.0.0.1:3000 即可访问前端页面
|
||||||
39
README.md
39
README.md
@@ -1,45 +1,18 @@
|
|||||||
<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>
|
||||||
<a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square"></a>
|
<img alt="Image" src="https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/22752cfac5a04a9c90c41995b9f55fed.png" width="1200">
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
## 💡 简介
|
## 💡 简介
|
||||||
|
|
||||||
OpenIsle 是一个使用 Spring Boot 和 Vue 3 构建的全栈开源社区平台,提供用户注册、登录、贴文发布、评论交互等完整功能,可用于项目社区或直接打造自主社区站点。
|
OpenIsle 是一个使用 Spring Boot 和 Vue 3 构建的全栈开源社区平台,提供用户注册、登录、贴文发布、评论交互等完整功能,可用于项目社区或直接打造自主社区站点。
|
||||||
|
|
||||||
## 🚧 开发
|
## 🚧 开发 & 部署
|
||||||
|
|
||||||
### 后端
|
详细见 [Contributing](https://github.com/nagisa77/OpenIsle?tab=contributing-ov-file)
|
||||||
|
|
||||||
1. 确保安装 JDK 17 及 Maven
|
|
||||||
2. 信息配置修改 `src/main/resources/application.properties`,或通过环境变量设置数据库等参数
|
|
||||||
3. 执行 `mvn clean package` 生成包,之后使用 `java -jar target/openisle-0.0.1-SNAPSHOT.jar`启动,或在开发时直接使用 `mvn spring-boot:run`
|
|
||||||
|
|
||||||
### 前端
|
|
||||||
|
|
||||||
1. 进入前端目录
|
|
||||||
```bash
|
|
||||||
cd frontend_nuxt
|
|
||||||
```
|
|
||||||
2. 安装依赖
|
|
||||||
```bash
|
|
||||||
npm install
|
|
||||||
```
|
|
||||||
3. 启动开发服务
|
|
||||||
```bash
|
|
||||||
npm run dev
|
|
||||||
```
|
|
||||||
|
|
||||||
生产版本使用如下命令编译:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npm run build
|
|
||||||
```
|
|
||||||
|
|
||||||
会在 `.output` 目录生成文件,配合线上网站方式部署
|
|
||||||
|
|
||||||
## ✨ 项目特点
|
## ✨ 项目特点
|
||||||
|
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -38,6 +42,16 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-security</artifactId>
|
<artifactId>spring-boot-starter-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.vladsch.flexmark</groupId>
|
||||||
|
<artifactId>flexmark-all</artifactId>
|
||||||
|
<version>0.64.8</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jsoup</groupId>
|
||||||
|
<artifactId>jsoup</artifactId>
|
||||||
|
<version>1.17.2</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.mysql</groupId>
|
<groupId>com.mysql</groupId>
|
||||||
<artifactId>mysql-connector-j</artifactId>
|
<artifactId>mysql-connector-j</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,8 @@ 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/point-goods").permitAll()
|
.requestMatchers(HttpMethod.GET, "/api/point-goods").permitAll()
|
||||||
.requestMatchers(HttpMethod.POST, "/api/point-goods").permitAll()
|
.requestMatchers(HttpMethod.POST, "/api/point-goods").permitAll()
|
||||||
.requestMatchers(HttpMethod.POST, "/api/categories/**").hasAuthority("ADMIN")
|
.requestMatchers(HttpMethod.POST, "/api/categories/**").hasAuthority("ADMIN")
|
||||||
@@ -153,8 +157,9 @@ 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"));
|
||||||
|
|
||||||
if (authHeader != null && authHeader.startsWith("Bearer ")) {
|
if (authHeader != null && authHeader.startsWith("Bearer ")) {
|
||||||
String token = authHeader.substring(7);
|
String token = authHeader.substring(7);
|
||||||
@@ -170,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;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -45,4 +45,14 @@ public class AdminPostController {
|
|||||||
public PostSummaryDto unpin(@PathVariable Long id) {
|
public PostSummaryDto unpin(@PathVariable Long id) {
|
||||||
return postMapper.toSummaryDto(postService.unpinPost(id));
|
return postMapper.toSummaryDto(postService.unpinPost(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/{id}/rss-exclude")
|
||||||
|
public PostSummaryDto excludeFromRss(@PathVariable Long id) {
|
||||||
|
return postMapper.toSummaryDto(postService.excludeFromRss(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/{id}/rss-include")
|
||||||
|
public PostSummaryDto includeInRss(@PathVariable Long id) {
|
||||||
|
return postMapper.toSummaryDto(postService.includeInRss(id));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,13 +47,15 @@ public class AuthController {
|
|||||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid captcha"));
|
return ResponseEntity.badRequest().body(Map.of("error", "Invalid captcha"));
|
||||||
}
|
}
|
||||||
if (req.getInviteToken() != null && !req.getInviteToken().isEmpty()) {
|
if (req.getInviteToken() != null && !req.getInviteToken().isEmpty()) {
|
||||||
if (!inviteService.validate(req.getInviteToken())) {
|
InviteService.InviteValidateResult result = inviteService.validate(req.getInviteToken());
|
||||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
if (!result.isValidate()) {
|
||||||
|
return ResponseEntity.badRequest().body(Map.of("error", "邀请码使用次数过多"));
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
User user = userService.registerWithInvite(
|
User user = userService.registerWithInvite(
|
||||||
req.getUsername(), req.getEmail(), req.getPassword());
|
req.getUsername(), req.getEmail(), req.getPassword());
|
||||||
inviteService.consume(req.getInviteToken());
|
inviteService.consume(req.getInviteToken(), user.getUsername());
|
||||||
|
emailService.sendEmail(user.getEmail(), "在网站填写验证码以验证", "您的验证码是 " + user.getVerificationCode());
|
||||||
return ResponseEntity.ok(Map.of(
|
return ResponseEntity.ok(Map.of(
|
||||||
"token", jwtService.generateToken(user.getUsername()),
|
"token", jwtService.generateToken(user.getUsername()),
|
||||||
"reason_code", "INVITE_APPROVED"
|
"reason_code", "INVITE_APPROVED"
|
||||||
@@ -78,10 +80,26 @@ public class AuthController {
|
|||||||
public ResponseEntity<?> verify(@RequestBody VerifyRequest req) {
|
public ResponseEntity<?> verify(@RequestBody VerifyRequest req) {
|
||||||
boolean ok = userService.verifyCode(req.getUsername(), req.getCode());
|
boolean ok = userService.verifyCode(req.getUsername(), req.getCode());
|
||||||
if (ok) {
|
if (ok) {
|
||||||
return ResponseEntity.ok(Map.of(
|
Optional<User> userOpt = userService.findByUsername(req.getUsername());
|
||||||
"message", "Verified",
|
if (userOpt.isEmpty()) {
|
||||||
"token", jwtService.generateReasonToken(req.getUsername())
|
return ResponseEntity.badRequest().body(Map.of("error", "Invalid credentials"));
|
||||||
));
|
}
|
||||||
|
|
||||||
|
User user = userOpt.get();
|
||||||
|
|
||||||
|
if (user.isApproved()) {
|
||||||
|
return ResponseEntity.ok(Map.of(
|
||||||
|
"message", "Verified and isApproved",
|
||||||
|
"reason_code", "VERIFIED_AND_APPROVED",
|
||||||
|
"token", jwtService.generateToken(req.getUsername())
|
||||||
|
));
|
||||||
|
} else {
|
||||||
|
return ResponseEntity.ok(Map.of(
|
||||||
|
"message", "Verified",
|
||||||
|
"reason_code", "VERIFIED",
|
||||||
|
"token", jwtService.generateReasonToken(req.getUsername())
|
||||||
|
));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid verification code"));
|
return ResponseEntity.badRequest().body(Map.of("error", "Invalid verification code"));
|
||||||
}
|
}
|
||||||
@@ -127,7 +145,8 @@ public class AuthController {
|
|||||||
@PostMapping("/google")
|
@PostMapping("/google")
|
||||||
public ResponseEntity<?> loginWithGoogle(@RequestBody GoogleLoginRequest req) {
|
public ResponseEntity<?> loginWithGoogle(@RequestBody GoogleLoginRequest req) {
|
||||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||||
if (viaInvite && !inviteService.validate(req.getInviteToken())) {
|
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||||
|
if (viaInvite && !inviteValidateResult.isValidate()) {
|
||||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
||||||
}
|
}
|
||||||
Optional<AuthResult> resultOpt = googleAuthService.authenticate(
|
Optional<AuthResult> resultOpt = googleAuthService.authenticate(
|
||||||
@@ -137,7 +156,7 @@ public class AuthController {
|
|||||||
if (resultOpt.isPresent()) {
|
if (resultOpt.isPresent()) {
|
||||||
AuthResult result = resultOpt.get();
|
AuthResult result = resultOpt.get();
|
||||||
if (viaInvite && result.isNewUser()) {
|
if (viaInvite && result.isNewUser()) {
|
||||||
inviteService.consume(req.getInviteToken());
|
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
|
||||||
return ResponseEntity.ok(Map.of(
|
return ResponseEntity.ok(Map.of(
|
||||||
"token", jwtService.generateToken(result.getUser().getUsername()),
|
"token", jwtService.generateToken(result.getUser().getUsername()),
|
||||||
"reason_code", "INVITE_APPROVED"
|
"reason_code", "INVITE_APPROVED"
|
||||||
@@ -201,7 +220,8 @@ public class AuthController {
|
|||||||
@PostMapping("/github")
|
@PostMapping("/github")
|
||||||
public ResponseEntity<?> loginWithGithub(@RequestBody GithubLoginRequest req) {
|
public ResponseEntity<?> loginWithGithub(@RequestBody GithubLoginRequest req) {
|
||||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||||
if (viaInvite && !inviteService.validate(req.getInviteToken())) {
|
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||||
|
if (viaInvite && !inviteValidateResult.isValidate()) {
|
||||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
||||||
}
|
}
|
||||||
Optional<AuthResult> resultOpt = githubAuthService.authenticate(
|
Optional<AuthResult> resultOpt = githubAuthService.authenticate(
|
||||||
@@ -212,7 +232,7 @@ public class AuthController {
|
|||||||
if (resultOpt.isPresent()) {
|
if (resultOpt.isPresent()) {
|
||||||
AuthResult result = resultOpt.get();
|
AuthResult result = resultOpt.get();
|
||||||
if (viaInvite && result.isNewUser()) {
|
if (viaInvite && result.isNewUser()) {
|
||||||
inviteService.consume(req.getInviteToken());
|
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
|
||||||
return ResponseEntity.ok(Map.of(
|
return ResponseEntity.ok(Map.of(
|
||||||
"token", jwtService.generateToken(result.getUser().getUsername()),
|
"token", jwtService.generateToken(result.getUser().getUsername()),
|
||||||
"reason_code", "INVITE_APPROVED"
|
"reason_code", "INVITE_APPROVED"
|
||||||
@@ -248,7 +268,8 @@ public class AuthController {
|
|||||||
@PostMapping("/discord")
|
@PostMapping("/discord")
|
||||||
public ResponseEntity<?> loginWithDiscord(@RequestBody DiscordLoginRequest req) {
|
public ResponseEntity<?> loginWithDiscord(@RequestBody DiscordLoginRequest req) {
|
||||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||||
if (viaInvite && !inviteService.validate(req.getInviteToken())) {
|
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||||
|
if (viaInvite && !inviteValidateResult.isValidate()) {
|
||||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
||||||
}
|
}
|
||||||
Optional<AuthResult> resultOpt = discordAuthService.authenticate(
|
Optional<AuthResult> resultOpt = discordAuthService.authenticate(
|
||||||
@@ -259,7 +280,7 @@ public class AuthController {
|
|||||||
if (resultOpt.isPresent()) {
|
if (resultOpt.isPresent()) {
|
||||||
AuthResult result = resultOpt.get();
|
AuthResult result = resultOpt.get();
|
||||||
if (viaInvite && result.isNewUser()) {
|
if (viaInvite && result.isNewUser()) {
|
||||||
inviteService.consume(req.getInviteToken());
|
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
|
||||||
return ResponseEntity.ok(Map.of(
|
return ResponseEntity.ok(Map.of(
|
||||||
"token", jwtService.generateToken(result.getUser().getUsername()),
|
"token", jwtService.generateToken(result.getUser().getUsername()),
|
||||||
"reason_code", "INVITE_APPROVED"
|
"reason_code", "INVITE_APPROVED"
|
||||||
@@ -294,7 +315,8 @@ public class AuthController {
|
|||||||
@PostMapping("/twitter")
|
@PostMapping("/twitter")
|
||||||
public ResponseEntity<?> loginWithTwitter(@RequestBody TwitterLoginRequest req) {
|
public ResponseEntity<?> loginWithTwitter(@RequestBody TwitterLoginRequest req) {
|
||||||
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
boolean viaInvite = req.getInviteToken() != null && !req.getInviteToken().isEmpty();
|
||||||
if (viaInvite && !inviteService.validate(req.getInviteToken())) {
|
InviteService.InviteValidateResult inviteValidateResult = inviteService.validate(req.getInviteToken());
|
||||||
|
if (viaInvite && !inviteValidateResult.isValidate()) {
|
||||||
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
return ResponseEntity.badRequest().body(Map.of("error", "Invalid invite token"));
|
||||||
}
|
}
|
||||||
Optional<AuthResult> resultOpt = twitterAuthService.authenticate(
|
Optional<AuthResult> resultOpt = twitterAuthService.authenticate(
|
||||||
@@ -306,7 +328,7 @@ public class AuthController {
|
|||||||
if (resultOpt.isPresent()) {
|
if (resultOpt.isPresent()) {
|
||||||
AuthResult result = resultOpt.get();
|
AuthResult result = resultOpt.get();
|
||||||
if (viaInvite && result.isNewUser()) {
|
if (viaInvite && result.isNewUser()) {
|
||||||
inviteService.consume(req.getInviteToken());
|
inviteService.consume(req.getInviteToken(), inviteValidateResult.getInviteToken().getInviter().getUsername());
|
||||||
return ResponseEntity.ok(Map.of(
|
return ResponseEntity.ok(Map.of(
|
||||||
"token", jwtService.generateToken(result.getUser().getUsername()),
|
"token", jwtService.generateToken(result.getUser().getUsername()),
|
||||||
"reason_code", "INVITE_APPROVED"
|
"reason_code", "INVITE_APPROVED"
|
||||||
|
|||||||
@@ -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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -47,7 +47,7 @@ public class CommentController {
|
|||||||
Comment comment = commentService.addComment(auth.getName(), postId, req.getContent());
|
Comment comment = commentService.addComment(auth.getName(), postId, req.getContent());
|
||||||
CommentDto dto = commentMapper.toDto(comment);
|
CommentDto dto = commentMapper.toDto(comment);
|
||||||
dto.setReward(levelService.awardForComment(auth.getName()));
|
dto.setReward(levelService.awardForComment(auth.getName()));
|
||||||
dto.setPointReward(pointService.awardForComment(auth.getName(),postId));
|
dto.setPointReward(pointService.awardForComment(auth.getName(), postId, comment.getId()));
|
||||||
log.debug("createComment succeeded for comment {}", comment.getId());
|
log.debug("createComment succeeded for comment {}", comment.getId());
|
||||||
return ResponseEntity.ok(dto);
|
return ResponseEntity.ok(dto);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,9 +23,19 @@ public class NotificationController {
|
|||||||
private final NotificationMapper notificationMapper;
|
private final NotificationMapper notificationMapper;
|
||||||
|
|
||||||
@GetMapping
|
@GetMapping
|
||||||
public List<NotificationDto> list(@RequestParam(value = "read", required = false) Boolean read,
|
public List<NotificationDto> list(@RequestParam(value = "page", defaultValue = "0") int page,
|
||||||
|
@RequestParam(value = "size", defaultValue = "30") int size,
|
||||||
Authentication auth) {
|
Authentication auth) {
|
||||||
return notificationService.listNotifications(auth.getName(), read).stream()
|
return notificationService.listNotifications(auth.getName(), null, page, size).stream()
|
||||||
|
.map(notificationMapper::toDto)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/unread")
|
||||||
|
public List<NotificationDto> listUnread(@RequestParam(value = "page", defaultValue = "0") int page,
|
||||||
|
@RequestParam(value = "size", defaultValue = "30") int size,
|
||||||
|
Authentication auth) {
|
||||||
|
return notificationService.listNotifications(auth.getName(), false, page, size).stream()
|
||||||
.map(notificationMapper::toDto)
|
.map(notificationMapper::toDto)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package com.openisle.controller;
|
||||||
|
|
||||||
|
import com.openisle.dto.PointHistoryDto;
|
||||||
|
import com.openisle.mapper.PointHistoryMapper;
|
||||||
|
import com.openisle.service.PointService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.security.core.Authentication;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api/point-histories")
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class PointHistoryController {
|
||||||
|
private final PointService pointService;
|
||||||
|
private final PointHistoryMapper pointHistoryMapper;
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public List<PointHistoryDto> list(Authentication auth) {
|
||||||
|
return pointService.listHistory(auth.getName()).stream()
|
||||||
|
.map(pointHistoryMapper::toDto)
|
||||||
|
.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,11 +41,12 @@ 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()));
|
||||||
dto.setPointReward(pointService.awardForPost(auth.getName()));
|
dto.setPointReward(pointService.awardForPost(auth.getName(), post.getId()));
|
||||||
return ResponseEntity.ok(dto);
|
return ResponseEntity.ok(dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,6 +63,16 @@ public class PostController {
|
|||||||
postService.deletePost(id, auth.getName());
|
postService.deletePost(id, auth.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/{id}/close")
|
||||||
|
public PostSummaryDto close(@PathVariable Long id, Authentication auth) {
|
||||||
|
return postMapper.toSummaryDto(postService.closePost(id, auth.getName()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/{id}/reopen")
|
||||||
|
public PostSummaryDto reopen(@PathVariable Long id, Authentication auth) {
|
||||||
|
return postMapper.toSummaryDto(postService.reopenPost(id, auth.getName()));
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/{id}")
|
@GetMapping("/{id}")
|
||||||
public ResponseEntity<PostDetailDto> getPost(@PathVariable Long id, Authentication auth) {
|
public ResponseEntity<PostDetailDto> getPost(@PathVariable Long id, Authentication auth) {
|
||||||
String viewer = auth != null ? auth.getName() : null;
|
String viewer = auth != null ? auth.getName() : null;
|
||||||
@@ -161,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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
352
backend/src/main/java/com/openisle/controller/RssController.java
Normal file
352
backend/src/main/java/com/openisle/controller/RssController.java
Normal file
@@ -0,0 +1,352 @@
|
|||||||
|
package com.openisle.controller;
|
||||||
|
|
||||||
|
import com.openisle.model.Post;
|
||||||
|
import com.openisle.model.Comment;
|
||||||
|
import com.openisle.model.CommentSort;
|
||||||
|
import com.openisle.service.PostService;
|
||||||
|
import com.openisle.service.CommentService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.jsoup.Jsoup;
|
||||||
|
import org.jsoup.nodes.Document;
|
||||||
|
import org.jsoup.nodes.Element;
|
||||||
|
import org.jsoup.safety.Safelist;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
|
||||||
|
import com.vladsch.flexmark.ext.tables.TablesExtension;
|
||||||
|
import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension;
|
||||||
|
import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
|
||||||
|
import com.vladsch.flexmark.html.HtmlRenderer;
|
||||||
|
import com.vladsch.flexmark.parser.Parser;
|
||||||
|
import com.vladsch.flexmark.util.data.MutableDataSet;
|
||||||
|
|
||||||
|
import java.net.URI;
|
||||||
|
import java.time.ZoneId;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class RssController {
|
||||||
|
private final PostService postService;
|
||||||
|
private final CommentService commentService;
|
||||||
|
|
||||||
|
@Value("${app.website-url:https://www.open-isle.com}")
|
||||||
|
private String websiteUrl;
|
||||||
|
|
||||||
|
// 兼容 Markdown/HTML 两类图片写法(用于 enclosure)
|
||||||
|
private static final Pattern MD_IMAGE = Pattern.compile("!\\[[^\\]]*\\]\\(([^)]+)\\)");
|
||||||
|
private static final Pattern HTML_IMAGE = Pattern.compile("<BaseImage[^>]+src=[\"']?([^\"'>]+)[\"']?[^>]*>");
|
||||||
|
|
||||||
|
private static final DateTimeFormatter RFC1123 = DateTimeFormatter.RFC_1123_DATE_TIME;
|
||||||
|
|
||||||
|
// flexmark:Markdown -> HTML
|
||||||
|
private static final Parser MD_PARSER;
|
||||||
|
private static final HtmlRenderer MD_RENDERER;
|
||||||
|
static {
|
||||||
|
MutableDataSet opts = new MutableDataSet();
|
||||||
|
opts.set(Parser.EXTENSIONS, Arrays.asList(
|
||||||
|
TablesExtension.create(),
|
||||||
|
AutolinkExtension.create(),
|
||||||
|
StrikethroughExtension.create(),
|
||||||
|
TaskListExtension.create()
|
||||||
|
));
|
||||||
|
// 允许内联 HTML(下游再做 sanitize)
|
||||||
|
opts.set(Parser.HTML_BLOCK_PARSER, true);
|
||||||
|
MD_PARSER = Parser.builder(opts).build();
|
||||||
|
MD_RENDERER = HtmlRenderer.builder(opts).escapeHtml(false).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping(value = "/api/rss", produces = "application/rss+xml;charset=UTF-8")
|
||||||
|
public String feed() {
|
||||||
|
// 建议 20;你现在是 10,这里保留你的 10
|
||||||
|
List<Post> posts = postService.listLatestRssPosts(10);
|
||||||
|
String base = trimTrailingSlash(websiteUrl);
|
||||||
|
|
||||||
|
StringBuilder sb = new StringBuilder(4096);
|
||||||
|
sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
|
||||||
|
sb.append("<rss version=\"2.0\" xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">");
|
||||||
|
sb.append("<channel>");
|
||||||
|
elem(sb, "title", cdata("OpenIsle RSS"));
|
||||||
|
elem(sb, "link", base + "/");
|
||||||
|
elem(sb, "description", cdata("Latest posts"));
|
||||||
|
ZonedDateTime updated = posts.stream()
|
||||||
|
.map(p -> p.getCreatedAt().atZone(ZoneId.systemDefault()))
|
||||||
|
.max(Comparator.naturalOrder())
|
||||||
|
.orElse(ZonedDateTime.now());
|
||||||
|
// channel lastBuildDate(GMT)
|
||||||
|
elem(sb, "lastBuildDate", toRfc1123Gmt(updated));
|
||||||
|
|
||||||
|
for (Post p : posts) {
|
||||||
|
String link = base + "/posts/" + p.getId();
|
||||||
|
|
||||||
|
// 1) Markdown -> HTML
|
||||||
|
String html = renderMarkdown(p.getContent());
|
||||||
|
|
||||||
|
// 2) Sanitize(白名单增强)
|
||||||
|
String safeHtml = sanitizeHtml(html);
|
||||||
|
|
||||||
|
// 3) 绝对化 href/src + 强制 rel/target
|
||||||
|
String absHtml = absolutifyHtml(safeHtml, base);
|
||||||
|
|
||||||
|
// 4) 纯文本摘要(用于 <description>)
|
||||||
|
String plain = textSummary(absHtml, 180);
|
||||||
|
|
||||||
|
// 5) enclosure(首图,已绝对化)
|
||||||
|
String enclosure = firstImage(p.getContent());
|
||||||
|
if (enclosure == null) {
|
||||||
|
// 如果 Markdown 没有图,尝试从渲染后的 HTML 再抓一次
|
||||||
|
enclosure = firstImage(absHtml);
|
||||||
|
}
|
||||||
|
if (enclosure != null) {
|
||||||
|
enclosure = absolutifyUrl(enclosure, base);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6) 构造优雅的附加区块(原文链接 + 精选评论),编入 <content:encoded>
|
||||||
|
List<Comment> topComments = commentService
|
||||||
|
.getCommentsForPost(p.getId(), CommentSort.MOST_INTERACTIONS);
|
||||||
|
topComments = topComments.subList(0, Math.min(10, topComments.size()));
|
||||||
|
String footerHtml = buildFooterHtml(base, link, topComments);
|
||||||
|
|
||||||
|
sb.append("<item>");
|
||||||
|
elem(sb, "title", cdata(nullSafe(p.getTitle())));
|
||||||
|
elem(sb, "link", link);
|
||||||
|
sb.append("<guid isPermaLink=\"true\">").append(link).append("</guid>");
|
||||||
|
elem(sb, "pubDate", toRfc1123Gmt(p.getCreatedAt().atZone(ZoneId.systemDefault())));
|
||||||
|
// 摘要
|
||||||
|
elem(sb, "description", cdata(plain));
|
||||||
|
// 全文(HTML):正文 + 优雅的 Markdown 区块(已转 HTML)
|
||||||
|
sb.append("<content:encoded><![CDATA[")
|
||||||
|
.append(absHtml)
|
||||||
|
.append(footerHtml)
|
||||||
|
.append("]]></content:encoded>");
|
||||||
|
// 首图 enclosure(图片类型)
|
||||||
|
if (enclosure != null) {
|
||||||
|
sb.append("<enclosure url=\"").append(escapeXml(enclosure)).append("\" type=\"")
|
||||||
|
.append(getMimeType(enclosure)).append("\" />");
|
||||||
|
}
|
||||||
|
sb.append("</item>");
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("</channel></rss>");
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ===================== Markdown → HTML ===================== */
|
||||||
|
|
||||||
|
private static String renderMarkdown(String md) {
|
||||||
|
if (md == null || md.isEmpty()) return "";
|
||||||
|
return MD_RENDERER.render(MD_PARSER.parse(md));
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ===================== Sanitize & 绝对化 ===================== */
|
||||||
|
|
||||||
|
private static String sanitizeHtml(String html) {
|
||||||
|
if (html == null) return "";
|
||||||
|
Safelist wl = Safelist.relaxed()
|
||||||
|
.addTags(
|
||||||
|
"pre","code","figure","figcaption","picture","source",
|
||||||
|
"table","thead","tbody","tr","th","td",
|
||||||
|
"h1","h2","h3","h4","h5","h6",
|
||||||
|
"hr","blockquote"
|
||||||
|
)
|
||||||
|
.addAttributes("a", "href", "title", "target", "rel")
|
||||||
|
.addAttributes("img", "src", "alt", "title", "width", "height")
|
||||||
|
.addAttributes("source", "srcset", "type", "media")
|
||||||
|
.addAttributes("code", "class")
|
||||||
|
.addAttributes("pre", "class")
|
||||||
|
.addProtocols("a", "href", "http", "https", "mailto")
|
||||||
|
.addProtocols("img", "src", "http", "https", "data")
|
||||||
|
.addProtocols("source", "srcset", "http", "https");
|
||||||
|
// 清除所有 on* 事件、style(避免阅读器环境差异)
|
||||||
|
return Jsoup.clean(html, wl);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String absolutifyHtml(String html, String baseUrl) {
|
||||||
|
if (html == null || html.isEmpty()) return "";
|
||||||
|
Document doc = Jsoup.parseBodyFragment(html, baseUrl);
|
||||||
|
// a[href]
|
||||||
|
for (Element a : doc.select("a[href]")) {
|
||||||
|
String href = a.attr("href");
|
||||||
|
String abs = absolutifyUrl(href, baseUrl);
|
||||||
|
a.attr("href", abs);
|
||||||
|
// 强制外链安全属性
|
||||||
|
a.attr("rel", "noopener noreferrer nofollow");
|
||||||
|
a.attr("target", "_blank");
|
||||||
|
}
|
||||||
|
// img[src]
|
||||||
|
for (Element img : doc.select("img[src]")) {
|
||||||
|
String src = img.attr("src");
|
||||||
|
String abs = absolutifyUrl(src, baseUrl);
|
||||||
|
img.attr("src", abs);
|
||||||
|
}
|
||||||
|
// source[srcset] (picture/webp)
|
||||||
|
for (Element s : doc.select("source[srcset]")) {
|
||||||
|
String srcset = s.attr("srcset");
|
||||||
|
s.attr("srcset", absolutifySrcset(srcset, baseUrl));
|
||||||
|
}
|
||||||
|
return doc.body().html();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String absolutifyUrl(String url, String baseUrl) {
|
||||||
|
if (url == null || url.isEmpty()) return url;
|
||||||
|
String u = url.trim();
|
||||||
|
if (u.startsWith("//")) {
|
||||||
|
return "https:" + u;
|
||||||
|
}
|
||||||
|
if (u.startsWith("#")) {
|
||||||
|
// 保留页面内锚点:拼接到首页(也可拼接到当前帖子的 link,但此处无上下文)
|
||||||
|
return baseUrl + "/" + u;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
URI base = URI.create(ensureTrailingSlash(baseUrl));
|
||||||
|
URI abs = base.resolve(u);
|
||||||
|
return abs.toString();
|
||||||
|
} catch (Exception e) {
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String absolutifySrcset(String srcset, String baseUrl) {
|
||||||
|
if (srcset == null || srcset.isEmpty()) return srcset;
|
||||||
|
String[] parts = srcset.split(",");
|
||||||
|
List<String> out = new ArrayList<>(parts.length);
|
||||||
|
for (String part : parts) {
|
||||||
|
String p = part.trim();
|
||||||
|
if (p.isEmpty()) continue;
|
||||||
|
String[] seg = p.split("\\s+");
|
||||||
|
String url = seg[0];
|
||||||
|
String size = seg.length > 1 ? seg[1] : "";
|
||||||
|
out.add(absolutifyUrl(url, baseUrl) + (size.isEmpty() ? "" : " " + size));
|
||||||
|
}
|
||||||
|
return String.join(", ", out);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ===================== 摘要 & enclosure ===================== */
|
||||||
|
|
||||||
|
private static String textSummary(String html, int maxLen) {
|
||||||
|
if (html == null) return "";
|
||||||
|
String text = Jsoup.parse(html).text().replaceAll("\\s+", " ").trim();
|
||||||
|
if (text.length() <= maxLen) return text;
|
||||||
|
return text.substring(0, maxLen) + "…";
|
||||||
|
}
|
||||||
|
|
||||||
|
private String firstImage(String content) {
|
||||||
|
if (content == null) return null;
|
||||||
|
Matcher m = MD_IMAGE.matcher(content);
|
||||||
|
if (m.find()) return m.group(1);
|
||||||
|
m = HTML_IMAGE.matcher(content);
|
||||||
|
if (m.find()) return m.group(1);
|
||||||
|
// 再从纯 HTML 里解析一次(如果传入的是渲染后的)
|
||||||
|
try {
|
||||||
|
Document doc = Jsoup.parse(content);
|
||||||
|
Element img = doc.selectFirst("img[src]");
|
||||||
|
if (img != null) return img.attr("src");
|
||||||
|
} catch (Exception ignored) {}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String getMimeType(String url) {
|
||||||
|
String lower = url == null ? "" : url.toLowerCase(Locale.ROOT);
|
||||||
|
if (lower.endsWith(".png")) return "image/png";
|
||||||
|
if (lower.endsWith(".gif")) return "image/gif";
|
||||||
|
if (lower.endsWith(".webp")) return "image/webp";
|
||||||
|
if (lower.endsWith(".svg")) return "image/svg+xml";
|
||||||
|
if (lower.endsWith(".avif")) return "image/avif";
|
||||||
|
if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
|
||||||
|
// 默认兜底
|
||||||
|
return "image/jpeg";
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ===================== 附加区块(原文链接 + 精选评论) ===================== */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 将“原文链接 + 精选评论(最多 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 ===================== */
|
||||||
|
|
||||||
|
private static String toRfc1123Gmt(ZonedDateTime zdt) {
|
||||||
|
return zdt.withZoneSameInstant(ZoneId.of("GMT")).format(RFC1123);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String cdata(String s) {
|
||||||
|
if (s == null) return "<![CDATA[]]>";
|
||||||
|
// 防止出现 "]]>" 终止标记破坏 CDATA
|
||||||
|
return "<![CDATA[" + s.replace("]]>", "]]]]><![CDATA[>") + "]]>";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void elem(StringBuilder sb, String name, String value) {
|
||||||
|
sb.append('<').append(name).append('>').append(value).append("</").append(name).append('>');
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String escapeXml(String s) {
|
||||||
|
if (s == null) return "";
|
||||||
|
return s.replace("&", "&").replace("<", "<").replace(">", ">")
|
||||||
|
.replace("\"", """).replace("'", "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String trimTrailingSlash(String s) {
|
||||||
|
if (s == null) return "";
|
||||||
|
return s.endsWith("/") ? s.substring(0, s.length() - 1) : s;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String ensureTrailingSlash(String s) {
|
||||||
|
if (s == null || s.isEmpty()) return "/";
|
||||||
|
return s.endsWith("/") ? s : s + "/";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String nullSafe(String s) { return s == null ? "" : s; }
|
||||||
|
}
|
||||||
@@ -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
backend/src/main/java/com/openisle/dto/PointHistoryDto.java
Normal file
23
backend/src/main/java/com/openisle/dto/PointHistoryDto.java
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
package com.openisle.dto;
|
||||||
|
|
||||||
|
import com.openisle.model.PointHistoryType;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class PointHistoryDto {
|
||||||
|
private Long id;
|
||||||
|
private PointHistoryType type;
|
||||||
|
private int amount;
|
||||||
|
private int balance;
|
||||||
|
private Long postId;
|
||||||
|
private String postTitle;
|
||||||
|
private Long commentId;
|
||||||
|
private String commentContent;
|
||||||
|
private Long fromUserId;
|
||||||
|
private String fromUserName;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,5 +31,7 @@ public class PostSummaryDto {
|
|||||||
private int pointReward;
|
private int pointReward;
|
||||||
private PostType type;
|
private PostType type;
|
||||||
private LotteryDto lottery;
|
private LotteryDto lottery;
|
||||||
|
private boolean rssExcluded;
|
||||||
|
private boolean closed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package com.openisle.mapper;
|
||||||
|
|
||||||
|
import com.openisle.dto.PointHistoryDto;
|
||||||
|
import com.openisle.model.PointHistory;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class PointHistoryMapper {
|
||||||
|
public PointHistoryDto toDto(PointHistory history) {
|
||||||
|
PointHistoryDto dto = new PointHistoryDto();
|
||||||
|
dto.setId(history.getId());
|
||||||
|
dto.setType(history.getType());
|
||||||
|
dto.setAmount(history.getAmount());
|
||||||
|
dto.setBalance(history.getBalance());
|
||||||
|
dto.setCreatedAt(history.getCreatedAt());
|
||||||
|
if (history.getPost() != null) {
|
||||||
|
dto.setPostId(history.getPost().getId());
|
||||||
|
dto.setPostTitle(history.getPost().getTitle());
|
||||||
|
}
|
||||||
|
if (history.getComment() != null) {
|
||||||
|
dto.setCommentId(history.getComment().getId());
|
||||||
|
dto.setCommentContent(history.getComment().getContent());
|
||||||
|
if (history.getComment().getPost() != null && dto.getPostId() == null) {
|
||||||
|
dto.setPostId(history.getComment().getPost().getId());
|
||||||
|
dto.setPostTitle(history.getComment().getPost().getTitle());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (history.getFromUser() != null) {
|
||||||
|
dto.setFromUserId(history.getFromUser().getId());
|
||||||
|
dto.setFromUserName(history.getFromUser().getUsername());
|
||||||
|
}
|
||||||
|
return dto;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -63,6 +63,8 @@ public class PostMapper {
|
|||||||
dto.setCommentCount(commentService.countComments(post.getId()));
|
dto.setCommentCount(commentService.countComments(post.getId()));
|
||||||
dto.setStatus(post.getStatus());
|
dto.setStatus(post.getStatus());
|
||||||
dto.setPinnedAt(post.getPinnedAt());
|
dto.setPinnedAt(post.getPinnedAt());
|
||||||
|
dto.setRssExcluded(post.getRssExcluded() == null || post.getRssExcluded());
|
||||||
|
dto.setClosed(post.isClosed());
|
||||||
|
|
||||||
List<ReactionDto> reactions = reactionService.getReactionsForPost(post.getId())
|
List<ReactionDto> reactions = reactionService.getReactionsForPost(post.getId())
|
||||||
.stream()
|
.stream()
|
||||||
@@ -84,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;
|
||||||
|
}
|
||||||
@@ -14,6 +14,8 @@ public enum NotificationType {
|
|||||||
POST_REVIEW_REQUEST,
|
POST_REVIEW_REQUEST,
|
||||||
/** Your post under review was approved or rejected */
|
/** Your post under review was approved or rejected */
|
||||||
POST_REVIEWED,
|
POST_REVIEWED,
|
||||||
|
/** An administrator deleted your post */
|
||||||
|
POST_DELETED,
|
||||||
/** A subscribed post received a new comment */
|
/** A subscribed post received a new comment */
|
||||||
POST_UPDATED,
|
POST_UPDATED,
|
||||||
/** Someone subscribed to your post */
|
/** Someone subscribed to your post */
|
||||||
@@ -38,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
|
||||||
}
|
}
|
||||||
|
|||||||
49
backend/src/main/java/com/openisle/model/PointHistory.java
Normal file
49
backend/src/main/java/com/openisle/model/PointHistory.java
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
package com.openisle.model;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
/** Point change history for a user. */
|
||||||
|
@Entity
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@Table(name = "point_histories")
|
||||||
|
public class PointHistory {
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||||
|
@JoinColumn(name = "user_id")
|
||||||
|
private User user;
|
||||||
|
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
@Column(nullable = false)
|
||||||
|
private PointHistoryType type;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
private int amount;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
private int balance;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "post_id")
|
||||||
|
private Post post;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "comment_id")
|
||||||
|
private Comment comment;
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "from_user_id")
|
||||||
|
private User fromUser;
|
||||||
|
|
||||||
|
@Column(name = "created_at", nullable = false)
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.openisle.model;
|
||||||
|
|
||||||
|
public enum PointHistoryType {
|
||||||
|
POST,
|
||||||
|
COMMENT,
|
||||||
|
POST_LIKED,
|
||||||
|
COMMENT_LIKED,
|
||||||
|
POST_LIKE_CANCELLED,
|
||||||
|
COMMENT_LIKE_CANCELLED,
|
||||||
|
INVITE,
|
||||||
|
FEATURE,
|
||||||
|
SYSTEM_ONLINE,
|
||||||
|
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
|
||||||
@@ -64,7 +64,12 @@ public class Post {
|
|||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
private PostType type = PostType.NORMAL;
|
private PostType type = PostType.NORMAL;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
private boolean closed = false;
|
||||||
|
|
||||||
@Column
|
@Column
|
||||||
private LocalDateTime pinnedAt;
|
private LocalDateTime pinnedAt;
|
||||||
|
|
||||||
|
@Column(nullable = true)
|
||||||
|
private Boolean rssExcluded = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,7 +5,10 @@ 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.Pageable;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -13,7 +16,12 @@ import java.util.List;
|
|||||||
public interface NotificationRepository extends JpaRepository<Notification, Long> {
|
public interface NotificationRepository extends JpaRepository<Notification, Long> {
|
||||||
List<Notification> findByUserOrderByCreatedAtDesc(User user);
|
List<Notification> findByUserOrderByCreatedAtDesc(User user);
|
||||||
List<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read);
|
List<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read);
|
||||||
|
Page<Notification> findByUserOrderByCreatedAtDesc(User user, Pageable pageable);
|
||||||
|
Page<Notification> findByUserAndReadOrderByCreatedAtDesc(User user, boolean read, Pageable pageable);
|
||||||
|
Page<Notification> findByUserAndTypeNotInOrderByCreatedAtDesc(User user, java.util.Collection<NotificationType> types, Pageable pageable);
|
||||||
|
Page<Notification> findByUserAndReadAndTypeNotInOrderByCreatedAtDesc(User user, boolean read, java.util.Collection<NotificationType> types, Pageable pageable);
|
||||||
long countByUserAndRead(User user, boolean read);
|
long countByUserAndRead(User user, boolean read);
|
||||||
|
long countByUserAndReadAndTypeNotIn(User user, boolean read, java.util.Collection<NotificationType> types);
|
||||||
List<Notification> findByPost(Post post);
|
List<Notification> findByPost(Post post);
|
||||||
List<Notification> findByComment(Comment comment);
|
List<Notification> findByComment(Comment comment);
|
||||||
|
|
||||||
@@ -22,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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package com.openisle.repository;
|
||||||
|
|
||||||
|
import com.openisle.model.PointHistory;
|
||||||
|
import com.openisle.model.User;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface PointHistoryRepository extends JpaRepository<PointHistory, Long> {
|
||||||
|
List<PointHistory> findByUserOrderByIdDesc(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);
|
||||||
|
|
||||||
@@ -106,4 +108,6 @@ public interface PostRepository extends JpaRepository<Post, Long> {
|
|||||||
"WHERE p.createdAt >= :start AND p.createdAt < :end GROUP BY d ORDER BY d")
|
"WHERE p.createdAt >= :start AND p.createdAt < :end GROUP BY d ORDER BY d")
|
||||||
java.util.List<Object[]> countDailyRange(@Param("start") LocalDateTime start,
|
java.util.List<Object[]> countDailyRange(@Param("start") LocalDateTime start,
|
||||||
@Param("end") LocalDateTime end);
|
@Param("end") LocalDateTime end);
|
||||||
|
|
||||||
|
List<Post> findByStatusAndRssExcludedFalseOrderByCreatedAtDesc(PostStatus status, Pageable pageable);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -52,6 +52,9 @@ public class CommentService {
|
|||||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||||
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"));
|
||||||
|
if (post.isClosed()) {
|
||||||
|
throw new IllegalStateException("Post closed");
|
||||||
|
}
|
||||||
Comment comment = new Comment();
|
Comment comment = new Comment();
|
||||||
comment.setAuthor(author);
|
comment.setAuthor(author);
|
||||||
comment.setPost(post);
|
comment.setPost(post);
|
||||||
@@ -94,6 +97,9 @@ public class CommentService {
|
|||||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||||
Comment parent = commentRepository.findById(parentId)
|
Comment parent = commentRepository.findById(parentId)
|
||||||
.orElseThrow(() -> new IllegalArgumentException("Comment not found"));
|
.orElseThrow(() -> new IllegalArgumentException("Comment not found"));
|
||||||
|
if (parent.getPost().isClosed()) {
|
||||||
|
throw new IllegalStateException("Post closed");
|
||||||
|
}
|
||||||
Comment comment = new Comment();
|
Comment comment = new Comment();
|
||||||
comment.setAuthor(author);
|
comment.setAuthor(author);
|
||||||
comment.setPost(parent.getPost());
|
comment.setPost(parent.getPost());
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.openisle.model.User;
|
|||||||
import com.openisle.repository.InviteTokenRepository;
|
import com.openisle.repository.InviteTokenRepository;
|
||||||
import com.openisle.repository.UserRepository;
|
import com.openisle.repository.UserRepository;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@@ -18,6 +19,12 @@ public class InviteService {
|
|||||||
private final JwtService jwtService;
|
private final JwtService jwtService;
|
||||||
private final PointService pointService;
|
private final PointService pointService;
|
||||||
|
|
||||||
|
@Value
|
||||||
|
public class InviteValidateResult {
|
||||||
|
InviteToken inviteToken;
|
||||||
|
boolean validate;
|
||||||
|
}
|
||||||
|
|
||||||
public String generate(String username) {
|
public String generate(String username) {
|
||||||
User inviter = userRepository.findByUsername(username).orElseThrow();
|
User inviter = userRepository.findByUsername(username).orElseThrow();
|
||||||
LocalDate today = LocalDate.now();
|
LocalDate today = LocalDate.now();
|
||||||
@@ -35,20 +42,23 @@ public class InviteService {
|
|||||||
return token;
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean validate(String token) {
|
public InviteValidateResult validate(String token) {
|
||||||
|
if (token == null || token.isEmpty()) {
|
||||||
|
return new InviteValidateResult(null, false);
|
||||||
|
}
|
||||||
try {
|
try {
|
||||||
jwtService.validateAndGetSubjectForInvite(token);
|
jwtService.validateAndGetSubjectForInvite(token);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
return false;
|
return new InviteValidateResult(null, false);
|
||||||
}
|
}
|
||||||
InviteToken invite = inviteTokenRepository.findById(token).orElse(null);
|
InviteToken invite = inviteTokenRepository.findById(token).orElse(null);
|
||||||
return invite != null && invite.getUsageCount() < 3;
|
return new InviteValidateResult(invite, invite != null && invite.getUsageCount() < 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void consume(String token) {
|
public void consume(String token, String newUserName) {
|
||||||
InviteToken invite = inviteTokenRepository.findById(token).orElseThrow();
|
InviteToken invite = inviteTokenRepository.findById(token).orElseThrow();
|
||||||
invite.setUsageCount(invite.getUsageCount() + 1);
|
invite.setUsageCount(invite.getUsageCount() + 1);
|
||||||
inviteTokenRepository.save(invite);
|
inviteTokenRepository.save(invite);
|
||||||
pointService.awardForInvite(invite.getInviter().getUsername());
|
pointService.awardForInvite(invite.getInviter().getUsername(), newUserName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,7 +23,6 @@ import java.util.HashSet;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
/** Service for creating and retrieving notifications. */
|
/** Service for creating and retrieving notifications. */
|
||||||
@Service
|
@Service
|
||||||
@@ -115,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.
|
||||||
@@ -180,17 +187,26 @@ public class NotificationService {
|
|||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Notification> listNotifications(String username, Boolean read) {
|
public List<Notification> listNotifications(String username, Boolean read, int page, int size) {
|
||||||
User user = userRepository.findByUsername(username)
|
User user = userRepository.findByUsername(username)
|
||||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||||
Set<NotificationType> disabled = user.getDisabledNotificationTypes();
|
Set<NotificationType> disabled = user.getDisabledNotificationTypes();
|
||||||
List<Notification> list;
|
org.springframework.data.domain.Pageable pageable = org.springframework.data.domain.PageRequest.of(page, size);
|
||||||
|
org.springframework.data.domain.Page<Notification> result;
|
||||||
if (read == null) {
|
if (read == null) {
|
||||||
list = notificationRepository.findByUserOrderByCreatedAtDesc(user);
|
if (disabled.isEmpty()) {
|
||||||
|
result = notificationRepository.findByUserOrderByCreatedAtDesc(user, pageable);
|
||||||
|
} else {
|
||||||
|
result = notificationRepository.findByUserAndTypeNotInOrderByCreatedAtDesc(user, disabled, pageable);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
list = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read);
|
if (disabled.isEmpty()) {
|
||||||
|
result = notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, read, pageable);
|
||||||
|
} else {
|
||||||
|
result = notificationRepository.findByUserAndReadAndTypeNotInOrderByCreatedAtDesc(user, read, disabled, pageable);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return list.stream().filter(n -> !disabled.contains(n.getType())).collect(Collectors.toList());
|
return result.getContent();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void markRead(String username, List<Long> ids) {
|
public void markRead(String username, List<Long> ids) {
|
||||||
@@ -209,8 +225,10 @@ public class NotificationService {
|
|||||||
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"));
|
||||||
Set<NotificationType> disabled = user.getDisabledNotificationTypes();
|
Set<NotificationType> disabled = user.getDisabledNotificationTypes();
|
||||||
return notificationRepository.findByUserAndReadOrderByCreatedAtDesc(user, false).stream()
|
if (disabled.isEmpty()) {
|
||||||
.filter(n -> !disabled.contains(n.getType())).count();
|
return notificationRepository.countByUserAndRead(user, false);
|
||||||
|
}
|
||||||
|
return notificationRepository.countByUserAndReadAndTypeNotIn(user, false, disabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void notifyMentions(String content, User fromUser, Post post, Comment comment) {
|
public void notifyMentions(String content, User fromUser, Post post, Comment comment) {
|
||||||
|
|||||||
@@ -3,8 +3,11 @@ package com.openisle.service;
|
|||||||
import com.openisle.exception.FieldException;
|
import com.openisle.exception.FieldException;
|
||||||
import com.openisle.exception.NotFoundException;
|
import com.openisle.exception.NotFoundException;
|
||||||
import com.openisle.model.PointGood;
|
import com.openisle.model.PointGood;
|
||||||
|
import com.openisle.model.PointHistory;
|
||||||
|
import com.openisle.model.PointHistoryType;
|
||||||
import com.openisle.model.User;
|
import com.openisle.model.User;
|
||||||
import com.openisle.repository.PointGoodRepository;
|
import com.openisle.repository.PointGoodRepository;
|
||||||
|
import com.openisle.repository.PointHistoryRepository;
|
||||||
import com.openisle.repository.UserRepository;
|
import com.openisle.repository.UserRepository;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -18,6 +21,7 @@ public class PointMallService {
|
|||||||
private final PointGoodRepository pointGoodRepository;
|
private final PointGoodRepository pointGoodRepository;
|
||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
private final NotificationService notificationService;
|
private final NotificationService notificationService;
|
||||||
|
private final PointHistoryRepository pointHistoryRepository;
|
||||||
|
|
||||||
public List<PointGood> listGoods() {
|
public List<PointGood> listGoods() {
|
||||||
return pointGoodRepository.findAll();
|
return pointGoodRepository.findAll();
|
||||||
@@ -32,6 +36,13 @@ public class PointMallService {
|
|||||||
user.setPoint(user.getPoint() - good.getCost());
|
user.setPoint(user.getPoint() - good.getCost());
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
notificationService.createPointRedeemNotifications(user, good.getName() + ": " + contact);
|
notificationService.createPointRedeemNotifications(user, good.getName() + ": " + contact);
|
||||||
|
PointHistory history = new PointHistory();
|
||||||
|
history.setUser(user);
|
||||||
|
history.setType(PointHistoryType.REDEEM);
|
||||||
|
history.setAmount(-good.getCost());
|
||||||
|
history.setBalance(user.getPoint());
|
||||||
|
history.setCreatedAt(java.time.LocalDateTime.now());
|
||||||
|
pointHistoryRepository.save(history);
|
||||||
return user.getPoint();
|
return user.getPoint();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
package com.openisle.service;
|
package com.openisle.service;
|
||||||
|
|
||||||
import com.openisle.model.PointLog;
|
import com.openisle.model.*;
|
||||||
import com.openisle.model.User;
|
|
||||||
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
|
||||||
@@ -16,19 +20,39 @@ public class PointService {
|
|||||||
private final PointLogRepository pointLogRepository;
|
private final PointLogRepository pointLogRepository;
|
||||||
private final PostRepository postRepository;
|
private final PostRepository postRepository;
|
||||||
private final CommentRepository commentRepository;
|
private final CommentRepository commentRepository;
|
||||||
|
private final PointHistoryRepository pointHistoryRepository;
|
||||||
|
|
||||||
public int awardForPost(String userName) {
|
public int awardForPost(String userName, Long postId) {
|
||||||
User user = userRepository.findByUsername(userName).orElseThrow();
|
User user = userRepository.findByUsername(userName).orElseThrow();
|
||||||
PointLog log = getTodayLog(user);
|
PointLog log = getTodayLog(user);
|
||||||
if (log.getPostCount() > 1) return 0;
|
if (log.getPostCount() > 1) return 0;
|
||||||
log.setPostCount(log.getPostCount() + 1);
|
log.setPostCount(log.getPostCount() + 1);
|
||||||
pointLogRepository.save(log);
|
pointLogRepository.save(log);
|
||||||
return addPoint(user, 30);
|
Post post = postRepository.findById(postId).orElseThrow();
|
||||||
|
return addPoint(user, 30, PointHistoryType.POST, post, null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int awardForInvite(String userName) {
|
public int awardForInvite(String userName, String inviteeName) {
|
||||||
User user = userRepository.findByUsername(userName).orElseThrow();
|
User user = userRepository.findByUsername(userName).orElseThrow();
|
||||||
return addPoint(user, 500);
|
User invitee = userRepository.findByUsername(inviteeName).orElseThrow();
|
||||||
|
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) {
|
||||||
@@ -45,20 +69,41 @@ public class PointService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private int addPoint(User user, int amount) {
|
private int addPoint(User user, int amount, PointHistoryType type,
|
||||||
|
Post post, Comment comment, User fromUser) {
|
||||||
|
if (pointHistoryRepository.countByUser(user) == 0) {
|
||||||
|
recordHistory(user, PointHistoryType.SYSTEM_ONLINE, 0, null, null, null);
|
||||||
|
}
|
||||||
user.setPoint(user.getPoint() + amount);
|
user.setPoint(user.getPoint() + amount);
|
||||||
userRepository.save(user);
|
userRepository.save(user);
|
||||||
|
recordHistory(user, type, amount, post, comment, fromUser);
|
||||||
return amount;
|
return amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void recordHistory(User user, PointHistoryType type, int amount,
|
||||||
|
Post post, Comment comment, User fromUser) {
|
||||||
|
PointHistory history = new PointHistory();
|
||||||
|
history.setUser(user);
|
||||||
|
history.setType(type);
|
||||||
|
history.setAmount(amount);
|
||||||
|
history.setBalance(user.getPoint());
|
||||||
|
history.setPost(post);
|
||||||
|
history.setComment(comment);
|
||||||
|
history.setFromUser(fromUser);
|
||||||
|
history.setCreatedAt(java.time.LocalDateTime.now());
|
||||||
|
pointHistoryRepository.save(history);
|
||||||
|
}
|
||||||
|
|
||||||
// 同时为评论者和发帖人增加积分,返回值为评论者增加的积分数
|
// 同时为评论者和发帖人增加积分,返回值为评论者增加的积分数
|
||||||
// 注意需要考虑发帖和回复是同一人的场景
|
// 注意需要考虑发帖和回复是同一人的场景
|
||||||
public int awardForComment(String commenterName, Long postId) {
|
public int awardForComment(String commenterName, Long postId, Long commentId) {
|
||||||
// 标记评论者是否已达到积分奖励上限
|
// 标记评论者是否已达到积分奖励上限
|
||||||
boolean isTheRewardCapped = false;
|
boolean isTheRewardCapped = false;
|
||||||
|
|
||||||
// 根据帖子id找到发帖人
|
// 根据帖子id找到发帖人
|
||||||
User poster = postRepository.findById(postId).orElseThrow().getAuthor();
|
Post post = postRepository.findById(postId).orElseThrow();
|
||||||
|
User poster = post.getAuthor();
|
||||||
|
Comment comment = commentRepository.findById(commentId).orElseThrow();
|
||||||
|
|
||||||
// 获取评论者的加分日志
|
// 获取评论者的加分日志
|
||||||
User commenter = userRepository.findByUsername(commenterName).orElseThrow();
|
User commenter = userRepository.findByUsername(commenterName).orElseThrow();
|
||||||
@@ -74,15 +119,15 @@ public class PointService {
|
|||||||
} else {
|
} else {
|
||||||
log.setCommentCount(log.getCommentCount() + 1);
|
log.setCommentCount(log.getCommentCount() + 1);
|
||||||
pointLogRepository.save(log);
|
pointLogRepository.save(log);
|
||||||
return addPoint(commenter, 10);
|
return addPoint(commenter, 10, PointHistoryType.COMMENT, post, comment, null);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
addPoint(poster, 10);
|
addPoint(poster, 10, PointHistoryType.COMMENT, post, comment, commenter);
|
||||||
// 如果发帖人与评论者不是同一个,则根据是否达到积分上限来判断评论者加分情况
|
// 如果发帖人与评论者不是同一个,则根据是否达到积分上限来判断评论者加分情况
|
||||||
if (isTheRewardCapped) {
|
if (isTheRewardCapped) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
return addPoint(commenter, 10);
|
return addPoint(commenter, 10, PointHistoryType.COMMENT, post, comment, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -101,7 +146,18 @@ public class PointService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 如果不是同一个,则为发帖人加分
|
// 如果不是同一个,则为发帖人加分
|
||||||
return addPoint(poster, 10);
|
Post post = postRepository.findById(postId).orElseThrow();
|
||||||
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 考虑点赞者和评论者是同一个的情况
|
// 考虑点赞者和评论者是同一个的情况
|
||||||
@@ -118,7 +174,49 @@ public class PointService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 如果不是同一个,则为发帖人加分
|
// 如果不是同一个,则为发帖人加分
|
||||||
return addPoint(commenter, 10);
|
Comment comment = commentRepository.findById(commentId).orElseThrow();
|
||||||
|
Post post = comment.getPost();
|
||||||
|
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) {
|
||||||
|
User user = userRepository.findByUsername(userName).orElseThrow();
|
||||||
|
if (pointHistoryRepository.countByUser(user) == 0) {
|
||||||
|
recordHistory(user, PointHistoryType.SYSTEM_ONLINE, 0, null, null, null);
|
||||||
|
}
|
||||||
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,6 +135,26 @@ public class PostService {
|
|||||||
this.publishMode = publishMode;
|
this.publishMode = publishMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Post> listLatestRssPosts(int limit) {
|
||||||
|
Pageable pageable = PageRequest.of(0, limit, Sort.by(Sort.Direction.DESC, "createdAt"));
|
||||||
|
return postRepository.findByStatusAndRssExcludedFalseOrderByCreatedAtDesc(PostStatus.PUBLISHED, pageable);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Post excludeFromRss(Long id) {
|
||||||
|
Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||||
|
post.setRssExcluded(true);
|
||||||
|
return postRepository.save(post);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Post includeInRss(Long id) {
|
||||||
|
Post post = postRepository.findById(id).orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||||
|
post.setRssExcluded(false);
|
||||||
|
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,
|
||||||
Long categoryId,
|
Long categoryId,
|
||||||
String title,
|
String title,
|
||||||
@@ -141,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,
|
||||||
@@ -165,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;
|
||||||
@@ -227,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
|
||||||
@@ -441,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);
|
||||||
}
|
}
|
||||||
@@ -495,6 +553,30 @@ public class PostService {
|
|||||||
return postRepository.save(post);
|
return postRepository.save(post);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Post closePost(Long id, String username) {
|
||||||
|
Post post = postRepository.findById(id)
|
||||||
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||||
|
User user = userRepository.findByUsername(username)
|
||||||
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||||
|
if (!user.getId().equals(post.getAuthor().getId()) && user.getRole() != Role.ADMIN) {
|
||||||
|
throw new IllegalArgumentException("Unauthorized");
|
||||||
|
}
|
||||||
|
post.setClosed(true);
|
||||||
|
return postRepository.save(post);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Post reopenPost(Long id, String username) {
|
||||||
|
Post post = postRepository.findById(id)
|
||||||
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("Post not found"));
|
||||||
|
User user = userRepository.findByUsername(username)
|
||||||
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||||
|
if (!user.getId().equals(post.getAuthor().getId()) && user.getRole() != Role.ADMIN) {
|
||||||
|
throw new IllegalArgumentException("Unauthorized");
|
||||||
|
}
|
||||||
|
post.setClosed(false);
|
||||||
|
return postRepository.save(post);
|
||||||
|
}
|
||||||
|
|
||||||
@org.springframework.transaction.annotation.Transactional
|
@org.springframework.transaction.annotation.Transactional
|
||||||
public Post updatePost(Long id,
|
public Post updatePost(Long id,
|
||||||
String username,
|
String username,
|
||||||
@@ -538,7 +620,9 @@ 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"));
|
||||||
if (!user.getId().equals(post.getAuthor().getId()) && user.getRole() != Role.ADMIN) {
|
User author = post.getAuthor();
|
||||||
|
boolean adminDeleting = !user.getId().equals(author.getId()) && user.getRole() == Role.ADMIN;
|
||||||
|
if (!user.getId().equals(author.getId()) && user.getRole() != Role.ADMIN) {
|
||||||
throw new IllegalArgumentException("Unauthorized");
|
throw new IllegalArgumentException("Unauthorized");
|
||||||
}
|
}
|
||||||
for (Comment c : commentRepository.findByPostAndParentIsNullOrderByCreatedAtAsc(post)) {
|
for (Comment c : commentRepository.findByPostAndParentIsNullOrderByCreatedAtAsc(post)) {
|
||||||
@@ -555,7 +639,12 @@ public class PostService {
|
|||||||
future.cancel(false);
|
future.cancel(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
String title = post.getTitle();
|
||||||
postRepository.delete(post);
|
postRepository.delete(post);
|
||||||
|
if (adminDeleting) {
|
||||||
|
notificationService.createNotification(author, NotificationType.POST_DELETED,
|
||||||
|
null, null, null, user, null, title);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public java.util.List<Post> getPostsByIds(java.util.List<Long> ids) {
|
public java.util.List<Post> getPostsByIds(java.util.List<Long> ids) {
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ public class UserService {
|
|||||||
public User registerWithInvite(String username, String email, String password) {
|
public User registerWithInvite(String username, String email, String password) {
|
||||||
User user = register(username, email, password, "", com.openisle.model.RegisterMode.DIRECT);
|
User user = register(username, email, password, "", com.openisle.model.RegisterMode.DIRECT);
|
||||||
user.setVerified(true);
|
user.setVerified(true);
|
||||||
user.setVerificationCode(null);
|
user.setVerificationCode(genCode());
|
||||||
return userRepository.save(user);
|
return userRepository.save(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE posts ADD COLUMN rss_excluded BOOLEAN NOT NULL DEFAULT 0;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE lottery_posts ADD COLUMN point_cost INT NOT NULL DEFAULT 0;
|
||||||
@@ -45,7 +45,7 @@ class NotificationControllerTest {
|
|||||||
p.setId(2L);
|
p.setId(2L);
|
||||||
n.setPost(p);
|
n.setPost(p);
|
||||||
n.setCreatedAt(LocalDateTime.now());
|
n.setCreatedAt(LocalDateTime.now());
|
||||||
when(notificationService.listNotifications("alice", null))
|
when(notificationService.listNotifications("alice", null, 0, 30))
|
||||||
.thenReturn(List.of(n));
|
.thenReturn(List.of(n));
|
||||||
|
|
||||||
NotificationDto dto = new NotificationDto();
|
NotificationDto dto = new NotificationDto();
|
||||||
@@ -62,6 +62,24 @@ class NotificationControllerTest {
|
|||||||
.andExpect(jsonPath("$[0].post.id").value(2));
|
.andExpect(jsonPath("$[0].post.id").value(2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void listUnreadNotifications() throws Exception {
|
||||||
|
Notification n = new Notification();
|
||||||
|
n.setId(5L);
|
||||||
|
n.setType(NotificationType.POST_VIEWED);
|
||||||
|
when(notificationService.listNotifications("alice", false, 0, 30))
|
||||||
|
.thenReturn(List.of(n));
|
||||||
|
|
||||||
|
NotificationDto dto = new NotificationDto();
|
||||||
|
dto.setId(5L);
|
||||||
|
when(notificationMapper.toDto(n)).thenReturn(dto);
|
||||||
|
|
||||||
|
mockMvc.perform(get("/api/notifications/unread")
|
||||||
|
.principal(new UsernamePasswordAuthenticationToken("alice","p")))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$[0].id").value(5));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void markReadEndpoint() throws Exception {
|
void markReadEndpoint() throws Exception {
|
||||||
mockMvc.perform(post("/api/notifications/read")
|
mockMvc.perform(post("/api/notifications/read")
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ import org.mockito.Mockito;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import org.springframework.data.domain.PageImpl;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
import static org.mockito.Mockito.*;
|
import static org.mockito.Mockito.*;
|
||||||
@@ -62,15 +65,17 @@ class NotificationServiceTest {
|
|||||||
User user = new User();
|
User user = new User();
|
||||||
user.setId(2L);
|
user.setId(2L);
|
||||||
user.setUsername("bob");
|
user.setUsername("bob");
|
||||||
|
user.setDisabledNotificationTypes(new HashSet<>());
|
||||||
when(uRepo.findByUsername("bob")).thenReturn(Optional.of(user));
|
when(uRepo.findByUsername("bob")).thenReturn(Optional.of(user));
|
||||||
|
|
||||||
Notification n = new Notification();
|
Notification n = new Notification();
|
||||||
when(nRepo.findByUserOrderByCreatedAtDesc(user)).thenReturn(List.of(n));
|
when(nRepo.findByUserOrderByCreatedAtDesc(eq(user), any(Pageable.class)))
|
||||||
|
.thenReturn(new PageImpl<>(List.of(n)));
|
||||||
|
|
||||||
List<Notification> list = service.listNotifications("bob", null);
|
List<Notification> list = service.listNotifications("bob", null, 0, 10);
|
||||||
|
|
||||||
assertEquals(1, list.size());
|
assertEquals(1, list.size());
|
||||||
verify(nRepo).findByUserOrderByCreatedAtDesc(user);
|
verify(nRepo).findByUserOrderByCreatedAtDesc(eq(user), any(Pageable.class));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -87,6 +92,7 @@ class NotificationServiceTest {
|
|||||||
User user = new User();
|
User user = new User();
|
||||||
user.setId(3L);
|
user.setId(3L);
|
||||||
user.setUsername("carl");
|
user.setUsername("carl");
|
||||||
|
user.setDisabledNotificationTypes(new HashSet<>());
|
||||||
when(uRepo.findByUsername("carl")).thenReturn(Optional.of(user));
|
when(uRepo.findByUsername("carl")).thenReturn(Optional.of(user));
|
||||||
when(nRepo.countByUserAndRead(user, false)).thenReturn(5L);
|
when(nRepo.countByUserAndRead(user, false)).thenReturn(5L);
|
||||||
|
|
||||||
@@ -96,6 +102,56 @@ class NotificationServiceTest {
|
|||||||
verify(nRepo).countByUserAndRead(user, false);
|
verify(nRepo).countByUserAndRead(user, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void listNotificationsFiltersDisabledTypes() {
|
||||||
|
NotificationRepository nRepo = mock(NotificationRepository.class);
|
||||||
|
UserRepository uRepo = mock(UserRepository.class);
|
||||||
|
ReactionRepository rRepo = mock(ReactionRepository.class);
|
||||||
|
EmailSender email = mock(EmailSender.class);
|
||||||
|
PushNotificationService push = mock(PushNotificationService.class);
|
||||||
|
Executor executor = Runnable::run;
|
||||||
|
NotificationService service = new NotificationService(nRepo, uRepo, email, push, rRepo, executor);
|
||||||
|
org.springframework.test.util.ReflectionTestUtils.setField(service, "websiteUrl", "https://ex.com");
|
||||||
|
|
||||||
|
User user = new User();
|
||||||
|
user.setId(4L);
|
||||||
|
user.setUsername("dana");
|
||||||
|
when(uRepo.findByUsername("dana")).thenReturn(Optional.of(user));
|
||||||
|
|
||||||
|
Notification n = new Notification();
|
||||||
|
when(nRepo.findByUserAndTypeNotInOrderByCreatedAtDesc(eq(user), eq(user.getDisabledNotificationTypes()), any(Pageable.class)))
|
||||||
|
.thenReturn(new PageImpl<>(List.of(n)));
|
||||||
|
|
||||||
|
List<Notification> list = service.listNotifications("dana", null, 0, 10);
|
||||||
|
|
||||||
|
assertEquals(1, list.size());
|
||||||
|
verify(nRepo).findByUserAndTypeNotInOrderByCreatedAtDesc(eq(user), eq(user.getDisabledNotificationTypes()), any(Pageable.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void countUnreadFiltersDisabledTypes() {
|
||||||
|
NotificationRepository nRepo = mock(NotificationRepository.class);
|
||||||
|
UserRepository uRepo = mock(UserRepository.class);
|
||||||
|
ReactionRepository rRepo = mock(ReactionRepository.class);
|
||||||
|
EmailSender email = mock(EmailSender.class);
|
||||||
|
PushNotificationService push = mock(PushNotificationService.class);
|
||||||
|
Executor executor = Runnable::run;
|
||||||
|
NotificationService service = new NotificationService(nRepo, uRepo, email, push, rRepo, executor);
|
||||||
|
org.springframework.test.util.ReflectionTestUtils.setField(service, "websiteUrl", "https://ex.com");
|
||||||
|
|
||||||
|
User user = new User();
|
||||||
|
user.setId(5L);
|
||||||
|
user.setUsername("erin");
|
||||||
|
when(uRepo.findByUsername("erin")).thenReturn(Optional.of(user));
|
||||||
|
when(nRepo.countByUserAndReadAndTypeNotIn(eq(user), eq(false), eq(user.getDisabledNotificationTypes())))
|
||||||
|
.thenReturn(2L);
|
||||||
|
|
||||||
|
long count = service.countUnread("erin");
|
||||||
|
|
||||||
|
assertEquals(2L, count);
|
||||||
|
verify(nRepo).countByUserAndReadAndTypeNotIn(eq(user), eq(false), eq(user.getDisabledNotificationTypes()));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void createRegisterRequestNotificationsDeletesOldOnes() {
|
void createRegisterRequestNotificationsDeletesOldOnes() {
|
||||||
NotificationRepository nRepo = mock(NotificationRepository.class);
|
NotificationRepository nRepo = mock(NotificationRepository.class);
|
||||||
|
|||||||
@@ -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();
|
||||||
@@ -61,6 +62,59 @@ class PostServiceTest {
|
|||||||
verify(postRepo).delete(post);
|
verify(postRepo).delete(post);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void deletePostByAdminNotifiesAuthor() {
|
||||||
|
PostRepository postRepo = mock(PostRepository.class);
|
||||||
|
UserRepository userRepo = mock(UserRepository.class);
|
||||||
|
CategoryRepository catRepo = mock(CategoryRepository.class);
|
||||||
|
TagRepository tagRepo = mock(TagRepository.class);
|
||||||
|
LotteryPostRepository lotteryRepo = mock(LotteryPostRepository.class);
|
||||||
|
NotificationService notifService = mock(NotificationService.class);
|
||||||
|
SubscriptionService subService = mock(SubscriptionService.class);
|
||||||
|
CommentService commentService = mock(CommentService.class);
|
||||||
|
CommentRepository commentRepo = mock(CommentRepository.class);
|
||||||
|
ReactionRepository reactionRepo = mock(ReactionRepository.class);
|
||||||
|
PostSubscriptionRepository subRepo = mock(PostSubscriptionRepository.class);
|
||||||
|
NotificationRepository notificationRepo = mock(NotificationRepository.class);
|
||||||
|
PostReadService postReadService = mock(PostReadService.class);
|
||||||
|
ImageUploader imageUploader = mock(ImageUploader.class);
|
||||||
|
TaskScheduler taskScheduler = mock(TaskScheduler.class);
|
||||||
|
EmailSender emailSender = mock(EmailSender.class);
|
||||||
|
ApplicationContext context = mock(ApplicationContext.class);
|
||||||
|
PointService pointService = mock(PointService.class);
|
||||||
|
|
||||||
|
PostService service = new PostService(postRepo, userRepo, catRepo, tagRepo, lotteryRepo,
|
||||||
|
notifService, subService, commentService, commentRepo,
|
||||||
|
reactionRepo, subRepo, notificationRepo, postReadService,
|
||||||
|
imageUploader, taskScheduler, emailSender, context, pointService, PublishMode.DIRECT);
|
||||||
|
when(context.getBean(PostService.class)).thenReturn(service);
|
||||||
|
|
||||||
|
Post post = new Post();
|
||||||
|
post.setId(1L);
|
||||||
|
post.setTitle("T");
|
||||||
|
post.setContent("");
|
||||||
|
User author = new User();
|
||||||
|
author.setId(2L);
|
||||||
|
author.setRole(Role.USER);
|
||||||
|
post.setAuthor(author);
|
||||||
|
|
||||||
|
User admin = new User();
|
||||||
|
admin.setId(1L);
|
||||||
|
admin.setRole(Role.ADMIN);
|
||||||
|
|
||||||
|
when(postRepo.findById(1L)).thenReturn(Optional.of(post));
|
||||||
|
when(userRepo.findByUsername("admin")).thenReturn(Optional.of(admin));
|
||||||
|
when(commentRepo.findByPostAndParentIsNullOrderByCreatedAtAsc(post)).thenReturn(List.of());
|
||||||
|
when(reactionRepo.findByPost(post)).thenReturn(List.of());
|
||||||
|
when(subRepo.findByPost(post)).thenReturn(List.of());
|
||||||
|
when(notificationRepo.findByPost(post)).thenReturn(List.of());
|
||||||
|
|
||||||
|
service.deletePost(1L, "admin");
|
||||||
|
|
||||||
|
verify(notifService).createNotification(eq(author), eq(NotificationType.POST_DELETED), isNull(),
|
||||||
|
isNull(), isNull(), eq(admin), isNull(), eq("T"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void createPostRespectsRateLimit() {
|
void createPostRespectsRateLimit() {
|
||||||
PostRepository postRepo = mock(PostRepository.class);
|
PostRepository postRepo = mock(PostRepository.class);
|
||||||
@@ -80,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
|
||||||
@@ -113,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,18 +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 />
|
||||||
|
<MessageFloatWindow v-if="!isFloatMode" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -28,6 +38,8 @@
|
|||||||
import HeaderComponent from '~/components/HeaderComponent.vue'
|
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 MessageFloatWindow from '~/components/MessageFloatWindow.vue'
|
||||||
import { useIsMobile } from '~/utils/screen'
|
import { useIsMobile } from '~/utils/screen'
|
||||||
|
|
||||||
const isMobile = useIsMobile()
|
const isMobile = useIsMobile()
|
||||||
@@ -50,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') {
|
||||||
@@ -125,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);
|
||||||
/* 禁止滚动 */
|
/* 禁止滚动 */
|
||||||
@@ -90,7 +90,8 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.vditor-toolbar--pin {
|
.vditor-toolbar--pin {
|
||||||
top: var(--header-height) !important;
|
top: calc(var(--header-height) + 1px) !important;
|
||||||
|
z-index: 2000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vditor-panel {
|
.vditor-panel {
|
||||||
@@ -138,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%;
|
||||||
@@ -157,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 {
|
||||||
@@ -183,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: no-wrap;
|
|
||||||
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>
|
||||||
65
frontend_nuxt/components/BaseSwitch.vue
Normal file
65
frontend_nuxt/components/BaseSwitch.vue
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
<template>
|
||||||
|
<label class="switch">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
:checked="modelValue"
|
||||||
|
@change="$emit('update:modelValue', $event.target.checked)"
|
||||||
|
/>
|
||||||
|
<span class="slider"></span>
|
||||||
|
</label>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
defineProps({
|
||||||
|
modelValue: { type: Boolean, default: false },
|
||||||
|
})
|
||||||
|
|
||||||
|
defineEmits(['update:modelValue'])
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.switch {
|
||||||
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
|
width: 40px;
|
||||||
|
height: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.switch input {
|
||||||
|
opacity: 0;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slider {
|
||||||
|
position: absolute;
|
||||||
|
cursor: pointer;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
background-color: #ccc;
|
||||||
|
transition: 0.2s;
|
||||||
|
border-radius: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.slider:before {
|
||||||
|
position: absolute;
|
||||||
|
content: '';
|
||||||
|
height: 16px;
|
||||||
|
width: 16px;
|
||||||
|
left: 2px;
|
||||||
|
bottom: 2px;
|
||||||
|
background-color: white;
|
||||||
|
transition: 0.2s;
|
||||||
|
border-radius: 50%;
|
||||||
|
}
|
||||||
|
|
||||||
|
input:checked + .slider {
|
||||||
|
background-color: var(--primary-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
input:checked + .slider:before {
|
||||||
|
transform: translateX(20px);
|
||||||
|
}
|
||||||
|
</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"
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import {
|
|||||||
getEditorTheme as getEditorThemeUtil,
|
getEditorTheme as getEditorThemeUtil,
|
||||||
getPreviewTheme as getPreviewThemeUtil,
|
getPreviewTheme as getPreviewThemeUtil,
|
||||||
} from '~/utils/vditor'
|
} from '~/utils/vditor'
|
||||||
|
import '~/assets/global.css'
|
||||||
import LoginOverlay from '~/components/LoginOverlay.vue'
|
import LoginOverlay from '~/components/LoginOverlay.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|||||||
@@ -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">
|
||||||
@@ -16,16 +16,20 @@
|
|||||||
<div class="info-content-header-left">
|
<div class="info-content-header-left">
|
||||||
<span class="user-name">{{ comment.userName }}</span>
|
<span class="user-name">{{ comment.userName }}</span>
|
||||||
<i class="fas fa-medal medal-icon"></i>
|
<i class="fas fa-medal medal-icon"></i>
|
||||||
<router-link
|
<NuxtLink
|
||||||
v-if="comment.medal"
|
v-if="comment.medal"
|
||||||
class="medal-name"
|
class="medal-name"
|
||||||
:to="`/users/${comment.userId}?tab=achievements`"
|
:to="`/users/${comment.userId}?tab=achievements`"
|
||||||
>{{ getMedalTitle(comment.medal) }}</router-link
|
>{{ getMedalTitle(comment.medal) }}</NuxtLink
|
||||||
>
|
>
|
||||||
<i v-if="comment.pinned" class="fas fa-thumbtack pin-icon"></i>
|
<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>
|
||||||
@@ -57,7 +61,7 @@
|
|||||||
v-if="showEditor"
|
v-if="showEditor"
|
||||||
@submit="submitReply"
|
@submit="submitReply"
|
||||||
:loading="isWaitingForReply"
|
:loading="isWaitingForReply"
|
||||||
:disabled="!loggedIn"
|
:disabled="!loggedIn || postClosed"
|
||||||
:show-login-overlay="!loggedIn"
|
:show-login-overlay="!loggedIn"
|
||||||
:parent-user-name="comment.userName"
|
:parent-user-name="comment.userName"
|
||||||
/>
|
/>
|
||||||
@@ -76,6 +80,7 @@
|
|||||||
:level="level + 1"
|
:level="level + 1"
|
||||||
:default-show-replies="item.openReplies"
|
:default-show-replies="item.openReplies"
|
||||||
:post-author-id="postAuthorId"
|
:post-author-id="postAuthorId"
|
||||||
|
:post-closed="postClosed"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</BaseTimeline>
|
</BaseTimeline>
|
||||||
@@ -122,6 +127,10 @@ const props = defineProps({
|
|||||||
type: [Number, String],
|
type: [Number, String],
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
postClosed: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const emit = defineEmits(['deleted'])
|
const emit = defineEmits(['deleted'])
|
||||||
@@ -148,6 +157,7 @@ const toggleReplies = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const toggleEditor = () => {
|
const toggleEditor = () => {
|
||||||
|
if (props.postClosed) return
|
||||||
showEditor.value = !showEditor.value
|
showEditor.value = !showEditor.value
|
||||||
if (showEditor.value) {
|
if (showEditor.value) {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@@ -213,6 +223,10 @@ const deleteComment = async () => {
|
|||||||
}
|
}
|
||||||
const submitReply = async (parentUserName, text, clear) => {
|
const submitReply = async (parentUserName, text, clear) => {
|
||||||
if (!text.trim()) return
|
if (!text.trim()) return
|
||||||
|
if (props.postClosed) {
|
||||||
|
toast.error('帖子已关闭')
|
||||||
|
return
|
||||||
|
}
|
||||||
isWaitingForReply.value = true
|
isWaitingForReply.value = true
|
||||||
const token = getToken()
|
const token = getToken()
|
||||||
if (!token) {
|
if (!token) {
|
||||||
@@ -240,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,
|
||||||
@@ -366,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;
|
||||||
|
|||||||
71
frontend_nuxt/components/ConfirmDialog.vue
Normal file
71
frontend_nuxt/components/ConfirmDialog.vue
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
<template>
|
||||||
|
<BasePopup :visible="visible" @close="onCancel">
|
||||||
|
<div class="confirm-dialog" role="dialog" aria-modal="true">
|
||||||
|
<h3 class="confirm-title">{{ title }}</h3>
|
||||||
|
<p class="confirm-message">{{ message }}</p>
|
||||||
|
<div class="confirm-actions">
|
||||||
|
<div class="cancel-button" @click="onCancel">取消</div>
|
||||||
|
<div class="confirm-button" @click="onConfirm">确认</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</BasePopup>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import BasePopup from '~/components/BasePopup.vue'
|
||||||
|
import { useConfirm } from '~/composables/useConfirm'
|
||||||
|
|
||||||
|
const { visible, title, message, onConfirm, onCancel } = useConfirm()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.confirm-dialog {
|
||||||
|
padding: 20px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
.confirm-title {
|
||||||
|
margin-top: 0;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
.confirm-message {
|
||||||
|
margin: 16px 0 20px;
|
||||||
|
line-height: 1.6;
|
||||||
|
color: var(--text-secondary, #666);
|
||||||
|
}
|
||||||
|
.confirm-actions {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
.confirm-button,
|
||||||
|
.cancel-button {
|
||||||
|
min-width: 88px;
|
||||||
|
height: 36px;
|
||||||
|
padding: 0 14px;
|
||||||
|
border-radius: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
}
|
||||||
|
.confirm-button {
|
||||||
|
background: var(--primary-color);
|
||||||
|
color: #fff;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.confirm-button:hover {
|
||||||
|
background: var(--primary-color-hover);
|
||||||
|
}
|
||||||
|
.cancel-button {
|
||||||
|
background: transparent;
|
||||||
|
color: var(--primary-color);
|
||||||
|
border-color: currentColor;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.cancel-button:hover {
|
||||||
|
opacity: 0.85;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -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,7 +7,15 @@
|
|||||||
@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
|
||||||
|
:visible="showInviteCodePopup"
|
||||||
|
:icon="inviteCodeIcon"
|
||||||
|
text="邀请码活动开始了,速来参与大伙们🔥🔥🔥"
|
||||||
|
@close="closeInviteCodePopup"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -15,14 +23,19 @@
|
|||||||
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()
|
||||||
const API_BASE_URL = config.public.apiBaseUrl
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
|
||||||
const showMilkTeaPopup = ref(false)
|
const showMilkTeaPopup = ref(false)
|
||||||
|
const showInviteCodePopup = ref(false)
|
||||||
const milkTeaIcon = ref('')
|
const milkTeaIcon = 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([])
|
||||||
|
|
||||||
@@ -30,6 +43,12 @@ onMounted(async () => {
|
|||||||
await checkMilkTeaActivity()
|
await checkMilkTeaActivity()
|
||||||
if (showMilkTeaPopup.value) return
|
if (showMilkTeaPopup.value) return
|
||||||
|
|
||||||
|
await checkInviteCodeActivity()
|
||||||
|
if (showInviteCodePopup.value) return
|
||||||
|
|
||||||
|
await checkMessageFeature()
|
||||||
|
if (showMessagePopup.value) return
|
||||||
|
|
||||||
await checkNotificationSetting()
|
await checkNotificationSetting()
|
||||||
if (showNotificationPopup.value) return
|
if (showNotificationPopup.value) return
|
||||||
|
|
||||||
@@ -37,7 +56,7 @@ onMounted(async () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const checkMilkTeaActivity = async () => {
|
const checkMilkTeaActivity = async () => {
|
||||||
if (!process.client) return
|
if (!import.meta.client) return
|
||||||
if (localStorage.getItem('milkTeaActivityPopupShown')) return
|
if (localStorage.getItem('milkTeaActivityPopupShown')) return
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`${API_BASE_URL}/api/activities`)
|
const res = await fetch(`${API_BASE_URL}/api/activities`)
|
||||||
@@ -53,26 +72,62 @@ const checkMilkTeaActivity = async () => {
|
|||||||
// ignore network errors
|
// ignore network errors
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const checkInviteCodeActivity = async () => {
|
||||||
|
if (!import.meta.client) return
|
||||||
|
if (localStorage.getItem('inviteCodeActivityPopupShown')) return
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/activities`)
|
||||||
|
if (res.ok) {
|
||||||
|
const list = await res.json()
|
||||||
|
const a = list.find((i) => i.type === 'INVITE_POINTS' && !i.ended)
|
||||||
|
if (a) {
|
||||||
|
inviteCodeIcon.value = a.icon
|
||||||
|
showInviteCodePopup.value = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
// ignore network errors
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const closeInviteCodePopup = () => {
|
||||||
|
if (!import.meta.client) return
|
||||||
|
localStorage.setItem('inviteCodeActivityPopupShown', 'true')
|
||||||
|
showInviteCodePopup.value = false
|
||||||
|
}
|
||||||
|
|
||||||
const closeMilkTeaPopup = () => {
|
const closeMilkTeaPopup = () => {
|
||||||
if (!process.client) return
|
if (!import.meta.client) return
|
||||||
localStorage.setItem('milkTeaActivityPopupShown', 'true')
|
localStorage.setItem('milkTeaActivityPopupShown', 'true')
|
||||||
showMilkTeaPopup.value = false
|
showMilkTeaPopup.value = false
|
||||||
checkNotificationSetting()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 (!process.client) return
|
if (!import.meta.client) return
|
||||||
if (!authState.loggedIn) return
|
if (!authState.loggedIn) return
|
||||||
if (localStorage.getItem('notificationSettingPopupShown')) return
|
if (localStorage.getItem('notificationSettingPopupShown')) return
|
||||||
showNotificationPopup.value = true
|
showNotificationPopup.value = true
|
||||||
}
|
}
|
||||||
const closeNotificationPopup = () => {
|
const closeNotificationPopup = () => {
|
||||||
if (!process.client) return
|
if (!import.meta.client) return
|
||||||
localStorage.setItem('notificationSettingPopupShown', 'true')
|
localStorage.setItem('notificationSettingPopupShown', 'true')
|
||||||
showNotificationPopup.value = false
|
showNotificationPopup.value = false
|
||||||
checkNewMedals()
|
|
||||||
}
|
}
|
||||||
const checkNewMedals = async () => {
|
const checkNewMedals = async () => {
|
||||||
if (!process.client) return
|
if (!import.meta.client) return
|
||||||
if (!authState.loggedIn || !authState.userId) return
|
if (!authState.loggedIn || !authState.userId) return
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`${API_BASE_URL}/api/medals?userId=${authState.userId}`)
|
const res = await fetch(`${API_BASE_URL}/api/medals?userId=${authState.userId}`)
|
||||||
@@ -90,7 +145,7 @@ const checkNewMedals = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
const closeMedalPopup = () => {
|
const closeMedalPopup = () => {
|
||||||
if (!process.client) return
|
if (!import.meta.client) return
|
||||||
const seen = new Set(JSON.parse(localStorage.getItem('seenMedals') || '[]'))
|
const seen = new Set(JSON.parse(localStorage.getItem('seenMedals') || '[]'))
|
||||||
newMedals.value.forEach((m) => seen.add(m.type))
|
newMedals.value.forEach((m) => seen.add(m.type))
|
||||||
localStorage.setItem('seenMedals', JSON.stringify([...seen]))
|
localStorage.setItem('seenMedals', JSON.stringify([...seen]))
|
||||||
|
|||||||
@@ -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"
|
||||||
@@ -29,12 +32,34 @@
|
|||||||
<i :class="iconClass"></i>
|
<i :class="iconClass"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-if="!isMobile" class="invite_text" @click="copyInviteLink">
|
||||||
|
<i class="fas fa-copy"></i>
|
||||||
|
邀请
|
||||||
|
<i v-if="isCopying" class="fas fa-spinner fa-spin"></i>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ToolTip content="复制RSS链接" placement="bottom">
|
||||||
|
<div class="rss-icon" @click="copyRssLink">
|
||||||
|
<i class="fas fa-rss"></i>
|
||||||
|
</div>
|
||||||
|
</ToolTip>
|
||||||
|
|
||||||
<ToolTip v-if="!isMobile && isLogin" content="发帖" placement="bottom">
|
<ToolTip v-if="!isMobile && isLogin" content="发帖" placement="bottom">
|
||||||
<div class="new-post-icon" @click="goToNewPost">
|
<div class="new-post-icon" @click="goToNewPost">
|
||||||
<i class="fas fa-edit"></i>
|
<i class="fas fa-edit"></i>
|
||||||
</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">
|
||||||
@@ -50,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>
|
||||||
@@ -63,9 +87,15 @@ 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 { getToken } from '~/utils/auth'
|
||||||
|
const config = useRuntimeConfig()
|
||||||
|
const API_BASE_URL = config.public.apiBaseUrl
|
||||||
|
const WEBSITE_BASE_URL = config.public.websiteBaseUrl
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
showMenuBtn: {
|
showMenuBtn: {
|
||||||
@@ -76,12 +106,14 @@ 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)
|
||||||
const userMenu = ref(null)
|
const userMenu = ref(null)
|
||||||
const menuBtn = ref(null)
|
const menuBtn = ref(null)
|
||||||
|
const isCopying = ref(false)
|
||||||
|
|
||||||
const search = () => {
|
const search = () => {
|
||||||
showSearch.value = true
|
showSearch.value = true
|
||||||
@@ -100,6 +132,54 @@ const goToLogin = () => {
|
|||||||
const goToSettings = () => {
|
const goToSettings = () => {
|
||||||
navigateTo('/settings', { replace: true })
|
navigateTo('/settings', { replace: true })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const copyInviteLink = async () => {
|
||||||
|
isCopying.value = true
|
||||||
|
const token = getToken()
|
||||||
|
if (!token) {
|
||||||
|
toast.error('请先登录')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const res = await fetch(`${API_BASE_URL}/api/invite/generate`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
})
|
||||||
|
if (res.ok) {
|
||||||
|
const data = await res.json()
|
||||||
|
const inviteLink = data.token ? `${WEBSITE_BASE_URL}/signup?invite_token=${data.token}` : ''
|
||||||
|
/**
|
||||||
|
* 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 {
|
||||||
|
const data = await res.json().catch(() => ({}))
|
||||||
|
toast.error(data.error || '生成邀请链接失败')
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
toast.error('生成邀请链接失败')
|
||||||
|
} finally {
|
||||||
|
isCopying.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const copyRssLink = async () => {
|
||||||
|
const rssLink = `${API_BASE_URL}/api/rss`
|
||||||
|
await navigator.clipboard.writeText(rssLink)
|
||||||
|
toast.success('RSS链接已复制')
|
||||||
|
}
|
||||||
|
|
||||||
const goToProfile = async () => {
|
const goToProfile = async () => {
|
||||||
if (!authState.loggedIn) {
|
if (!authState.loggedIn) {
|
||||||
navigateTo('/login', { replace: true })
|
navigateTo('/login', { replace: true })
|
||||||
@@ -129,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 },
|
||||||
@@ -162,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()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,7 +257,7 @@ onMounted(async () => {
|
|||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => authState.loggedIn,
|
() => authState.loggedIn,
|
||||||
async () => {
|
async (isLoggedIn) => {
|
||||||
await updateAvatar()
|
await updateAvatar()
|
||||||
await updateUnread()
|
await updateUnread()
|
||||||
},
|
},
|
||||||
@@ -224,7 +308,7 @@ onMounted(async () => {
|
|||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 20px;
|
gap: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.auth-btns {
|
.auth-btns {
|
||||||
@@ -234,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;
|
||||||
@@ -286,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 {
|
||||||
@@ -315,9 +404,67 @@ onMounted(async () => {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.new-post-icon {
|
.invite_text {
|
||||||
|
font-size: 12px;
|
||||||
|
cursor: pointer;
|
||||||
|
color: var(--primary-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.invite_text:hover {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rss-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 {
|
||||||
|
animation: rss-glow 2s 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes rss-glow {
|
||||||
|
0% {
|
||||||
|
text-shadow: 0 0 0px var(--primary-color);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
text-shadow: 0 0 12px var(--primary-color);
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
text-shadow: 0 0 0px var(--primary-color);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 1200px) {
|
@media (max-width: 1200px) {
|
||||||
@@ -336,5 +483,9 @@ onMounted(async () => {
|
|||||||
.logo-text {
|
.logo-text {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header-content-right {
|
||||||
|
gap: 15px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
102
frontend_nuxt/components/InfiniteLoadMore.vue
Normal file
102
frontend_nuxt/components/InfiniteLoadMore.vue
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
<template>
|
||||||
|
<!-- 当 done 后整个容器自动隐藏,不再占位 -->
|
||||||
|
<div v-show="!done" class="infinite-loadmore">
|
||||||
|
<div v-show="isLoading" class="loading-container bottom-loading" aria-live="polite">
|
||||||
|
<l-hatch size="28" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
|
||||||
|
</div>
|
||||||
|
<!-- 永久存在的底部触发器(由组件内部持有与观察) -->
|
||||||
|
<div ref="sentinel" class="load-more-trigger" aria-hidden="true"></div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup>
|
||||||
|
import { ref, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
/** 父组件提供:执行“加载下一页”的函数
|
||||||
|
* 返回:
|
||||||
|
* - boolean:true 表示“已经没有更多数据(done)”
|
||||||
|
* - { done: boolean }:同上
|
||||||
|
*/
|
||||||
|
onLoad: { type: Function, required: true },
|
||||||
|
/** pause=true 时暂停观察(例如首屏/筛选加载过程) */
|
||||||
|
pause: { type: Boolean, default: false },
|
||||||
|
/** 预取范围,默认 200px */
|
||||||
|
rootMargin: { type: String, default: '200px 0px' },
|
||||||
|
/** 触发阈值 */
|
||||||
|
threshold: { type: Number, default: 0 },
|
||||||
|
})
|
||||||
|
|
||||||
|
const isLoading = ref(false)
|
||||||
|
const done = ref(false)
|
||||||
|
const sentinel = ref(null)
|
||||||
|
let io = null
|
||||||
|
|
||||||
|
const stopObserver = () => {
|
||||||
|
if (io) {
|
||||||
|
io.disconnect()
|
||||||
|
io = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const startObserver = () => {
|
||||||
|
if (!import.meta.client || props.pause || done.value) return
|
||||||
|
stopObserver()
|
||||||
|
io = new IntersectionObserver(
|
||||||
|
async (entries) => {
|
||||||
|
const e = entries[0]
|
||||||
|
if (!e?.isIntersecting || isLoading.value || done.value) return
|
||||||
|
isLoading.value = true
|
||||||
|
try {
|
||||||
|
const res = await props.onLoad()
|
||||||
|
const finished = typeof res === 'boolean' ? res : !!(res && res.done)
|
||||||
|
if (finished) {
|
||||||
|
done.value = true
|
||||||
|
stopObserver()
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
isLoading.value = false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ root: null, rootMargin: props.rootMargin, threshold: props.threshold },
|
||||||
|
)
|
||||||
|
if (sentinel.value) io.observe(sentinel.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
nextTick(startObserver)
|
||||||
|
})
|
||||||
|
onBeforeUnmount(stopObserver)
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.pause,
|
||||||
|
(p) => {
|
||||||
|
if (p) stopObserver()
|
||||||
|
else nextTick(startObserver)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
/** 父组件可选择性调用,用于外部强制重置(一般直接用 :key 重建更简单) */
|
||||||
|
const reset = () => {
|
||||||
|
done.value = false
|
||||||
|
nextTick(startObserver)
|
||||||
|
}
|
||||||
|
defineExpose({ reset })
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.infinite-loadmore {
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-container {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
height: 100px; /* 与原样式匹配 */
|
||||||
|
}
|
||||||
|
|
||||||
|
.load-more-trigger {
|
||||||
|
width: 100%;
|
||||||
|
height: 1px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -6,16 +6,16 @@
|
|||||||
<span class="invite-code-description-title-text">邀请规则说明</span>
|
<span class="invite-code-description-title-text">邀请规则说明</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="invite-code-description-content">
|
<div class="invite-code-description-content">
|
||||||
<p>邀请好友注册并登录,每次可以获得500积分</p>
|
<p>⚠️邀请好友注册并登录,每次可以获得500积分🎉🎉🎉</p>
|
||||||
<p>邀请链接的有效期为1个月</p>
|
<p>邀请链接的有效期为1个月</p>
|
||||||
<p>每一个邀请链接的邀请人数上限为3人</p>
|
<p>每一个邀请链接的邀请人数上限为3人</p>
|
||||||
<p>通过邀请链接注册,无需注册审核</p>
|
<p>通过邀请链接注册,无需注册审核</p>
|
||||||
<p>每人每天仅能生产3个邀请链接</p>
|
<p>每人每天仅能生产1个邀请链接</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="inviteLink" class="invite-code-link-content">
|
<div v-if="inviteLink" class="invite-code-link-content">
|
||||||
<p>
|
<p class="invite-code-link-content-text">
|
||||||
邀请链接:{{ inviteLink }}
|
邀请链接:{{ inviteLink }}
|
||||||
<span @click="copyLink"><i class="fas fa-copy copy-icon"></i></span>
|
<span @click="copyLink"><i class="fas fa-copy copy-icon"></i></span>
|
||||||
</p>
|
</p>
|
||||||
@@ -48,9 +48,9 @@ onMounted(async () => {
|
|||||||
isLoadingUser.value = true
|
isLoadingUser.value = true
|
||||||
user.value = await fetchCurrentUser()
|
user.value = await fetchCurrentUser()
|
||||||
isLoadingUser.value = false
|
isLoadingUser.value = false
|
||||||
if (user.value) {
|
// if (user.value) {
|
||||||
await fetchInvite(false)
|
// await fetchInvite(false)
|
||||||
}
|
// }
|
||||||
})
|
})
|
||||||
|
|
||||||
const fetchInvite = async (showToast = true) => {
|
const fetchInvite = async (showToast = true) => {
|
||||||
@@ -171,6 +171,10 @@ const copyLink = async () => {
|
|||||||
opacity: 0.8;
|
opacity: 0.8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.invite-code-link-content-text {
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
|
||||||
.copy-icon {
|
.copy-icon {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
|
|||||||
@@ -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>
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user