Förbättringar i HelloModel m.m

Author: MartinStenhagen

src/main/java/com/example/HelloModel.java

@@ -83,25 +83,41 @@ public boolean sendImage(File imageFile) {
 
     private void receiveMessages() {
         connection.receive(dto -> {
-            if (dto.message() == null || dto.message().isBlank()) return;
-            if (dto.message().contains("\"clientId\":\"" + clientId + "\"")) {
+            String msg = dto.message();
+            if (msg == null || msg.isBlank()) return;
+
+            // Ignorera egna meddelanden
+            if (msg.contains("\"clientId\":\"" + clientId + "\"")) {
                 return;
             }
-            if (dto.message().startsWith("![Bild](") || dto.message().contains("\n![Bild](")) {
-                String url = dto.message().replaceAll(".*!\\[Bild\\]\\(([^)]+)\\).*", "$1");
-                addMessageSafely(new NtfyMessageDto(dto.id(),
-                        dto.time(),
-                        dto.event(),
-                        dto.topic(),
-                        null,
-                        null,
-                        url));
-                return;
+
+            // Identifiera Markdown-bild via enkel substring-sökning
+            int marker = msg.indexOf("![Bild](");
+            if (marker != -1) {
+                int open = msg.indexOf('(', marker);
+                int close = msg.indexOf(')', open + 1);
+
+                if (open != -1 && close != -1) {
+                    String url = msg.substring(open + 1, close);
+                    addMessageSafely(new NtfyMessageDto(
+                            dto.id(),
+                            dto.time(),
+                            dto.event(),
+                            dto.topic(),
+                            null,
+                            null,
+                            url
+                    ));
+                    return;
+                }
             }
+
+            // Ren text
             addMessageSafely(dto);
         });
     }
 
+
     private void addMessageSafely(NtfyMessageDto msg) {
         if (Platform.isFxApplicationThread()) {
             messages.add(msg);
@@ -122,17 +138,16 @@ protected String uploadToLocalServer(File imageFile) throws IOException {
 
         int status = conn.getResponseCode();
         if (status < 200 || status >= 300) {
-            conn.disconnect();
-            throw new IOException("Upload failed with HTTP status: " + status);
+            throw new IOException("Upload failed with status " + status);
         }
 
         try (InputStream in = conn.getInputStream()) {
-            String imageUrl = new String(in.readAllBytes());
-            return imageUrl;
+            return new String(in.readAllBytes());
         } finally {
             conn.disconnect();
         }
     }
 
 
+
 }

src/main/java/com/example/NtfyConnectionImpl.java

@@ -58,21 +58,31 @@ public boolean sendImage(File imageFile, String clientId) {
             conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
             conn.setRequestProperty("X-Client-Id", clientId);
 
+            // JSON-del
+            var json = mapper.writeValueAsString(
+                    new java.util.LinkedHashMap<String,Object>() {{
+                        put("clientId", clientId);
+                        put("type", "image");
+                        put("fileName", imageFile.getName());
+                    }}
+            );
+
             try (OutputStream output = conn.getOutputStream();
                  PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8), true)) {
 
-                // textdel med JSON
                 writer.append("--").append(boundary).append("\r\n");
                 writer.append("Content-Disposition: form-data; name=\"message\"\r\n\r\n");
-                writer.append("{\"clientId\":\"").append(clientId).append("\",\"type\":\"image\",\"fileName\":\"")
-                        .append(imageFile.getName()).append("\"}\r\n");
+                writer.append(json).append("\r\n");
                 writer.flush();
 
-                // bildfil
+                // Bildfil
+                String contentType = Files.probeContentType(imageFile.toPath());
+                if (contentType == null) contentType = "application/octet-stream";
+
                 writer.append("--").append(boundary).append("\r\n");
                 writer.append("Content-Disposition: form-data; name=\"file\"; filename=\"")
                         .append(imageFile.getName()).append("\"\r\n");
-                writer.append("Content-Type: ").append(Files.probeContentType(imageFile.toPath())).append("\r\n\r\n");
+                writer.append("Content-Type: ").append(contentType).append("\r\n\r\n");
                 writer.flush();
 
                 Files.copy(imageFile.toPath(), output);
@@ -92,6 +102,7 @@ public boolean sendImage(File imageFile, String clientId) {
     }
 
 
+
     @Override
     public void receive(Consumer<NtfyMessageDto> messageHandler) {
         Thread thread = new Thread(() -> {

src/test/java/com/example/NtfyConnectionSpy.java

@@ -42,9 +42,11 @@ public void stopReceiving() { }
      */
     public void simulateIncomingMessage(String json) {
         if (messageHandler != null) {
+            long now = System.currentTimeMillis() / 1000;
+
             NtfyMessageDto dto = new NtfyMessageDto(
                     "test-id",
-                    System.currentTimeMillis(),
+                    now,
                     "message",
                     HelloModel.DEFAULT_TOPIC,
                     json.contains("\"message\"") ? json.replaceAll(".*\"message\":\"([^\"]+)\".*", "$1") : null,