Partow/Telegram-Final-Project
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve errors

Browse Source
This commit is contained in:
Partow
2025-08-11 16:32:31 +03:30
parent 8f03027770
commit 6a1d3857d0
5 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/to/telegramfinalproject/Database/MessageDatabase.java
+1 -2
View File
@@ -428,13 +428,12 @@ public class MessageDatabase {
rs.getString("status"), rs.getString("status"),
rs.getObject("reply_to_id") != null ? UUID.fromString(rs.getString("reply_to_id")) : null, rs.getObject("reply_to_id") != null ? UUID.fromString(rs.getString("reply_to_id")) : null,
rs.getBoolean("is_edited"), rs.getBoolean("is_edited"),
rs.getBoolean("is_deleted_globally"),
rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null, rs.getObject("original_message_id") != null ? UUID.fromString(rs.getString("original_message_id")) : null,
rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null, rs.getObject("forwarded_by") != null ? UUID.fromString(rs.getString("forwarded_by")) : null,
rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null, rs.getObject("forwarded_from") != null ? UUID.fromString(rs.getString("forwarded_from")) : null,
rs.getBoolean("is_deleted_globally"), rs.getBoolean("is_deleted_globally"),
rs.getTimestamp("edited_at") != null ? rs.getTimestamp("edited_at").toLocalDateTime() : null rs.getTimestamp("edited_at") != null ? rs.getTimestamp("edited_at").toLocalDateTime() : null
)); );
messages.add(message); messages.add(message);
} }
src/main/java/org/to/telegramfinalproject/Models/Message.java
+12 -14
View File
@@ -190,26 +190,24 @@ public class Message {
this.receiver_name = receiver_name; this.receiver_name = receiver_name;
} }
public LocalDateTime getEdited_at() { public LocalDateTime getEdited_at() {
return edited_at; return edited_at;
} }
public void setEdited_at(LocalDateTime edited_at) { public void setEdited_at(LocalDateTime edited_at) {
this.edited_at = edited_at; this.edited_at = edited_at;
} }
public void setIs_deleted_globally(boolean is_deleted_globally) {
this.is_deleted_globally = is_deleted_globally;
}
public boolean getIs_deleted_globally() { public boolean getIs_deleted_globally() {
return is_deleted_globally; return is_deleted_globally;
} }
//
public void setEdited_at(LocalDateTime edited_at) { // public void setEdited_at(LocalDateTime edited_at) {
this.edited_at = edited_at; // this.edited_at = edited_at;
} // }
//
public LocalDateTime getEdited_at() { // public LocalDateTime getEdited_at() {
return edited_at; // return edited_at;
} // }
} }
src/main/java/org/to/telegramfinalproject/Models/SearchResultModel.java
+1 -1
View File
@@ -2,7 +2,7 @@ package org.to.telegramfinalproject.Models;
public class SearchResultModel { public class SearchResultModel {
private final String type; private final String type;
private final String id; // ← UUID واقعی برای عملیات private final String id; // ← UUID
private final String displayId; // ← user_id یا group_id برای نمایش private final String displayId; // ← user_id یا group_id برای نمایش
private String name; private String name;
private final String content; private final String content;
src/main/java/org/to/telegramfinalproject/Server/ClientHandler.java
+1 -1
View File
@@ -2497,7 +2497,7 @@ public class ClientHandler implements Runnable {
case "get_saved_messages": { case "get_saved_messages": {
UUID user_Id = UUID.fromString(requestJson.getString("user_id")); UUID user_Id = UUID.fromString(requestJson.getString("user_id"));
response = SidebarService.handleGetSavedMessages(user_Id); // response = SidebarService.handleGetSavedMessages(user_Id);
break; break;
} }
src/main/java/org/to/telegramfinalproject/Server/SidebarService.java
+43 -43
View File
@@ -212,49 +212,49 @@ public class SidebarService {
} }
// Get saved messages data // Get saved messages data
public static ResponseModel handleGetSavedMessages(UUID userId) { // public static ResponseModel handleGetSavedMessages(UUID userId) {
try { // try {
//
UUID chatId = PrivateChatDatabase.getOrCreateSavedMessagesChat(userId); // UUID chatId = PrivateChatDatabase.getOrCreateSavedMessagesChat(userId);
if (chatId == null) { // if (chatId == null) {
return new ResponseModel("error", "Failed to create or find saved messages chat."); // return new ResponseModel("error", "Failed to create or find saved messages chat.");
} // }
//
List<Message> messages = MessageDatabase.privateChatHistory(chatId); // List<Message> messages = MessageDatabase.privateChatHistory(chatId);
//
JSONArray messageArray = new JSONArray(); // JSONArray messageArray = new JSONArray();
if (!messages.isEmpty()) { // if (!messages.isEmpty()) {
for (Message msg : messages) { // for (Message msg : messages) {
JSONObject msgJson = new JSONObject(); // JSONObject msgJson = new JSONObject();
msgJson.put("message_id", msg.getMessage_id().toString()); // msgJson.put("message_id", msg.getMessage_id().toString());
msgJson.put("sender_id", msg.getSender_id().toString()); // msgJson.put("sender_id", msg.getSender_id().toString());
msgJson.put("receiver_type", msg.getReceiver_type()); // msgJson.put("receiver_type", msg.getReceiver_type());
msgJson.put("receiver_id", msg.getReceiver_id().toString()); // msgJson.put("receiver_id", msg.getReceiver_id().toString());
msgJson.put("content", msg.getContent()); // msgJson.put("content", msg.getContent());
msgJson.put("message_type", msg.getMessage_type()); // msgJson.put("message_type", msg.getMessage_type());
msgJson.put("send_at", msg.getSend_at().toString()); // LocalDateTime // msgJson.put("send_at", msg.getSend_at().toString()); // LocalDateTime
msgJson.put("status", msg.getStatus()); // msgJson.put("status", msg.getStatus());
msgJson.put("reply_to_id", msg.getReply_to_id() != null ? msg.getReply_to_id().toString() : JSONObject.NULL); // msgJson.put("reply_to_id", msg.getReply_to_id() != null ? msg.getReply_to_id().toString() : JSONObject.NULL);
msgJson.put("is_edited", msg.isIs_edited()); // msgJson.put("is_edited", msg.isIs_edited());
msgJson.put("original_message_id", msg.getOriginal_message_id() != null ? msg.getOriginal_message_id().toString() : JSONObject.NULL); // msgJson.put("original_message_id", msg.getOriginal_message_id() != null ? msg.getOriginal_message_id().toString() : JSONObject.NULL);
msgJson.put("forwarded_by", msg.getForwarded_by() != null ? msg.getForwarded_by().toString() : JSONObject.NULL); // msgJson.put("forwarded_by", msg.getForwarded_by() != null ? msg.getForwarded_by().toString() : JSONObject.NULL);
msgJson.put("forwarded_from", msg.getForwarded_from() != null ? msg.getForwarded_from().toString() : JSONObject.NULL); // msgJson.put("forwarded_from", msg.getForwarded_from() != null ? msg.getForwarded_from().toString() : JSONObject.NULL);
//
messageArray.put(msgJson); // messageArray.put(msgJson);
} // }
} // }
//
JSONObject data = new JSONObject(); // JSONObject data = new JSONObject();
data.put("chat_id", chatId.toString()); // data.put("chat_id", chatId.toString());
data.put("messages", messageArray); // data.put("messages", messageArray);
//
return new ResponseModel("success", "Saved messages retrieved successfully", data); // return new ResponseModel("success", "Saved messages retrieved successfully", data);
//
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
return new ResponseModel("error", "Unexpected server error."); // return new ResponseModel("error", "Unexpected server error.");
} // }
} // }
// Save messages to DB // Save messages to DB
public static ResponseModel handleSendMessage(JSONObject requestJson) { public static ResponseModel handleSendMessage(JSONObject requestJson) {