From ebcee0bbae57245b8d45a340c206bd34f784b762 Mon Sep 17 00:00:00 2001
From: Charlie Darques <charlie.darques.etu@univ-lille.fr>
Date: Fri, 14 Mar 2025 12:31:09 +0100
Subject: [PATCH] =?UTF-8?q?bug=20=C3=A0=20r=C3=A9gler=20:=20unfollow=20ne?=
=?UTF-8?q?=20fonctionne=20pas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WEB-INF/src/controleurs/Discover.java | 5 +----
WEB-INF/src/controleurs/FollowThread.java | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/WEB-INF/src/controleurs/Discover.java b/WEB-INF/src/controleurs/Discover.java
index feb4572..58ed274 100644
--- a/WEB-INF/src/controleurs/Discover.java
+++ b/WEB-INF/src/controleurs/Discover.java
@@ -43,7 +43,6 @@ public class Discover extends HttpServlet {
try {
followedThreads = userDao.getThreadsFollowedByUser(user);
- System.out.println(followedThreads.get(2));
}
catch (SQLException sqle) {
sqle.getStackTrace();
@@ -54,14 +53,12 @@ public class Discover extends HttpServlet {
MyThread msgThread = null;
try {
msgThread = threadDao.getThreadById(message.getThreadId());
- System.out.println(msgThread.getId());
} catch (SQLException e) {
throw new RuntimeException(e);
}
User sender = userDao.getUserById(message.getSenderId());
String senderName = sender.getUserName();
boolean followed = followedThreads.contains(msgThread.getId());
- System.out.println("suivi : " + followed);
out.println("<div class=\"message\">");
out.println("<h3 class=\"msgThread\">" + msgThread.getThreadName() + "</h3>");
@@ -74,7 +71,7 @@ public class Discover extends HttpServlet {
if (followed) {
out.println("<button class=\"followed\" type=\"submit\">Followed</button>");
}
- else {
+ else if (!followed) {
out.println("<button class=\"unfollowed\" type=\"submit\">Follow</button>");
}
out.println("</form>");
diff --git a/WEB-INF/src/controleurs/FollowThread.java b/WEB-INF/src/controleurs/FollowThread.java
index 857ec85..8083319 100644
--- a/WEB-INF/src/controleurs/FollowThread.java
+++ b/WEB-INF/src/controleurs/FollowThread.java
@@ -54,7 +54,7 @@ public class FollowThread extends HttpServlet {
sqle.getStackTrace();
}
}
- else {
+ else if (followed) {
try {
userDao.unfollowThread(user, threadDao.getThreadById((Integer.parseInt(req.getParameter("threadid")))));
res.sendRedirect("http://localhost:8080/s4a021-web-backend/Discover");
--
GitLab