Extract notification JSON creation to NotifierBase

README.md

@@ -403,7 +403,6 @@ The following is example data for when ```SendImage``` is ```false```.
     }
   ],
   "message": "Motion detected on Driveway\n\nDetected 1 objects:\nCar",
-  "image": null
 }
 ```
 

SynoAI/Notifiers/Mqtt/Mqtt.cs

@@ -5,9 +5,6 @@
 using MQTTnet;
 using System.Threading;
 using System;
-using System.Text;
-using Newtonsoft.Json;
-using System.IO;
 
 namespace SynoAI.Notifiers.Mqtt
 {
@@ -66,7 +63,7 @@ public override async Task SendAsync(Camera camera, Notification notification, I
 
             MqttApplicationMessageBuilder messageBuilder = new MqttApplicationMessageBuilder()
                 .WithTopic($"{BaseTopic}/{camera.Name}/notification")
-                .WithPayload(GeneratePayload(camera, notification));
+                .WithPayload(GenerateJSON(camera, notification, SendImage));
 
             await _client.PublishAsync(messageBuilder.Build());
         }
@@ -132,34 +129,6 @@ private async Task DisconnectAsync(ILogger logger)
             }
         }
 
-        /// <summary>
-        /// Generates the message payload as a JSON string encoded as UTF-8
-        /// </summary>
-        private byte[] GeneratePayload(Camera camera, Notification notification)
-        {
-            var request = new
-            {
-                camera = camera.Name,
-                foundTypes = notification.FoundTypes,
-                predictions = notification.ValidPredictions,
-                message = GetMessage(camera, notification.FoundTypes),
-                image = SendImage ? ToBase64String(notification.ProcessedImage.GetReadonlyStream()) : null
-            };
-
-            return Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(request));
-        }
-
-        /// <summary>
-        /// Returns FileStream data as a base64-encoded string
-        /// </summary>
-        private string ToBase64String(FileStream fileStream)
-        {
-            byte[] buffer = new byte[fileStream.Length];
-            fileStream.Read(buffer, 0, (int)fileStream.Length);
-
-            return Convert.ToBase64String(buffer);
-        }
-
         public override Task CleanupAsync(ILogger logger)
         {
             return DisconnectAsync(logger);

SynoAI/Notifiers/NotifierBase.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Dynamic;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -59,6 +61,50 @@ protected string GetMessage(Camera camera, IEnumerable<string> foundTypes, strin
             return result;
         }
 
+        protected string GetImageUrl(Camera camera, Notification notification)
+        {
+            if (Config.SynoAIUrL == null)
+            {
+                return null;
+            }
+
+            UriBuilder builder = new UriBuilder(Config.SynoAIUrL);
+            builder.Path += $"/{camera.Name}/{notification.ProcessedImage.FileName}";
+
+            return builder.Uri.ToString();
+        }
+
+        /// <summary>
+        /// Generates a JSON representation of the notification.
+        /// </summary>
+        protected string GenerateJSON(Camera camera, Notification notification, bool sendImage)
+        {
+            dynamic jsonObject = new ExpandoObject();
+
+            jsonObject.camera = camera.Name;
+            jsonObject.foundTypes = notification.FoundTypes;
+            jsonObject.predictions = notification.ValidPredictions;
+            jsonObject.message = GetMessage(camera, notification.FoundTypes);
+
+            if (sendImage)
+            {
+                jsonObject.image = ToBase64String(notification.ProcessedImage.GetReadonlyStream());
+            }
+
+            return JsonConvert.SerializeObject(jsonObject);
+        }
+
+        /// <summary>
+        /// Returns FileStream data as a base64-encoded string
+        /// </summary>
+        private string ToBase64String(FileStream fileStream)
+        {
+            byte[] buffer = new byte[fileStream.Length];
+            fileStream.Read(buffer, 0, (int)fileStream.Length);
+
+            return Convert.ToBase64String(buffer);
+        }
+
         /// <summary>
         /// Fetches the response content and parses it as the specified type.
         /// </summary>

SynoAI/Notifiers/Webhook/Webhook.cs

@@ -7,7 +7,6 @@
 using System.IO;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Net.Http.Json;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -102,16 +101,7 @@ public override async Task SendAsync(Camera camera, Notification notification, I
                 else
                 {
                     // Otherwise we can just use a simple JSON object
-                    var request = new
-                    {
-                        camera = camera.Name,
-                        foundTypes = foundTypes,
-                        predictions = notification.ValidPredictions,
-                        message = message
-                    };
-
-                    string requestJson = JsonConvert.SerializeObject(request);
-                    content = new StringContent(requestJson, null, "application/json");
+                    content = new StringContent(GenerateJSON(camera, notification, false), null, "application/json");
                 }
 
                 logger.LogInformation($"{camera.Name}: Webhook: Calling {Method}.");