Update Unity project and add FileSamples

Author: jakub-grzesiowski

unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/Channel.cs

@@ -800,6 +800,32 @@ public async Task<ChatOperationResult> SendText(string message)
             return await SendText(message, new SendTextParams()).ConfigureAwait(false);
         }
 
+        private async Task<ChatOperationResult<ChatFile>> SendFileForPublish(ChatInputFile inputFile)
+        {
+            var result = new ChatOperationResult<ChatFile>("Channel.SendFileForPublish()", chat);
+            var send = await chat.PubnubInstance.SendFile().Channel(Id).File(inputFile.Source).FileName(inputFile.Name)
+                .ShouldStore(false)
+                .ExecuteAsync().ConfigureAwait(false);
+            if (result.RegisterOperation(send))
+            {
+                return result;
+            }
+            var getUrl = await chat.PubnubInstance.GetFileUrl().Channel(Id).FileId(send.Result.FileId)
+                .FileName(send.Result.FileName).ExecuteAsync().ConfigureAwait(false);
+            if (result.RegisterOperation(getUrl))
+            {
+                return result;
+            }
+            result.Result = new ChatFile()
+            {
+                Id = send.Result.FileId,
+                Name = send.Result.FileName,
+                Type = inputFile.Type,
+                Url = getUrl.Result.Url
+            };
+            return result;
+        }
+
         /// <summary>
         /// Sends the text message with additional parameters.
         /// <para>
@@ -812,6 +838,7 @@ public async Task<ChatOperationResult> SendText(string message)
         public virtual async Task<ChatOperationResult> SendText(string message, SendTextParams sendTextParams)
         {
             var result = new ChatOperationResult("Channel.SendText()", chat);
+            var jsonLibrary = chat.PubnubInstance.JsonPluggableLibrary;
 
             var baseInterval = Type switch
             {
@@ -829,6 +856,26 @@ public virtual async Task<ChatOperationResult> SendText(string message, SendText
                     {"text", message},
                     {"type", "text"}
                 };
+                if (sendTextParams.Files.Any())
+                {
+                    var fileTasks = sendTextParams.Files.Select(SendFileForPublish);
+                    var fileResults = await Task.WhenAll(fileTasks).ConfigureAwait(false);
+                    foreach (var fileResult in fileResults)
+                    {
+                        result.RegisterOperation(fileResult);
+                    }
+                    var failedUploads = fileResults.Where(x => x.Error).ToList();
+                    if (failedUploads.Any())
+                    {
+                        var combinedException = string.Join("\n",failedUploads.Select(x => x.Exception.Message));
+                        result.Exception = new PNException($"Message publishing aborted: {failedUploads.Count} out of {fileResults.Length} " +
+                                                           $"file uploads failed. Exceptions from file uploads: {combinedException}");
+                        result.Error = true;
+                        return result;
+                    }
+                    var chatFilesAsDictionaries = fileResults.Select(x => x.Result.ToDictionary()).ToList();
+                    messageDict["files"] = jsonLibrary.SerializeToJsonString(chatFilesAsDictionaries);
+                }
                 var meta = sendTextParams.Meta ?? new Dictionary<string, object>();
                 if (sendTextParams.QuotedMessage != null)
                 {
@@ -851,7 +898,7 @@ public virtual async Task<ChatOperationResult> SendText(string message, SendText
                     .Channel(Id)
                     .ShouldStore(sendTextParams.StoreInHistory)
                     .UsePOST(sendTextParams.SendByPost)
-                    .Message(chat.PubnubInstance.JsonPluggableLibrary.SerializeToJsonString(messageDict))
+                    .Message(jsonLibrary.SerializeToJsonString(messageDict))
                     .Meta(meta)
                     .ExecuteAsync().ConfigureAwait(false);
                 if (result.RegisterOperation(publishResult))
@@ -874,6 +921,8 @@ public virtual async Task<ChatOperationResult> SendText(string message, SendText
             }, exception =>
             {
                 chat.Logger.Error($"Error occured when trying to SendText(): {exception.Message}");
+                result.Error = true;
+                result.Exception = new PNException($"Encountered exception in SendText(): {exception.Message}");
                 completionSource.SetResult(true);
             });
 
@@ -1242,5 +1291,71 @@ public async Task<ChatOperationResult<List<Membership>>> InviteMultiple(List<Use
         {
             return await chat.InviteMultipleToChannel(Id, users).ConfigureAwait(false);
         }
+
+        /// <summary>
+        /// Retrieves a wrapper object with a of files that were sent on this channel.
+        /// </summary>
+        /// <param name="limit">Optional - number of files to return.</param>
+        /// <param name="next">Optional - String token to get the next batch of files.</param>
+        public async Task<ChatOperationResult<ChatFilesResult>> GetFiles(int limit = 0, string next = "")
+        {
+            var result = new ChatOperationResult<ChatFilesResult>("Channel.GetFiles()", chat);
+            
+            var listFilesOperation = chat.PubnubInstance.ListFiles().Channel(Id);
+            if (limit > 0)
+            {
+                listFilesOperation = listFilesOperation.Limit(limit);
+            }
+            if (!string.IsNullOrEmpty(next))
+            {
+                listFilesOperation = listFilesOperation.Next(next);
+            }
+            var listFiles = await listFilesOperation.ExecuteAsync().ConfigureAwait(false);
+            if (result.RegisterOperation(listFiles))
+            {
+                return result;
+            }
+            
+            var files = new List<ChatFile>();
+            if (listFiles.Result.FilesList != null && listFiles.Result.FilesList.Any())
+            {
+                var getUrlsTasks = listFiles.Result.FilesList.Select(x =>
+                    chat.PubnubInstance.GetFileUrl().Channel(Id).FileId(x.Id).FileName(x.Name).ExecuteAsync());
+                var getUrls = await Task.WhenAll(getUrlsTasks).ConfigureAwait(false);
+                foreach (var pnResult in getUrls)
+                {
+                    if (result.RegisterOperation(pnResult))
+                    {
+                        return result;
+                    }
+                }
+                for (int i = 0; i < listFiles.Result.FilesList.Count; i++)
+                {
+                    files.Add(new ChatFile()
+                    {
+                        Id = listFiles.Result.FilesList[i].Id,
+                        Name = listFiles.Result.FilesList[i].Name,
+                        Url = getUrls[i].Result.Url,
+                    });
+                }  
+            }
+
+            result.Result = new ChatFilesResult()
+            {
+                Files = files,
+                Next = listFiles.Result.Next,
+                Total = listFiles.Result.Count
+            };
+            return result;
+        }
+        
+        /// <summary>
+        /// Deletes a file with a specified Id and Name from this channel.
+        /// </summary>
+        public async Task<ChatOperationResult> DeleteFile(string id, string name)
+        {
+            return (await chat.PubnubInstance.DeleteFile().Channel(Id).FileId(id).FileName(name).ExecuteAsync())
+                .ToChatOperationResult("Channel.DeleteFile()", chat);
+        }
     }
 }

unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/Data/ChatFile.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using PubnubApi;
+
+namespace PubnubChatApi
+{
+    public class ChatFilesResult
+    {
+        public List<ChatFile> Files;
+        public string Next;
+        public int Total;
+    }
+    
+    public class ChatFile
+    {
+        public string Name;
+        public string Id;
+        public string Url;
+        public string Type;
+
+        internal Dictionary<string, string> ToDictionary()
+        {
+            return new Dictionary<string, string>()
+            {
+                { "name", Name },
+                { "id", Id },
+                { "url", Url },
+                { "type", Type }
+            };
+        }
+    }
+
+    public struct ChatInputFile
+    {
+        public string Name;
+        public string Type;
+        public string Source;
+    }
+}

unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/Data/ChatFile.cs.meta

@@ -9,5 +9,6 @@ public class SendTextParams
         public Dictionary<string, object> Meta = new();
         public Dictionary<int, MentionedUser> MentionedUsers = new();
         public Message QuotedMessage = null;
+        public List<ChatInputFile> Files = new();
     }
 }

unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/Data/SendTextParams.cs

@@ -211,6 +211,10 @@ public List<TextLink> TextLinks {
         /// <seealso cref="pubnub_chat_message_type"/>
         public PubnubChatMessageType Type { get; internal set; }
 
+        /// <summary>
+        /// Files sent within this message.
+        /// </summary>
+        public List<ChatFile> Files { get; }
 
         /// <summary>
         /// Event that is triggered when the message is updated.
@@ -234,7 +238,7 @@ public List<TextLink> TextLinks {
 
         protected override string UpdateChannelId => ChannelId;
 
-        internal Message(Chat chat, string timeToken,string originalMessageText, string channelId, string userId, PubnubChatMessageType type, Dictionary<string, object> meta, List<MessageAction> messageActions) : base(chat, timeToken)
+        internal Message(Chat chat, string timeToken,string originalMessageText, string channelId, string userId, PubnubChatMessageType type, Dictionary<string, object> meta, List<MessageAction> messageActions, List<ChatFile> files) : base(chat, timeToken)
         {
             TimeToken = timeToken;
             OriginalMessageText = originalMessageText;
@@ -243,6 +247,7 @@ internal Message(Chat chat, string timeToken,string originalMessageText, string
             Type = type;
             Meta = meta;
             MessageActions = messageActions;
+            Files = files;
         }
 
         protected override SubscribeCallback CreateUpdateListener()

unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/Message.cs

@@ -105,8 +105,16 @@ private class DraftCallbackDataHelper
         /// </summary>
         public List<MessageElement> MessageElements => GetMessageElements();
 
+        /// <summary>
+        /// Defines whether this MessageDraft should search for suggestions after it's content is updated.
+        /// </summary>
         public bool ShouldSearchForSuggestions { get; set; }
 
+        /// <summary>
+        /// Can be used to attach files to send with this MessageDraft.
+        /// </summary>
+        public List<ChatInputFile> Files { get; set; } = new();
+        
         private Channel channel;
         private Chat chat;
 
@@ -579,6 +587,7 @@ public async Task<ChatOperationResult> Send(SendTextParams sendTextParams)
                 }
             }
             sendTextParams.MentionedUsers = mentions;
+            sendTextParams.Files = Files;
             return await channel.SendText(Render(), sendTextParams).ConfigureAwait(false);
         }
 

unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/MessageDraft.cs

@@ -92,7 +92,7 @@ public async Task<ChatOperationResult<List<ThreadMessage>>> GetThreadHistory(str
             {
                 result.Result.Add(new ThreadMessage(chat, message.TimeToken, message.OriginalMessageText,
                     message.ChannelId, ParentChannelId, message.UserId, PubnubChatMessageType.Text, message.Meta,
-                    message.MessageActions));
+                    message.MessageActions, message.Files));
             }
 
             return result;

unity-chat/PubnubChatUnity/Assets/PubnubChat/Runtime/PubnubChatApi/Entities/ThreadChannel.cs

@@ -13,8 +13,8 @@ public class ThreadMessage : Message
 
         internal ThreadMessage(Chat chat, string timeToken, string originalMessageText, string channelId,
             string parentChannelId, string userId, PubnubChatMessageType type, Dictionary<string, object> meta,
-            List<MessageAction> messageActions) : base(chat, timeToken, originalMessageText, channelId, userId, type,
-            meta, messageActions)
+            List<MessageAction> messageActions, List<ChatFile> files) : base(chat, timeToken, originalMessageText, channelId, userId, type,
+            meta, messageActions, files)
         {
             ParentChannelId = parentChannelId;
         }