Fix Tags

.gitea/workflows/build.yaml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           # Semantic version range syntax or exact version of a dotnet version
-          dotnet-version: '6.x'
+          dotnet-version: '8.x'
 
       - run: echo "Build."
       - name: Check out repository code
@@ -36,8 +36,8 @@ jobs:
           dotnet build --configuration Release --os win  LaDOSE.DesktopApp.Avalonia
       - name: Zip file 
         run: |
-          zip -rj build-winx64.zip ./LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/win-x64/
+          zip -rj build-winx64.zip ./LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net8.0/win-x64/
-          zip -rj build-linux64.zip ./LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/linux-x64/
+          zip -rj build-linux64.zip ./LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net8.0/linux-x64/
       - name: Upload Artifact Windows 
         uses: actions/upload-artifact@v3
         with:
@@ -54,10 +54,15 @@ jobs:
           retention-days: 30
           overwrite: true
 
+      - name: Get current date
+        id: date
+        run: echo "date=$(echo $(date +'%Y-%m-%d'))" >> $GITHUB_OUTPUT
       - name: Release
+        if: github.ref_name == 'master'
         uses: akkuman/gitea-release-action@v1
         env:
         with:
+          tag_name: release-${{ steps.date.outputs.date }}
           files: |-
             build-winx64.zip
             build-linux64.zip

LaDOSE.Src/LaDOSE.Api/Controllers/WordPressController.cs

@@ -77,7 +77,7 @@ namespace LaDOSE.Api.Controllers
         [HttpGet("UpdateDb")]
         public bool UpdateDb()
         {
-            return _service.UpdateBooking();
+            return false;
         }
 
         [HttpGet("CreateChallonge/{gameId:int}/{wpEventId:int}")]

LaDOSE.Src/LaDOSE.Api/LaDOSE.Api.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,13 +11,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="10.0.0" />
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.12" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.4" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.7" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
   </ItemGroup>
 
   <ItemGroup>

LaDOSE.Src/LaDOSE.DTO/LaDOSE.DTO.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 

LaDOSE.Src/LaDOSE.DTO/TournamentDTO.cs

@@ -27,6 +27,8 @@ namespace LaDOSE.DTO
         public List<GameDTO> Games { get; set; }
 
         public List<ResultDTO> Results { get; set; }
+        
+        public string Slug { get; set; }
     }
     public class ResultDTO
     {

LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/LaDOSE.DesktopApp.Avalonia.csproj

@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <LangVersion>12</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -24,8 +25,8 @@
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.3" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.3" />
         <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     </ItemGroup>
 
 

LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/Program.cs

@@ -38,9 +38,9 @@ sealed class Program
             var restUser = builder["REST:User"].ToString();
             var restPassword = builder["REST:Password"].ToString();
             
-            currentMutable.RegisterLazySingleton<RestService>(() =>
+            currentMutable.Register<RestService>(() =>
             {        
-                    var restService = new RestService();
+                    var restService = new RestService(new Uri(restUrl), restUser, restPassword);
                     try
                     {
                         restService.Connect(new Uri(restUrl), restUser, restPassword);
@@ -53,7 +53,7 @@ sealed class Program
                     
                     return restService;
             });
-
+            
     }
 
     // Avalonia configuration, don't remove; also used by visual designer.

LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/ViewModels/TournamentResultViewModel.cs

@@ -223,8 +223,8 @@ namespace LaDOSE.DesktopApp.Avalonia.ViewModels
             this.To = new DateTimeOffset(DateTime.Now);
             this.From = new DateTimeOffset(DateTime.Now.AddMonths(-1));
             this.SelectRegex = "Ranking";
-            this.SelectEventRegex = @"Ranking #10\d{2}";
+            this.SelectEventRegex = @"Ranking #13\d{2}";
-            this.Slug = "ranking-1001";
+            this.Slug = "ranking-130";
             
             LoadTournaments();
             LoadEvents();
@@ -472,7 +472,7 @@ namespace LaDOSE.DesktopApp.Avalonia.ViewModels
                     string url = enumerable.FirstOrDefault()?.TournamentUrl;
                     url = url.Replace(" ", "-");
                     url = url.Replace(".", "-");
-                    sb.AppendLine($"<a href=\"https://smash.gg/tournament/ranking-1002/event/{url}\" target=\"_blank\">Voir le Bracket</p></td>");
+                    sb.AppendLine($"<a href=\"https://start.gg/tournament/{Results.Slug}/event/{url}\" target=\"_blank\">Voir le Bracket</p></td>");
                 }
 
                 

LaDOSE.Src/LaDOSE.DiscordBot/LaDOSE.DiscordBot.csproj

@@ -2,16 +2,16 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DSharpPlus" Version="4.2.0" />
+    <PackageReference Include="DSharpPlus" Version="4.5.0" />
-    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.2.0" />
+    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.5.0" />
-    <PackageReference Include="DSharpPlus.Interactivity" Version="4.2.0" />
+    <PackageReference Include="DSharpPlus.Interactivity" Version="4.5.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

LaDOSE.Src/LaDOSE.Entity/Challonge/TournamentsResult.cs

@@ -9,6 +9,7 @@ namespace LaDOSE.Entity.Challonge
         public List<Game> Games{ get; set; }
 
         public List<Result> Results { get; set; }
+        public string Slug { get; set; }
     }
 
     public class Result

LaDOSE.Src/LaDOSE.Entity/LaDOSE.Entity.csproj

@@ -2,12 +2,18 @@
 
   <PropertyGroup>
     <Platforms>AnyCPU;x64</Platforms>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.12" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.EntityFrameworkCore">
+      <HintPath>..\..\..\..\.nuget\packages\microsoft.entityframeworkcore\8.0.11\lib\net8.0\Microsoft.EntityFrameworkCore.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
 </Project>

LaDOSE.Src/LaDOSE.REST/LaDOSE.REST.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="RestSharp" Version="110.2.0" />
+    <PackageReference Include="RestSharp" Version="112.1.0" />
   </ItemGroup>
 
   <ItemGroup>

LaDOSE.Src/LaDOSE.REST/RestService.cs

@@ -29,13 +29,19 @@ namespace LaDOSE.REST
         {
             
         }
-    
+        public RestService(Uri url, string user, string password)
-
-        public void Connect(Uri url, string user, string password)
         {
             Client = new RestClient(url);
             this.username = user;
             this.password = password;
+        }
+    
+
+        public void Connect(Uri url, string user, string password)
+        {
+            // Client = new RestClient(url);
+            // this.username = user;
+            // this.password = password;
             string token;
             try
             {
@@ -79,7 +85,7 @@ namespace LaDOSE.REST
 
         private void CheckToken()
         {
-            if (this.Auth == null || this.Auth.Expire <= DateTime.Now)
+            if (this.Auth == null || this.Auth.Expire.ToUniversalTime() <= DateTime.Now.ToUniversalTime())
             {
                 GetToken(this.username,this.password);
             }

LaDOSE.Src/LaDOSE.Service/Interface/IWordPressService.cs

@@ -11,7 +11,6 @@ namespace LaDOSE.Business.Interface
         List<WPEvent> GetWpEvent();
         List<WPUser> GetBooking(int wpEventId, Game game);
         List<WPUser> GetBookingOptions(int wpEventId, Game game);
-        bool UpdateBooking();
         string CreateChallonge(int gameId, int wpEventId, IList<WPUser> additionPlayers);
 
         Task<string> GetLastChallonge();

LaDOSE.Src/LaDOSE.Service/LaDOSE.Business.csproj

@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>LaDOSE.Business</AssemblyName>
     <RootNamespace>LaDOSE.Business</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GraphQL.Client" Version="4.0.2" />
+    <PackageReference Include="GraphQL.Client" Version="6.1.0" />
-    <PackageReference Include="GraphQL.Client.Serializer.Newtonsoft" Version="4.0.2" />
+    <PackageReference Include="GraphQL.Client.Serializer.Newtonsoft" Version="6.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.12" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

LaDOSE.Src/LaDOSE.Service/Provider/SmashProvider/SmashProvider.cs

@@ -15,6 +15,7 @@ namespace LaDOSE.Business.Provider.SmashProvider
 {
     public class SmashProvider : ISmashProvider
     {
+        private static string API_FQDN = "api.start.gg";
         public string ApiKey { get; set; }
         //public SmashProvider(string apiKey)
         //{
@@ -34,7 +35,7 @@ namespace LaDOSE.Business.Provider.SmashProvider
 
         private async Task<T> QuerySmash<T>(GraphQLRequest req)
         {
-            var graphQLClient = new GraphQLHttpClient("https://api.smash.gg/gql/alpha", new NewtonsoftJsonSerializer());
+            var graphQLClient = new GraphQLHttpClient($"https://{API_FQDN}/gql/alpha", new NewtonsoftJsonSerializer());
             graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {ApiKey}");
 
             var graphQLResponse = await graphQLClient.SendQueryAsync<T>(req);
@@ -346,7 +347,7 @@ namespace LaDOSE.Business.Provider.SmashProvider
                public async Task<TournamentResponse> GetNames(string slug)
         {
 
-            var graphQLClient = new GraphQLHttpClient("https://api.smash.gg/gql/alpha", new NewtonsoftJsonSerializer());
+            var graphQLClient = new GraphQLHttpClient($"https://{API_FQDN}/gql/alpha", new NewtonsoftJsonSerializer());
             graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {ApiKey}");
             var Event = new GraphQLRequest
             {
@@ -412,7 +413,7 @@ namespace LaDOSE.Business.Provider.SmashProvider
         public async Task<TournamentResponse> GetTournament(string slug)
         {
 
-            var graphQLClient = new GraphQLHttpClient("https://api.smash.gg/gql/alpha", new NewtonsoftJsonSerializer());
+            var graphQLClient = new GraphQLHttpClient($"https://{API_FQDN}/gql/alpha", new NewtonsoftJsonSerializer());
             graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {ApiKey}");
             var Event = new GraphQLRequest
             {

LaDOSE.Src/LaDOSE.Service/Service/BotEventService.cs

@@ -6,6 +6,7 @@ using LaDOSE.Entity.BotEvent;
 using LaDOSE.Entity.Context;
 using Microsoft.EntityFrameworkCore;
 
+
 namespace LaDOSE.Business.Service
 {
     public class BotEventService : BaseService<BotEvent>, IBotEventService

LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs

@@ -148,10 +148,14 @@ namespace LaDOSE.Business.Service
                 players = players.Concat(e.Tournaments.SelectMany(e => e.Results.Select(e => e.Player)).Distinct().ToList()).ToList();
                 cevent.Tournaments = cevent.Tournaments.Concat(e.Tournaments).ToList();
             }
-
+            
             var games = _context.Game.ToList();
 
             TournamentsResult result = new TournamentsResult();
+            if (id.Count == 1)
+            {
+                result.Slug = _context.Event.Where(e=> e.Id == id.First()).First().SmashSlug;
+            }
             result.Results = new List<Result>();
             result.Games = new List<Game>();
             result.Participents = new List<ChallongeParticipent>();

LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs

@@ -42,14 +42,7 @@ namespace LaDOSE.Business.Service
                 .Include(e => e.WPBookings).ThenInclude(e => e.WPUser).FirstOrDefault(e => Enumerable.Count<WPBooking>(e.WPBookings) != 0);
             return wpEvents;
         }
-
+        
-        public bool UpdateBooking()
-        {
-            _context.Database.SetCommandTimeout(60);
-            _context.Database.ExecuteSqlRaw("call ladoseapi.ImportEvent();");
-            _context.Database.SetCommandTimeout(30);
-            return true;
-        }
         public List<WPUser> GetBooking(int wpEventId, Game game)
         {
             var selectedGameWpId = game.WordPressTag.Split(';');

LaDOSE.Src/LinuxTest/LinuxTest.csproj

@@ -2,9 +2,10 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <LangVersion>12</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

LaDOSE.Src/LinuxTest/Program.cs

@@ -2,18 +2,18 @@
 internal class Program
 {
     public static void Main(string[] args)
-    {
-     Console.WriteLine("Rest Test");
-     var p = new LaDOSE.REST.RestService();
-     Console.WriteLine("[+] Connect");
-     
-     p.Connect(new Uri("http://localhost:5000/"),"dev","dev");
-     Console.WriteLine("[+] Test");
-     var games = p.GetGames();
-     foreach (var ga in games)
      {
-         Console.WriteLine(ga.Name);
+    //  Console.WriteLine("Rest Test");
-     }
+    //  var p = new LaDOSE.REST.RestService();
+    //  Console.WriteLine("[+] Connect");
+    //  
+    //  p.Connect(new Uri("http://localhost:5000/"),"dev","dev");
+    //  Console.WriteLine("[+] Test");
+    //  var games = p.GetGames();
+    //  foreach (var ga in games)
+    //  {
+    //      Console.WriteLine(ga.Name);
+    //  }
 
     }
 }

LaDOSE.Src/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "8.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }