SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'feature/fallback_sender' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m6s
Details
Build Docker Image / Clean-Registry (push) Successful in -2s
Details

Browse Source
This commit is contained in:
Stephan Richter
2026-01-27 22:48:33 +01:00
parent f6f9a7c18b 33ff47a133
commit de49226bd9
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bus/src/main/java/de/srsoftware/umbrella/messagebus/MessageBus.java
View File

@@ -4,7 +4,6 @@ package de.srsoftware.umbrella.messagebus;
import de.srsoftware.umbrella.messagebus.events.Event;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class MessageBus {

1
messages/src/main/java/de/srsoftware/umbrella/message/Constants.java
View File

@@ -5,6 +5,7 @@ public class Constants {
public static final String AUTH = "mail.smtp.auth";
public static final String CONFIG_DB = "umbrella.modules.message.database";
public static final String CONFIG_SMTP_FROM = "umbrella.modules.message.smtp.from";
public static final String CONFIG_SMTP_HOST = "umbrella.modules.message.smtp.host";
public static final String CONFIG_SMTP_PASS = "umbrella.modules.message.smtp.pass";
public static final String CONFIG_SMTP_PORT = "umbrella.modules.message.smtp.port";

11
messages/src/main/java/de/srsoftware/umbrella/message/MessageSystem.java
View File

@@ -93,10 +93,10 @@ public class MessageSystem extends BaseHandler implements PostBox, EventListener
debugAddress = config.get(DEBUG_ADDREESS).map(Object::toString).orElse(null);
port = config.get(CONFIG_SMTP_PORT,587);
host = config.get(CONFIG_SMTP_HOST).map(Object::toString).orElseThrow(() -> new RuntimeException("umbrella.modules.message.smtp.host not configured!"));
user = config.get(CONFIG_SMTP_USER).map(Object::toString).orElseThrow(() -> new RuntimeException("umbrella.modules.message.smtp.user not configured!"));
pass = config.get(CONFIG_SMTP_PASS).map(Object::toString).orElseThrow(() -> new RuntimeException("umbrella.modules.message.smtp.pass not configured!"));
from = user;
host = config.get(CONFIG_SMTP_HOST).map(Object::toString).orElseThrow(() -> missingConfig(CONFIG_SMTP_HOST));
user = config.get(CONFIG_SMTP_USER).map(Object::toString).orElseThrow(() -> missingConfig(CONFIG_SMTP_USER));
pass = config.get(CONFIG_SMTP_PASS).map(Object::toString).orElseThrow(() -> missingConfig(CONFIG_SMTP_PASS));
from = config.get(CONFIG_SMTP_FROM).map(Object::toString).orElseThrow(() -> missingConfig(CONFIG_SMTP_FROM));
ModuleRegistry.add(this);
new SubmissionTask(8).schedule();
new SubmissionTask(10).schedule();
@@ -214,13 +214,14 @@ public class MessageSystem extends BaseHandler implements PostBox, EventListener
var dueRecipients = queue.getReceivers().map(this::toUmbrellaUser).filter(uu -> sendAt(uu,scheduledHour)).toList();
var date = new Date();
var fallbackSender = new User("Umbrella",new EmailAddress(from),null);
for (var receiver : dueRecipients){
if (debugAddress != null && !debugAddress.equals(receiver.email().toString())) {
LOG.log(DEBUG,"Debug address is set to {0}, ignoring mail to {1}",debugAddress,receiver);
continue;
}
var combined = new CombinedMessage(t("Collected messages"),receiver);
var combined = new CombinedMessage(t("Collected messages"),receiver, fallbackSender);
try {
var envelopes = queue.getEnvelopesFor(receiver);

10
messages/src/main/java/de/srsoftware/umbrella/message/model/CombinedMessage.java
View File

@@ -3,7 +3,6 @@ package de.srsoftware.umbrella.message.model;
import static de.srsoftware.umbrella.core.ModuleRegistry.translator;
import static de.srsoftware.umbrella.core.Util.dateTimeOf;
import static de.srsoftware.umbrella.core.model.Translatable.t;
import static java.lang.System.Logger.Level.DEBUG;
import static java.lang.System.Logger.Level.TRACE;
import static java.text.MessageFormat.format;
@@ -18,17 +17,19 @@ public class CombinedMessage {
private final StringBuilder combinedBody = new StringBuilder();
private final User receiver;
private final String lang;
private final User fallbackSender;
private String combinedSubject = null;
private final List<Message<?>> mergedMessages = new ArrayList<>();
private final Translatable subjectForCombinedMessage;
private UmbrellaUser sender = null;
private User sender = null;
public static final String SEPARATOR = "\n\n━━━━━━━━━━━━━━━━━━━━━\n\n";
public CombinedMessage(Translatable subjectForCombinedMessage, User receiver){
public CombinedMessage(Translatable subjectForCombinedMessage, User receiver, User fallbackSender){
LOG.log(DEBUG,"Creating combined message for {0}…",receiver);
this.subjectForCombinedMessage = subjectForCombinedMessage;
this.receiver = receiver;
this.lang = receiver.language();
this.fallbackSender = fallbackSender;
}
public void addNote() {
@@ -57,6 +58,7 @@ public class CombinedMessage {
combinedSubject = subject;
break;
case 1:
if (!sender.equals(message.sender())) sender = fallbackSender;
combinedBody.insert(0,format("# {0} @ {1}\n→ {2}:\n\n",sender, dateTimeOf(message.utcTime()),subject)); // insert sender and subject of first message right before the body of the first message
combinedSubject = subjectForCombinedMessage.translate(lang);
// no break here, we need to append the subject and content
@@ -76,7 +78,7 @@ public class CombinedMessage {
return receiver;
}
public UmbrellaUser sender() {
public User sender() {
return sender;
}

1
user/src/main/java/de/srsoftware/umbrella/user/api/UserDb.java
View File

@@ -10,7 +10,6 @@ import de.srsoftware.umbrella.user.model.DbUser;
import de.srsoftware.umbrella.user.model.Password;
import java.util.Collection;
import java.util.Map;
import java.util.Optional;
public interface UserDb {