Merge branch 'develop' into Sidebar-Menu

# Conflicts:
#	src/main/java/org/to/telegramfinalproject/Client/ActionHandler.java
#	src/main/java/org/to/telegramfinalproject/Database/PrivateChatDatabase.java
#	src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
This commit is contained in:
Asal Lotfi
2025-08-03 18:58:29 +03:30
16 changed files with 1882 additions and 174 deletions
@@ -1,6 +1,7 @@
package org.to.telegramfinalproject.Models;
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;
public class Message {
@@ -10,7 +11,6 @@ public class Message {
private UUID receiver_id;
private String content;
private String message_type; // TEXT, IMAGE, FILE, ...
private String file_url;
private LocalDateTime send_at;
private String status; // SENT, DELIVERED, READ
private UUID reply_to_id;
@@ -18,9 +18,10 @@ public class Message {
private UUID original_message_id;
private UUID forwarded_by;
private UUID forwarded_from;
private List<FileAttachment> attachments;
public Message(UUID message_id, UUID sender_id, String receiver_type, UUID receiver_id, String content,
String message_type, String file_url, LocalDateTime send_at, String status,
String message_type, LocalDateTime send_at, String status,
UUID reply_to_id, boolean is_edited, UUID original_message_id,
UUID forwarded_by, UUID forwarded_from) {
this.message_id = message_id;
@@ -29,7 +30,6 @@ public class Message {
this.receiver_id = receiver_id;
this.content = content;
this.message_type = message_type;
this.file_url = file_url;
this.send_at = send_at;
this.status = status;
this.reply_to_id = reply_to_id;
@@ -39,6 +39,16 @@ public class Message {
this.forwarded_from = forwarded_from;
}
public Message(UUID messageId, UUID senderId, UUID receiverId, String receiverType, String content, String messageType, LocalDateTime now) {
this.message_id = messageId;
this.sender_id = senderId;
this.receiver_id = receiverId;
this.receiver_type = receiverType;
this.content = content;
this.message_type = messageType;
this.send_at = now;
}
public UUID getMessage_id() {
return message_id;
@@ -85,14 +95,6 @@ public class Message {
this.message_type = message_type;
}
public String getFile_url() {
return file_url;
}
public void setFile_url(String file_url) {
this.file_url = file_url;
}
public LocalDateTime getSend_at() {
return send_at;
}
@@ -148,4 +150,11 @@ public class Message {
public void setForwarded_from(UUID forwarded_from) {
this.forwarded_from = forwarded_from;
}
public void setAttachments(List<FileAttachment> attachments) {
this.attachments = attachments;
}
public List<FileAttachment> getAttachments() {
return attachments;
}
}