Merge branch 'dev'

Author: Reavert

VisualStudioDiscordRPC.Shared/DiscordRpcController.cs

@@ -6,6 +6,8 @@
 using VisualStudioDiscordRPC.Shared.Plugs;
 using VisualStudioDiscordRPC.Shared.Nests;
 using VisualStudioDiscordRPC.Shared.Nests.Base;
+using System.Windows;
+using VisualStudioDiscordRPC.Shared.Plugs.TimerPlugs;
 
 namespace VisualStudioDiscordRPC.Shared
 {
@@ -14,13 +16,15 @@ public class DiscordRpcController
         public const string DefaultApplicationId = "914622396630175855";
 
         private static readonly RichPresence HiddenRichPresence;
+        private static readonly RichPresence IdlingRichPresence;
 
-        private readonly DiscordRpcClient _discordRpcClient;
-        
         private bool _isDirty;
+        private DateTime _lastDirtyTime;
         private readonly object _dirtyFlagSync = new object();
 
+        private readonly DiscordRpcClient _discordRpcClient;
         private readonly LocalizationService _localizationService;
+        private readonly SettingsService _settingsService;
 
         private readonly RichPresence _sharedRichPresence;
         private readonly object _richPresenceSync = new object();
@@ -29,6 +33,8 @@ public class DiscordRpcController
         private readonly int _sendDataMillisecondsTimeout;
         private bool _sendingThreadCancellation;
 
+        private bool _isIdling;
+
         private bool _enabled = true;
         public bool Enabled
         {
@@ -63,7 +69,7 @@ public bool Secret
             set
             {
                 _secret = value;
-                _isDirty = true;
+                SetDirty();
             }
         }
 
@@ -81,12 +87,23 @@ static DiscordRpcController()
                 },
                 Details = "This solution is hidden"
             };
+
+            IdlingRichPresence = new RichPresence
+            {
+                Assets = new Assets()
+                {
+                    LargeImageKey = "zzz",
+                    LargeImageText = "Idling..."
+                },
+                Details = "Idling..."
+            };
         }
 
         public DiscordRpcController(int updateMillisecondsTimeout) 
         {
-            var settingsService = ServiceRepository.Default.GetService<SettingsService>();
-            var applicationId = settingsService.Read<string>(SettingsKeys.ApplicationID);
+            _settingsService = ServiceRepository.Default.GetService<SettingsService>();
+
+            var applicationId = _settingsService.Read<string>(SettingsKeys.ApplicationID);
 
             _discordRpcClient = new DiscordRpcClient(applicationId)
             {
@@ -194,10 +211,7 @@ private void OnLocalizationChanged()
 
         private void OnNestChanged()
         {
-            lock (_dirtyFlagSync)
-            {
-                _isDirty = true;
-            }
+            SetDirty();
         }
 
         public void RefreshAll()
@@ -206,10 +220,17 @@ public void RefreshAll()
             {
                 nest.BasePlug?.Update();
             }
+            
+            SetDirty();
+        }
 
+        private void SetDirty()
+        {
             lock (_dirtyFlagSync)
             {
                 _isDirty = true;
+                _isIdling = false;
+                _lastDirtyTime = DateTime.Now;
             }
         }
 
@@ -228,22 +249,50 @@ private void SendRichPresenceData()
 
                     lock (_dirtyFlagSync)
                     {
-                        if (_enabled && _isDirty)
+                        if (_enabled)
                         {
-                            if (_secret)
+                            if (!_isIdling)
                             {
-                                _discordRpcClient.SetPresence(HiddenRichPresence);
+                                bool detectIdling = _settingsService.Read<bool>(SettingsKeys.DetectIdling);
+                                if (detectIdling)
+                                {
+                                    TimeSpan timeDiff = DateTime.Now - _lastDirtyTime;
+                                    long idleMinutes = _settingsService.Read(SettingsKeys.IdleTime, SettingsDefaults.DefaultIdleTime);
+
+                                    if (timeDiff > TimeSpan.FromMinutes(idleMinutes))
+                                    {
+                                        OnIdle();
+                                        _isIdling = true;
+                                    }
+                                }
                             }
-                            else
+
+                            if (_isDirty && !_isIdling)
                             {
-                                _discordRpcClient.SetPresence(_sharedRichPresence);
+                                OnRpcUpdate();
+                                _isDirty = false;
                             }
-
-                            _isDirty = false;
                         }
                     }
                 }
             }
         }
+
+        private void OnRpcUpdate()
+        {
+            if (_secret)
+            {
+                _discordRpcClient.SetPresence(HiddenRichPresence);
+            }
+            else
+            {
+                _discordRpcClient.SetPresence(_sharedRichPresence);
+            }
+        }
+
+        private void OnIdle()
+        {
+            _discordRpcClient.SetPresence(IdlingRichPresence);
+        }
     }
 }

VisualStudioDiscordRPC.Shared/SettingsDefaults.cs

@@ -0,0 +1,7 @@
+namespace VisualStudioDiscordRPC.Shared
+{
+    public static class SettingsDefaults
+    {
+        public const long DefaultIdleTime = 5;
+    }
+}

VisualStudioDiscordRPC.Shared/SettingsKeys.cs

@@ -19,5 +19,7 @@ public static class SettingsKeys
         public const string TranslationsPath = "TranslationsPath";
         public const string PrivateRepositories = "PrivateRepositories";
         public const string SecretSolutions = "SecretSolutions";
+        public const string DetectIdling = "DetectIdling";
+        public const string IdleTime = "IdleTime";
     }
 }

VisualStudioDiscordRPC.Shared/ViewModels/SettingsViewModel.cs

@@ -9,6 +9,7 @@
 using VisualStudioDiscordRPC.Shared.Plugs.TimerPlugs;
 using VisualStudioDiscordRPC.Shared.Nests;
 using VisualStudioDiscordRPC.Shared.Utils;
+using System.Windows.Input;
 
 namespace VisualStudioDiscordRPC.Shared.ViewModels
 {
@@ -31,6 +32,22 @@ public bool UpdateNotificationsEnabled
             set => _settingsService.Set(SettingsKeys.UpdateNotifications, value);
         }
 
+        public bool DetectIdlingEnabled
+        {
+            get => _settingsService.Read<bool>(SettingsKeys.DetectIdling);
+            set
+            {
+                _settingsService.Set(SettingsKeys.DetectIdling, value);
+                OnPropertyChanged(nameof(DetectIdlingEnabled));
+            }
+        }
+
+        public string IdleTime
+        {
+            get => _settingsService.Read(SettingsKeys.IdleTime, SettingsDefaults.DefaultIdleTime).ToString();
+            set => _settingsService.Set(SettingsKeys.IdleTime, long.Parse(value));
+        }
+
         public bool RichPresenceEnabled
         {
             get => _discordRpcController.Enabled;

VisualStudioDiscordRPC.Shared/Views/SettingsWindow.xaml

@@ -112,6 +112,17 @@
                           IsChecked="{Binding UpdateNotificationsEnabled}">
                     <TextBlock Text="Notify about extension updates"/>
                 </CheckBox>
+                <CheckBox Margin="5"
+                          IsChecked="{Binding DetectIdlingEnabled}">
+                    <TextBlock Text="Detect idling"/>
+                </CheckBox>
+
+                <TextBlock Text="Idle time (minutes):"/>
+                <TextBox Name="IdleTimeTextBox"
+                         IsEnabled="{Binding DetectIdlingEnabled}"
+                         Text="{Binding IdleTime}"
+                         PreviewTextInput="ValidateIdleTimeTextBox"/>
+
                 <Expander Header="Advanced"
                           Margin="5">
                     <StackPanel Margin="5">

VisualStudioDiscordRPC.Shared/Views/SettingsWindow.xaml.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Windows;
+using System.Windows.Input;
 using VisualStudioDiscordRPC.Shared.Services;
 using VisualStudioDiscordRPC.Shared.ViewModels;
 
@@ -33,5 +34,13 @@ private void OnResetButtonClick(object sender, RoutedEventArgs e)
         {
             ViewModel.DiscordAppId = DiscordRpcController.DefaultApplicationId;
         }
+
+        private void ValidateIdleTimeTextBox(object sender, TextCompositionEventArgs e)
+        {
+            if (!char.IsDigit(e.Text, e.Text.Length - 1))
+            {
+                e.Handled = true;
+            }
+        }
     }
 }

VisualStudioDiscordRPC.Shared/VisualStudioDiscordRPC.Shared.projitems

@@ -25,6 +25,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)IStringCollectionProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)LocalizationKeys.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugs\TextPlugs\GitBranchTextPlug.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SettingsDefaults.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Utils\MigrationHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Utils\StringHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Variables\DebugModeVariable.cs" />