Fix patreon connection

src/PoeLurker.Core/Models/Collaboration.cs

@@ -7,7 +7,7 @@
 namespace PoeLurker.Core.Models;
 
 using System;
-using System.Diagnostics;
+using PoeLurker.Core.Extensions;
 
 /// <summary>
 /// Represents a collaboration.
@@ -51,7 +51,7 @@ public bool IsExpired()
     /// </summary>
     public void Open()
     {
-        Process.Start(Url.ToString());
+        ProcessExtensions.OpenUrl(Url.ToString());
     }
 
     #endregion

src/PoeLurker.Core/Models/Settings.cs

@@ -25,14 +25,33 @@ public Settings()
         SoldMessage = DefaultSoldMessage;
         BusyMessage = DefaultBusyMessage;
         ThankYouMessage = DefaultThankYouMessage;
+
+        ShowWelcome = true;
+        IncomingTradeEnabled = true;
+        OutgoingTradeEnabled = true;
+        ToolTipEnabled = true;
+        ClipboardEnabled = true;
+        AutoKickEnabled = true;
+        HideInBackground = true;
+        HideoutEnabled = true;
+        BuildAutoClose = true;
+        ShowReleaseNote = true;
+        ShowStartupAnimation = true;
+        SoldDetection = true;
+        OutgoingDelayToClose = 100;
+        JoinHideoutVolume = 1;
+        AlertVolume = 1;
+        ItemAlertVolume = 0.5f;
+        TradebarScaling = 1;
+        LifeForeground = "#FFFFFFFF";
+        ToolTipDelay = 1000;
     }
 
     #region Properties
 
     /// <summary>
     /// Gets or sets a value indicating whether the welcome screen should be shown.
     /// </summary>
-    [DefaultValue(true)]
     public bool ShowWelcome { get; set; }
 
     /// <summary>
@@ -68,13 +87,11 @@ public Settings()
     /// <summary>
     /// Gets or sets a value indicating whether [incoming trade enabled].
     /// </summary>
-    [DefaultValue(true)]
     public bool IncomingTradeEnabled { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether [outgoing trade enabled].
     /// </summary>
-    [DefaultValue(true)]
     public bool OutgoingTradeEnabled { get; set; }
 
     /// <summary>
@@ -110,37 +127,31 @@ public Settings()
     /// <summary>
     /// Gets or sets the alert volume.
     /// </summary>
-    [DefaultValue(1)]
     public float AlertVolume { get; set; }
 
     /// <summary>
     /// Gets or sets the alert volume.
     /// </summary>
-    [DefaultValue(0.5f)]
     public float ItemAlertVolume { get; set; }
 
     /// <summary>
     /// Gets or sets the join hideout volume.
     /// </summary>
-    [DefaultValue(1)]
     public float JoinHideoutVolume { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether [tool tip enabled].
     /// </summary>
-    [DefaultValue(true)]
     public bool ToolTipEnabled { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether [clipboard enabled].
     /// </summary>
-    [DefaultValue(true)]
     public bool ClipboardEnabled { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether [automatic kick].
     /// </summary>
-    [DefaultValue(true)]
     public bool AutoKickEnabled { get; set; }
 
     /// <summary>
@@ -161,13 +172,11 @@ public Settings()
     /// <summary>
     /// Gets or sets the tooltip delay.
     /// </summary>
-    [DefaultValue(1000)]
     public int ToolTipDelay { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether [hide in background].
     /// </summary>
-    [DefaultValue(true)]
     public bool HideInBackground { get; set; }
 
     /// <summary>
@@ -178,19 +187,16 @@ public Settings()
     /// <summary>
     /// Gets or sets the life foreground.
     /// </summary>
-    [DefaultValue("#FFFFFFFF")]
     public string LifeForeground { get; set; }
 
     /// <summary>
     /// Gets or sets the trade bar scaling.
     /// </summary>
-    [DefaultValue(1)]
     public double TradebarScaling { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether [show startup animation].
     /// </summary>
-    [DefaultValue(true)]
     public bool ShowStartupAnimation { get; set; }
 
     /// <summary>
@@ -206,13 +212,11 @@ public Settings()
     /// <summary>
     /// Gets or sets a value indicating whether [sold detection].
     /// </summary>
-    [DefaultValue(true)]
     public bool SoldDetection { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether [show release note].
     /// </summary>
-    [DefaultValue(true)]
     public bool ShowReleaseNote { get; set; }
 
     /// <summary>
@@ -223,7 +227,6 @@ public Settings()
     /// <summary>
     /// Gets or sets a value indicating whether [build automatic close].
     /// </summary>
-    [DefaultValue(true)]
     public bool BuildAutoClose { get; set; }
 
     /// <summary>
@@ -234,13 +237,11 @@ public Settings()
     /// <summary>
     /// Gets or sets a value indicating whether [synchronize build].
     /// </summary>
-    [DefaultValue(true)]
     public bool SyncBuild { get; set; }
 
     /// <summary>
     /// Gets or sets a value indicating whether [hideout enabled].
     /// </summary>
-    [DefaultValue(true)]
     public bool HideoutEnabled { get; set; }
 
     /// <summary>
@@ -261,8 +262,12 @@ public Settings()
     /// <summary>
     /// Gets or sets a value indicating the delay to close outgoing trades.
     /// </summary>
-    [DefaultValue(100)]
     public double OutgoingDelayToClose { get; set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating if the user tried to connect with patreon.
+    /// </summary>
+    public bool ConnectedToPatreon { get; set; }
+
     #endregion
 }

src/PoeLurker.Core/PoeLurker.Core.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="HtmlAgilityPack" Version="1.11.71" />
     <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="NLog" Version="5.3.4" />
-    <PackageReference Include="PoeLurker.Patreon" Version="8.0.11" />
+    <PackageReference Include="PoeLurker.Patreon" Version="8.0.13" />
     <PackageReference Include="ProcessLurker" Version="8.0.0" />
     <PackageReference Include="SharpClipboard" Version="3.5.2" />
     <PackageReference Include="TextCopy" Version="6.2.1" />

src/PoeLurker.Core/Services/SettingsService.cs

@@ -487,6 +487,19 @@ public bool ShowStartupAnimation
         }
     }
 
+    public bool ConnectedToPatreon
+    {
+        get
+        {
+            return _settings.Entity.ConnectedToPatreon;
+        }
+
+        set
+        {
+            _settings.Entity.ConnectedToPatreon = value;
+        }
+    }
+
     /// <summary>
     /// Gets or sets a value indicating whether [vulkan renderer].
     /// </summary>

src/PoeLurker.UI/PoeLurker.UI.csproj

@@ -151,7 +151,7 @@
     <PackageReference Include="NLog" Version="5.3.4" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.15" />
     <PackageReference Include="PixiEditor.ColorPicker" Version="3.4.1" />
-    <PackageReference Include="PoeLurker.Patreon" Version="8.0.11" />
+    <PackageReference Include="PoeLurker.Patreon" Version="8.0.13" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
     <PackageReference Include="Velopack" Version="0.0.942" />
   </ItemGroup>

src/PoeLurker.UI/ViewModels/BuildViewModel.cs

@@ -8,12 +8,12 @@ namespace PoeLurker.UI.ViewModels;
 
 using System;
 using System.Collections.ObjectModel;
-using System.Diagnostics;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Caliburn.Micro;
 using PoeLurker.Core;
+using PoeLurker.Core.Extensions;
 using PoeLurker.Core.Helpers;
 using PoeLurker.Core.Models;
 using PoeLurker.Core.Services;
@@ -491,7 +491,7 @@ public void OpenSelectedTree()
     {
         if (SelectedSkillTreeInformation != null && !string.IsNullOrEmpty(SelectedSkillTreeInformation.Url))
         {
-            Process.Start(SelectedSkillTreeInformation.Url);
+            ProcessExtensions.OpenUrl(SelectedSkillTreeInformation.Url);
         }
     }
 

src/PoeLurker.UI/ViewModels/PushoverViewModel.cs

@@ -6,7 +6,7 @@
 
 namespace PoeLurker.UI.ViewModels;
 
-using System.Diagnostics;
+using PoeLurker.Core.Extensions;
 using PoeLurker.Patreon.Services;
 
 /// <summary>
@@ -121,15 +121,15 @@ public async void Test()
     /// </summary>
     public void NewAccount()
     {
-        Process.Start("https://pushover.net/signup");
+        ProcessExtensions.OpenUrl("https://pushover.net/signup");
     }
 
     /// <summary>
     /// Open the info.md.
     /// </summary>
     public void Info()
     {
-        Process.Start("https://github.com/C1rdec/Poe-Lurker/blob/main/assets/Pushover.md");
+        ProcessExtensions.OpenUrl("https://github.com/C1rdec/Poe-Lurker/blob/main/assets/Pushover.md");
     }
 
     #endregion

src/PoeLurker.UI/ViewModels/SettingsViewModel.cs

@@ -437,14 +437,14 @@ public bool NotConnected
     {
         get
         {
-            return !new TokenService().Connected;
+            return !_settingService.ConnectedToPatreon;
         }
     }
 
     /// <summary>
     /// Gets the patreon identifier.
     /// </summary>
-    public string PatreonId => new TokenService().PatreonId;
+    public string PatreonId => _currentPatreonService.PatreonId;
 
     /// <summary>
     /// Gets or sets a value indicating whether this <see cref="SettingsViewModel"/> is pledging.
@@ -1049,7 +1049,7 @@ public void OpenLogs()
 
         if (Directory.Exists(folderName))
         {
-            Process.Start(folderName);
+            ProcessExtensions.OpenUrl(folderName);
         }
     }
 
@@ -1308,6 +1308,9 @@ public async Task LoginToPatreon()
             SearchEnabled = true;
             MapEnabled = true;
             DashboardEnabled = true;
+            _settingService.ConnectedToPatreon = true;
+            SaveSettings();
+            NotifyOfPropertyChange(() => NotConnected);
         }
     }
 
@@ -1383,28 +1386,36 @@ protected override async Task OnActivateAsync(CancellationToken token)
     {
         HasCustomTradeSound = _soundService.HasCustomTradeAlert();
         HasCustomItemSound = _soundService.HasCustomItemAlert();
+        AlertVolume = (int)(_settingService.AlertVolume * 100);
+        ItemAlertVolume = (int)(_settingService.ItemAlertVolume * 100);
+        JoinHideoutVolume = (int)(_settingService.JoinHideoutVolume * 100);
+        CheckForUpdate();
 
-        _ = _currentPatreonService.CheckPledgeStatus().ContinueWith(t =>
+        if (_settingService.ConnectedToPatreon)
         {
-            Pledging = _currentPatreonService.Pledging;
-            if (Pledging)
-            {
-                BlessingText = "A blessing I can’t deny";
-            }
-            else
+            _ = _currentPatreonService.CheckPledgeStatus().ContinueWith(t =>
             {
-                SearchEnabled = false;
-                DashboardEnabled = false;
-                MapEnabled = false;
-            }
+                Pledging = _currentPatreonService.Pledging;
+                if (Pledging)
+                {
+                    BlessingText = "A blessing I can’t deny";
+                }
+                else
+                {
+                    SearchEnabled = false;
+                    DashboardEnabled = false;
+                    MapEnabled = false;
+                    _settingService.ConnectedToPatreon = false;
+                    _settingService.Save();
+                }
 
+                _activated = true;
+            });
+        }
+        else
+        {
             _activated = true;
-        });
-
-        AlertVolume = (int)(_settingService.AlertVolume * 100);
-        ItemAlertVolume = (int)(_settingService.ItemAlertVolume * 100);
-        JoinHideoutVolume = (int)(_settingService.JoinHideoutVolume * 100);
-        CheckForUpdate();
+        }
 
         await base.OnActivateAsync(token);
     }

src/PoeLurker.UI/ViewModels/ShellViewModel.cs

@@ -17,6 +17,7 @@ namespace PoeLurker.UI.ViewModels;
 using System.Windows;
 using Caliburn.Micro;
 using PoeLurker.Core;
+using PoeLurker.Core.Extensions;
 using PoeLurker.Core.Helpers;
 using PoeLurker.Core.Models;
 using PoeLurker.Core.Services;
@@ -127,7 +128,7 @@ public ShellViewModel(
 
             if (settingsService.ShowReleaseNote)
             {
-                Process.Start("https://github.com/C1rdec/Poe-Lurker/releases/latest");
+                ProcessExtensions.OpenUrl("https://github.com/C1rdec/Poe-Lurker/releases/latest");
             }
         }