Merge pull request #2 from PromoFaux/fix/missingAttTitles

Fix/missing att titles

Author: PromoFaux

Matterhook.NET.MatterhookClient/MatterhookClient.cs

@@ -27,81 +27,126 @@ public MatterhookClient(string webhookUrl, int timeoutSeconds = 100)
             _httpClient.Timeout = new TimeSpan(0, 0, 0, timeoutSeconds);
         }
 
-        public MattermostMessage CloneMessage(MattermostMessage message)
+        public MattermostMessage CloneMessage(MattermostMessage inMsg)
         {
-            return new MattermostMessage
+            var outMsg = new MattermostMessage
             {
                 Text = "",
-                Channel = message.Channel,
-                Username = message.Username,
-                IconUrl = message.IconUrl
+                Channel = inMsg.Channel,
+                Username = inMsg.Username,
+                IconUrl = inMsg.IconUrl
             };
+
+            return outMsg;
         }
 
-        public async Task<HttpResponseMessage> PostAsync(MattermostMessage message)
+        private static MattermostAttachment CloneAttachment(MattermostAttachment inAtt)
         {
+            var outAtt = new MattermostAttachment
+            {
+                AuthorIcon = inAtt.AuthorIcon,
+                AuthorLink = inAtt.AuthorLink,
+                AuthorName = inAtt.AuthorName,
+                Color = inAtt.Color,
+                Fallback = inAtt.Fallback,
+                Fields = inAtt.Fields,
+                ImageUrl = inAtt.ImageUrl,
+                Pretext = inAtt.Pretext,
+                ThumbUrl = inAtt.ThumbUrl,
+                Title = inAtt.Title,
+                TitleLink = inAtt.TitleLink,
+                Text = ""
+            };
+            return outAtt;
+        }
+
+        /// <summary>
+        /// Post Message to Mattermost server. Messages will be automatically split if total text length > 4000
+        /// </summary>
+        /// <param name="inMessage">The messsage you wish to send</param>
+        /// <returns></returns>
+        public async Task<HttpResponseMessage> PostAsync(MattermostMessage inMessage)
+        {
+
             try
             {
                 HttpResponseMessage response = null;
-                var messages = new List<MattermostMessage>();
+                var outMessages = new List<MattermostMessage>();
 
-
-                var cnt = 0;
+                var msgCount = 0;
 
                 var lines = new string[] { };
-                if (message.Text != null)
+                if (inMessage.Text != null)
                 {
-                    lines = message.Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+                    lines = inMessage.Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
                 }
 
-                messages.Add(CloneMessage(message));
+                //start with one cloned inMessage in the list
+                outMessages.Add(CloneMessage(inMessage));
 
+                //add text from original. If we go over 3800, we'll split it to a new inMessage.
                 foreach (var line in lines)
                 {
-                    if (line.Length + messages[cnt].Text.Length > 3800)
+
+                    if (line.Length + outMessages[msgCount].Text.Length > 3800)
                     {
-                        cnt += 1;
-                        messages.Add(CloneMessage(message));
+
+                        msgCount += 1;
+                        outMessages.Add(CloneMessage(inMessage));
                     }
 
-                    messages[cnt].Text += $"{line}\r\n";
+                    outMessages[msgCount].Text += $"{line}\r\n";
                 }
 
-                var len = messages[cnt].Text.Length;
+                //Length of text on the last (or first if only one) inMessage.
+                var lenMessageText = outMessages[msgCount].Text.Length;
 
-                if (message.Attachments?.Any() ?? false)
+                //does our original have attachments?
+                if (inMessage.Attachments?.Any() ?? false)
                 {
-                    messages[cnt].Attachments = new List<MattermostAttachment> { new MattermostAttachment() };
-                    messages[cnt].Attachments[0].Text = "";
+                    outMessages[msgCount].Attachments = new List<MattermostAttachment>();
 
-                    lines = message.Attachments[0].Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
-
-                    foreach (var line in lines)
+                    //loop through them in a similar fashion to the inMessage text above.
+                    foreach (var att in inMessage.Attachments)
                     {
-                        if (len + messages[cnt].Attachments[0].Text.Length + line.Length > 3800)
+                        //add this attachment to the outgoing message
+                        outMessages[msgCount].Attachments.Add(CloneAttachment(att));
+                        //get a count of attachments on this message, and subtract one so we know the index of the current new attachment
+                        var attIndex = outMessages[msgCount].Attachments.Count - 1;
+
+                        //Get the text lines
+                        lines = att.Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+
+                        foreach (var line in lines)
                         {
-                            cnt += 1;
-                            messages.Add(CloneMessage(message));
-                            messages[cnt].Attachments = new List<MattermostAttachment> { new MattermostAttachment() };
-                            messages[cnt].Attachments[0].Text = "";
+                            //Get the total length of all attachments on the current outgoing message
+                            var lenAllAttsText = outMessages[msgCount].Attachments.Sum(a => a.Text.Length);
+
+                            if (lenMessageText + lenAllAttsText + line.Length > 3800)
+                            {
+                                msgCount += 1;
+                                attIndex = 0;
+                                outMessages.Add(CloneMessage(inMessage));
+                                outMessages[msgCount].Attachments = new List<MattermostAttachment> { CloneAttachment(att) };
+                            }
+
+                            outMessages[msgCount].Attachments[attIndex].Text += $"{line}\r\n";
                         }
-
-                        messages[cnt].Attachments[0].Text += $"{line}\r\n";
                     }
                 }
 
 
-                if (messages.Count > 1)
+                if (outMessages.Count > 1)
                 {
                     var num = 1;
-                    foreach (var msg in messages)
+                    foreach (var msg in outMessages)
                     {
-                        msg.Text = $"`({num}/{cnt + 1}): ` " + msg.Text;
+                        msg.Text = $"`({num}/{msgCount + 1}): ` " + msg.Text;
                         num++;
                     }
                 }
 
-                foreach (var msg in messages)
+                foreach (var msg in outMessages)
                 {
                     var serializedPayload = JsonConvert.SerializeObject(msg);
                     response = await _httpClient.PostAsync(_webhookUrl,
@@ -110,12 +155,12 @@ public async Task<HttpResponseMessage> PostAsync(MattermostMessage message)
 
                 return response;
             }
+
             catch (Exception e)
             {
                 Console.WriteLine(e.Message);
                 throw;
             }
         }
     }
-}
-
+}

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.2.2.{build}
+version: 1.2.3.{build}
 pull_requests:
   do_not_increment_build_number: true
 image: Visual Studio 2017
@@ -7,7 +7,7 @@ dotnet_csproj:
   patch: true
   file: '**\*.csproj'
   version: '{version}'
-  package_version: '{version}'
+  package_version: '1.2.3'
 nuget:
   disable_publish_on_pr: true
 before_build: