From 634f31c390da1c3b055aa4a62c98239e27e12de5 Mon Sep 17 00:00:00 2001 From: james Date: Mon, 6 Apr 2026 10:09:52 -0400 Subject: [PATCH 01/52] Whitespace --- .../com/zipcode/stardust/repository/UserRepository.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/repository/UserRepository.java b/java/src/main/java/com/zipcode/stardust/repository/UserRepository.java index 9a98b06..48be50f 100644 --- a/java/src/main/java/com/zipcode/stardust/repository/UserRepository.java +++ b/java/src/main/java/com/zipcode/stardust/repository/UserRepository.java @@ -1,9 +1,11 @@ package com.zipcode.stardust.repository; -import com.zipcode.stardust.model.User; -import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +import com.zipcode.stardust.model.User; + public interface UserRepository extends JpaRepository { Optional findByUsername(String username); Optional findByEmail(String email); From fa0ebf1b7409f08c6e376958b97866649ce7edc6 Mon Sep 17 00:00:00 2001 From: james Date: Mon, 6 Apr 2026 10:30:33 -0400 Subject: [PATCH 02/52] Renamed test files --- .../StardustApplicationTests.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename java/src/test/java/com/zipcode/{circuscircus/CircusCircusApplicationTests.java => stardust/StardustApplicationTests.java} (100%) diff --git a/java/src/test/java/com/zipcode/circuscircus/CircusCircusApplicationTests.java b/java/src/test/java/com/zipcode/stardust/StardustApplicationTests.java similarity index 100% rename from java/src/test/java/com/zipcode/circuscircus/CircusCircusApplicationTests.java rename to java/src/test/java/com/zipcode/stardust/StardustApplicationTests.java From 635d38bbe63d02b85bcb372c13f374fe25add741 Mon Sep 17 00:00:00 2001 From: mahala Date: Mon, 6 Apr 2026 11:35:26 -0400 Subject: [PATCH 03/52] Changed Name --- .../{circuscircus => stardust}/CircusCircusApplicationTests.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename java/src/test/java/com/zipcode/{circuscircus => stardust}/CircusCircusApplicationTests.java (100%) diff --git a/java/src/test/java/com/zipcode/circuscircus/CircusCircusApplicationTests.java b/java/src/test/java/com/zipcode/stardust/CircusCircusApplicationTests.java similarity index 100% rename from java/src/test/java/com/zipcode/circuscircus/CircusCircusApplicationTests.java rename to java/src/test/java/com/zipcode/stardust/CircusCircusApplicationTests.java From 78290e8b0e0b6bf383389ec0559b76f702359384 Mon Sep 17 00:00:00 2001 From: james Date: Mon, 6 Apr 2026 15:21:10 -0400 Subject: [PATCH 04/52] Branch and Port fixes --- java/pom.xml | 2 -- java/src/main/resources/application.properties | 2 +- java/src/test/resources/application.properties | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index d35d08a..941dfdf 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -45,12 +45,10 @@ org.xerial sqlite-jdbc - 3.45.3.0 org.hibernate.orm hibernate-community-dialects - 6.4.4.Final org.springframework.boot diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index 3a5f22b..ebd39f7 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -3,7 +3,7 @@ spring.datasource.driver-class-name=org.sqlite.JDBC spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=false -server.port=5000 +server.port=8080 spring.application.name=Schooner site.name=Schooner site.description=a schooner forum diff --git a/java/src/test/resources/application.properties b/java/src/test/resources/application.properties index a1e18e6..601f780 100644 --- a/java/src/test/resources/application.properties +++ b/java/src/test/resources/application.properties @@ -3,7 +3,7 @@ spring.datasource.driver-class-name=org.sqlite.JDBC spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.show-sql=false -server.port=5000 +server.port=8080 spring.application.name=Schooner site.name=Schooner site.description=a schooner forum From 9cd019e4c6aa37879e05721c8451b1a022865d34 Mon Sep 17 00:00:00 2001 From: mahala Date: Mon, 6 Apr 2026 16:53:30 -0400 Subject: [PATCH 05/52] Changed Server port --- java/src/main/resources/application.properties | 2 +- java/src/test/resources/application.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index 3a5f22b..ebd39f7 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -3,7 +3,7 @@ spring.datasource.driver-class-name=org.sqlite.JDBC spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=false -server.port=5000 +server.port=8080 spring.application.name=Schooner site.name=Schooner site.description=a schooner forum diff --git a/java/src/test/resources/application.properties b/java/src/test/resources/application.properties index a1e18e6..601f780 100644 --- a/java/src/test/resources/application.properties +++ b/java/src/test/resources/application.properties @@ -3,7 +3,7 @@ spring.datasource.driver-class-name=org.sqlite.JDBC spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.show-sql=false -server.port=5000 +server.port=8080 spring.application.name=Schooner site.name=Schooner site.description=a schooner forum From a7ab228190b570fec1d4f32f3310d8c33d9faace Mon Sep 17 00:00:00 2001 From: james Date: Tue, 7 Apr 2026 21:13:34 -0400 Subject: [PATCH 06/52] Markdown Support --- java/pom.xml | 10 ++++++++ .../stardust/controller/ForumController.java | 8 ++++++ .../stardust/service/ForumService.java | 25 +++++++++++++++++++ .../main/resources/templates/createpost.html | 4 +++ .../main/resources/templates/viewpost.html | 4 +-- 5 files changed, 49 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 941dfdf..4cc7490 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -60,6 +60,16 @@ spring-security-test test + + org.commonmark + commonmark + 0.22.0 + + + com.googlecode.owasp-java-html-sanitizer + owasp-java-html-sanitizer + 20240325.1 + diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 73f2019..61a0d85 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -12,7 +12,9 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Optional; @Controller @@ -170,8 +172,14 @@ public String viewPost(@RequestParam Long post, Model model, Authentication auth Post p = opt.get(); List comments = commentRepository.findByPostOrderByPostdateAsc(p); String breadcrumb = forumService.generateLinkPath(p.getSubforum().getId()); + Map commentContents = new LinkedHashMap<>(); + for (Comment c : comments) { + commentContents.put(c.getId(), forumService.renderMarkdown(c.getContent())); + } model.addAttribute("post", p); + model.addAttribute("postContent", forumService.renderMarkdown(p.getContent())); model.addAttribute("comments", comments); + model.addAttribute("commentContents", commentContents); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("errors", new ArrayList<>()); return "viewpost"; diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index 1ebbc72..0b117cb 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -3,6 +3,11 @@ import com.zipcode.stardust.model.Subforum; import com.zipcode.stardust.repository.SubforumRepository; import com.zipcode.stardust.repository.UserRepository; +import org.commonmark.node.Node; +import org.commonmark.parser.Parser; +import org.commonmark.renderer.html.HtmlRenderer; +import org.owasp.html.HtmlPolicyBuilder; +import org.owasp.html.PolicyFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.util.HtmlUtils; @@ -18,6 +23,26 @@ public class ForumService { @Autowired private UserRepository userRepository; + // Markdown rendering pipeline — thread-safe singletons + private final Parser mdParser = Parser.builder().build(); + private final HtmlRenderer mdRenderer = HtmlRenderer.builder().build(); + private final PolicyFactory sanitizer = new HtmlPolicyBuilder() + .allowElements("p", "br", "hr", "b", "strong", "em", "i", "u", "s", + "code", "pre", "blockquote", "ul", "ol", "li", + "h1", "h2", "h3", "h4") + .allowUrlProtocols("http", "https") + .allowElements("a") + .allowAttributes("href").onElements("a") + .requireRelNofollowOnLinks() + .toFactory(); + + public String renderMarkdown(String raw) { + if (raw == null) return ""; + Node document = mdParser.parse(raw); + String html = mdRenderer.render(document); + return sanitizer.sanitize(html); + } + public String generateLinkPath(Long subforumId) { StringBuilder sb = new StringBuilder(); sb.append(" / Forum Index"); diff --git a/java/src/main/resources/templates/createpost.html b/java/src/main/resources/templates/createpost.html index ee04f65..8854db8 100644 --- a/java/src/main/resources/templates/createpost.html +++ b/java/src/main/resources/templates/createpost.html @@ -21,6 +21,10 @@

Create Post in Forum

+ + Markdown supported: **bold**, _italic_, + `code`, # Heading, - list item + Cancel diff --git a/java/src/main/resources/templates/viewpost.html b/java/src/main/resources/templates/viewpost.html index 6762abc..fbce6f9 100644 --- a/java/src/main/resources/templates/viewpost.html +++ b/java/src/main/resources/templates/viewpost.html @@ -16,11 +16,11 @@

Post Title

— time

-
Content here
+
Content here
Comments (0)
-

Comment content

+

Comment content

by author — time From cf48dfddace5027d79678e0ae77293e3ea8b3d95 Mon Sep 17 00:00:00 2001 From: james Date: Wed, 8 Apr 2026 13:23:35 -0400 Subject: [PATCH 07/52] Message file and Message controller file --- Stardust.db | Bin 0 -> 32768 bytes .../controller/MessageController.java | 179 ++++++++++++++++++ .../com/zipcode/stardust/model/Message.java | 99 ++++++++++ .../repository/MessageRepository.java | 16 ++ .../service/CommonAttributesHelper.java | 46 +++++ 5 files changed, 340 insertions(+) create mode 100644 Stardust.db create mode 100644 java/src/main/java/com/zipcode/stardust/controller/MessageController.java create mode 100644 java/src/main/java/com/zipcode/stardust/model/Message.java create mode 100644 java/src/main/java/com/zipcode/stardust/repository/MessageRepository.java create mode 100644 java/src/main/java/com/zipcode/stardust/service/CommonAttributesHelper.java diff --git a/Stardust.db b/Stardust.db new file mode 100644 index 0000000000000000000000000000000000000000..48dfa9673dac572c860d82b1fcf6d830aca36752 GIT binary patch literal 32768 zcmeI)&u-H&90zb`>0d+}IE)_9BnyzXi2@yH7dVVD#tuxH*nkU%%56+*k=R}AFm~+V z$e9=56*zI=Dc})!1|&|{*|M!rhLHF>eIsS@9LM(WW2=(0dK>pvh2iwEN@8Z{HFAo0 z9=S;=A*5>0iaqnAU=!}l4=+y~ajlZe@@=jDf|O4tBv`M%ti7sloJ?wQ?e-B*;T8lS z009U<00Izz00ba#Oaz8&#d2eE(tGY1)`@tkdE(B}()#k^{bhQ8@z&}xJ?FB{(HRj^ zAr0^Gq)AyA3rRalMVv`0m7y|?q9)}r6A^vNl5U?RGgs&5XZLT?REo`%H|c?61?ODB^6vDU=#ZQ{Usrd)uDNQ$;(mvvuZhX(F2$J0gpE zptNzPKN79W8I827>#0uX=z1Rwwb2tWV=5P-n35^(GPV*Nb{UI&}O zLjAK%;(!1IAOHafKmY;|fB*y_009X67XlZGC9+UyklR9cQ?02oeV$O$7qX|RP4YFD zu~aCLZe@-<&~|4)U+DdB`%|N`Jp+`vTCoH0S72B;9Ex$zWR?b(~ z`9LLxc2e8ImN0!=W45V2jk5-Cr9HY^M7JhNWTi4)eJJ>r+jehDFez0kyWH&)*zMrr z;haZanG7%5ct&!Yt}&Wq?P|L@MuxPv*S&BzZnyJ;byR8&b*953l`GtFji0b1S`6Nh z;A8M1_!PXeNgNP>00bZa0SG_<0uX=z1Rwwb2>b&ARlnh7uP};d{5kL2mlB1*KkprS z<=~(8r@fJv2NM;)QO(x>`2PPtFrerH1Rwwb2tWV=5P$##AOHafK;SnExWE77|Ns4F zWK<6U2tWV=5P$##AOHafKmY;|_{#!V|NrFyK=TlQ00bZa0SG_<0uX=z1Rwx`KOpc0 Dju6H} literal 0 HcmV?d00001 diff --git a/java/src/main/java/com/zipcode/stardust/controller/MessageController.java b/java/src/main/java/com/zipcode/stardust/controller/MessageController.java new file mode 100644 index 0000000..f987f41 --- /dev/null +++ b/java/src/main/java/com/zipcode/stardust/controller/MessageController.java @@ -0,0 +1,179 @@ +package com.zipcode.stardust.controller; + +import com.zipcode.stardust.model.Message; +import com.zipcode.stardust.model.User; +import com.zipcode.stardust.repository.MessageRepository; +import com.zipcode.stardust.repository.UserRepository; +import com.zipcode.stardust.service.CommonAttributesHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +@Controller +public class MessageController { + + @Autowired private MessageRepository messageRepository; + @Autowired private UserRepository userRepository; + @Autowired private CommonAttributesHelper helper; + + // ── Inbox ──────────────────────────────────────────────────────────────── + + @GetMapping("/messages/inbox") + public String inbox(Model model, Authentication auth) { + helper.addCommonAttributes(model, auth); + User user = helper.getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + + List messages = + messageRepository.findByRecipientAndDeletedByRecipientFalseOrderBySentAtDesc(user); + model.addAttribute("messages", messages); + return "messages/inbox"; + } + + // ── Outbox ─────────────────────────────────────────────────────────────── + + @GetMapping("/messages/outbox") + public String outbox(Model model, Authentication auth) { + helper.addCommonAttributes(model, auth); + User user = helper.getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + + List messages = + messageRepository.findBySenderAndDeletedBySenderFalseOrderBySentAtDesc(user); + model.addAttribute("messages", messages); + return "messages/outbox"; + } + + // ── Compose — show form ────────────────────────────────────────────────── + + @GetMapping("/messages/compose") + public String composeForm( + @RequestParam(required = false, defaultValue = "") String to, + @RequestParam(required = false, defaultValue = "") String subject, + Model model, Authentication auth) { + + helper.addCommonAttributes(model, auth); + if (helper.getCurrentUser(auth) == null) return "redirect:/loginform"; + + // Truncate pre-filled subject to 200 chars to stay within the field limit + if (subject.length() > 200) subject = subject.substring(0, 200); + + model.addAttribute("toUsername", to); + model.addAttribute("subjectPrefill", subject); + model.addAttribute("errors", new ArrayList<>()); + return "messages/compose"; + } + + // ── Compose — send message ─────────────────────────────────────────────── + + @PostMapping("/messages/compose") + public String sendMessage( + @RequestParam String to, + @RequestParam String subject, + @RequestParam String content, + Model model, Authentication auth) { + + helper.addCommonAttributes(model, auth); + User sender = helper.getCurrentUser(auth); + if (sender == null) return "redirect:/loginform"; + + List errors = new ArrayList<>(); + + // Validate subject and content + if (subject == null || subject.isBlank() || subject.length() > 200) + errors.add("Subject must be between 1 and 200 characters."); + if (content == null || content.isBlank() || content.length() > 4999) + errors.add("Message must be between 1 and 4999 characters."); + + // Look up the recipient by username + Optional recipientOpt = userRepository.findByUsername(to); + if (recipientOpt.isEmpty()) + errors.add("No user with the username \"" + to + "\" exists."); + + // If any errors, re-render the compose form with the values intact + if (!errors.isEmpty()) { + model.addAttribute("toUsername", to); + model.addAttribute("subjectPrefill", subject); + model.addAttribute("errors", errors); + return "messages/compose"; + } + + Message message = new Message(sender, recipientOpt.get(), subject, content); + messageRepository.save(message); + return "redirect:/messages/outbox"; + } + + // ── View a message ─────────────────────────────────────────────────────── + + @GetMapping("/messages/view") + public String viewMessage( + @RequestParam Long id, + Model model, Authentication auth) { + + helper.addCommonAttributes(model, auth); + User user = helper.getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + + Optional opt = messageRepository.findById(id); + if (opt.isEmpty()) return "redirect:/messages/inbox"; + Message message = opt.get(); + + // Security check — only the sender or recipient may view this message + boolean isSender = message.getSender().getId().equals(user.getId()); + boolean isRecipient = message.getRecipient().getId().equals(user.getId()); + if (!isSender && !isRecipient) return "redirect:/"; + + // Mark as read when the recipient opens it for the first time + if (isRecipient && !message.isRead()) { + message.setRead(true); + messageRepository.save(message); + } + + // Build the reply URL with a properly encoded subject line + String encodedSubject = URLEncoder.encode("Re: " + message.getSubject(), StandardCharsets.UTF_8); + String replyUrl = "/messages/compose?to=" + message.getSender().getUsername() + + "&subject=" + encodedSubject; + + model.addAttribute("message", message); + model.addAttribute("replyUrl", replyUrl); + model.addAttribute("isSender", isSender); + return "messages/view"; + } + + // ── Delete (soft) ──────────────────────────────────────────────────────── + + @PostMapping("/messages/delete") + public String deleteMessage( + @RequestParam Long id, + @RequestParam String box, + Authentication auth) { + + User user = helper.getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + + Optional opt = messageRepository.findById(id); + if (opt.isEmpty()) return "redirect:/messages/inbox"; + Message message = opt.get(); + + if ("outbox".equals(box) && message.getSender().getId().equals(user.getId())) { + message.setDeletedBySender(true); + messageRepository.save(message); + return "redirect:/messages/outbox"; + } + + if ("inbox".equals(box) && message.getRecipient().getId().equals(user.getId())) { + message.setDeletedByRecipient(true); + messageRepository.save(message); + } + + return "redirect:/messages/inbox"; + } +} diff --git a/java/src/main/java/com/zipcode/stardust/model/Message.java b/java/src/main/java/com/zipcode/stardust/model/Message.java new file mode 100644 index 0000000..f5f9d85 --- /dev/null +++ b/java/src/main/java/com/zipcode/stardust/model/Message.java @@ -0,0 +1,99 @@ +package com.zipcode.stardust.model; + +import java.time.Duration; +import java.time.LocalDateTime; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "message") +public class Message { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "sender_id") + private User sender; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "recipient_id") + private User recipient; + + @Column(nullable = false, length = 200) + private String subject; + + @Column(nullable = false, length = 5000) + private String content; + + @Column(nullable = false) + private LocalDateTime sentAt; + + @Column(nullable = false) + private boolean read = false; + + @Column(nullable = false) + private boolean deletedBySender = false; + + @Column(nullable = false) + private boolean deletedByRecipient = false; + + public Message() {} + + public Message(User sender, User recipient, String subject, String content) { + this.sender = sender; + this.recipient = recipient; + this.subject = subject; + this.content = content; + this.sentAt = LocalDateTime.now(); + } + + public String getTimeString() { + Duration d = Duration.between(sentAt, LocalDateTime.now()); + long months = d.toDays() / 30; + long days = d.toDays(); + long hours = d.toHours(); + long minutes = d.toMinutes(); + if (months > 0) return months + " month" + (months == 1 ? "" : "s") + " ago"; + if (days > 0) return days + " day" + (days == 1 ? "" : "s") + " ago"; + if (hours > 0) return hours + " hour" + (hours == 1 ? "" : "s") + " ago"; + if (minutes > 0) return minutes + " minute" + (minutes == 1 ? "" : "s") + " ago"; + return "Just now"; + } + + public Long getId() { return id; } + public void setId(Long id) { this.id = id; } + + public User getSender() { return sender; } + public void setSender(User sender) { this.sender = sender; } + + public User getRecipient() { return recipient; } + public void setRecipient(User recipient) { this.recipient = recipient; } + + public String getSubject() { return subject; } + public void setSubject(String subject) { this.subject = subject; } + + public String getContent() { return content; } + public void setContent(String content) { this.content = content; } + + public LocalDateTime getSentAt() { return sentAt; } + public void setSentAt(LocalDateTime sentAt) { this.sentAt = sentAt; } + + public boolean isRead() { return read; } + public void setRead(boolean read) { this.read = read; } + + public boolean isDeletedBySender() { return deletedBySender; } + public void setDeletedBySender(boolean v) { this.deletedBySender = v; } + + public boolean isDeletedByRecipient() { return deletedByRecipient; } + public void setDeletedByRecipient(boolean v) { this.deletedByRecipient = v; } +} diff --git a/java/src/main/java/com/zipcode/stardust/repository/MessageRepository.java b/java/src/main/java/com/zipcode/stardust/repository/MessageRepository.java new file mode 100644 index 0000000..29ae5ae --- /dev/null +++ b/java/src/main/java/com/zipcode/stardust/repository/MessageRepository.java @@ -0,0 +1,16 @@ +package com.zipcode.stardust.repository; + +import com.zipcode.stardust.model.Message; +import com.zipcode.stardust.model.User; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface MessageRepository extends JpaRepository { + + List findByRecipientAndDeletedByRecipientFalseOrderBySentAtDesc(User recipient); + + List findBySenderAndDeletedBySenderFalseOrderBySentAtDesc(User sender); + + long countByRecipientAndReadFalseAndDeletedByRecipientFalse(User recipient); +} diff --git a/java/src/main/java/com/zipcode/stardust/service/CommonAttributesHelper.java b/java/src/main/java/com/zipcode/stardust/service/CommonAttributesHelper.java new file mode 100644 index 0000000..d92bc56 --- /dev/null +++ b/java/src/main/java/com/zipcode/stardust/service/CommonAttributesHelper.java @@ -0,0 +1,46 @@ +package com.zipcode.stardust.service; + +import com.zipcode.stardust.model.User; +import com.zipcode.stardust.repository.MessageRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; +import org.springframework.ui.Model; + +@Component +public class CommonAttributesHelper { + + @Autowired + private MessageRepository messageRepository; + + @Value("${site.name:Schooner}") + private String siteName; + + @Value("${site.description:a schooner forum}") + private String siteDescription; + + public User getCurrentUser(Authentication auth) { + if (auth == null || !auth.isAuthenticated() || + "anonymousUser".equals(auth.getPrincipal())) { + return null; + } + return (User) auth.getPrincipal(); + } + + public void addCommonAttributes(Model model, Authentication auth) { + model.addAttribute("siteName", siteName); + model.addAttribute("siteDescription", siteDescription); + + User user = getCurrentUser(auth); + if (user != null) { + model.addAttribute("isLoggedIn", true); + model.addAttribute("currentUser", user.getUsername()); + model.addAttribute("unreadCount", + messageRepository.countByRecipientAndReadFalseAndDeletedByRecipientFalse(user)); + } else { + model.addAttribute("isLoggedIn", false); + model.addAttribute("unreadCount", 0L); + } + } +} From 418a6c49a079a9628dcfcd366d53ad3df2402b4c Mon Sep 17 00:00:00 2001 From: james Date: Wed, 8 Apr 2026 14:08:39 -0400 Subject: [PATCH 08/52] Html files for messages --- java/src/main/resources/static/style.css | 3 ++ .../resources/templates/messages/compose.html | 40 ++++++++++++++++++ .../resources/templates/messages/inbox.html | 41 ++++++++++++++++++ .../resources/templates/messages/outbox.html | 36 ++++++++++++++++ .../resources/templates/messages/view.html | 42 +++++++++++++++++++ 5 files changed, 162 insertions(+) create mode 100644 java/src/main/resources/templates/messages/compose.html create mode 100644 java/src/main/resources/templates/messages/inbox.html create mode 100644 java/src/main/resources/templates/messages/outbox.html create mode 100644 java/src/main/resources/templates/messages/view.html diff --git a/java/src/main/resources/static/style.css b/java/src/main/resources/static/style.css index d69c81d..e0b1847 100644 --- a/java/src/main/resources/static/style.css +++ b/java/src/main/resources/static/style.css @@ -19,3 +19,6 @@ body { padding: 10px; margin-bottom: 10px; } +.message-list .list-group-item { + border-left: 4px solid #6f42c1; +} diff --git a/java/src/main/resources/templates/messages/compose.html b/java/src/main/resources/templates/messages/compose.html new file mode 100644 index 0000000..66caaf2 --- /dev/null +++ b/java/src/main/resources/templates/messages/compose.html @@ -0,0 +1,40 @@ + + + + +
+
+ +

Compose Message

+ +
+
    +
  • Error
    • +
+
+ +
+
+ + +
+
+ + +
+
+ + +
+ + Cancel +
+ +
+ + diff --git a/java/src/main/resources/templates/messages/inbox.html b/java/src/main/resources/templates/messages/inbox.html new file mode 100644 index 0000000..41da984 --- /dev/null +++ b/java/src/main/resources/templates/messages/inbox.html @@ -0,0 +1,41 @@ + + + + +
+
+ +
+

Inbox

+ Compose +
+ +
+ Sent Messages +
+ +
+ No messages. +
+ +
+ +
+ sender + time +
+
+ subject + New +
+ +
+ +
+ + diff --git a/java/src/main/resources/templates/messages/outbox.html b/java/src/main/resources/templates/messages/outbox.html new file mode 100644 index 0000000..cc5ef9c --- /dev/null +++ b/java/src/main/resources/templates/messages/outbox.html @@ -0,0 +1,36 @@ + + + + +
+
+ +
+

Sent Messages

+ Compose +
+ +
+ Inbox +
+ +
+ No sent messages. +
+ +
+ +
+ recipient + time +
+ subject + +
+ +
+ + diff --git a/java/src/main/resources/templates/messages/view.html b/java/src/main/resources/templates/messages/view.html new file mode 100644 index 0000000..8e6a70b --- /dev/null +++ b/java/src/main/resources/templates/messages/view.html @@ -0,0 +1,42 @@ + + + + +
+
+ +
+ ← Back +
+ +
+
+
Subject
+ + From sender + to recipient + — time + +
+
+

Message content

+
+
+ +
+ Reply + +
+ + + +
+
+ +
+ + From d721271140ea19d7347cecfcdeea4394ef7225e0 Mon Sep 17 00:00:00 2001 From: james Date: Wed, 8 Apr 2026 14:12:30 -0400 Subject: [PATCH 09/52] Whitespace --- .../src/main/java/com/zipcode/stardust/model/Message.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/model/Message.java b/java/src/main/java/com/zipcode/stardust/model/Message.java index f5f9d85..cc34087 100644 --- a/java/src/main/java/com/zipcode/stardust/model/Message.java +++ b/java/src/main/java/com/zipcode/stardust/model/Message.java @@ -72,28 +72,20 @@ public String getTimeString() { public Long getId() { return id; } public void setId(Long id) { this.id = id; } - public User getSender() { return sender; } public void setSender(User sender) { this.sender = sender; } - public User getRecipient() { return recipient; } public void setRecipient(User recipient) { this.recipient = recipient; } - public String getSubject() { return subject; } public void setSubject(String subject) { this.subject = subject; } - public String getContent() { return content; } public void setContent(String content) { this.content = content; } - public LocalDateTime getSentAt() { return sentAt; } public void setSentAt(LocalDateTime sentAt) { this.sentAt = sentAt; } - public boolean isRead() { return read; } public void setRead(boolean read) { this.read = read; } - public boolean isDeletedBySender() { return deletedBySender; } public void setDeletedBySender(boolean v) { this.deletedBySender = v; } - public boolean isDeletedByRecipient() { return deletedByRecipient; } public void setDeletedByRecipient(boolean v) { this.deletedByRecipient = v; } } From 552af70c99de91d449a6304b87c53f0bb66bc34e Mon Sep 17 00:00:00 2001 From: james Date: Wed, 8 Apr 2026 15:25:48 -0400 Subject: [PATCH 10/52] Simple security --- Stardust.db | Bin 32768 -> 36864 bytes .../stardust/config/SecurityConfig.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Stardust.db b/Stardust.db index 48dfa9673dac572c860d82b1fcf6d830aca36752..fea4e21245563dd3642a07eae344e52408f7e417 100644 GIT binary patch delta 573 zcmZo@U}{*vG(lRBhk=2C6Nq7eb)t^3EDwWT-Y#Cg76uM(TL%6hz8>Cbe8D_Lyt%wC z+_oDV4{{kb8F8?SOG`7hSeGOw<)r4O78fU`!zfPYAXmo_SA`HqCm&Y@sNCeOe0udM zsX3`7sVVVEmGMQX$(aS2sd*&|N%{FXsfl?CdHE#@d8IiyItob2ic|AaQj4&tDN0RD z!6FP)UlN~KqEM0vw6`QNw*bl5V)N3ZtkmQZg|ft=fOX82DFg78IDr9}&jL!O$qoD$dENte~Y;0<=y`iCbe8D_Lyt%wC kn*{}aaBnW+nIycJML=LNi-E#s7J)zfj9i-;1^&Y*08&vD!vFvP diff --git a/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java b/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java index 68a847c..9e1259d 100644 --- a/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java +++ b/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java @@ -38,7 +38,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { "/action_createaccount", "/static/**", "/style.css").permitAll() .requestMatchers("/addpost", "/action_post", "/action_comment") .authenticated() - .anyRequest().permitAll() + .anyRequest().authenticated() ) .formLogin(form -> form .loginPage("/loginform") From cb7934a32c2ae177f00a9ad40a8a1ed348782de4 Mon Sep 17 00:00:00 2001 From: joseph Date: Wed, 8 Apr 2026 16:21:09 -0400 Subject: [PATCH 11/52] changes --- Stardust.db | Bin 0 -> 40960 bytes java/pom.xml | 4 +- .../java/com/zipcode/stardust/model/User.java | 2 +- .../zipcode/stardust/model/UserProfile.java | 72 ++++++++++++++++++ .../repository/UserProfileRepository.java | 12 +++ .../stardust/service/ForumService.java | 25 +++++- .../src/main/resources/application.properties | 3 +- .../StardustApplicationTests.java} | 4 +- 8 files changed, 115 insertions(+), 7 deletions(-) create mode 100644 Stardust.db create mode 100644 java/src/main/java/com/zipcode/stardust/model/UserProfile.java create mode 100644 java/src/main/java/com/zipcode/stardust/repository/UserProfileRepository.java rename java/src/test/java/com/zipcode/{circuscircus/CircusCircusApplicationTests.java => Stardust/StardustApplicationTests.java} (85%) diff --git a/Stardust.db b/Stardust.db new file mode 100644 index 0000000000000000000000000000000000000000..c1fc97802d44c072f271fe85f2a60ee6e734933a GIT binary patch literal 40960 zcmeI)&u-&H90%}moxj~pyc~)Tt4gCSQnuOvX;FoM!_w`R9$2)ZyKvzUP2$;Pz@AAx zV@i(+969p>yaFcv|D*g>GP7Sv@b;wGw``b|J>Li>KDAyzsyrt2+MB zuZHXE-sB)R(pk?A(6VH{E)}fixkasr>wYRmMkrZ`r%i_ESv7ayPyddT_owsl~+`Kbi6#n?0R}F99_9k!VQS?=k*w)QfD}`8Qng3%r zF4q6l+J=L_<=(JB00Izz00bZa0SG_<0uX=z1R!u-1u*`z{}fB*y_009U< z00Izz00d42-1xuT{G9|p2S>sE=HE7n1p*L&00bZa0SG_<0uX=z1R(HQ2)tFUko&ce zJQTX0X-$kD@Wig!{r->t|9i>EC>{b3fB*y_009U<00Izz00ba##R3@rU-1P%^$>sn z1Rwwb2tWV=5P$##AOL|&5Ww^Qmw=2aAOHafKmY;|fB*y_009U<00LJmfZzYG_yVAM Z2tWV=5P$##AOHafKmY;|fWRdP`~y758&?1T literal 0 HcmV?d00001 diff --git a/java/pom.xml b/java/pom.xml index d35d08a..9026094 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -45,12 +45,12 @@ org.xerial sqlite-jdbc - 3.45.3.0 + org.hibernate.orm hibernate-community-dialects - 6.4.4.Final + org.springframework.boot diff --git a/java/src/main/java/com/zipcode/stardust/model/User.java b/java/src/main/java/com/zipcode/stardust/model/User.java index 7b02b2d..920911a 100644 --- a/java/src/main/java/com/zipcode/stardust/model/User.java +++ b/java/src/main/java/com/zipcode/stardust/model/User.java @@ -50,7 +50,7 @@ public User(String email, String username, String rawPassword, PasswordEncoder e this.email = email; this.username = username; this.passwordHash = encoder.encode(rawPassword); - this.admin = "admin".equalsIgnoreCase(username); + this.admin = "admin".equalsIgnoreCase(username); ///meanifull } public boolean checkPassword(String rawPassword, PasswordEncoder encoder) { diff --git a/java/src/main/java/com/zipcode/stardust/model/UserProfile.java b/java/src/main/java/com/zipcode/stardust/model/UserProfile.java new file mode 100644 index 0000000..7f49316 --- /dev/null +++ b/java/src/main/java/com/zipcode/stardust/model/UserProfile.java @@ -0,0 +1,72 @@ +package com.zipcode.stardust.model; + +import jakarta.persistence.*; +import java.time.LocalDateTime; + +@Entity +@Table(name = "user_profiles") +public class UserProfile { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String bio; + + private String email; + + private LocalDateTime joinDate; + + @OneToOne + @JoinColumn(name = "user_id") + private User user; + + public UserProfile() {} + + public UserProfile(User user) { + this.user = user; + this.email = user.getEmail(); + this.joinDate = LocalDateTime.now(); + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getBio() { + return bio; + } + + public void setBio(String bio) { + this.bio = bio; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public LocalDateTime getJoinDate() { + return joinDate; + } + + public void setJoinDate(LocalDateTime joinDate) { + this.joinDate = joinDate; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + +} \ No newline at end of file diff --git a/java/src/main/java/com/zipcode/stardust/repository/UserProfileRepository.java b/java/src/main/java/com/zipcode/stardust/repository/UserProfileRepository.java new file mode 100644 index 0000000..59e14c4 --- /dev/null +++ b/java/src/main/java/com/zipcode/stardust/repository/UserProfileRepository.java @@ -0,0 +1,12 @@ +package com.zipcode.stardust.repository; +import com.zipcode.stardust.model.UserProfile; + +import com.zipcode.stardust.model.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserProfileRepository extends JpaRepository { + + + + UserProfile findByUser(User user); +} \ No newline at end of file diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index 1ebbc72..46c9b9b 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -1,8 +1,11 @@ package com.zipcode.stardust.service; import com.zipcode.stardust.model.Subforum; +import com.zipcode.stardust.model.UserProfile; +import com.zipcode.stardust.model.User; import com.zipcode.stardust.repository.SubforumRepository; import com.zipcode.stardust.repository.UserRepository; +import com.zipcode.stardust.repository.UserProfileRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.util.HtmlUtils; @@ -18,6 +21,9 @@ public class ForumService { @Autowired private UserRepository userRepository; + @Autowired + private UserProfileRepository userProfileRepository; // ADD 1 - new repo + public String generateLinkPath(Long subforumId) { StringBuilder sb = new StringBuilder(); sb.append(" / Forum Index"); @@ -63,4 +69,21 @@ public boolean usernameTaken(String username) { public boolean emailTaken(String email) { return userRepository.existsByEmail(email); } -} + + // ADD 2 - UserProfile methods + public UserProfile getUserProfile(User user) { + return userProfileRepository.findByUser(user); + } + + public UserProfile createUserProfile(User user) { + UserProfile profile = new UserProfile(user); + return userProfileRepository.save(profile); + } + + public UserProfile updateBio(User user, String bio) { + UserProfile profile = userProfileRepository.findByUser(user); + profile.setBio(bio); + return userProfileRepository.save(profile); + } + +} \ No newline at end of file diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index 3a5f22b..fa02e53 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -3,8 +3,9 @@ spring.datasource.driver-class-name=org.sqlite.JDBC spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=false -server.port=5000 +server.port=8080 spring.application.name=Schooner site.name=Schooner site.description=a schooner forum spring.thymeleaf.cache=false + diff --git a/java/src/test/java/com/zipcode/circuscircus/CircusCircusApplicationTests.java b/java/src/test/java/com/zipcode/Stardust/StardustApplicationTests.java similarity index 85% rename from java/src/test/java/com/zipcode/circuscircus/CircusCircusApplicationTests.java rename to java/src/test/java/com/zipcode/Stardust/StardustApplicationTests.java index 2ffc944..ed6bd9e 100644 --- a/java/src/test/java/com/zipcode/circuscircus/CircusCircusApplicationTests.java +++ b/java/src/test/java/com/zipcode/Stardust/StardustApplicationTests.java @@ -1,4 +1,4 @@ -package com.zipcode.stardust; +package com.zipcode.Stardust; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @@ -7,4 +7,4 @@ class StardustApplicationTests { @Test void contextLoads() {} -} +} \ No newline at end of file From d762babd4dd33370b11de8ea102d19ad0a924860 Mon Sep 17 00:00:00 2001 From: james Date: Wed, 8 Apr 2026 16:46:28 -0400 Subject: [PATCH 12/52] userProfileRepository --- .../zipcode/stardust/service/ForumService.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index d0e09e7..ecd817a 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -1,10 +1,7 @@ package com.zipcode.stardust.service; -import com.zipcode.stardust.model.Subforum; -import com.zipcode.stardust.model.UserProfile; -import com.zipcode.stardust.model.User; -import com.zipcode.stardust.repository.SubforumRepository; -import com.zipcode.stardust.repository.UserRepository; +import java.util.Optional; + import org.commonmark.node.Node; import org.commonmark.parser.Parser; import org.commonmark.renderer.html.HtmlRenderer; @@ -14,7 +11,12 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.HtmlUtils; -import java.util.Optional; +import com.zipcode.stardust.model.Subforum; +import com.zipcode.stardust.model.User; +import com.zipcode.stardust.model.UserProfile; +import com.zipcode.stardust.repository.SubforumRepository; +import com.zipcode.stardust.repository.UserProfileRepository; +import com.zipcode.stardust.repository.UserRepository; @Service public class ForumService { @@ -25,6 +27,9 @@ public class ForumService { @Autowired private UserRepository userRepository; + @Autowired + private UserProfileRepository userProfileRepository; + // Markdown rendering pipeline — thread-safe singletons private final Parser mdParser = Parser.builder().build(); private final HtmlRenderer mdRenderer = HtmlRenderer.builder().build(); @@ -106,5 +111,4 @@ public UserProfile updateBio(User user, String bio) { profile.setBio(bio); return userProfileRepository.save(profile); } - } \ No newline at end of file From 0446d2799888b9d55bd61168845539748454225b Mon Sep 17 00:00:00 2001 From: james Date: Wed, 8 Apr 2026 21:32:05 -0400 Subject: [PATCH 13/52] Checkpoint --- Stardust.db | Bin 36864 -> 45056 bytes .../stardust/controller/ForumController.java | 24 +++--------------- java/src/main/resources/templates/header.html | 4 +++ 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Stardust.db b/Stardust.db index fea4e21245563dd3642a07eae344e52408f7e417..b4c6fafce83189545d587daf39ef33444d7cef58 100644 GIT binary patch delta 268 zcmZozz|`=7X@ayMF9QPuHxR=B+e95>MP3HIyj{F}Eeu>-z6|_9d_BC=_=0(gcyoDO zxNW(7xtTULp5;txG~#3zS663jQZ7kM%1JFPPA!TrD9TUE%tUxUc$TFJ4&*m^qH%6Ssn(xyj{F}Eessowha71d_BC=_=0(gcyoDO RxNSEJ3LNCxY|DMP1puyT4k`cu diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 61a0d85..72f27b3 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -2,9 +2,9 @@ import com.zipcode.stardust.model.*; import com.zipcode.stardust.repository.*; +import com.zipcode.stardust.service.CommonAttributesHelper; import com.zipcode.stardust.service.ForumService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Controller; @@ -26,30 +26,14 @@ public class ForumController { @Autowired private UserRepository userRepository; @Autowired private PasswordEncoder passwordEncoder; @Autowired private ForumService forumService; - - @Value("${site.name:Schooner}") - private String siteName; - - @Value("${site.description:a schooner forum}") - private String siteDescription; + @Autowired private CommonAttributesHelper helper; private User getCurrentUser(Authentication auth) { - if (auth == null || !auth.isAuthenticated() || - "anonymousUser".equals(auth.getPrincipal())) { - return null; - } - return (User) auth.getPrincipal(); + return helper.getCurrentUser(auth); } private void addCommonAttributes(Model model, Authentication auth) { - model.addAttribute("siteName", siteName); - model.addAttribute("siteDescription", siteDescription); - if (auth != null && auth.isAuthenticated() && !"anonymousUser".equals(auth.getPrincipal())) { - model.addAttribute("currentUser", auth.getName()); - model.addAttribute("isLoggedIn", true); - } else { - model.addAttribute("isLoggedIn", false); - } + helper.addCommonAttributes(model, auth); } @GetMapping("/") diff --git a/java/src/main/resources/templates/header.html b/java/src/main/resources/templates/header.html index 8abe4a2..3299cf5 100644 --- a/java/src/main/resources/templates/header.html +++ b/java/src/main/resources/templates/header.html @@ -8,6 +8,10 @@
Subforum Index + + Messages + 0 + Hello, user
From c15038139300fb86da0cefcbf602bcd59a226593 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 9 Apr 2026 14:23:04 -0400 Subject: [PATCH 14/52] Fixed crash option from Null result --- Stardust.db | Bin 45056 -> 49152 bytes .../stardust/service/ForumService.java | 1 + 2 files changed, 1 insertion(+) diff --git a/Stardust.db b/Stardust.db index b4c6fafce83189545d587daf39ef33444d7cef58..f2717d0adae5bb805146d566eba83210b2d9a626 100644 GIT binary patch delta 286 zcmZp8z|_#dJV9EJkAZ=K2Z&*SeWH%BG9QCpnCbe8D_Lyt%wC V+_qf4+)SGV1 Date: Thu, 9 Apr 2026 14:32:16 -0400 Subject: [PATCH 15/52] Delete Extra File --- Stardust.db | Bin 40960 -> 45056 bytes java/src/main/java/com/zipcode/stardust/Media | 133 ------------------ 2 files changed, 133 deletions(-) delete mode 100644 java/src/main/java/com/zipcode/stardust/Media diff --git a/Stardust.db b/Stardust.db index c1fc97802d44c072f271fe85f2a60ee6e734933a..37fa96c97f5e5a621bf7a5dd9a2e614cc0ef7091 100644 GIT binary patch delta 449 zcmZoTz|`=7X@ayM4+8@OHxR=B+e95>MIHvdHcei>76vY^2@L!}d_BC=_=0(gcyoDO zxSM#)xh8CE6yVBk%;#bkS5{_hRxL?P%1O;lP037*Pt8qAO+jLEI|sQshPWz(I6C>b zDj-QHXk?}+WagEmrl%I^C?qEqlw{`TDU>A^C1)fSX&4(AXzDUsgRdnqL5dblcS?h zkY8L9541TcGaYC-Tw<~zukhw3?j{#DM*igt{L42B3e4qC4rgR%;81U5l{Pdoc1X`n z%*@eC&d*gbN>nj4P|5Q(v-FH`E)CZYvkVP3HA%@c3yUfZF82+KOv~_z49P3Y^fU}{ zHP3fR(MzgK3CXK8E_9E|PjyMGtl|O&HzWUh2LAUzi=OgJ3oxs5qSygZ@Rfo8D^S5} Ser_&iX-=r#MF9$n6a)Z`je@)Y delta 82 zcmZp8z|?SnX@ayM7Xt$W2*UvDL>*&!E(X24UA%lP44m9e4E#ZSJ-pNSf_aK~b9r63 dn|RDO3ktAsZ*Jmla@ow%@JD{p1cgNt1OShe69oVO diff --git a/java/src/main/java/com/zipcode/stardust/Media b/java/src/main/java/com/zipcode/stardust/Media deleted file mode 100644 index 35bb1f1..0000000 --- a/java/src/main/java/com/zipcode/stardust/Media +++ /dev/null @@ -1,133 +0,0 @@ -package com.zipcode.stardust.model; - -import jakarta.persistence.*; - -/** - * ============================================================= - * MediaEmbed — a database entity that stores one media link - * attached to a Post. - * - * KEY CONCEPTS FOR LEARNERS - * -------------------------- - * @Entity → tells JPA "make a table for this class" - * @Table → lets us name the table ourselves ("media_embed") - * @Id → marks the primary-key field - * @GeneratedValue → the database auto-assigns the id number - * @ManyToOne → many embeds can belong to ONE post - * @JoinColumn → the foreign-key column in the DB table - * @Enumerated → stores our enum as a readable string ("IMAGE" - * or "VIDEO") instead of a number - * ============================================================= - */ -@Entity -@Table(name = "media_embed") -public class MediaEmbed { - - // ── Enum ──────────────────────────────────────────────── - /** - * MediaType limits the kind of media to IMAGE or VIDEO. - * Using an enum prevents typos like "img" vs "image". - */ - public enum MediaType { - IMAGE, - VIDEO - } - - // ── Fields ────────────────────────────────────────────── - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - /** - * The URL the user pasted (e.g. https://i.imgur.com/abc.jpg). - * nullable = false → the DB will reject a row with no URL. - * length = 2048 → URLs can be long; 255 (the default) is too short. - */ - @Column(nullable = false, length = 2048) - private String url; - - /** - * IMAGE or VIDEO — stored as the enum name string in the DB. - * EnumType.STRING is safer than ORDINAL because adding new - * enum values won't silently corrupt old data. - */ - @Enumerated(EnumType.STRING) - @Column(nullable = false) - private MediaType mediaType; - - /** - * Optional caption the user may provide (e.g. "My cat"). - * nullable = true (default) means it is allowed to be blank. - */ - @Column(length = 300) - private String caption; - - /** - * The post this embed belongs to. - * FetchType.LAZY → don't load the whole Post object from the - * DB until we actually call getPost(); saves memory. - */ - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "post_id", nullable = false) - private Post post; - - // ── Constructors ───────────────────────────────────────── - - /** JPA needs a no-argument constructor (it uses reflection). */ - public MediaEmbed() {} - - /** - * Convenience constructor used in the controller when saving - * a new embed. - * - * @param url the media URL - * @param mediaType IMAGE or VIDEO - * @param caption optional caption (may be null or blank) - * @param post the parent post - */ - public MediaEmbed(String url, MediaType mediaType, String caption, Post post) { - this.url = url; - this.mediaType = mediaType; - this.caption = caption; - this.post = post; - } - - // ── Getters & Setters ──────────────────────────────────── - // These let other classes read/write the private fields. - // Spring and Thymeleaf use getters heavily. - - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - - public String getUrl() { return url; } - public void setUrl(String url) { this.url = url; } - - public MediaType getMediaType() { return mediaType; } - public void setMediaType(MediaType mediaType) { this.mediaType = mediaType; } - - public String getCaption() { return caption; } - public void setCaption(String caption){ this.caption = caption; } - - public Post getPost() { return post; } - public void setPost(Post post) { this.post = post; } - - // ── Helper used in Thymeleaf templates ─────────────────── - - /** - * Returns true when this embed is an IMAGE. - * Thymeleaf can call th:if="${embed.image}" instead of - * comparing the enum by name — cleaner templates! - */ - public boolean isImage() { - return MediaType.IMAGE == this.mediaType; - } - - /** - * Returns true when this embed is a VIDEO. - */ - public boolean isVideo() { - return MediaType.VIDEO == this.mediaType; - } -} - \ No newline at end of file From a8a3584ab8883d234e85353ed673f135bd90568b Mon Sep 17 00:00:00 2001 From: nishat Date: Thu, 9 Apr 2026 14:38:01 -0400 Subject: [PATCH 16/52] reactions by nishat --- cookies.txt | 5 ++ java/README.md | 22 ++++++ .../stardust/controller/ForumController.java | 62 ++++++++++++--- .../com/zipcode/stardust/model/Reaction.java | 42 ++++++++++ .../repository/ReactionRepository.java | 27 +++++++ .../stardust/service/ForumService.java | 77 +++++++++++++++++-- 6 files changed, 218 insertions(+), 17 deletions(-) create mode 100644 cookies.txt create mode 100644 java/src/main/java/com/zipcode/stardust/model/Reaction.java create mode 100644 java/src/main/java/com/zipcode/stardust/repository/ReactionRepository.java diff --git a/cookies.txt b/cookies.txt new file mode 100644 index 0000000..ea4db75 --- /dev/null +++ b/cookies.txt @@ -0,0 +1,5 @@ +# Netscape HTTP Cookie File +# https://curl.se/docs/http-cookies.html +# This file was generated by libcurl! Edit at your own risk. + +#HttpOnly_localhost FALSE / FALSE 0 JSESSIONID F685D287A1AF69C47949E472AB4C43DA diff --git a/java/README.md b/java/README.md index a674827..a41890b 100644 --- a/java/README.md +++ b/java/README.md @@ -54,3 +54,25 @@ By default, the app runs on: - user profile/settings pages - media embedding (image/video links) - moderation tools and role-based controls + + +to run it- cd java +mvn spring-boot:run + +curl -s -b cookies.txt http://localhost:5000/viewpost?post=1 | grep -o "action_react" | head -1 + +curl -s -o /dev/null -w "%{http_code}" -X POST \ + -b cookies.txt -c cookies.txt \ + -d "postId=1&type=LIKE" \ + http://localhost:5000/action_react + +Reaction.java +→ +ReactionRepository +→ +ForumService +→ +ForumController +→ +viewpost.html + diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 73f2019..e869826 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -1,19 +1,29 @@ package com.zipcode.stardust.controller; -import com.zipcode.stardust.model.*; -import com.zipcode.stardust.repository.*; -import com.zipcode.stardust.service.ForumService; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.zipcode.stardust.model.Comment; +import com.zipcode.stardust.model.Post; +import com.zipcode.stardust.model.Reaction; +import com.zipcode.stardust.model.Subforum; +import com.zipcode.stardust.model.User; +import com.zipcode.stardust.repository.CommentRepository; +import com.zipcode.stardust.repository.PostRepository; +import com.zipcode.stardust.repository.SubforumRepository; +import com.zipcode.stardust.repository.UserRepository; +import com.zipcode.stardust.service.ForumService; @Controller public class ForumController { @@ -174,6 +184,24 @@ public String viewPost(@RequestParam Long post, Model model, Authentication auth model.addAttribute("comments", comments); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("errors", new ArrayList<>()); + + // all reaction counts + model.addAttribute("likeCount", forumService.getLikeCount(p)); + model.addAttribute("dislikeCount", forumService.getDislikeCount(p)); + model.addAttribute("fireCount", forumService.getFireCount(p)); + model.addAttribute("funnyCount", forumService.getFunnyCount(p)); + model.addAttribute("sadCount", forumService.getSadCount(p)); + model.addAttribute("celebrateCount", forumService.getCelebrateCount(p)); + + // current user's reaction + User currentUser = getCurrentUser(auth); + if (currentUser != null) { + Reaction userReaction = forumService.getUserReaction(currentUser, p); + model.addAttribute("userReaction", userReaction != null ? userReaction.getType() : ""); + } else { + model.addAttribute("userReaction", ""); + } + return "viewpost"; } @@ -196,4 +224,20 @@ public String addComment(@RequestParam Long post, public String addCommentGet(@RequestParam Long post) { return "redirect:/viewpost?post=" + post; } -} + + @PostMapping("/action_react") + public String reactToPost(@RequestParam Long postId, + @RequestParam String type, + Authentication auth) { + if (auth == null || !auth.isAuthenticated()) { + return "redirect:/loginform"; + } + Optional opt = postRepository.findById(postId); + if (opt.isEmpty()) return "redirect:/"; + + User user = getCurrentUser(auth); + forumService.reactToPost(user, opt.get(), type); + + return "redirect:/viewpost?post=" + postId + "&reacted=" + type; + } +} \ No newline at end of file diff --git a/java/src/main/java/com/zipcode/stardust/model/Reaction.java b/java/src/main/java/com/zipcode/stardust/model/Reaction.java new file mode 100644 index 0000000..0302759 --- /dev/null +++ b/java/src/main/java/com/zipcode/stardust/model/Reaction.java @@ -0,0 +1,42 @@ +package com.zipcode.stardust.model; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +@Entity +public class Reaction { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String type; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; //user relationship + + @ManyToOne + @JoinColumn(name = "post_id") + private Post post; //post relationship + + @ManyToOne + @JoinColumn(name = "comment_id" , nullable = true) + private Comment comment; //comment relationship + + //getters and setters +public Long getId() { return id; } + +public String getType() { return type; } +public void setType(String type) { this.type = type; } + +public User getUser() { return user; } +public void setUser(User user) { this.user = user; } + +public Post getPost() { return post; } +public void setPost(Post post) { this.post = post; } + +public Comment getComment() { return comment; } +public void setComment(Comment comment) { this.comment = comment; } +} diff --git a/java/src/main/java/com/zipcode/stardust/repository/ReactionRepository.java b/java/src/main/java/com/zipcode/stardust/repository/ReactionRepository.java new file mode 100644 index 0000000..83ef4bd --- /dev/null +++ b/java/src/main/java/com/zipcode/stardust/repository/ReactionRepository.java @@ -0,0 +1,27 @@ +package com.zipcode.stardust.repository; + + + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.zipcode.stardust.model.Comment; +import com.zipcode.stardust.model.Post; +import com.zipcode.stardust.model.Reaction; +import com.zipcode.stardust.model.User; + +@Repository +public interface ReactionRepository extends JpaRepository { + + // check if a user already reacted to a post + Reaction findByUserAndPost(User user, Post post); + + // check if a user already reacted to a comment + Reaction findByUserAndComment(User user, Comment comment); + + // count likes or dislikes on a post + Long countByPostAndType(Post post, String type); + + // count likes or dislikes on a comment + Long countByCommentAndType(Comment comment, String type); +} diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index 46c9b9b..475d7df 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -1,16 +1,21 @@ package com.zipcode.stardust.service; -import com.zipcode.stardust.model.Subforum; -import com.zipcode.stardust.model.UserProfile; -import com.zipcode.stardust.model.User; -import com.zipcode.stardust.repository.SubforumRepository; -import com.zipcode.stardust.repository.UserRepository; -import com.zipcode.stardust.repository.UserProfileRepository; + +import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.util.HtmlUtils; -import java.util.Optional; +import com.zipcode.stardust.model.Post; +import com.zipcode.stardust.model.Reaction; +import com.zipcode.stardust.model.Subforum; +import com.zipcode.stardust.model.User; +import com.zipcode.stardust.model.UserProfile; +import com.zipcode.stardust.repository.ReactionRepository; +import com.zipcode.stardust.repository.SubforumRepository; +import com.zipcode.stardust.repository.UserProfileRepository; +import com.zipcode.stardust.repository.UserRepository; @Service public class ForumService { @@ -22,7 +27,11 @@ public class ForumService { private UserRepository userRepository; @Autowired + private UserProfileRepository userProfileRepository; // ADD 1 - new repo + @Autowired + private ReactionRepository reactionRepository; + public String generateLinkPath(Long subforumId) { StringBuilder sb = new StringBuilder(); @@ -70,6 +79,7 @@ public boolean emailTaken(String email) { return userRepository.existsByEmail(email); } + // ADD 2 - UserProfile methods public UserProfile getUserProfile(User user) { return userProfileRepository.findByUser(user); @@ -86,4 +96,55 @@ public UserProfile updateBio(User user, String bio) { return userProfileRepository.save(profile); } -} \ No newline at end of file + + + // ── REACTIONS ──────────────────────────────────────────────── + + public void reactToPost(User user, Post post, String type) { + Reaction existing = reactionRepository.findByUserAndPost(user, post); + + if (existing == null) { + Reaction reaction = new Reaction(); + reaction.setUser(user); + reaction.setPost(post); + reaction.setType(type); + reactionRepository.save(reaction); + + } else if (existing.getType().equals(type)) { + reactionRepository.delete(existing); + + } else { + existing.setType(type); + reactionRepository.save(existing); + } + } + + public Long getLikeCount(Post post) { + return reactionRepository.countByPostAndType(post, "LIKE"); + } + + public Long getDislikeCount(Post post) { + return reactionRepository.countByPostAndType(post, "DISLIKE"); + } + + public Long getFireCount(Post post) { + return reactionRepository.countByPostAndType(post, "FIRE"); + } + + public Long getFunnyCount(Post post) { + return reactionRepository.countByPostAndType(post, "FUNNY"); + } + + public Long getSadCount(Post post) { + return reactionRepository.countByPostAndType(post, "SAD"); + } + + public Long getCelebrateCount(Post post) { + return reactionRepository.countByPostAndType(post, "CELEBRATE"); + } + + public Reaction getUserReaction(User user, Post post) { + return reactionRepository.findByUserAndPost(user, post); + } +} + From 8a752625a39742ea6ac7771236a40485b692b4bc Mon Sep 17 00:00:00 2001 From: james Date: Thu, 9 Apr 2026 14:51:29 -0400 Subject: [PATCH 17/52] Edits to Forum files --- .../stardust/controller/ForumController.java | 20 ------------------- .../stardust/service/ForumService.java | 11 +++++----- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 25d04d2..68106cc 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -1,16 +1,9 @@ package com.zipcode.stardust.controller; -<<<<<<< HEAD import com.zipcode.stardust.model.*; import com.zipcode.stardust.repository.*; import com.zipcode.stardust.service.CommonAttributesHelper; import com.zipcode.stardust.service.ForumService; -======= -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - ->>>>>>> 32cb2b34ca64462e5374f07dc611bf86ca3f4254 import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.crypto.password.PasswordEncoder; @@ -20,24 +13,11 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -<<<<<<< HEAD import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Optional; -======= -import com.zipcode.stardust.model.Comment; -import com.zipcode.stardust.model.Post; -import com.zipcode.stardust.model.Reaction; -import com.zipcode.stardust.model.Subforum; -import com.zipcode.stardust.model.User; -import com.zipcode.stardust.repository.CommentRepository; -import com.zipcode.stardust.repository.PostRepository; -import com.zipcode.stardust.repository.SubforumRepository; -import com.zipcode.stardust.repository.UserRepository; -import com.zipcode.stardust.service.ForumService; ->>>>>>> 32cb2b34ca64462e5374f07dc611bf86ca3f4254 @Controller public class ForumController { diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index 489a800..32abcd5 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -11,9 +11,12 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.HtmlUtils; +import com.zipcode.stardust.model.Post; +import com.zipcode.stardust.model.Reaction; import com.zipcode.stardust.model.Subforum; import com.zipcode.stardust.model.User; import com.zipcode.stardust.model.UserProfile; +import com.zipcode.stardust.repository.ReactionRepository; import com.zipcode.stardust.repository.SubforumRepository; import com.zipcode.stardust.repository.UserProfileRepository; import com.zipcode.stardust.repository.UserRepository; @@ -30,6 +33,9 @@ public class ForumService { @Autowired private UserProfileRepository userProfileRepository; + @Autowired + private ReactionRepository reactionRepository; + // Markdown rendering pipeline — thread-safe singletons private final Parser mdParser = Parser.builder().build(); private final HtmlRenderer mdRenderer = HtmlRenderer.builder().build(); @@ -50,11 +56,6 @@ public String renderMarkdown(String raw) { return sanitizer.sanitize(html); } - private UserProfileRepository userProfileRepository; // ADD 1 - new repo - @Autowired - private ReactionRepository reactionRepository; - - public String generateLinkPath(Long subforumId) { StringBuilder sb = new StringBuilder(); sb.append(" / Forum Index"); From da5f7decc78fc88965780b202ae45649ffcba450 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 9 Apr 2026 14:55:11 -0400 Subject: [PATCH 18/52] Forum controller work --- .../stardust/controller/ForumController.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 68106cc..c341cf7 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -1,9 +1,11 @@ package com.zipcode.stardust.controller; -import com.zipcode.stardust.model.*; -import com.zipcode.stardust.repository.*; -import com.zipcode.stardust.service.CommonAttributesHelper; -import com.zipcode.stardust.service.ForumService; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.crypto.password.PasswordEncoder; @@ -13,11 +15,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import com.zipcode.stardust.model.Comment; +import com.zipcode.stardust.model.Post; +import com.zipcode.stardust.model.Reaction; +import com.zipcode.stardust.model.Subforum; +import com.zipcode.stardust.model.User; +import com.zipcode.stardust.repository.CommentRepository; +import com.zipcode.stardust.repository.PostRepository; +import com.zipcode.stardust.repository.SubforumRepository; +import com.zipcode.stardust.repository.UserRepository; +import com.zipcode.stardust.service.CommonAttributesHelper; +import com.zipcode.stardust.service.ForumService; @Controller public class ForumController { From a56aabb96f49002df3ed147438df22daff585bbc Mon Sep 17 00:00:00 2001 From: mahala Date: Thu, 9 Apr 2026 15:04:40 -0400 Subject: [PATCH 19/52] Updates to button --- .../stardust/controller/ForumController.java | 3 ++ .../main/resources/templates/viewpost.html | 40 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 73f2019..e5d2faa 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -3,6 +3,7 @@ import com.zipcode.stardust.model.*; import com.zipcode.stardust.repository.*; import com.zipcode.stardust.service.ForumService; +import com.zipcode.stardust.service.MediaEmbedService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; @@ -24,6 +25,7 @@ public class ForumController { @Autowired private UserRepository userRepository; @Autowired private PasswordEncoder passwordEncoder; @Autowired private ForumService forumService; + @Autowired private MediaEmbedService mediaEmbedService; @Value("${site.name:Schooner}") private String siteName; @@ -172,6 +174,7 @@ public String viewPost(@RequestParam Long post, Model model, Authentication auth String breadcrumb = forumService.generateLinkPath(p.getSubforum().getId()); model.addAttribute("post", p); model.addAttribute("comments", comments); + model.addAttribute("embeds", mediaEmbedService.getEmbedsForPost(p)); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("errors", new ArrayList<>()); return "viewpost"; diff --git a/java/src/main/resources/templates/viewpost.html b/java/src/main/resources/templates/viewpost.html index 6762abc..83cce62 100644 --- a/java/src/main/resources/templates/viewpost.html +++ b/java/src/main/resources/templates/viewpost.html @@ -18,6 +18,46 @@

Post Title

Content here
+ +
+
Media
+
+
+ embedded image +
+
+ +
+

+ + + + + +
+
+ + +
+
Add Media
+

+

+
+ +
+ +
+
+ +
+ +
+
+
Comments (0)

Comment content

From f0798e210b2d390dd63dd71d285c245d5602c34e Mon Sep 17 00:00:00 2001 From: james Date: Thu, 9 Apr 2026 15:04:44 -0400 Subject: [PATCH 20/52] Line changes --- .../controller/MediaEmbedController.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java b/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java index 87073ef..b39727c 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java @@ -1,18 +1,20 @@ package com.zipcode.stardust.controller; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + import com.zipcode.stardust.model.MediaEmbed; import com.zipcode.stardust.model.MediaEmbed.MediaType; import com.zipcode.stardust.model.Post; import com.zipcode.stardust.model.User; import com.zipcode.stardust.repository.PostRepository; import com.zipcode.stardust.service.MediaEmbedService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.Authentication; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; - -import java.util.Optional; /** * ============================================================= From ea249fe1d0047d996d3d3f5611e50ee2a9610ec9 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 9 Apr 2026 15:12:54 -0400 Subject: [PATCH 21/52] ForumController bugs fixes --- .../zipcode/stardust/controller/ForumController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 4947aff..c341cf7 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -1,7 +1,9 @@ package com.zipcode.stardust.controller; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; @@ -34,12 +36,7 @@ public class ForumController { @Autowired private UserRepository userRepository; @Autowired private PasswordEncoder passwordEncoder; @Autowired private ForumService forumService; - - @Value("${site.name:Schooner}") - private String siteName; - - @Value("${site.description:a schooner forum}") - private String siteDescription; + @Autowired private CommonAttributesHelper helper; private User getCurrentUser(Authentication auth) { return helper.getCurrentUser(auth); @@ -176,6 +173,7 @@ public String viewPost(@RequestParam Long post, Model model, Authentication auth model.addAttribute("post", p); model.addAttribute("postContent", forumService.renderMarkdown(p.getContent())); model.addAttribute("comments", comments); + model.addAttribute("commentContents", commentContents); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("errors", new ArrayList<>()); From 5ed56bcb365f82c52fbb086113fa79d52cf9d3ac Mon Sep 17 00:00:00 2001 From: james Date: Thu, 9 Apr 2026 15:17:36 -0400 Subject: [PATCH 22/52] Frontend stuff --- .../java/com/zipcode/stardust/controller/ForumController.java | 3 +++ java/src/main/resources/templates/viewpost.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index c341cf7..38994c9 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -21,6 +21,7 @@ import com.zipcode.stardust.model.Subforum; import com.zipcode.stardust.model.User; import com.zipcode.stardust.repository.CommentRepository; +import com.zipcode.stardust.repository.MediaEmbedRepository; import com.zipcode.stardust.repository.PostRepository; import com.zipcode.stardust.repository.SubforumRepository; import com.zipcode.stardust.repository.UserRepository; @@ -36,6 +37,7 @@ public class ForumController { @Autowired private UserRepository userRepository; @Autowired private PasswordEncoder passwordEncoder; @Autowired private ForumService forumService; + @Autowired private MediaEmbedRepository mediaEmbedRepository; @Autowired private CommonAttributesHelper helper; private User getCurrentUser(Authentication auth) { @@ -174,6 +176,7 @@ public String viewPost(@RequestParam Long post, Model model, Authentication auth model.addAttribute("postContent", forumService.renderMarkdown(p.getContent())); model.addAttribute("comments", comments); model.addAttribute("commentContents", commentContents); + model.addAttribute("embeds", mediaEmbedRepository.findByPostOrderByIdAsc(p)); model.addAttribute("breadcrumb", breadcrumb); model.addAttribute("errors", new ArrayList<>()); diff --git a/java/src/main/resources/templates/viewpost.html b/java/src/main/resources/templates/viewpost.html index 0fa35f8..7c3b088 100644 --- a/java/src/main/resources/templates/viewpost.html +++ b/java/src/main/resources/templates/viewpost.html @@ -31,7 +31,7 @@
Media

+ th:if="${isLoggedIn and (currentUser == post.user.username or #authentication.principal.admin)}"> From 6156dbf070fecf5078a0e690e72d95a9f5989d85 Mon Sep 17 00:00:00 2001 From: james Date: Thu, 9 Apr 2026 15:31:17 -0400 Subject: [PATCH 23/52] Updated Frontend --- Stardust.db | Bin 49152 -> 53248 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Stardust.db b/Stardust.db index f2717d0adae5bb805146d566eba83210b2d9a626..d9f16080f0c775537730d342b548be151135647e 100644 GIT binary patch delta 502 zcmZo@U~X8zJV9DejDdlH7l>hiW1^0+su+V_nCbe8D_Lyt%wC z+_qf4+)SL&90xZ}wB<-|6z5?Vmz8B~Vk}8a%1JFsO-wGy%+G_-yv{+cjv=lJA&yQy zt_medF#G>Sk#3BtNQ&UYHh2;F)+|<01c%ZVR%ygj2 z$!GbEH%D`>WMgCGf5yQ7Y_p)i9eybZMm7djR!&am{QMl49>%%F+Ye6Oq`)$PgNdJ) zf&UOcFHkWfe|@776FUR1cvB>&r>~>CYeq>)L9vy-er9fBdTOy=X5GI3llT56iY*c#Kc4s`$Ag_1GREnBLg!_wZzhreA~4A zqTIw1wY1C<+vKAB0=3MFoXjNKq9k1tJwrVMAUCr<#n#ujyuvrj(KyY;$->v8qCC;v z(jckQuskw6B`3|J!XnK*tP~^%W;?1Hy8w|5(2Km{`KWF#FE0nVv!JvjwJ0OMAQkNB jti+=9{5<^v{eq(W^rFOEy@I@SaKs9Lqjod5z*l|%qFIt; delta 88 zcmZozz}(QlJV9EJkAZ=K2Z&*SeWH%BG9QCpn Date: Thu, 9 Apr 2026 16:49:38 -0400 Subject: [PATCH 24/52] Comment Update --- Stardust.db | Bin 53248 -> 53248 bytes .../main/resources/templates/viewpost.html | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Stardust.db b/Stardust.db index d9f16080f0c775537730d342b548be151135647e..8627540cd11115d3b0cf3408320cd69772e7f878 100644 GIT binary patch delta 324 zcmZozz}&Ead4e>f zYLP-_nnGoMsX}sMoc0@C-Jd0|w3szOL=aS7Ar75Xs>Km&pp_*e4> z0S$2Dj|>MIz@gsADs5z+kBh(0{%|Gfn0sz=nV#ELd delta 101 zcmZozz}&Ead4e>f*hCp;MzM_vOZeFs`JXZHKie$WaEE{LGkG~6e+2{oip_!o^Y}Nf z(2r373an<}Ukwyk$Uk{?d?b+nfr0-6P{T9+$sh7Xfczf}{6B#Fcl?`w)N=#?0Cy-N Aw*UYD diff --git a/java/src/main/resources/templates/viewpost.html b/java/src/main/resources/templates/viewpost.html index 7c3b088..1b0d59c 100644 --- a/java/src/main/resources/templates/viewpost.html +++ b/java/src/main/resources/templates/viewpost.html @@ -60,14 +60,14 @@
Add Media
Comments (0)
-

Comment content

+

Comment content

by author — time
No comments yet.
-
+
Add a Comment
@@ -77,7 +77,7 @@
Add a Comment
-
+
Login to post a comment.
From 905b08267901283efd8065d3e22ae928655fb9d9 Mon Sep 17 00:00:00 2001 From: joseph Date: Thu, 9 Apr 2026 17:12:21 -0400 Subject: [PATCH 25/52] w --- Stardust.db | Bin 53248 -> 53248 bytes .../zipcode/stardust/model/UserProfile.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Stardust.db b/Stardust.db index d9f16080f0c775537730d342b548be151135647e..66d1b0ac4af80512d9d242abee9c2dde900f8b00 100644 GIT binary patch delta 261 zcmZozz}&Ead4e>f#6%fqMv09HOZYjM_|G%&KjS~YSy13Gzqlw98-pw>Cu4GcZf^+Q7wnPgrx)dxQBr0Z;FRJNSmhGx z7m}Y;lv?f{<`bq@QC#R03^8=_>i9^YwU-$9FY$i>T6>INPL|o85vPqzlRxB(05!a2 a;D5{iW3ynvLw;^9W=W_9rp-Uf*hCp;MzM_vOZeFs`JXZHKie!=aEE{MGkG}!pulPd{?(fW1s3v8 mUL79^?w?IRXH#1ReVT diff --git a/java/src/main/java/com/zipcode/stardust/model/UserProfile.java b/java/src/main/java/com/zipcode/stardust/model/UserProfile.java index 7f49316..4a8362b 100644 --- a/java/src/main/java/com/zipcode/stardust/model/UserProfile.java +++ b/java/src/main/java/com/zipcode/stardust/model/UserProfile.java @@ -8,7 +8,7 @@ public class UserProfile { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String bio; From 0e5c58f82f8d858dc377e1a6ff55eced7bcfc12e Mon Sep 17 00:00:00 2001 From: mahala Date: Thu, 9 Apr 2026 17:24:15 -0400 Subject: [PATCH 26/52] Media Markdown --- .../main/java/com/zipcode/stardust/service/ForumService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index 32abcd5..0b24657 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -47,6 +47,9 @@ public class ForumService { .allowElements("a") .allowAttributes("href").onElements("a") .requireRelNofollowOnLinks() + .allowElements("img") + .allowAttributes("src", "alt").onElements("img") + .allowUrlProtocols("http", "https") .toFactory(); public String renderMarkdown(String raw) { From 009918b3824f1d0306c73834354bcfd679c43518 Mon Sep 17 00:00:00 2001 From: joseph Date: Fri, 10 Apr 2026 11:00:26 -0400 Subject: [PATCH 27/52] settings --- Stardust.db | Bin 53248 -> 53248 bytes .../main/resources/templates/createpost.html | 32 ++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Stardust.db b/Stardust.db index 66d1b0ac4af80512d9d242abee9c2dde900f8b00..3ccf08e5c4d62d248cef93889312b85342c3b33f 100644 GIT binary patch delta 70 zcmZozz}&Ead4e>ff#6%fqMv09HOZYjM_|G%&KjS~YS+L+R|K{`Zh8qCtVhtMr diff --git a/java/src/main/resources/templates/createpost.html b/java/src/main/resources/templates/createpost.html index 8854db8..b1a67a2 100644 --- a/java/src/main/resources/templates/createpost.html +++ b/java/src/main/resources/templates/createpost.html @@ -1,7 +1,7 @@ - +
@@ -19,7 +19,18 @@

Create Post in Forum

- Markdown supported: **bold**, _italic_, @@ -30,5 +41,20 @@

Create Post in Forum

Cancel
+ + + - + \ No newline at end of file From ebcd9f091a792224d2ad4f5dc4d4c61befe99e42 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 10 Apr 2026 11:15:19 -0400 Subject: [PATCH 28/52] Docker File Additions --- Stardust.db | Bin 53248 -> 53248 bytes java/Dockerfile | 13 ++++++++ java/docker-compose.yml | 31 ++++++++++++++++++ java/pom.xml | 9 ++--- .../com/zipcode/stardust/model/Message.java | 2 +- .../java/com/zipcode/stardust/model/User.java | 2 +- .../src/main/resources/application.properties | 7 ++-- 7 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 java/Dockerfile create mode 100644 java/docker-compose.yml diff --git a/Stardust.db b/Stardust.db index 8627540cd11115d3b0cf3408320cd69772e7f878..b02657f7cd0a5413b1525d61b7519a39f26df9bb 100644 GIT binary patch delta 74 zcmV-Q0JZ;spaX!Q1CSd58j&1B0UEJjqz?)M519ZD<`23LnX?fPiw_|m0|o#w1px^| gVQwIKZ*?GZWo00AXlZi|3IUyW)ZhLBv$`Kfun^=I6951J delta 38 ucmZozz}&Ead4e>fthymeleaf-extras-springsecurity6 - org.xerial - sqlite-jdbc - - - org.hibernate.orm - hibernate-community-dialects + com.mysql + mysql-connector-j + runtime org.springframework.boot diff --git a/java/src/main/java/com/zipcode/stardust/model/Message.java b/java/src/main/java/com/zipcode/stardust/model/Message.java index cc34087..6bc59e1 100644 --- a/java/src/main/java/com/zipcode/stardust/model/Message.java +++ b/java/src/main/java/com/zipcode/stardust/model/Message.java @@ -38,7 +38,7 @@ public class Message { @Column(nullable = false) private LocalDateTime sentAt; - @Column(nullable = false) + @Column(name = "is_read", nullable = false) private boolean read = false; @Column(nullable = false) diff --git a/java/src/main/java/com/zipcode/stardust/model/User.java b/java/src/main/java/com/zipcode/stardust/model/User.java index 920911a..4b87301 100644 --- a/java/src/main/java/com/zipcode/stardust/model/User.java +++ b/java/src/main/java/com/zipcode/stardust/model/User.java @@ -19,7 +19,7 @@ import jakarta.persistence.Table; @Entity -@Table(name = "\"user\"") +@Table(name = "users") public class User implements UserDetails { @Id diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index ebd39f7..26e4fe9 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -1,6 +1,7 @@ -spring.datasource.url=jdbc:sqlite:Stardust.db -spring.datasource.driver-class-name=org.sqlite.JDBC -spring.jpa.database-platform=org.hibernate.community.dialect.SQLiteDialect +spring.datasource.url=jdbc:mysql://localhost:7070/stardust?allowPublicKeyRetrieval=true&useSSL=false +spring.datasource.username=root +spring.datasource.password=rootpassword +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=false server.port=8080 From 1b81d747a744ec47fe4f6c4711bf113ea9a82e75 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 10 Apr 2026 14:03:35 -0400 Subject: [PATCH 29/52] Minor Markdown stuff --- java/src/main/resources/templates/viewpost.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java/src/main/resources/templates/viewpost.html b/java/src/main/resources/templates/viewpost.html index 1b0d59c..6761b18 100644 --- a/java/src/main/resources/templates/viewpost.html +++ b/java/src/main/resources/templates/viewpost.html @@ -73,6 +73,10 @@
Add a Comment
+ + Markdown supported: **bold**, _italic_, + `code`, # Heading, - list item +
From 65f36e23cd69903d7e61ee6f7eefa825127cbd4c Mon Sep 17 00:00:00 2001 From: nishat Date: Fri, 10 Apr 2026 15:27:59 -0400 Subject: [PATCH 30/52] reactions are back --- cookies.txt | 2 +- java/README.md | 1 + .../main/resources/templates/viewpost.html | 108 +++++++++++++++++- 3 files changed, 109 insertions(+), 2 deletions(-) diff --git a/cookies.txt b/cookies.txt index ea4db75..fd004db 100644 --- a/cookies.txt +++ b/cookies.txt @@ -2,4 +2,4 @@ # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. -#HttpOnly_localhost FALSE / FALSE 0 JSESSIONID F685D287A1AF69C47949E472AB4C43DA +#HttpOnly_localhost FALSE / FALSE 0 JSESSIONID DB5849AC053301B7D9FEDABF995B3D34 diff --git a/java/README.md b/java/README.md index a41890b..23bd73f 100644 --- a/java/README.md +++ b/java/README.md @@ -76,3 +76,4 @@ ForumController → viewpost.html +lsof -ti :5000 | xargs kill -9 2>/dev/null && mvn spring-boot:run \ No newline at end of file diff --git a/java/src/main/resources/templates/viewpost.html b/java/src/main/resources/templates/viewpost.html index 7c3b088..c76c169 100644 --- a/java/src/main/resources/templates/viewpost.html +++ b/java/src/main/resources/templates/viewpost.html @@ -4,6 +4,18 @@
+ + +
-
Add Media
@@ -81,5 +158,34 @@
Add a Comment
Login to post a comment.
+ + From a0ee04cf2f3dfcc72791d1e8628e7252ebb7de02 Mon Sep 17 00:00:00 2001 From: nishat Date: Fri, 10 Apr 2026 16:21:59 -0400 Subject: [PATCH 31/52] final --- java/Dockerfile | 7 +++++++ java/docker-compose.yml | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 java/Dockerfile create mode 100644 java/docker-compose.yml diff --git a/java/Dockerfile b/java/Dockerfile new file mode 100644 index 0000000..59bdafb --- /dev/null +++ b/java/Dockerfile @@ -0,0 +1,7 @@ +FROM eclipse-temurin:17-jdk-jammy +WORKDIR /app +COPY pom.xml . +COPY src ./src +RUN apt-get update && apt-get install -y maven && mvn package -DskipTests +EXPOSE 8080 +CMD ["java", "-jar", "target/Stardust-0.0.1-SNAPSHOT.jar"] diff --git a/java/docker-compose.yml b/java/docker-compose.yml new file mode 100644 index 0000000..f280f2c --- /dev/null +++ b/java/docker-compose.yml @@ -0,0 +1,7 @@ +services: + app: + build: . + ports: + - "8080:8080" + volumes: + - ./Stardust.db:/app/Stardust.db From be4012169291141f34c1b9c39c26e9c1ec0b0fab Mon Sep 17 00:00:00 2001 From: james Date: Fri, 10 Apr 2026 17:07:39 -0400 Subject: [PATCH 32/52] PostGreSQL change --- java/docker-compose.yml | 17 +++++++++-------- java/pom.xml | 4 ++-- java/src/main/resources/application.properties | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/java/docker-compose.yml b/java/docker-compose.yml index e41a73a..5fabe52 100644 --- a/java/docker-compose.yml +++ b/java/docker-compose.yml @@ -1,15 +1,16 @@ services: db: - image: mysql:8 + image: postgres:16 ports: - - "7070:3306" + - "7070:5432" environment: - MYSQL_ROOT_PASSWORD: rootpassword - MYSQL_DATABASE: stardust + POSTGRES_PASSWORD: rootpassword + POSTGRES_DB: stardust + POSTGRES_USER: postgres volumes: - - db-data:/var/lib/mysql + - db-data:/var/lib/postgresql/data healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-prootpassword"] + test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 5s timeout: 5s retries: 20 @@ -23,8 +24,8 @@ services: db: condition: service_healthy environment: - SPRING_DATASOURCE_URL: "jdbc:mysql://db:3306/stardust?allowPublicKeyRetrieval=true&useSSL=false" - SPRING_DATASOURCE_USERNAME: root + SPRING_DATASOURCE_URL: "jdbc:postgresql://db:5432/stardust" + SPRING_DATASOURCE_USERNAME: postgres SPRING_DATASOURCE_PASSWORD: rootpassword volumes: diff --git a/java/pom.xml b/java/pom.xml index aa0f2b0..fc78b92 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -43,8 +43,8 @@ thymeleaf-extras-springsecurity6 - com.mysql - mysql-connector-j + org.postgresql + postgresql runtime diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index 26e4fe9..3c832e6 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -1,7 +1,7 @@ -spring.datasource.url=jdbc:mysql://localhost:7070/stardust?allowPublicKeyRetrieval=true&useSSL=false -spring.datasource.username=root +spring.datasource.url=jdbc:postgresql://localhost:7070/stardust +spring.datasource.username=postgres spring.datasource.password=rootpassword -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.driver-class-name=org.postgresql.Driver spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=false server.port=8080 From c38e3d0fe3e34b757e2385a7eac2a59c425cc05b Mon Sep 17 00:00:00 2001 From: james Date: Sat, 11 Apr 2026 10:24:56 -0400 Subject: [PATCH 33/52] XO edits --- java/docker-compose.yml | 29 ++----------------- .../src/main/resources/application.properties | 6 ++-- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/java/docker-compose.yml b/java/docker-compose.yml index 5fabe52..7bb46aa 100644 --- a/java/docker-compose.yml +++ b/java/docker-compose.yml @@ -1,32 +1,9 @@ services: - db: - image: postgres:16 - ports: - - "7070:5432" - environment: - POSTGRES_PASSWORD: rootpassword - POSTGRES_DB: stardust - POSTGRES_USER: postgres - volumes: - - db-data:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] - interval: 5s - timeout: 5s - retries: 20 - start_period: 30s - app: build: . ports: - "7071:8080" - depends_on: - db: - condition: service_healthy environment: - SPRING_DATASOURCE_URL: "jdbc:postgresql://db:5432/stardust" - SPRING_DATASOURCE_USERNAME: postgres - SPRING_DATASOURCE_PASSWORD: rootpassword - -volumes: - db-data: + SPRING_DATASOURCE_URL: "jdbc:postgresql://xo.zipcode.rocks:9088/circus" + SPRING_DATASOURCE_USERNAME: sunflower_user + SPRING_DATASOURCE_PASSWORD: zipmusic diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index 3c832e6..452dd6c 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -1,6 +1,6 @@ -spring.datasource.url=jdbc:postgresql://localhost:7070/stardust -spring.datasource.username=postgres -spring.datasource.password=rootpassword +spring.datasource.url=jdbc:postgresql://xo.zipcode.rocks:9088/circus +spring.datasource.username=sunflower_user +spring.datasource.password=zipmusic spring.datasource.driver-class-name=org.postgresql.Driver spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=false From 0530d70dc549d7670e26afaad6de065170afa28d Mon Sep 17 00:00:00 2001 From: james Date: Sat, 11 Apr 2026 12:24:06 -0400 Subject: [PATCH 34/52] Checkpoint --- java/docker-compose.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/java/docker-compose.yml b/java/docker-compose.yml index bdecfe0..7bb46aa 100644 --- a/java/docker-compose.yml +++ b/java/docker-compose.yml @@ -1,23 +1,4 @@ services: -<<<<<<< HEAD -======= - db: - image: postgres:16 - ports: - - "7070:5432" - environment: - POSTGRES_PASSWORD: rootpassword - POSTGRES_DB: stardust - POSTGRES_USER: postgres - volumes: - - db-data:/var/lib/postgresql/data - healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] - interval: 5s - timeout: 5s - retries: 20 - start_period: 30s ->>>>>>> e3c4ef103c266fea3efc4f4fe26f2be72546600c app: build: . ports: From a31b8e201a71602639f5952a761056e40afef11c Mon Sep 17 00:00:00 2001 From: mahala Date: Sat, 11 Apr 2026 15:40:31 -0400 Subject: [PATCH 35/52] Bio, Email, and Change PW --- java/README.md | 7 +- .../stardust/controller/ForumController.java | 47 ++++++++++++++ .../stardust/service/ForumService.java | 17 +++++ .../src/main/resources/application.properties | 2 +- java/src/main/resources/templates/header.html | 1 + .../main/resources/templates/settings.html | 64 +++++++++++++++++++ 6 files changed, 133 insertions(+), 5 deletions(-) create mode 100644 java/src/main/resources/templates/settings.html diff --git a/java/README.md b/java/README.md index 23bd73f..531b0ad 100644 --- a/java/README.md +++ b/java/README.md @@ -38,7 +38,7 @@ java -jar target/Stardust-0.0.1-SNAPSHOT.jar By default, the app runs on: -`http://localhost:8080` +`http://localhost:7071` ## Notes on the Port @@ -55,16 +55,15 @@ By default, the app runs on: - media embedding (image/video links) - moderation tools and role-based controls - to run it- cd java mvn spring-boot:run -curl -s -b cookies.txt http://localhost:5000/viewpost?post=1 | grep -o "action_react" | head -1 +curl -s -b cookies.txt http://localhost:7071/viewpost?post=1 | grep -o "action_react" | head -1 curl -s -o /dev/null -w "%{http_code}" -X POST \ -b cookies.txt -c cookies.txt \ -d "postId=1&type=LIKE" \ - http://localhost:5000/action_react + http://localhost:7071/action_react Reaction.java → diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 38994c9..1781d42 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -220,6 +220,53 @@ public String addCommentGet(@RequestParam Long post) { return "redirect:/viewpost?post=" + post; } + @GetMapping("/settings") + public String settingsPage(Model model, Authentication auth) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + addCommonAttributes(model, auth); + model.addAttribute("profile", forumService.getUserProfile(user)); + model.addAttribute("errors", new ArrayList<>()); + model.addAttribute("success", ""); + return "settings"; + } + + @PostMapping("/action_update_bio") + public String updateBio(@RequestParam String bio, Authentication auth) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + forumService.updateBio(user, bio); + return "redirect:/settings?saved=bio"; + } + + @PostMapping("/action_update_email") + public String updateEmail(@RequestParam String email, Authentication auth, + org.springframework.web.servlet.mvc.support.RedirectAttributes ra) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + if (!forumService.updateEmail(user, email)) { + ra.addFlashAttribute("emailError", "Email is already in use or invalid."); + } else { + ra.addFlashAttribute("success", "Email updated."); + } + return "redirect:/settings"; + } + + @PostMapping("/action_update_password") + public String updatePassword(@RequestParam String currentPassword, + @RequestParam String newPassword, + Authentication auth, + org.springframework.web.servlet.mvc.support.RedirectAttributes ra) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + if (!forumService.updatePassword(user, currentPassword, newPassword, passwordEncoder)) { + ra.addFlashAttribute("passwordError", "Current password is wrong or new password is invalid (6-40 chars, alphanumeric + !@#%&)."); + } else { + ra.addFlashAttribute("success", "Password updated."); + } + return "redirect:/settings"; + } + @PostMapping("/action_react") public String reactToPost(@RequestParam Long postId, @RequestParam String type, diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index 0b24657..14f3166 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -123,6 +123,23 @@ public UserProfile updateBio(User user, String bio) { return userProfileRepository.save(profile); } + public boolean updateEmail(User user, String newEmail) { + if (newEmail == null || newEmail.isBlank()) return false; + if (emailTaken(newEmail) && !newEmail.equalsIgnoreCase(user.getEmail())) return false; + user.setEmail(newEmail); + userRepository.save(user); + return true; + } + + public boolean updatePassword(User user, String currentRaw, String newRaw, + org.springframework.security.crypto.password.PasswordEncoder encoder) { + if (!user.checkPassword(currentRaw, encoder)) return false; + if (!validPassword(newRaw)) return false; + user.setPasswordHash(encoder.encode(newRaw)); + userRepository.save(user); + return true; + } + // ── REACTIONS ──────────────────────────────────────────────── diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index 452dd6c..39af196 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -4,7 +4,7 @@ spring.datasource.password=zipmusic spring.datasource.driver-class-name=org.postgresql.Driver spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=false -server.port=8080 +server.port=7071 spring.application.name=Schooner site.name=Schooner site.description=a schooner forum diff --git a/java/src/main/resources/templates/header.html b/java/src/main/resources/templates/header.html index 3299cf5..8dc09d1 100644 --- a/java/src/main/resources/templates/header.html +++ b/java/src/main/resources/templates/header.html @@ -12,6 +12,7 @@ Messages 0 + Settings Hello, user
diff --git a/java/src/main/resources/templates/settings.html b/java/src/main/resources/templates/settings.html new file mode 100644 index 0000000..0a692b3 --- /dev/null +++ b/java/src/main/resources/templates/settings.html @@ -0,0 +1,64 @@ + + + + +
+
+

Account Settings

+ +
+
+
+
Settings saved.
+ + +
+
Bio
+
+ +
+ +
+ + +
+
+ + +
+
Email Address
+
+
+
+ +
+ +
+
+
+ + +
+
Change Password
+
+
+
+ + +
+
+ + + 6-40 characters, alphanumeric + !@#%& +
+ +
+
+
+
+ + From fcc0fa5b2fc6985d18fa1daa6d6730cc0d77e8c7 Mon Sep 17 00:00:00 2001 From: mahala Date: Sun, 12 Apr 2026 11:10:18 -0400 Subject: [PATCH 36/52] Tables, strikethrough, task list and autolink. Changed layout --- java/pom.xml | 20 ++++ .../stardust/controller/ForumController.java | 8 ++ .../stardust/service/ForumService.java | 21 +++- .../main/resources/templates/createpost.html | 105 ++++++++++++++---- java/src/main/resources/templates/layout.html | 4 + 5 files changed, 136 insertions(+), 22 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index fc78b92..fbf8bef 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -62,6 +62,26 @@ commonmark 0.22.0 + + org.commonmark + commonmark-ext-gfm-tables + 0.22.0 + + + org.commonmark + commonmark-ext-gfm-strikethrough + 0.22.0 + + + org.commonmark + commonmark-ext-task-list-items + 0.22.0 + + + org.commonmark + commonmark-ext-autolink + 0.22.0 + com.googlecode.owasp-java-html-sanitizer owasp-java-html-sanitizer diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 1781d42..2696bbf 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -13,7 +13,9 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; import com.zipcode.stardust.model.Comment; import com.zipcode.stardust.model.Post; @@ -220,6 +222,12 @@ public String addCommentGet(@RequestParam Long post) { return "redirect:/viewpost?post=" + post; } + @PostMapping("/action_preview") + @ResponseBody + public String preview(@RequestBody String raw) { + return forumService.renderMarkdown(raw); + } + @GetMapping("/settings") public String settingsPage(Model model, Authentication auth) { User user = getCurrentUser(auth); diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index 14f3166..efacc36 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -2,6 +2,10 @@ import java.util.Optional; +import org.commonmark.ext.autolink.AutolinkExtension; +import org.commonmark.ext.gfm.strikethrough.StrikethroughExtension; +import org.commonmark.ext.gfm.tables.TablesExtension; +import org.commonmark.ext.task.list.items.TaskListItemsExtension; import org.commonmark.node.Node; import org.commonmark.parser.Parser; import org.commonmark.renderer.html.HtmlRenderer; @@ -37,8 +41,14 @@ public class ForumService { private ReactionRepository reactionRepository; // Markdown rendering pipeline — thread-safe singletons - private final Parser mdParser = Parser.builder().build(); - private final HtmlRenderer mdRenderer = HtmlRenderer.builder().build(); + private static final java.util.List MD_EXTENSIONS = java.util.List.of( + TablesExtension.create(), + StrikethroughExtension.create(), + TaskListItemsExtension.create(), + AutolinkExtension.create() + ); + private final Parser mdParser = Parser.builder().extensions(MD_EXTENSIONS).build(); + private final HtmlRenderer mdRenderer = HtmlRenderer.builder().extensions(MD_EXTENSIONS).build(); private final PolicyFactory sanitizer = new HtmlPolicyBuilder() .allowElements("p", "br", "hr", "b", "strong", "em", "i", "u", "s", "code", "pre", "blockquote", "ul", "ol", "li", @@ -49,7 +59,12 @@ public class ForumService { .requireRelNofollowOnLinks() .allowElements("img") .allowAttributes("src", "alt").onElements("img") - .allowUrlProtocols("http", "https") + // Tables (GFM) + .allowElements("table", "thead", "tbody", "tr", "th", "td") + .allowAttributes("align").onElements("th", "td") + // Task list checkboxes + .allowElements("input") + .allowAttributes("type", "disabled", "checked").onElements("input") .toFactory(); public String renderMarkdown(String raw) { diff --git a/java/src/main/resources/templates/createpost.html b/java/src/main/resources/templates/createpost.html index b1a67a2..4a0dc68 100644 --- a/java/src/main/resources/templates/createpost.html +++ b/java/src/main/resources/templates/createpost.html @@ -21,20 +21,51 @@

Create Post in Forum

-
- - - - - - + - +
+
+ +
+
+
+
+
- Markdown supported: **bold**, _italic_, - `code`, # Heading, - list item + Supports bold, italic, strikethrough, + `code`, ```blocks```, tables, task lists, and bare URLs.
@@ -44,15 +75,51 @@

Create Post in Forum

diff --git a/java/src/main/resources/templates/layout.html b/java/src/main/resources/templates/layout.html index 0ad36f8..cabafa3 100644 --- a/java/src/main/resources/templates/layout.html +++ b/java/src/main/resources/templates/layout.html @@ -8,6 +8,10 @@ + + +
From 5d8da9d041874bb69d2069ff81435b5d4addb887 Mon Sep 17 00:00:00 2001 From: mahala Date: Sun, 12 Apr 2026 13:15:42 -0400 Subject: [PATCH 37/52] Revert local host --- java/README.md | 6 +++--- java/src/main/resources/application.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/README.md b/java/README.md index 531b0ad..0f7ead9 100644 --- a/java/README.md +++ b/java/README.md @@ -38,7 +38,7 @@ java -jar target/Stardust-0.0.1-SNAPSHOT.jar By default, the app runs on: -`http://localhost:7071` +`http://localhost:8080` ## Notes on the Port @@ -58,12 +58,12 @@ By default, the app runs on: to run it- cd java mvn spring-boot:run -curl -s -b cookies.txt http://localhost:7071/viewpost?post=1 | grep -o "action_react" | head -1 +curl -s -b cookies.txt http://localhost:5000/viewpost?post=1 | grep -o "action_react" | head -1 curl -s -o /dev/null -w "%{http_code}" -X POST \ -b cookies.txt -c cookies.txt \ -d "postId=1&type=LIKE" \ - http://localhost:7071/action_react + http://localhost:5000/action_react Reaction.java → diff --git a/java/src/main/resources/application.properties b/java/src/main/resources/application.properties index 39af196..452dd6c 100644 --- a/java/src/main/resources/application.properties +++ b/java/src/main/resources/application.properties @@ -4,7 +4,7 @@ spring.datasource.password=zipmusic spring.datasource.driver-class-name=org.postgresql.Driver spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=false -server.port=7071 +server.port=8080 spring.application.name=Schooner site.name=Schooner site.description=a schooner forum From cd2ff5ae45f3870fa0b8a2c7abe2df810a9e5528 Mon Sep 17 00:00:00 2001 From: nishat Date: Sun, 12 Apr 2026 13:28:08 -0400 Subject: [PATCH 38/52] merged --- java/src/test/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/java/src/test/resources/application.properties b/java/src/test/resources/application.properties index 601f780..95ed0f4 100644 --- a/java/src/test/resources/application.properties +++ b/java/src/test/resources/application.properties @@ -8,3 +8,4 @@ spring.application.name=Schooner site.name=Schooner site.description=a schooner forum spring.thymeleaf.cache=false + \ No newline at end of file From c69959dde09f1f54e3295cad93ed92952e9189a5 Mon Sep 17 00:00:00 2001 From: joseph Date: Sun, 12 Apr 2026 13:47:27 -0400 Subject: [PATCH 39/52] banned --- .../java/com/zipcode/stardust/model/User.java | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/model/User.java b/java/src/main/java/com/zipcode/stardust/model/User.java index 4b87301..2333339 100644 --- a/java/src/main/java/com/zipcode/stardust/model/User.java +++ b/java/src/main/java/com/zipcode/stardust/model/User.java @@ -38,6 +38,12 @@ public class User implements UserDetails { @Column(nullable = false) private boolean admin = false; + @Column(nullable = false) + private String role = "ROLE_USER"; // ADDED role field + + @Column(nullable = false) + private boolean banned = false; // ADDED banned field + @OneToMany(mappedBy = "user", fetch = FetchType.LAZY) private List posts = new ArrayList<>(); @@ -50,7 +56,7 @@ public User(String email, String username, String rawPassword, PasswordEncoder e this.email = email; this.username = username; this.passwordHash = encoder.encode(rawPassword); - this.admin = "admin".equalsIgnoreCase(username); ///meanifull + this.admin = "admin".equalsIgnoreCase(username); } public boolean checkPassword(String rawPassword, PasswordEncoder encoder) { @@ -60,7 +66,7 @@ public boolean checkPassword(String rawPassword, PasswordEncoder encoder) { @Override public Collection getAuthorities() { List authorities = new ArrayList<>(); - authorities.add(new SimpleGrantedAuthority("ROLE_USER")); + authorities.add(new SimpleGrantedAuthority(role)); // ADD - uses role field if (admin) { authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN")); } @@ -81,7 +87,7 @@ public String getUsername() { public boolean isAccountNonExpired() { return true; } @Override - public boolean isAccountNonLocked() { return true; } + public boolean isAccountNonLocked() { return !banned; } // ADD - uses banned field @Override public boolean isCredentialsNonExpired() { return true; } @@ -98,8 +104,17 @@ public String getUsername() { public void setEmail(String email) { this.email = email; } public boolean isAdmin() { return admin; } public void setAdmin(boolean admin) { this.admin = admin; } + + // ADD - role getters/setters + public String getRole() { return role; } + public void setRole(String role) { this.role = role; } + + // ADD - banned getters/setters + public boolean isBanned() { return banned; } + public void setBanned(boolean banned) { this.banned = banned; } + public List getPosts() { return posts; } public void setPosts(List posts) { this.posts = posts; } public List getComments() { return comments; } public void setComments(List comments) { this.comments = comments; } -} +} \ No newline at end of file From d8784b57b0b99202e8336339fca9e4ec4c4fb01d Mon Sep 17 00:00:00 2001 From: james Date: Sun, 12 Apr 2026 14:11:26 -0400 Subject: [PATCH 40/52] Moderator permissions --- .../com/zipcode/stardust/service/ForumService.java | 13 +++++++++++++ java/src/test/resources/application.properties | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index efacc36..b65065c 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -207,3 +207,16 @@ public Reaction getUserReaction(User user, Post post) { } } + public void moderatePost(Long postId) { + postRepository.deleteById(postId); + } + + public void moderateComment(Long commentId) { + commentRepository.deleteById(commentId); + } + + public void banUser(String username) { + User user = userRepository.findByUsername(username); + user.setBanned(true); + userRepository.save(user); + } diff --git a/java/src/test/resources/application.properties b/java/src/test/resources/application.properties index 95ed0f4..601f780 100644 --- a/java/src/test/resources/application.properties +++ b/java/src/test/resources/application.properties @@ -8,4 +8,3 @@ spring.application.name=Schooner site.name=Schooner site.description=a schooner forum spring.thymeleaf.cache=false - \ No newline at end of file From 5d9edb4401489a4ed7697688070e3b24eedf0f1e Mon Sep 17 00:00:00 2001 From: james Date: Sun, 12 Apr 2026 14:18:25 -0400 Subject: [PATCH 41/52] Mod Permissions 2 --- .../stardust/service/ForumService.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index b65065c..d6679b9 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -20,6 +20,8 @@ import com.zipcode.stardust.model.Subforum; import com.zipcode.stardust.model.User; import com.zipcode.stardust.model.UserProfile; +import com.zipcode.stardust.repository.CommentRepository; +import com.zipcode.stardust.repository.PostRepository; import com.zipcode.stardust.repository.ReactionRepository; import com.zipcode.stardust.repository.SubforumRepository; import com.zipcode.stardust.repository.UserProfileRepository; @@ -31,6 +33,12 @@ public class ForumService { @Autowired private SubforumRepository subforumRepository; + @Autowired + private PostRepository postRepository; + + @Autowired + private CommentRepository commentRepository; + @Autowired private UserRepository userRepository; @@ -205,7 +213,6 @@ public Long getCelebrateCount(Post post) { public Reaction getUserReaction(User user, Post post) { return reactionRepository.findByUserAndPost(user, post); } -} public void moderatePost(Long postId) { postRepository.deleteById(postId); @@ -216,7 +223,11 @@ public void moderateComment(Long commentId) { } public void banUser(String username) { - User user = userRepository.findByUsername(username); - user.setBanned(true); - userRepository.save(user); + Optional opt = userRepository.findByUsername(username); + if (opt.isPresent()) { + User user = opt.get(); + user.setBanned(true); + userRepository.save(user); + } } +} From 91cf1b3bf5c4c1128036b0037d6a9de0b26359ae Mon Sep 17 00:00:00 2001 From: nishat Date: Sun, 12 Apr 2026 14:24:10 -0400 Subject: [PATCH 42/52] forumcontroller and sec config --- .../main/java/com/zipcode/stardust/config/SecurityConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java b/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java index 9e1259d..43391c2 100644 --- a/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java +++ b/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.core.userdetails.UserDetailsService; @@ -14,6 +15,7 @@ @Configuration @EnableWebSecurity +@EnableMethodSecurity public class SecurityConfig { @Autowired From 47d9d12308ce5efce508baaf1b024b10a072ab5a Mon Sep 17 00:00:00 2001 From: james Date: Sun, 12 Apr 2026 14:41:06 -0400 Subject: [PATCH 43/52] Minor Change --- .../main/java/com/zipcode/stardust/config/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java b/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java index 43391c2..445f4c7 100644 --- a/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java +++ b/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java @@ -1,6 +1,5 @@ package com.zipcode.stardust.config; -import com.zipcode.stardust.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,6 +12,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; +import com.zipcode.stardust.repository.UserRepository; + @Configuration @EnableWebSecurity @EnableMethodSecurity From a0effcb7ab9bec6c42ad59d0d3d98b8b0de8dd75 Mon Sep 17 00:00:00 2001 From: nishat Date: Sun, 12 Apr 2026 14:57:44 -0400 Subject: [PATCH 44/52] add @EnableMethodSecurity and moderation routes to controller --- .../main/java/com/zipcode/stardust/config/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java b/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java index 43391c2..445f4c7 100644 --- a/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java +++ b/java/src/main/java/com/zipcode/stardust/config/SecurityConfig.java @@ -1,6 +1,5 @@ package com.zipcode.stardust.config; -import com.zipcode.stardust.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,6 +12,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; +import com.zipcode.stardust.repository.UserRepository; + @Configuration @EnableWebSecurity @EnableMethodSecurity From 448b08c5c6c13750f266be3421c744956b49ecb9 Mon Sep 17 00:00:00 2001 From: mahala Date: Sun, 12 Apr 2026 15:09:34 -0400 Subject: [PATCH 45/52] Create Delete and Edir --- .../stardust/config/DataInitializer.java | 13 +++ .../stardust/controller/ForumController.java | 69 ++++++++++++++ .../java/com/zipcode/stardust/model/User.java | 10 +- .../service/CommonAttributesHelper.java | 2 + .../stardust/service/ForumService.java | 22 +++++ .../main/resources/templates/editpost.html | 94 +++++++++++++++++++ .../main/resources/templates/viewpost.html | 89 +++++++++++++++++- 7 files changed, 296 insertions(+), 3 deletions(-) create mode 100644 java/src/main/resources/templates/editpost.html diff --git a/java/src/main/java/com/zipcode/stardust/config/DataInitializer.java b/java/src/main/java/com/zipcode/stardust/config/DataInitializer.java index 41c04ae..04c3810 100644 --- a/java/src/main/java/com/zipcode/stardust/config/DataInitializer.java +++ b/java/src/main/java/com/zipcode/stardust/config/DataInitializer.java @@ -1,7 +1,9 @@ package com.zipcode.stardust.config; import com.zipcode.stardust.model.Subforum; +import com.zipcode.stardust.model.User; import com.zipcode.stardust.repository.SubforumRepository; +import com.zipcode.stardust.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -13,6 +15,9 @@ public class DataInitializer implements ApplicationRunner { @Autowired private SubforumRepository subforumRepository; + @Autowired + private UserRepository userRepository; + @Override public void run(ApplicationArguments args) { if (subforumRepository.count() == 0) { @@ -36,5 +41,13 @@ public void run(ApplicationArguments args) { "Discuss other things here", null); subforumRepository.save(other); } + + // Promote any existing accounts that belong to privileged usernames + for (User user : userRepository.findAll()) { + if (User.isPrivilegedUsername(user.getUsername()) && !user.isAdmin()) { + user.setAdmin(true); + userRepository.save(user); + } + } } } diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 2696bbf..ec4186c 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -290,4 +290,73 @@ public String reactToPost(@RequestParam Long postId, return "redirect:/viewpost?post=" + postId + "&reacted=" + type; } + + // ── Delete post ─────────────────────────────────────────────── + @PostMapping("/action_delete_post") + public String deletePost(@RequestParam Long postId, Authentication auth) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + Optional opt = postRepository.findById(postId); + if (opt.isEmpty()) return "redirect:/"; + Post post = opt.get(); + boolean isOwner = post.getUser().getUsername().equals(user.getUsername()); + if (!isOwner && !user.isAdmin()) return "redirect:/viewpost?post=" + postId; + Long subId = post.getSubforum().getId(); + forumService.moderatePost(postId); + return "redirect:/subforum?sub=" + subId; + } + + // ── Delete comment ──────────────────────────────────────────── + @PostMapping("/action_delete_comment") + public String deleteComment(@RequestParam Long commentId, + @RequestParam Long postId, + Authentication auth) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + Optional opt = commentRepository.findById(commentId); + if (opt.isEmpty()) return "redirect:/viewpost?post=" + postId; + com.zipcode.stardust.model.Comment comment = opt.get(); + boolean isOwner = comment.getUser().getUsername().equals(user.getUsername()); + if (!isOwner && !user.isAdmin()) return "redirect:/viewpost?post=" + postId; + forumService.moderateComment(commentId); + return "redirect:/viewpost?post=" + postId; + } + + // ── Edit post form ──────────────────────────────────────────── + @GetMapping("/editpost") + public String editPostForm(@RequestParam Long postId, Model model, Authentication auth) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + Optional opt = postRepository.findById(postId); + if (opt.isEmpty()) return "redirect:/"; + Post post = opt.get(); + if (!post.getUser().getUsername().equals(user.getUsername())) return "redirect:/viewpost?post=" + postId; + addCommonAttributes(model, auth); + model.addAttribute("post", post); + return "editpost"; + } + + // ── Save edited post ────────────────────────────────────────── + @PostMapping("/action_edit_post") + public String saveEditPost(@RequestParam Long postId, + @RequestParam String title, + @RequestParam String content, + Authentication auth) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + forumService.editPost(postId, title, content, user); + return "redirect:/viewpost?post=" + postId; + } + + // ── Save edited comment ─────────────────────────────────────── + @PostMapping("/action_edit_comment") + public String saveEditComment(@RequestParam Long commentId, + @RequestParam Long postId, + @RequestParam String content, + Authentication auth) { + User user = getCurrentUser(auth); + if (user == null) return "redirect:/loginform"; + forumService.editComment(commentId, content, user); + return "redirect:/viewpost?post=" + postId; + } } \ No newline at end of file diff --git a/java/src/main/java/com/zipcode/stardust/model/User.java b/java/src/main/java/com/zipcode/stardust/model/User.java index 2333339..84abdcb 100644 --- a/java/src/main/java/com/zipcode/stardust/model/User.java +++ b/java/src/main/java/com/zipcode/stardust/model/User.java @@ -52,11 +52,19 @@ public class User implements UserDetails { public User() {} + private static final java.util.Set ADMIN_USERNAMES = java.util.Set.of( + "admin", "ZoeDayz", "jumz", "Joseph", "nishat" + ); + + public static boolean isPrivilegedUsername(String username) { + return username != null && ADMIN_USERNAMES.contains(username); + } + public User(String email, String username, String rawPassword, PasswordEncoder encoder) { this.email = email; this.username = username; this.passwordHash = encoder.encode(rawPassword); - this.admin = "admin".equalsIgnoreCase(username); + this.admin = isPrivilegedUsername(username); } public boolean checkPassword(String rawPassword, PasswordEncoder encoder) { diff --git a/java/src/main/java/com/zipcode/stardust/service/CommonAttributesHelper.java b/java/src/main/java/com/zipcode/stardust/service/CommonAttributesHelper.java index d92bc56..f5d07cc 100644 --- a/java/src/main/java/com/zipcode/stardust/service/CommonAttributesHelper.java +++ b/java/src/main/java/com/zipcode/stardust/service/CommonAttributesHelper.java @@ -36,10 +36,12 @@ public void addCommonAttributes(Model model, Authentication auth) { if (user != null) { model.addAttribute("isLoggedIn", true); model.addAttribute("currentUser", user.getUsername()); + model.addAttribute("isAdmin", user.isAdmin()); model.addAttribute("unreadCount", messageRepository.countByRecipientAndReadFalseAndDeletedByRecipientFalse(user)); } else { model.addAttribute("isLoggedIn", false); + model.addAttribute("isAdmin", false); model.addAttribute("unreadCount", 0L); } } diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index d6679b9..aba4a0c 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.util.HtmlUtils; +import com.zipcode.stardust.model.Comment; import com.zipcode.stardust.model.Post; import com.zipcode.stardust.model.Reaction; import com.zipcode.stardust.model.Subforum; @@ -222,6 +223,27 @@ public void moderateComment(Long commentId) { commentRepository.deleteById(commentId); } + public boolean editPost(Long postId, String title, String content, User requestingUser) { + Optional opt = postRepository.findById(postId); + if (opt.isEmpty()) return false; + Post post = opt.get(); + if (!post.getUser().getId().equals(requestingUser.getId())) return false; + post.setTitle(title); + post.setContent(content); + postRepository.save(post); + return true; + } + + public boolean editComment(Long commentId, String content, User requestingUser) { + Optional opt = commentRepository.findById(commentId); + if (opt.isEmpty()) return false; + Comment comment = opt.get(); + if (!comment.getUser().getId().equals(requestingUser.getId())) return false; + comment.setContent(content); + commentRepository.save(comment); + return true; + } + public void banUser(String username) { Optional opt = userRepository.findByUsername(username); if (opt.isPresent()) { diff --git a/java/src/main/resources/templates/editpost.html b/java/src/main/resources/templates/editpost.html new file mode 100644 index 0000000..0337876 --- /dev/null +++ b/java/src/main/resources/templates/editpost.html @@ -0,0 +1,94 @@ + + + + +
+
+

Edit Post

+
+ +
+ + +
+
+ + +
+
+ +
+
+
+
+
+
+
+ + Cancel +
+
+
+ + + + diff --git a/java/src/main/resources/templates/viewpost.html b/java/src/main/resources/templates/viewpost.html index f874549..2ed6c25 100644 --- a/java/src/main/resources/templates/viewpost.html +++ b/java/src/main/resources/templates/viewpost.html @@ -26,6 +26,16 @@

Post Title

Posted by author — time + + Edit + +

+ +
+

Content here
@@ -136,11 +146,42 @@
Add Media
Comments (0)
-
-

Comment content

+
+ + +
+

Comment content

+
+ + +
+
+ + + + + +
+
+ by author — time + + + +
+ + +
+
No comments yet.
@@ -163,7 +204,51 @@
Add a Comment
+ + + + + + diff --git a/java/src/main/resources/templates/editpost.html b/java/src/main/resources/templates/editpost.html index 0337876..f0855b1 100644 --- a/java/src/main/resources/templates/editpost.html +++ b/java/src/main/resources/templates/editpost.html @@ -14,39 +14,35 @@

Edit Post

-
@@ -56,8 +52,8 @@

Edit Post

diff --git a/java/src/main/resources/templates/header.html b/java/src/main/resources/templates/header.html index 8dc09d1..65816c4 100644 --- a/java/src/main/resources/templates/header.html +++ b/java/src/main/resources/templates/header.html @@ -7,20 +7,41 @@ Schooner
Subforum Index - - - Messages - 0 - - Settings - Hello, user -
- -
- - +
+ +
+
+
+ + Messages + + + Settings +
+
+ +
+
+
+
diff --git a/java/src/main/resources/templates/layout.html b/java/src/main/resources/templates/layout.html index cabafa3..34e8233 100644 --- a/java/src/main/resources/templates/layout.html +++ b/java/src/main/resources/templates/layout.html @@ -12,6 +12,8 @@ href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github.min.css"/> + +
diff --git a/java/src/main/resources/templates/messages/compose.html b/java/src/main/resources/templates/messages/compose.html index 66caaf2..8899b80 100644 --- a/java/src/main/resources/templates/messages/compose.html +++ b/java/src/main/resources/templates/messages/compose.html @@ -27,7 +27,33 @@

Compose Message

-
@@ -36,5 +62,26 @@

Compose Message

+ diff --git a/java/src/main/resources/templates/viewpost.html b/java/src/main/resources/templates/viewpost.html index 2ed6c25..ead92cd 100644 --- a/java/src/main/resources/templates/viewpost.html +++ b/java/src/main/resources/templates/viewpost.html @@ -159,7 +159,33 @@
Comments (0)
-
- - - diff --git a/java/src/main/resources/templates/editpost.html b/java/src/main/resources/templates/editpost.html index f0855b1..450091f 100644 --- a/java/src/main/resources/templates/editpost.html +++ b/java/src/main/resources/templates/editpost.html @@ -14,6 +14,8 @@

Edit Post

+
@@ -298,6 +302,54 @@
Confirm Deletion
ta.focus(); } + const csrf = document.querySelector('meta[name="_csrf"]')?.content; + const csrfHdr = document.querySelector('meta[name="_csrf_header"]')?.content; + + function insertAtCursor(taId, text) { + const ta = document.getElementById(taId); + const pos = ta.selectionStart; + ta.value = ta.value.substring(0, pos) + text + ta.value.substring(pos); + ta.focus(); + } + function sendUpload(taId, file) { + const fd = new FormData(); + fd.append('file', file); + const headers = {}; + if (csrf && csrfHdr) headers[csrfHdr] = csrf; + fetch('/upload', { method: 'POST', body: fd, headers }) + .then(r => r.json()) + .then(data => { + if (data.error) { alert(data.error); return; } + const markup = data.type === 'video' + ? '\n' + : '![](' + data.url + ')\n'; + insertAtCursor(taId, markup); + }) + .catch(() => alert('Upload failed.')); + } + function triggerUpload(taId) { + const input = document.getElementById('upload-input'); + input.onchange = () => { if (input.files[0]) sendUpload(taId, input.files[0]); input.value = ''; }; + input.click(); + } + document.addEventListener('DOMContentLoaded', () => { + ['new-comment'].forEach(id => { + const ta = document.getElementById(id); + if (!ta) return; + ta.addEventListener('paste', e => { + const items = e.clipboardData?.items; + if (!items) return; + for (const item of items) { + if (item.kind === 'file' && item.type.startsWith('image/')) { + e.preventDefault(); + sendUpload(id, item.getAsFile()); + break; + } + } + }); + }); + }); + let pendingDeleteFormId = null; function confirmDelete(formId) { From e890948e921ac98e262cee283100540579a59106 Mon Sep 17 00:00:00 2001 From: mahala Date: Mon, 13 Apr 2026 00:24:11 -0400 Subject: [PATCH 50/52] Debug Controllers 1 --- .../zipcode/stardust/controller/ForumController.java | 9 ++++++--- .../stardust/controller/MediaEmbedController.java | 4 ++-- .../zipcode/stardust/controller/UploadController.java | 11 ++++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index ec4186c..617ce67 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -313,9 +313,10 @@ public String deleteComment(@RequestParam Long commentId, Authentication auth) { User user = getCurrentUser(auth); if (user == null) return "redirect:/loginform"; - Optional opt = commentRepository.findById(commentId); + if (commentId == null) return "redirect:/"; + Optional opt = commentRepository.findById(commentId); if (opt.isEmpty()) return "redirect:/viewpost?post=" + postId; - com.zipcode.stardust.model.Comment comment = opt.get(); + Comment comment = opt.get(); boolean isOwner = comment.getUser().getUsername().equals(user.getUsername()); if (!isOwner && !user.isAdmin()) return "redirect:/viewpost?post=" + postId; forumService.moderateComment(commentId); @@ -356,7 +357,9 @@ public String saveEditComment(@RequestParam Long commentId, Authentication auth) { User user = getCurrentUser(auth); if (user == null) return "redirect:/loginform"; - forumService.editComment(commentId, content, user); + if (commentId == null) return "redirect:/"; + boolean saved = forumService.editComment(commentId, content, user); + if (!saved) return "redirect:/viewpost?post=" + postId + "&editError=1"; return "redirect:/viewpost?post=" + postId; } } \ No newline at end of file diff --git a/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java b/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java index b39727c..4d22059 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java @@ -1,5 +1,5 @@ package com.zipcode.stardust.controller; - + import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +15,7 @@ import com.zipcode.stardust.model.User; import com.zipcode.stardust.repository.PostRepository; import com.zipcode.stardust.service.MediaEmbedService; - + /** * ============================================================= * MediaEmbedController — handles HTTP requests related to diff --git a/java/src/main/java/com/zipcode/stardust/controller/UploadController.java b/java/src/main/java/com/zipcode/stardust/controller/UploadController.java index b3e1d26..b91b5a0 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/UploadController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/UploadController.java @@ -34,20 +34,21 @@ public class UploadController { @PostMapping("/upload") public ResponseEntity upload(@RequestParam MultipartFile file, Authentication auth) { - if (auth == null || !auth.isAuthenticated()) { + if (auth == null || !auth.isAuthenticated() + || "anonymousUser".equals(auth.getPrincipal())) { return ResponseEntity.status(401).body(Map.of("error", "Login required.")); } + if (file.isEmpty()) { + return ResponseEntity.badRequest().body(Map.of("error", "File is empty.")); + } + String contentType = file.getContentType(); if (contentType == null || !ALLOWED_TYPES.contains(contentType)) { return ResponseEntity.badRequest() .body(Map.of("error", "Unsupported file type: " + contentType)); } - if (file.isEmpty()) { - return ResponseEntity.badRequest().body(Map.of("error", "File is empty.")); - } - String ext = getExtension(file.getOriginalFilename(), contentType); String filename = UUID.randomUUID() + ext; From 1013e3c974f58e69127ae3329b7ff1c4566afef0 Mon Sep 17 00:00:00 2001 From: mahala Date: Mon, 13 Apr 2026 00:32:20 -0400 Subject: [PATCH 51/52] Message Markdown --- .../com/zipcode/stardust/controller/MessageController.java | 3 +++ java/src/main/resources/templates/messages/view.html | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/controller/MessageController.java b/java/src/main/java/com/zipcode/stardust/controller/MessageController.java index f987f41..f12a282 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/MessageController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/MessageController.java @@ -5,6 +5,7 @@ import com.zipcode.stardust.repository.MessageRepository; import com.zipcode.stardust.repository.UserRepository; import com.zipcode.stardust.service.CommonAttributesHelper; +import com.zipcode.stardust.service.ForumService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Controller; @@ -23,6 +24,7 @@ public class MessageController { @Autowired private MessageRepository messageRepository; @Autowired private UserRepository userRepository; @Autowired private CommonAttributesHelper helper; + @Autowired private ForumService forumService; // ── Inbox ──────────────────────────────────────────────────────────────── @@ -143,6 +145,7 @@ public String viewMessage( + "&subject=" + encodedSubject; model.addAttribute("message", message); + model.addAttribute("renderedBody", forumService.renderMarkdown(message.getContent())); model.addAttribute("replyUrl", replyUrl); model.addAttribute("isSender", isSender); return "messages/view"; diff --git a/java/src/main/resources/templates/messages/view.html b/java/src/main/resources/templates/messages/view.html index 8e6a70b..0e6288a 100644 --- a/java/src/main/resources/templates/messages/view.html +++ b/java/src/main/resources/templates/messages/view.html @@ -20,9 +20,7 @@
Subject
— time
-
-

Message content

-
+
Message content
From 1d9edf49dd18716446f6227017c6a4f9f7b62305 Mon Sep 17 00:00:00 2001 From: mahala Date: Mon, 13 Apr 2026 01:07:40 -0400 Subject: [PATCH 52/52] Error reduction --- .../stardust/controller/ForumController.java | 32 +++++++++--------- .../controller/MediaEmbedController.java | 6 ++-- .../controller/MessageController.java | 4 +-- .../stardust/controller/UploadController.java | 21 ++++++------ .../stardust/service/ForumService.java | 10 +++--- .../stardust/service/MediaEmbedService.java | 6 ++-- .../main/resources/templates/createpost.html | 23 ++++++++----- .../main/resources/templates/editpost.html | 23 ++++++++----- .../resources/templates/messages/compose.html | 23 ++++++++----- .../main/resources/templates/viewpost.html | 33 ++++++++++++------- 10 files changed, 106 insertions(+), 75 deletions(-) diff --git a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java index 617ce67..1f96fa1 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/ForumController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/ForumController.java @@ -59,7 +59,7 @@ public String index(Model model, Authentication auth) { } @GetMapping("/subforum") - public String subforum(@RequestParam Long sub, Model model, Authentication auth) { + public String subforum(@RequestParam long sub, Model model, Authentication auth) { addCommonAttributes(model, auth); Optional opt = subforumRepository.findById(sub); if (opt.isEmpty()) return "redirect:/"; @@ -119,7 +119,7 @@ public String createAccount(@RequestParam String username, } @GetMapping("/addpost") - public String addPostForm(@RequestParam Long sub, Model model, Authentication auth) { + public String addPostForm(@RequestParam long sub, Model model, Authentication auth) { addCommonAttributes(model, auth); Optional opt = subforumRepository.findById(sub); if (opt.isEmpty()) return "redirect:/"; @@ -129,7 +129,7 @@ public String addPostForm(@RequestParam Long sub, Model model, Authentication au } @PostMapping("/action_post") - public String createPost(@RequestParam Long sub, + public String createPost(@RequestParam long sub, @RequestParam String title, @RequestParam String content, Model model, Authentication auth) { @@ -163,7 +163,7 @@ public String createPost(@RequestParam Long sub, } @GetMapping("/viewpost") - public String viewPost(@RequestParam Long post, Model model, Authentication auth) { + public String viewPost(@RequestParam long post, Model model, Authentication auth) { addCommonAttributes(model, auth); Optional opt = postRepository.findById(post); if (opt.isEmpty()) return "redirect:/"; @@ -203,7 +203,7 @@ public String viewPost(@RequestParam Long post, Model model, Authentication auth } @PostMapping("/action_comment") - public String addComment(@RequestParam Long post, + public String addComment(@RequestParam long post, @RequestParam String content, Authentication auth) { if (auth == null || !auth.isAuthenticated()) { @@ -218,7 +218,7 @@ public String addComment(@RequestParam Long post, } @GetMapping("/action_comment") - public String addCommentGet(@RequestParam Long post) { + public String addCommentGet(@RequestParam long post) { return "redirect:/viewpost?post=" + post; } @@ -276,7 +276,7 @@ public String updatePassword(@RequestParam String currentPassword, } @PostMapping("/action_react") - public String reactToPost(@RequestParam Long postId, + public String reactToPost(@RequestParam long postId, @RequestParam String type, Authentication auth) { if (auth == null || !auth.isAuthenticated()) { @@ -293,7 +293,7 @@ public String reactToPost(@RequestParam Long postId, // ── Delete post ─────────────────────────────────────────────── @PostMapping("/action_delete_post") - public String deletePost(@RequestParam Long postId, Authentication auth) { + public String deletePost(@RequestParam long postId, Authentication auth) { User user = getCurrentUser(auth); if (user == null) return "redirect:/loginform"; Optional opt = postRepository.findById(postId); @@ -301,19 +301,18 @@ public String deletePost(@RequestParam Long postId, Authentication auth) { Post post = opt.get(); boolean isOwner = post.getUser().getUsername().equals(user.getUsername()); if (!isOwner && !user.isAdmin()) return "redirect:/viewpost?post=" + postId; - Long subId = post.getSubforum().getId(); + long subId = post.getSubforum().getId(); forumService.moderatePost(postId); return "redirect:/subforum?sub=" + subId; } // ── Delete comment ──────────────────────────────────────────── @PostMapping("/action_delete_comment") - public String deleteComment(@RequestParam Long commentId, - @RequestParam Long postId, + public String deleteComment(@RequestParam long commentId, + @RequestParam long postId, Authentication auth) { User user = getCurrentUser(auth); if (user == null) return "redirect:/loginform"; - if (commentId == null) return "redirect:/"; Optional opt = commentRepository.findById(commentId); if (opt.isEmpty()) return "redirect:/viewpost?post=" + postId; Comment comment = opt.get(); @@ -325,7 +324,7 @@ public String deleteComment(@RequestParam Long commentId, // ── Edit post form ──────────────────────────────────────────── @GetMapping("/editpost") - public String editPostForm(@RequestParam Long postId, Model model, Authentication auth) { + public String editPostForm(@RequestParam long postId, Model model, Authentication auth) { User user = getCurrentUser(auth); if (user == null) return "redirect:/loginform"; Optional opt = postRepository.findById(postId); @@ -339,7 +338,7 @@ public String editPostForm(@RequestParam Long postId, Model model, Authenticatio // ── Save edited post ────────────────────────────────────────── @PostMapping("/action_edit_post") - public String saveEditPost(@RequestParam Long postId, + public String saveEditPost(@RequestParam long postId, @RequestParam String title, @RequestParam String content, Authentication auth) { @@ -351,13 +350,12 @@ public String saveEditPost(@RequestParam Long postId, // ── Save edited comment ─────────────────────────────────────── @PostMapping("/action_edit_comment") - public String saveEditComment(@RequestParam Long commentId, - @RequestParam Long postId, + public String saveEditComment(@RequestParam long commentId, + @RequestParam long postId, @RequestParam String content, Authentication auth) { User user = getCurrentUser(auth); if (user == null) return "redirect:/loginform"; - if (commentId == null) return "redirect:/"; boolean saved = forumService.editComment(commentId, content, user); if (!saved) return "redirect:/viewpost?post=" + postId + "&editError=1"; return "redirect:/viewpost?post=" + postId; diff --git a/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java b/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java index 4d22059..c9e5ce5 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/MediaEmbedController.java @@ -85,7 +85,7 @@ private User getCurrentUser(Authentication auth) { */ @PostMapping("/action_add_embed") public String addEmbed( - @RequestParam("post") Long postId, + @RequestParam("post") long postId, @RequestParam("url") String url, @RequestParam(value = "mediaType", required = false) String mediaTypeOverride, @@ -160,8 +160,8 @@ public String addEmbed( */ @PostMapping("/action_delete_embed") public String deleteEmbed( - @RequestParam("embedId") Long embedId, - @RequestParam("post") Long postId, + @RequestParam("embedId") long embedId, + @RequestParam("post") long postId, Authentication auth, RedirectAttributes redirectAttrs) { diff --git a/java/src/main/java/com/zipcode/stardust/controller/MessageController.java b/java/src/main/java/com/zipcode/stardust/controller/MessageController.java index f12a282..b51b311 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/MessageController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/MessageController.java @@ -117,7 +117,7 @@ public String sendMessage( @GetMapping("/messages/view") public String viewMessage( - @RequestParam Long id, + @RequestParam long id, Model model, Authentication auth) { helper.addCommonAttributes(model, auth); @@ -155,7 +155,7 @@ public String viewMessage( @PostMapping("/messages/delete") public String deleteMessage( - @RequestParam Long id, + @RequestParam long id, @RequestParam String box, Authentication auth) { diff --git a/java/src/main/java/com/zipcode/stardust/controller/UploadController.java b/java/src/main/java/com/zipcode/stardust/controller/UploadController.java index b91b5a0..f3c4333 100644 --- a/java/src/main/java/com/zipcode/stardust/controller/UploadController.java +++ b/java/src/main/java/com/zipcode/stardust/controller/UploadController.java @@ -7,7 +7,6 @@ import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.Map; -import java.util.Set; import java.util.UUID; import org.springframework.beans.factory.annotation.Value; @@ -24,12 +23,12 @@ public class UploadController { @Value("${upload.dir:uploads}") private String uploadDir; - private static final Set ALLOWED_TYPES = Set.of( - "image/jpeg", "image/png", "image/gif", "image/webp", - "image/bmp", "image/svg+xml", "image/avif", - "video/mp4", "video/webm", "video/ogg", - "video/quicktime", "video/x-msvideo", "video/x-matroska" - ); + /** Accept any image/* or video/* type except SVG (can carry embedded scripts). */ + private boolean isAllowedType(String contentType) { + if (contentType == null) return false; + if ("image/svg+xml".equals(contentType)) return false; + return contentType.startsWith("image/") || contentType.startsWith("video/"); + } @PostMapping("/upload") public ResponseEntity upload(@RequestParam MultipartFile file, @@ -43,11 +42,13 @@ public ResponseEntity upload(@RequestParam MultipartFile file, return ResponseEntity.badRequest().body(Map.of("error", "File is empty.")); } - String contentType = file.getContentType(); - if (contentType == null || !ALLOWED_TYPES.contains(contentType)) { + String rawType = file.getContentType(); + if (!isAllowedType(rawType)) { return ResponseEntity.badRequest() - .body(Map.of("error", "Unsupported file type: " + contentType)); + .body(Map.of("error", "Unsupported file type: " + rawType)); } + // isAllowedType returned true, so rawType is non-null here + String contentType = rawType; String ext = getExtension(file.getOriginalFilename(), contentType); String filename = UUID.randomUUID() + ext; diff --git a/java/src/main/java/com/zipcode/stardust/service/ForumService.java b/java/src/main/java/com/zipcode/stardust/service/ForumService.java index 0c62dd6..cbbfe29 100644 --- a/java/src/main/java/com/zipcode/stardust/service/ForumService.java +++ b/java/src/main/java/com/zipcode/stardust/service/ForumService.java @@ -89,7 +89,7 @@ public String renderMarkdown(String raw) { return sanitizer.sanitize(html); } - public String generateLinkPath(Long subforumId) { + public String generateLinkPath(long subforumId) { StringBuilder sb = new StringBuilder(); sb.append(" / Forum Index"); Optional opt = subforumRepository.findById(subforumId); @@ -221,15 +221,15 @@ public Reaction getUserReaction(User user, Post post) { return reactionRepository.findByUserAndPost(user, post); } - public void moderatePost(Long postId) { + public void moderatePost(long postId) { postRepository.deleteById(postId); } - public void moderateComment(Long commentId) { + public void moderateComment(long commentId) { commentRepository.deleteById(commentId); } - public boolean editPost(Long postId, String title, String content, User requestingUser) { + public boolean editPost(long postId, String title, String content, User requestingUser) { Optional opt = postRepository.findById(postId); if (opt.isEmpty()) return false; Post post = opt.get(); @@ -240,7 +240,7 @@ public boolean editPost(Long postId, String title, String content, User requesti return true; } - public boolean editComment(Long commentId, String content, User requestingUser) { + public boolean editComment(long commentId, String content, User requestingUser) { Optional opt = commentRepository.findById(commentId); if (opt.isEmpty()) return false; Comment comment = opt.get(); diff --git a/java/src/main/java/com/zipcode/stardust/service/MediaEmbedService.java b/java/src/main/java/com/zipcode/stardust/service/MediaEmbedService.java index fa8bf8e..e4e11a0 100644 --- a/java/src/main/java/com/zipcode/stardust/service/MediaEmbedService.java +++ b/java/src/main/java/com/zipcode/stardust/service/MediaEmbedService.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import java.util.List; +import org.springframework.lang.NonNull; /** * ============================================================= @@ -127,7 +128,8 @@ public boolean isValidCaption(String caption) { * @param embed the embed to persist * @return the saved embed (id is now populated) */ - public MediaEmbed save(MediaEmbed embed) { + @NonNull + public MediaEmbed save(@NonNull MediaEmbed embed) { return mediaEmbedRepository.save(embed); } @@ -148,7 +150,7 @@ public List getEmbedsForPost(Post post) { * * @param embedId the id of the embed to remove */ - public void deleteEmbed(Long embedId) { + public void deleteEmbed(long embedId) { mediaEmbedRepository.deleteById(embedId); } } diff --git a/java/src/main/resources/templates/createpost.html b/java/src/main/resources/templates/createpost.html index 8554fb6..7742468 100644 --- a/java/src/main/resources/templates/createpost.html +++ b/java/src/main/resources/templates/createpost.html @@ -21,8 +21,9 @@

Create Post in Forum

- + +
+ +
@@ -213,8 +217,9 @@
Comments (0)
No comments yet.
Add a Comment
- + +
@@ -242,8 +247,10 @@
Add a Comment
- + +
@@ -327,22 +334,24 @@
Confirm Deletion
}) .catch(() => alert('Upload failed.')); } - function triggerUpload(taId) { - const input = document.getElementById('upload-input'); - input.onchange = () => { if (input.files[0]) sendUpload(taId, input.files[0]); input.value = ''; }; + function triggerUpload(taId, mode) { + const input = document.getElementById( + mode === 'folder' ? 'upload-folder-input' : 'upload-input'); + input.onchange = () => { + Array.from(input.files).forEach(f => sendUpload(taId, f)); + input.value = ''; + }; input.click(); } document.addEventListener('DOMContentLoaded', () => { - ['new-comment'].forEach(id => { - const ta = document.getElementById(id); - if (!ta) return; + document.querySelectorAll('textarea').forEach(ta => { ta.addEventListener('paste', e => { const items = e.clipboardData?.items; if (!items) return; for (const item of items) { - if (item.kind === 'file' && item.type.startsWith('image/')) { + if (item.kind === 'file' && (item.type.startsWith('image/') || item.type.startsWith('video/'))) { e.preventDefault(); - sendUpload(id, item.getAsFile()); + sendUpload(ta.id, item.getAsFile()); break; } }