preparing display of selcted message

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
2026-01-17 21:03:50 +01:00
parent b176cd1f6b
commit 8422dce031
4 changed files with 74 additions and 5 deletions

View File

@@ -52,6 +52,17 @@ public class Envelope {
return new Envelope(message,receivers);
}
@Override
public final boolean equals(Object o) {
if (!(o instanceof Envelope envelope)) return false;
return message.equals(envelope.message) && time.equals(envelope.time);
}
@Override
public int hashCode() {
return 31 * message.hashCode() + time.hashCode();
}
public boolean isFor(User receiver) {
return receivers.contains(receiver);
}

View File

@@ -9,12 +9,13 @@ import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Translatable.t;
import static java.text.MessageFormat.format;
import de.srsoftware.tools.Mappable;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import java.util.*;
import org.json.JSONArray;
import org.json.JSONObject;
public record Message(UmbrellaUser sender, Translatable subject, Translatable body, List<Attachment> attachments) {
public record Message(UmbrellaUser sender, Translatable subject, Translatable body, List<Attachment> attachments) {
@Override
public boolean equals(Object o) {
if (!(o instanceof Message message)) return false;

View File

@@ -6,13 +6,25 @@
import { error, yikes } from '../../warn.svelte';
let router = useTinyRouter();
let messages = [];
async function display(hash){
const url = api(`message/${hash}`);
const res = get(url);
if (res.ok){
yikes();
const json = await res.json();
console.log(json);
} else {
error(res);
}
}
async function load(){
const url = api('message');
const res = await get(url);
if (res.ok){
let json = await res.json();
console.log(json);
messages = await res.json();
yikes();
} else {
error(res);
@@ -28,4 +40,22 @@
<fieldset>
<legend>{t('messages')} <button onclick={showSettings}>{t('settings')}</button></legend>
<table>
<thead>
<tr>
<th>{t('timestamp')}</th>
<th>{t('initiator')}</th>
<th>{t('subject')}</th>
</tr>
</thead>
<tbody>
{#each messages as message}
<tr class="message-{message.hash}" onclick={ev => display(message.hash)}>
<td>{message.timestamp}</td>
<td>{message.sender}</td>
<td>{message.subject}</td>
</tr>
{/each}
</tbody>
</table>
</fieldset>

View File

@@ -115,7 +115,14 @@ public class MessageSystem extends BaseHandler implements PostBox, EventListener
return switch (head){
case null -> listMessages(ex,user.get());
case SETTINGS -> getSettings(ex,user.get());
default -> super.doGet(path,ex);
default -> {
try {
yield getMessage(ex,user.get(),Integer.parseInt(head));
} catch (NumberFormatException ignored) {
}
yield super.doGet(path, ex);
}
};
} catch (NumberFormatException e){
return sendContent(ex,HTTP_BAD_REQUEST,"Invalid project id");
@@ -124,6 +131,25 @@ public class MessageSystem extends BaseHandler implements PostBox, EventListener
}
}
private boolean getMessage(HttpExchange ex, UmbrellaUser user, int hash) throws IOException {
var envelope = queue.stream()
.filter(msg -> msg.isFor(user))
.filter(msg -> msg.hashCode() == hash)
.findFirst();
if (envelope.isPresent()) {
var message = envelope.get().message();
var sender = message.sender().name();
var subject = message.subject().translate(user.language());
var body = message.body().translate(user.language());
return sendContent(ex,Map.of(
SENDER,sender,
SUBJECT,subject,
BODY,body
));
}
return notFound(ex);
}
@Override
public boolean doPatch(Path path, HttpExchange ex) throws IOException {
addCors(ex);
@@ -170,7 +196,8 @@ public class MessageSystem extends BaseHandler implements PostBox, EventListener
var sender = envelope.message().sender().name();
var subject = envelope.message().subject().translate(lang);
var time = envelope.time().format(TIME_FORMATTER);
return new JSONObject(Map.of(SENDER,sender,SUBJECT,subject,TIMESTAMP,time));
var hash = envelope.hashCode();
return new JSONObject(Map.of(SENDER,sender,SUBJECT,subject,TIMESTAMP,time,HASH,hash));
}
@Override