Skip to content

fix(mail): 审核邮件按用户注册语言发送，统一服务器名前缀与 {server_name} 占位符 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qs5668 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(mail): 审核邮件按用户注册语言发送，统一服务器名前缀与 {server_name} 占位符 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions plugin/src/main/java/team/kitemc/verifymc/command/VmcCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ private void handleApprove(CommandSender sender, String[] args) {
String email = (String) user.get("email");
if (email != null && !email.isEmpty()) {
ctx.getMailService().sendReviewResult(email, storedTarget, true,
"", ctx.getConfigManager().getLanguage());
"", resolveUserLanguage(user));
}
}

Expand Down Expand Up @@ -151,7 +151,7 @@ private void handleReject(CommandSender sender, String[] args) {
String email = (String) user.get("email");
if (email != null && !email.isEmpty()) {
ctx.getMailService().sendReviewResult(email, storedTarget, false,
reason, ctx.getConfigManager().getLanguage());
reason, resolveUserLanguage(user));
}
}

Expand Down Expand Up @@ -182,6 +182,14 @@ private void handleDelete(CommandSender sender, String[] args) {
}
}

private String resolveUserLanguage(java.util.Map<String, Object> user) {
String lang = user.get("language") == null ? null : String.valueOf(user.get("language")).trim();
if (lang == null || lang.isEmpty()) {
lang = ctx.getConfigManager().getLanguage();
}
return lang;
}

private void handleBan(CommandSender sender, String[] args) {
if (!sender.hasPermission("verifymc.admin")) {
sender.sendMessage("§6[VerifyMC] §cNo permission.");
Expand Down
17 changes: 17 additions & 0 deletions plugin/src/main/java/team/kitemc/verifymc/db/FileUserDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,23 @@ public boolean updateUserEmail(String username, String email) {
return true;
}

@Override
public boolean setUserLanguage(String username, String language) {
debugLog("setUserLanguage called: username=" + username + ", language=" + language);
String key = keyForUsername(username);
Map<String, Object> user = users.get(key);

if (user == null) {
debugLog("User not found: " + username);
return false;
}

user.put("language", language);
saveLater();
debugLog("User language updated: " + user.get("username"));
return true;
}

@Override
public Map<String, Object> getUserByUsername(String username) {
debugLog("Getting user by username: " + username);
Expand Down
23 changes: 23 additions & 0 deletions plugin/src/main/java/team/kitemc/verifymc/db/MysqlUserDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ private void initDatabase() throws SQLException {
"password VARCHAR(255)," +
"regTime BIGINT," +
"discord_id VARCHAR(64)," +
"language VARCHAR(8) NULL," +
"questionnaire_score INT NULL," +
"questionnaire_passed BOOLEAN NULL," +
"questionnaire_review_summary TEXT NULL," +
Expand All @@ -103,6 +104,12 @@ private void initDatabase() throws SQLException {
stmt.executeUpdate("ALTER TABLE users ADD COLUMN discord_id VARCHAR(64)");
}

try {
stmt.executeQuery("SELECT language FROM users LIMIT 1");
} catch (SQLException e) {
stmt.executeUpdate("ALTER TABLE users ADD COLUMN language VARCHAR(8) NULL");
}

try {
stmt.executeQuery("SELECT questionnaire_score FROM users LIMIT 1");
} catch (SQLException e) {
Expand Down Expand Up @@ -278,6 +285,21 @@ public boolean updateUserEmail(String username, String email) {
}
}

@Override
public boolean setUserLanguage(String username, String language) {
String sql = "UPDATE users SET language=? WHERE username=?";
try (PreparedStatement ps = getConnection().prepareStatement(sql)) {
ps.setString(1, language);
ps.setString(2, username);
int rows = ps.executeUpdate();
debugLog("User language updated: " + username);
return rows > 0;
} catch (SQLException e) {
debugLog("Error updating user language: " + e.getMessage());
return false;
}
}

@Override
public List<Map<String, Object>> getAllUsers() {
List<Map<String, Object>> result = new ArrayList<>();
Expand Down Expand Up @@ -314,6 +336,7 @@ private Map<String, Object> mapUserFromResultSet(ResultSet rs) throws SQLExcepti
user.put("password", rs.getString("password"));
user.put("regTime", rs.getLong("regTime"));
user.put("discordId", rs.getString("discord_id"));
user.put("language", rs.getString("language"));
user.put("questionnaireScore", rs.getObject("questionnaire_score"));
user.put("questionnairePassed", rs.getObject("questionnaire_passed"));
user.put("questionnaireReviewSummary", rs.getString("questionnaire_review_summary"));
Expand Down
6 changes: 6 additions & 0 deletions plugin/src/main/java/team/kitemc/verifymc/db/UserDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ boolean registerUser(String username, String email, String status, String passwo

boolean updateUserEmail(String username, String email);

/**
* Persists the interface language the user registered with,
* so later emails (e.g. review notifications) can be localized per user.
*/
boolean setUserLanguage(String username, String language);

List<Map<String, Object>> getAllUsers();

List<Map<String, Object>> getUsersWithPagination(int page, int pageSize);
Expand Down
11 changes: 7 additions & 4 deletions plugin/src/main/java/team/kitemc/verifymc/mail/MailService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,12 @@ public boolean sendCode(String to, String subject, String code, String language)
File emailDir = new File(plugin.getDataFolder(), "email");
File templateFile = new File(emailDir, "verify_code_" + lang + ".html");
String content;
String serverName = plugin.getConfig().getString("web_server_prefix", "VerifyMC");
if (templateFile.exists()) {
debugLog("Using custom template: " + templateFile.getAbsolutePath());
content = new String(Files.readAllBytes(templateFile.toPath()), StandardCharsets.UTF_8);
content = content.replace("{code}", escapeHtml(code));
content = content.replace("{code}", escapeHtml(code))
.replace("{server_name}", escapeHtml(serverName));
} else {
debugLog("Using default template");
content = getDefaultVerifyCodeTemplate(lang, escapeHtml(code));
Expand Down Expand Up @@ -225,9 +227,10 @@ public boolean sendReviewResultNotification(String email, String username, boole
try {
String lang = (language != null && !language.isEmpty()) ? language : plugin.getConfig().getString("language", "zh");
String templateName = approved ? "review_approved_" + lang + ".html" : "review_rejected_" + lang + ".html";
String subject = approved ?
("zh".equals(lang) ? "[VerifyMC] 您的白名单申请已通过" : "[VerifyMC] Your whitelist application has been approved") :
("zh".equals(lang) ? "[VerifyMC] 您的白名单申请被拒绝" : "[VerifyMC] Your whitelist application has been rejected");
String serverPrefix = plugin.getConfig().getString("web_server_prefix", "VerifyMC");
String subject = approved ?
("zh".equals(lang) ? serverPrefix + " 白名单申请已通过" : serverPrefix + " Whitelist Application Approved") :
("zh".equals(lang) ? serverPrefix + " 白名单申请未通过" : serverPrefix + " Whitelist Application Rejected");

File emailDir = new File(plugin.getDataFolder(), "email");
File templateFile = new File(emailDir, templateName);
Expand Down
3 changes: 3 additions & 0 deletions plugin/src/main/java/team/kitemc/verifymc/web/RegistrationProcessingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,9 @@ private JSONObject executeRegistration(RegistrationRequest request, Questionnair
ok = userDao.registerUser(request.normalizedUsername(), request.email(), status,
questionnaireScore, questionnairePassedValue, questionnaireReviewSummary, questionnaireScoredAt);
}
if (ok && request.language() != null && !request.language().isEmpty()) {
userDao.setUserLanguage(request.normalizedUsername(), request.language());
}

RegistrationApplicationService.RegistrationDecision decision =
registrationApplicationService.resolveDecision(ok, manualReviewRequired, questionnairePassed, registerAutoApprove, scoringServiceUnavailable);
Expand Down
10 changes: 9 additions & 1 deletion plugin/src/main/java/team/kitemc/verifymc/web/handler/AdminUserHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,18 @@ private void sendReviewResult(String username, boolean approved, String reason)
String email = (String) user.get("email");
if (email != null && !email.isEmpty()) {
ctx.getMailService().sendReviewResult(email, username, approved, reason,
ctx.getConfigManager().getLanguage());
resolveUserLanguage(user));
}
}

private String resolveUserLanguage(Map<String, Object> user) {
String lang = user.get("language") == null ? null : String.valueOf(user.get("language")).trim();
if (lang == null || lang.isEmpty()) {
lang = ctx.getConfigManager().getLanguage();
}
return lang;
}

private void addAudit(String action, String operator, String target, String detail) {
ctx.getAuditDao().addAudit(new AuditRecord(action, operator, target, detail, System.currentTimeMillis()));
}
Expand Down