Merge remote-tracking branch 'origin/main'

WEB-INF/src/controleur/ThreadController.java

@@ -3,6 +3,9 @@ package controleur;
 import java.io.IOException;
 import java.time.LocalDate;
 
+import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.text.translate.CharSequenceTranslator;
+
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
@@ -79,6 +82,8 @@ public class ThreadController extends HttpServlet {
                 break;
             case "create":
                 String name = req.getParameter("name");
+                CharSequenceTranslator cst = StringEscapeUtils.ESCAPE_HTML4;
+                name = cst.translate(name);
                 idThread = daoThread.create(new Thread(idThread, username, name, LocalDate.now()));
                 follow = new Follower(username, idThread);
                 daoFollower.create(follow);

WEB-INF/src/modele/dao/Dao.java

-package modele.dao;
-
-import java.util.List;
-
-public interface Dao<E>{
-    List<E> findAll();
-    void create(E elt);
-    void update(E elt);
-    void delete(E elt);
-}

WEB-INF/src/modele/dao/DaoThread.java

@@ -92,7 +92,7 @@ public class DaoThread {
         DS bdd = DS.getInstance();
         List<Thread> res = new ArrayList<>();
         try(Connection con = bdd.getConnection()) {
-            PreparedStatement ps = con.prepareStatement("SELECT * FROM threads WHERE id_thread NOT IN (SELECT id_thread FROM followers WHERE username = ?)");
+            PreparedStatement ps = con.prepareStatement("SELECT * FROM threads WHERE id_thread NOT IN (SELECT id_thread FROM followers WHERE username = ?) ORDER BY date DESC");
             ps.setString(1, creator);
             ResultSet rs = ps.executeQuery();
             while (rs.next()) {
@@ -108,7 +108,7 @@ public class DaoThread {
         DS bdd = DS.getInstance();
         List<Thread> res = new ArrayList<>();
         try(Connection con = bdd.getConnection()) {
-            PreparedStatement ps = con.prepareStatement("SELECT * FROM threads WHERE id_thread IN (SELECT id_thread FROM followers WHERE username = ?)");
+            PreparedStatement ps = con.prepareStatement("SELECT * FROM threads WHERE id_thread IN (SELECT id_thread FROM followers WHERE username = ?) ORDER BY date DESC");
             ps.setString(1, creator);
             ResultSet rs = ps.executeQuery();
             while (rs.next()) {

WEB-INF/vue/chat.jsp

@@ -126,7 +126,7 @@
                         <a class="input-group-text link-primary" href="thread?action=open&id=<%=id %>">
                             <i class="bi-arrow-clockwise"></i>
                         </a>
-                        <input name="message" class="form-control" placeholder="Entrez votre message ici." required>
+                        <input name="message" class="form-control" placeholder="Entrez votre message ici." maxlength=1024 required>
                         <input type="submit" class="input-group-text" value="Envoyer">
                     </form>
                 </div>

install_psql_on_podman_container.sh → scripts/install_psql_on_podman_container.sh

@@ -10,9 +10,9 @@ podman run -d --name bdd -e POSTGRES_USER=user -e POSTGRES_PASSWORD=password -e
 #On attend que le port fonctionne
 sleep 2
 
-PGPASSWORD=password psql -h localhost -p 9090 -U user -d bdd -a -f baseDeDonnee/init.sql && PGPASSWORD=password psql -h localhost -p 9090 -U user -d bdd -a -f baseDeDonnee/setup.sql && echo "Ajout des tables et des données effectuée !"
+PGPASSWORD=password psql -h localhost -p 9090 -U user -d bdd -a -f ../baseDeDonnee/init.sql && PGPASSWORD=password psql -h localhost -p 9090 -U user -d bdd -a -f ../baseDeDonnee/setup.sql && echo "Ajout des tables et des données effectuée !"
 
 echo "driver=org.postgresql.Driver
 url=jdbc:postgresql://localhost:9090/bdd
 login=user
-password=password" > WEB-INF/config.prop && echo "Modification du config.prop effectuée."
\ No newline at end of file
+password=password" > ../WEB-INF/config.prop && echo "Modification du config.prop effectuée."
\ No newline at end of file

reset_configprop.sh → scripts/reset_configprop.sh

@@ -2,4 +2,4 @@
 echo "driver=org.postgresql.Driver
 url=jdbc:postgresql://psqlserv/but2
 login=maximegosselinetu
-password=moi" > WEB-INF/config.prop && echo "Modification du config.prop effectuée."
\ No newline at end of file
+password=moi" > ../WEB-INF/config.prop && echo "Modification du config.prop effectuée."
\ No newline at end of file