Merge pull request #5 from Vipul1432/feature-giphy-in-chat

Adds giphy(GIFs) in user & group chat
Vipul1432 · Jul 20, 2024 · aaca9fb · aaca9fb
2 parents e7831ed + 485be31
commit aaca9fb
Show file tree

Hide file tree

Showing 9 changed files with 494 additions and 20 deletions.
diff --git a/MinimalChat.API/Controllers/MessagesController.cs b/MinimalChat.API/Controllers/MessagesController.cs
@@ -269,7 +269,7 @@ public async Task<IActionResult> GetConversationHistoryAsync([FromQuery] Convers
                 }
                 // Map group messages
                 List<GroupMemberDto> groupMemberDtos = null;
-                if (messages.Members != null)
+                if (messages?.Members.Count > 0)
                 {
                     groupMemberDtos = messages.Members.ToList().ConvertAll(member =>
                     {
@@ -293,7 +293,7 @@ public async Task<IActionResult> GetConversationHistoryAsync([FromQuery] Convers
                 var messageDtos = messages.Messages.Select(message =>
                 {
                     var messageDto = _mapper.Map<GetMessagesDto>(message);
-                    if (string.IsNullOrEmpty(messageDto.Content))
+                    if (string.IsNullOrEmpty(messageDto.Content) && string.IsNullOrEmpty(messageDto.GIFUrls))
                     {
                         string fileName = message.FilePath;
                         var filePath = Path.Combine(_applicationSettings.UploadDirectory, fileName);

diff --git a/MinimalChat.Domain/DTOs/GetMessagesDto.cs b/MinimalChat.Domain/DTOs/GetMessagesDto.cs
@@ -15,14 +15,10 @@ public class GetMessagesDto
 
         [Required]
         public string SenderId { get; set; }
-
-
         public string? ReceiverId { get; set; }
-        public Guid? GroupId { get; set; }
-        [Required]
-        [MaxLength(1000)]
-        public string Content { get; set; }
-
+        public Guid? GroupId { get; set; }  
+        public string? Content { get; set; }
+        public string? GIFUrls { get; set; }
         public string? FilePath { get; set; }
         public string? FileName { get; set; }
 

diff --git a/MinimalChat.Domain/DTOs/MessageDto.cs b/MinimalChat.Domain/DTOs/MessageDto.cs
@@ -12,8 +12,7 @@ public class MessageDto
 
         public string? ReceiverId { get; set; }
         public Guid? GroupId { get; set; }
-        [Required]
-        [MaxLength(1000)]
-        public string Content { get; set; }
+        public string? Content { get; set; }
+        public string? GIFUrls { get; set; }
     }
 }
diff --git a/MinimalChat.Domain/DTOs/ResponseMessageDto.cs b/MinimalChat.Domain/DTOs/ResponseMessageDto.cs
@@ -12,6 +12,7 @@ public class ResponseMessageDto
         public string SenderId { get; set; }
         public string? ReceiverId { get; set; }
         public string? Content { get; set; }
+        public string? GIFUrls { get; set; }
         public DateTime Timestamp { get; set; }
         public Guid? GroupId { get; set; }
         public string? FilePath { get; set; }

diff --git a/MinimalChat.Domain/Models/Message.cs b/MinimalChat.Domain/Models/Message.cs
@@ -20,6 +20,7 @@ public class Message
         [Required]
         [MaxLength(1000)] 
         public string? Content { get; set; }
+        public string? GIFUrls { get; set; }
         [Required]
         public DateTime Timestamp { get; set; }