Merge branch 'develop' into SendMessage

# 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/Models/Message.java

@@ -202,12 +202,5 @@ public class Message {
     public boolean getIs_deleted_globally() {
         return is_deleted_globally;
     }
-//
-//    public void setEdited_at(LocalDateTime edited_at) {
-//        this.edited_at = edited_at;
-//    }
-//
-//    public LocalDateTime getEdited_at() {
-//        return edited_at;
-//    }
+
 }

src/main/java/org/to/telegramfinalproject/Models/PrivateChat.java

@@ -27,6 +27,14 @@ public class PrivateChat {
         this.created_at = createdAt;
     }
 
+    public PrivateChat(UUID chatId, UUID user1, UUID user2, boolean user1Deleted, boolean user2Deleted) {
+        this.chat_id = chatId;
+        this.user1_id = user1;
+        this.user2_id = user2;
+        this.user1_deleted = user1Deleted;
+        this.user2_deleted = user2Deleted;
+    }
+
 
     public void setUser1_id(UUID user1_id){this.user1_id =user1_id;}
     public void setUser2_id(UUID user2_id){this.user2_id =user2_id;}