Merge pull request #216 from androidseb25/dev

Updated Lib and Fixes

Author: androidseb25

.github/workflows/dotnet.yml

@@ -118,7 +118,7 @@ jobs:
     name: Build dotNet
     strategy:
       matrix:
-        dotnet-version: [ '9.x' ]
+        dotnet-version: [ '10.x' ]
         kind: [ 'amd64', 'arm64', 'armv7' ]
         include:
           - kind: amd64

Models/DeviceModel.cs

@@ -1,4 +1,5 @@
 using iGotify_Notification_Assist.Services;
+using Newtonsoft.Json;
 using SecNtfyNuGet;
 using Websocket.Client;
 using Environments = iGotify_Notification_Assist.Services.Environments;
@@ -59,6 +60,6 @@ public async Task SendNotifications(GotifyMessage iGotifyMessage, WebsocketClien
         var ntfy = new SecNtfy(Environments.secNtfyUrl);
         var response = await ntfy.SendNotification(usr.DeviceToken, title, msg, iGotifyMessage.priority == 10, imageUrl,
             iGotifyMessage.priority);
-        Console.WriteLine(response);
+        Console.WriteLine(response != null ? JsonConvert.SerializeObject(response) : "Notification response is null");
     }
 }

Services/GotifySocketService.cs

@@ -261,7 +261,7 @@ public async void Start()
             var statusNtfyList = secntfyTokenList.Count == 0 ? "empty" : "filled";
             Console.WriteLine($"SecNtfy Token list is: {statusNtfyList}");
             Console.WriteLine(
-                $"If one or more lists are empty please check the environment variable! GOTIFY_SERVERS or GOTIFY_CLIENTS or NTFY_TOKENS");
+                $"If one or more lists are empty please check the environment variable! GOTIFY_URLS or GOTIFY_CLIENT_TOKENS or SECNTFY_TOKENS");
             Console.WriteLine(
                 $"If all lists are empty do nothing, you will configure the gotify server over the iGotify app.");
         }
@@ -271,15 +271,15 @@ public async void Start()
         StartConnection(userList, secntfyUrl);
     }
 
-    private void StartConnection(List<Users> userList, string secntfyUrl)
+    private async void StartConnection(List<Users> userList, string secntfyUrl)
     {
         foreach (var user in userList)
         {
             string isGotifyAvailable;
             string isSecNtfyAvailable;
             try
             {
-                isGotifyAvailable = SecNtfy.CheckIfUrlReachable(user.GotifyUrl) ? "yes" : "no";
+                isGotifyAvailable = await SecNtfy.CheckIfUrlReachable(user.GotifyUrl) ? "yes" : "no";
 
                 if (isGotifyAvailable == "no")
                 {
@@ -296,7 +296,7 @@ private void StartConnection(List<Users> userList, string secntfyUrl)
 
             try
             {
-                bool isSecNtfyAvailableBool = SecNtfy.CheckIfUrlReachable(secntfyUrl);
+                bool isSecNtfyAvailableBool = await SecNtfy.CheckIfUrlReachable(secntfyUrl);
                 isSecNtfyAvailable = isSecNtfyAvailableBool ? "yes" : "no";
 
                 if (!isSecNtfyAvailableBool)

iGotify Notification Assist.csproj

@@ -6,20 +6,20 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <InvariantGlobalization>true</InvariantGlobalization>
         <RootNamespace>iGotify_Notification_Assist</RootNamespace>
-        <AssemblyVersion>1.5.1.2</AssemblyVersion>
-        <FileVersion>1.5.1.2</FileVersion>
-        <Version>1.5.1.2</Version>
+        <AssemblyVersion>1.5.1.3</AssemblyVersion>
+        <FileVersion>1.5.1.3</FileVersion>
+        <Version>1.5.1.3</Version>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Dapper" Version="2.1.66" />
         <PackageReference Include="Dapper.Contrib" Version="2.0.78" />
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
-        <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
+        <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-        <PackageReference Include="Scalar.AspNetCore" Version="2.11.0" />
-        <PackageReference Include="secntfy.nuget" Version="1.0.5" />
+        <PackageReference Include="Scalar.AspNetCore" Version="2.11.10" />
+        <PackageReference Include="secntfy.nuget" Version="1.0.9" />
         <PackageReference Include="Websocket.Client" Version="5.3.0" />
     </ItemGroup>