Merge pull request #71 from androidseb25/dev

PR - Version 1.3.0.0

Author: androidseb25

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build_arm64_images:
-    if: startsWith(github.ref, 'refs/tags/v')
+    #if: startsWith(github.ref, 'refs/tags/v')
     #if: github.event.pull_request.merged == true
     name: "Build Multi Arch Images"
     runs-on: ubuntu-latest

Controller/DeviceController.cs

@@ -9,13 +9,6 @@ namespace iGotify_Notification_Assist.Controller;
 [Route("[controller]")]
 public class DeviceController : ControllerBase
 {
-    private readonly ILogger<DeviceController> _logger;
-    
-    public DeviceController(ILogger<DeviceController> logger)
-    {
-        _logger = logger;
-    }
-
     /// <summary>
     /// Add device token to the TXT for sending the push notificcation
     /// </summary>
@@ -24,17 +17,17 @@ public DeviceController(ILogger<DeviceController> logger)
     [HttpPost]
     public async Task<IActionResult> PostDeviceModel(DeviceModel deviceModel)
     {
-        string result = "";
-        bool resultBool = false;
+        string result;
+        bool resultBool;
 
         Console.WriteLine($"ClientToken: {deviceModel.ClientToken}");
         Console.WriteLine($"DeviceToken: {deviceModel.DeviceToken}");
         Console.WriteLine($"GotifyUrl: {deviceModel.GotifyUrl}");
 
         if (
-            deviceModel.ClientToken!.Length == 0 || deviceModel.ClientToken == "string" ||
-            deviceModel.DeviceToken!.Length == 0 || deviceModel.DeviceToken.Length < 60 || deviceModel.DeviceToken == "string" ||
-            deviceModel.GotifyUrl!.Length == 0 || deviceModel.GotifyUrl == "string"
+            deviceModel.ClientToken.Length == 0 || deviceModel.ClientToken == "string" ||
+            deviceModel.DeviceToken.Length == 0 || deviceModel.DeviceToken.Length < 60 || deviceModel.DeviceToken == "string" ||
+            deviceModel.GotifyUrl.Length == 0 || deviceModel.GotifyUrl == "string"
             )
         {
             result = "Fehler beim hinzugefügen des Gerätes!";
@@ -44,8 +37,8 @@ public async Task<IActionResult> PostDeviceModel(DeviceModel deviceModel)
 
         if (await deviceModel.Insert())
         {
-            GotifySocketService gss = GotifySocketService.getInstance();
-            gss.StartWSThread(deviceModel.GotifyUrl, deviceModel.ClientToken);
+            GotifySocketService.getInstance();
+            GotifySocketService.StartWsThread(deviceModel.GotifyUrl, deviceModel.ClientToken);
             result = "Gerät erfolgreich hinzugefügt";
             resultBool = true;
         } else {
@@ -64,8 +57,8 @@ public async Task<IActionResult> PostDeviceModel(DeviceModel deviceModel)
     [HttpDelete]
     public async Task<IActionResult> DeleteDevcice(string token)
     {
-        string result = "";
-        bool resultBool = false;
+        string result;
+        bool resultBool;
 
         Console.WriteLine($"Delete Token: {token}");
         if (token.Length == 0 || token == "string")
@@ -75,15 +68,14 @@ public async Task<IActionResult> DeleteDevcice(string token)
             return Ok(new { Message = result, Successful = resultBool });
         }
 
-        DeviceModel deviceModel = new DeviceModel();
-        deviceModel.ClientToken = token;
-        Users usr = await DatabaseService.GetUser(token);
+        var deviceModel = new DeviceModel { ClientToken = token };
+        var usr = await DatabaseService.GetUser(token);
         if (await deviceModel.Delete())
         {
             if (usr.Uid > 0)
             {
-                GotifySocketService gss = GotifySocketService.getInstance();
-                gss.KillWsThread(usr.ClientToken);
+                GotifySocketService.getInstance();
+                GotifySocketService.KillWsThread(usr.ClientToken);
             }
 
             result = "Gerät erfolgreich gelöscht";
@@ -99,9 +91,9 @@ public async Task<IActionResult> DeleteDevcice(string token)
     [HttpGet("Test/{deviceToken}")]
     public async Task<IActionResult> Test(string deviceToken)
     {
-        SecNtfy ntfy = new SecNtfy(Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app");
+        var ntfy = new SecNtfy(Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app");
         if (deviceToken.Length > 0)
-            _ = await ntfy.SendNotification(deviceToken, "Test", "Test Nachricht", false, "", 0);
+            _ = await ntfy.SendNotification(deviceToken, "Test", "Test Nachricht");
         Console.WriteLine(ntfy.encTitle);
 
         return Ok();

Controller/VersionController.cs

@@ -1,6 +1,4 @@
 using System.Reflection;
-using System.Security.Cryptography;
-using iGotify_Notification_Assist.Helpers;
 using iGotify_Notification_Assist.Models;
 using Microsoft.AspNetCore.Mvc;
 
@@ -10,23 +8,15 @@ namespace iGotify_Notification_Assist.Controller;
 [Route("[controller]")]
 public class VersionController : ControllerBase
 {
-    private readonly ILogger<DeviceController> _logger;
-    
-    public VersionController(ILogger<DeviceController> logger)
-    {
-        _logger = logger;
-    }
-    
     /// <summary>
     /// Get the current version of the container
     /// </summary>
     /// <returns></returns>
     [HttpGet]
     public IActionResult GetVersion()
     {
-        ServerVersion sv = new ServerVersion();
-        sv.version = Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "";
-        DateTime buildDate = new FileInfo(Assembly.GetExecutingAssembly().Location).LastWriteTime;
+        var sv = new ServerVersion { version = Assembly.GetEntryAssembly()?.GetName().Version?.ToString() ?? "" };
+        var buildDate = new FileInfo(Assembly.GetExecutingAssembly().Location).LastWriteTime;
         sv.buildDate = buildDate.ToString("yyyy-MM-dd'T'HH:mm:ss");
         sv.commit = Programms.StartUpCommit;
         return Ok(sv);
@@ -35,5 +25,5 @@ public IActionResult GetVersion()
 
 public static class Programms
 {
-    public static string? StartUpCommit = Guid.NewGuid().ToString().Replace("-", "");
+    public static readonly string? StartUpCommit = Guid.NewGuid().ToString().Replace("-", "");
 }

Helpers/MsgCrypto.cs

@@ -1,12 +1,11 @@
 using iGotify_Notification_Assist.Services;
 using SecNtfyNuGet;
+using Websocket.Client;
 
 namespace iGotify_Notification_Assist.Models;
 
 public class DeviceModel
 {
-    public DeviceModel() { }
-
     public string ClientToken { get; set; } = "";
     public string DeviceToken { get; set; } = "";
     public string GotifyUrl { get; set; } = "";
@@ -19,7 +18,8 @@ public async Task<bool> Insert()
     {
         if (!await DatabaseService.CheckIfUserExists(this))
             return await DatabaseService.InsertUser(this);
-        return true;
+        else
+            return false;
     }
 
     /// <summary>
@@ -28,28 +28,31 @@ public async Task<bool> Insert()
     /// <returns></returns>
     public async Task<bool> Delete()
     {
-        return await DatabaseService.DeleteUser(this.ClientToken);
+        return await DatabaseService.DeleteUser(ClientToken);
     }
 
     /// <summary>
     /// Send the passed notification from the gotify instance that was passed via WebSocket
     /// </summary>
     /// <param name="iGotifyMessage"></param>
-    public async Task SendNotifications(GotifyMessage iGotifyMessage, string clientToken)
+    /// <param name="clientToken"></param>
+    public async Task SendNotifications(GotifyMessage iGotifyMessage, WebsocketClient webSock)
     {
-        string? title = iGotifyMessage.title;
-        string? msg = iGotifyMessage.message;
-        string imageUrl = "";
-
-
-        Users usr = await DatabaseService.GetUser(clientToken);
+        var title = iGotifyMessage.title;
+        var msg = iGotifyMessage.message;
+        
+        var protocol = webSock.Url.ToString().Contains("ws://") ? "http://" : "https://";
+        var gotifyServerUrl = webSock.Url.ToString().Replace("ws://", "").Replace("wss://", "").Replace("\"", "").Split("/stream");
+        var imageUrl = gotifyServerUrl.Length > 0 ? $"{protocol}{gotifyServerUrl[0]}$$${iGotifyMessage.appid}$$${webSock.Name}" : "";
+        
+        var usr = await DatabaseService.GetUser(webSock.Name!);
 
         if (usr.Uid == 0)
         {
             Console.WriteLine("THERE'S SOMETHING WRONG HERE? NO USER FOUND");
         }
 
-        SecNtfy ntfy = new SecNtfy(Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app");
+        var ntfy = new SecNtfy(Environment.GetEnvironmentVariable("SECNTFY_SERVER_URL") ?? "https://api.secntfy.app");
         _ = ntfy.SendNotification(usr.DeviceToken, title, msg, iGotifyMessage.priority == 10, imageUrl, iGotifyMessage.priority);
     }
 }

Models/DeviceModel.cs

@@ -2,13 +2,13 @@ namespace iGotify_Notification_Assist.Models;
 
 public class GotifyMessage
 {
-    public int appid { get; set; }
-    public string? date { get; set; }
     public int id { get; set; }
+    public int appid { get; set; }
     public string? message { get; set; }
+    public string? title { get; set; }
     public int priority { get; set; }
     public GotifyExtras? extras { get; set; }
-    public string? title { get; set; }
+    public string? date { get; set; }
 }
 
 public class GotifyExtras

Models/GotifyMessage.cs

@@ -2,7 +2,7 @@ namespace iGotify_Notification_Assist.Models;
 
 public class ServerVersion
 {
-    public string? version { get; set; }
-    public string? commit { get; set; }
-    public string? buildDate { get; set; }
+    public string? version { get; set; } = "";
+    public string? commit { get; set; } = "";
+    public string? buildDate { get; set; } = "";
 }

Models/ServerVersion.cs

@@ -2,8 +2,8 @@ namespace iGotify_Notification_Assist.Models;
 
 public class Users
 {
-    public int Uid { get; set; }
-    public string ClientToken { get; set; } = "";
-    public string DeviceToken { get; set; } = "";
-    public string GotifyUrl { get; set; } = "";
+    public int Uid { get; init; }
+    public string ClientToken { get; init; } = "";
+    public string DeviceToken { get; init; } = "";
+    public string GotifyUrl { get; init; } = "";
 }

Models/Users.cs

@@ -1,6 +1,3 @@
-
-using System.Net.WebSockets;
-using iGotify_Notification_Assist;
 using iGotify_Notification_Assist.Services;
 using Microsoft.OpenApi.Models;
 

Program.cs

@@ -1,6 +1,7 @@
 [![Donate with PayPal](https://raw.githubusercontent.com/androidseb25/iGotify-Notification-Assistent/main/paypal-donate-icon-7_20.png)](https://www.paypal.com/donate/?hosted_button_id=VFSL9ZECRD6D6)
 ![Stars](https://img.shields.io/github/stars/androidseb25/iGotify-Notification-Assistent?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAEsWlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS41LjAiPgogPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iCiAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyIKICAgIHhtbG5zOnBob3Rvc2hvcD0iaHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyIKICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIgogICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgdGlmZjpJbWFnZUxlbmd0aD0iNDgiCiAgIHRpZmY6SW1hZ2VXaWR0aD0iNDgiCiAgIHRpZmY6UmVzb2x1dGlvblVuaXQ9IjIiCiAgIHRpZmY6WFJlc29sdXRpb249IjcyLzEiCiAgIHRpZmY6WVJlc29sdXRpb249IjcyLzEiCiAgIGV4aWY6UGl4ZWxYRGltZW5zaW9uPSI0OCIKICAgZXhpZjpQaXhlbFlEaW1lbnNpb249IjQ4IgogICBleGlmOkNvbG9yU3BhY2U9IjEiCiAgIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiCiAgIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIKICAgeG1wOk1vZGlmeURhdGU9IjIwMjMtMDQtMTlUMTc6NDE6MDIrMDI6MDAiCiAgIHhtcDpNZXRhZGF0YURhdGU9IjIwMjMtMDQtMTlUMTc6NDE6MDIrMDI6MDAiPgogICA8eG1wTU06SGlzdG9yeT4KICAgIDxyZGY6U2VxPgogICAgIDxyZGY6bGkKICAgICAgc3RFdnQ6YWN0aW9uPSJwcm9kdWNlZCIKICAgICAgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWZmaW5pdHkgUGhvdG8gMiAyLjAuNCIKICAgICAgc3RFdnQ6d2hlbj0iMjAyMy0wNC0xOVQxNzo0MTowMiswMjowMCIvPgogICAgPC9yZGY6U2VxPgogICA8L3htcE1NOkhpc3Rvcnk+CiAgPC9yZGY6RGVzY3JpcHRpb24+CiA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSJyIj8+0oDKYwAAAYFpQ0NQc1JHQiBJRUM2MTk2Ni0yLjEAACiRdZHfK4NRGMc/hiamKS5cuFgaV5tmanGjTEItaaYMN9u7X2o/3t53S8utcqsocePXBX8Bt8q1UkRKbrkmbliv591WW7Ln9Jznc77nPE/nPAcsobSS0Vs8kMnmteC037EUXnZYX2mhGzuDWCOKrk7MzwdoaF8PNJnxzm3WanzuX+uIxXUFmtqExxVVywvPCAfW86rJu8I9SioSEz4XdmlyQeF7U49W+M3kZIV/TNZCwUmwdAk7knUcrWMlpWWE5eU4M+mCUr2P+RJbPLu4ILFfvA+dINP4cTDLFJP4GGZMZh9uvAzJigb5nnL+HDnJVWRWKaKxRpIUeVyiFqR6XGJC9LiMNEWz/3/7qidGvJXqNj+0vhjGxwBYd6C0bRjfx4ZROoHmZ7jK1vJzRzD6Kfp2TXMegn0TLq5rWnQPLreg90mNaJGy1CxuSSTg/Qw6w9B9C+0rlZ5V9zl9hNCGfNUN7B/AoJy3r/4CMN5nzbh35xIAAAAJcEhZcwAACxMAAAsTAQCanBgAAAGYSURBVGiB7VjtjcMgDH2cbhx2KJ2syWSlO2Qf+sd3iji+7NhJT+JJVSKCsY39sCkwMTExMTFhhLRhSRvC1XaIQMYn+i1Wer6sFgZw270/rJSYOEBpE7KxxUKXVQTMdjyH016Qdv9Z+Xx3HlFTn0UEWrsftJVZRCA1FXpdnaoRGDnztcmsuhtpwxMDaaIZBbUIlI7OxtxFSy9rJ7IU2b/fwCNopOerMAbOSVV1gIx9MA3TRqTnWnPquyF8tfHI9MfShBYHXo1vZ6NqS5MDRLbT2oIKVufrpO+S+GInmsYDg6dQp7+xQtd4gHGMnuzEcNPHroij1VaI6DzuHAF2JSYFkSs3gJVrPCBsJUjRKpGtYCjfSzjSC8UDsmprWV7qOQhSwSMOXF3gABy4D/RuXmxDhHcEUQQ+6d+2T+GA+JIjdYCT/1GoYwiWEVidh2PUjFt/yl+IiNMhcLEojdzwJERmR6BD4GpFdf63z6m2IhIeSFIoFMZ+0qVrwM4RlVbkKAeGDc9BMnk0YmmuOtKGoFkLtNebmJj4R3gDsdt6T8W+vnEAAAAASUVORK5CYII=)
 [![Crowdin](https://badges.crowdin.net/igotify/localized.svg)](https://crowdin.com/project/igotify)
+[![Qodana](https://github.com/androidseb25/iGotify-Notification-Assistent/actions/workflows/code_quality.yml/badge.svg?branch=main)](https://github.com/androidseb25/iGotify-Notification-Assistent/actions/workflows/code_quality.yml)
 
 # iGotify
 
@@ -36,6 +37,20 @@ Download Link to iGotify down below
 
 * `GOTIFY_DEFAULTUSER_PASS` = the user password for the defaultuser
 
+### oOptional environment variables
+
+* `GOTIFY_URLS` = the local gotify sever URL e.g.: `http://gotify`
+* `GOTIFY_CLIENT_TOKENS` = the client token from the Gotify Client e.g.: `cXXXXXXXX`
+* `SECNTFY_TOKENS` = the SecNtfy Token that you get from the app after configure it e.g.: `NTFY-DEVICE-XXXXXX`
+
+#### All these configuration can be found after configure the app. It will display it for you
+#### Please note you can configure multiple instances of local gotify server by adding a semicolon `;` after each environment value e.g.:
+
+* `GOTIFY_URLS: 'http://gotify;http://gotify2;http://gotify3;...'`
+* `GOTIFY_CLIENT_TOKENS: 'cXXXXXXXX1;cXXXXXXXX2;cXXXXXXXX3;...'`
+* `SECNTFY_TOKENS: 'NTFY-DEVICE-XXXXXX1;NTFY-DEVICE-XXXXXX2;NTFY-DEVICE-XXXXXX3;...'`
+
+ 
 
 ```bash
 version: '3.8'
@@ -57,7 +72,6 @@ services:
     volumes:
       - data:/app/data
     environment:
-      TZ:                       'Europe/Berlin'
       GOTIFY_DEFAULTUSER_PASS:  'my-very-strong-password'   # Change me!!!!!
 
   igotify:
@@ -74,6 +88,10 @@ services:
       - "8681:8080"
     volumes:
       - api-data:/app/data
+    #environment:                 # option environment see above note
+    #  GOTIFY_URLS:          ''
+    #  GOTIFY_CLIENT_TOKENS: ''
+    #  SECNTFY_TOKENS:       ''
 
 networks:
   net:
@@ -119,7 +137,6 @@ services:
     volumes:
       - data:/app/data
     environment:
-      TZ:                       'Europe/Berlin'
       GOTIFY_DEFAULTUSER_PASS:  'my-very-strong-password'   # Change me!!!!!
       GOTIFY_REGISTRATION:       'false'
     labels:
@@ -150,6 +167,12 @@ services:
     pull_policy: always
     volumes:
       - api-data:/app/data
+      
+    #environment:                 # option environment see above note
+    #  GOTIFY_URLS:          ''
+    #  GOTIFY_CLIENT_TOKENS: ''
+    #  SECNTFY_TOKENS:       ''
+    
     labels:
       traefik.docker.network: proxy
       traefik.enable: "true"