- Check for null before Attachments.Any()

- move message number to start of message

Author: Adam Warner

Matterhook.NET.MatterhookClient/MatterhookClient.cs

@@ -32,7 +32,6 @@ public MattermostMessage CloneMessage(MattermostMessage message)
             return new MattermostMessage
             {
                 Text = "",
-                Attachments = null,
                 Channel = message.Channel,
                 Username = message.Username,
                 IconUrl = message.IconUrl
@@ -43,7 +42,6 @@ public async Task<HttpResponseMessage> PostAsync(MattermostMessage message)
         {
             try
             {
-                //string[] lines = theText.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
                 HttpResponseMessage response = null;
                 var messages = new List<MattermostMessage>();
 
@@ -53,7 +51,7 @@ public async Task<HttpResponseMessage> PostAsync(MattermostMessage message)
                 var lines = new string[] { };
                 if (message.Text != null)
                 {
-                    lines = message.Text.Split(new[] {"\r\n", "\r", "\n"}, StringSplitOptions.None);
+                    lines = message.Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
                 }
 
                 messages.Add(CloneMessage(message));
@@ -71,20 +69,20 @@ public async Task<HttpResponseMessage> PostAsync(MattermostMessage message)
 
                 var len = messages[cnt].Text.Length;
 
-                if (message.Attachments.Any())
+                if (message.Attachments?.Any() ?? false)
                 {
-                    messages[cnt].Attachments = new List<MattermostAttachment> {new MattermostAttachment()};
+                    messages[cnt].Attachments = new List<MattermostAttachment> { new MattermostAttachment() };
                     messages[cnt].Attachments[0].Text = "";
 
-                    lines = message.Attachments[0].Text.Split(new[] {"\r\n", "\r", "\n"}, StringSplitOptions.None);
+                    lines = message.Attachments[0].Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
 
                     foreach (var line in lines)
                     {
                         if (len + messages[cnt].Attachments[0].Text.Length + line.Length > 3800)
                         {
                             cnt += 1;
                             messages.Add(CloneMessage(message));
-                            messages[cnt].Attachments = new List<MattermostAttachment> {new MattermostAttachment()};
+                            messages[cnt].Attachments = new List<MattermostAttachment> { new MattermostAttachment() };
                             messages[cnt].Attachments[0].Text = "";
                         }
 
@@ -98,7 +96,7 @@ public async Task<HttpResponseMessage> PostAsync(MattermostMessage message)
                     var num = 1;
                     foreach (var msg in messages)
                     {
-                        msg.Text += $" ({num}/{cnt + 1})";
+                        msg.Text = $"`({num}/{cnt + 1}): ` " + msg.Text;
                         num++;
                     }
                 }

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.2.{build}
+version: 1.2.1{build}
 pull_requests:
   do_not_increment_build_number: true
 image: Visual Studio 2017