Ako/sae302_applicom
1
0
Fork 0
mirror of https://github.com/Akomry/sae302_applicom.git synced 2025-12-06 11:43:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(Event): 2.6.5: Récupération des posts après changement de discussion

Browse source
This commit is contained in:
Emi Boucly 2025-01-07 16:04:40 +01:00
parent 48da92717b
commit 1732a63a4a
3 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
chat/src/main/java/rtgre/chat/ChatController.java
View file

@ -278,6 +278,7 @@ public class ChatController implements Initializable {
Post postSys = new Post("system", loginTextField.getText(), "Bienvenue dans la discussion avec " + contactSelected.getLogin()); Post postSys = new Post("system", loginTextField.getText(), "Bienvenue dans la discussion avec " + contactSelected.getLogin());
postsObservableList.clear(); postsObservableList.clear();
postsObservableList.add(postSys); postsObservableList.add(postSys);
client.sendListPostEvent(0, contactSelected.getLogin());
postListView.refresh(); postListView.refresh();
} }

10
chat/src/main/java/rtgre/chat/net/ChatClient.java
View file

@ -58,6 +58,16 @@ public class ChatClient extends ClientTCP {
sendEvent(authEvent); sendEvent(authEvent);
} }
public void sendListPostEvent(long since, String select) {
Event listPostEvent = new Event(
Event.LIST_POSTS,
new JSONObject()
.put("since", since)
.put("select", select)
);
sendEvent(listPostEvent);
}
@Override @Override
public void receiveLoop() { public void receiveLoop() {

45
chat/src/main/java/rtgre/server/ChatServer.java
View file

@ -250,27 +250,48 @@ public class ChatServer {
doMessage(event.getContent()); doMessage(event.getContent());
LOGGER.info("Receiving message"); LOGGER.info("Receiving message");
return true; return true;
} else if (event.getType().equals(Event.LIST_POSTS)) {
doListPost(event.getContent());
LOGGER.info("Sending Posts");
return true;
} else { } else {
LOGGER.warning("Unhandled event type: " + event.getType()); LOGGER.warning("Unhandled event type: " + event.getType());
return false; return false;
} }
} }
private void doListPost(JSONObject content) throws JSONException, IllegalStateException {
if (contactMap.getContact(user.getLogin()).isConnected()) {
if (!contactMap.containsKey(content.getString("select"))) {
throw new IllegalStateException();
}
for (Post post: postVector.getPostsSince(content.getLong("since"))) {
if (post.getTo().equals(content.getString("select")) ||
post.getFrom().equals(content.getString("select"))) {
sendEventToContact(contactMap.getContact(user.getLogin()), new Event(Event.POST, post.toJsonObject()));
}
}
}
}
private void doMessage(JSONObject content) throws JSONException, IllegalStateException { private void doMessage(JSONObject content) throws JSONException, IllegalStateException {
if (content.getString("to").equals(user.getLogin()) || !contactMap.containsKey(content.getString("to"))) { if (contactMap.getContact(user.getLogin()).isConnected()) {
throw new IllegalStateException(); if (content.getString("to").equals(user.getLogin()) || !contactMap.containsKey(content.getString("to"))) {
} else { throw new IllegalStateException();
Post post = new Post( } else {
user.getLogin(), Post post = new Post(
Message.fromJson(content) user.getLogin(),
); Message.fromJson(content)
Event postEvent = new Event("POST", post.toJsonObject()); );
Event postEvent = new Event("POST", post.toJsonObject());
sendEventToContact(contactMap.getContact(post.getFrom()), postEvent); sendEventToContact(contactMap.getContact(post.getFrom()), postEvent);
sendEventToContact(contactMap.getContact(post.getTo()), postEvent); sendEventToContact(contactMap.getContact(post.getTo()), postEvent);
postVector.add(post); postVector.add(post);
LOGGER.info("Fin de doMessage"); LOGGER.info("Fin de doMessage");
}
} }
} }