Merge pull request #100 from Vivelin/feature/additions

Tracker additions and fixes

setup/randomizer.app.iss

@@ -4,7 +4,7 @@
 #include "CodeDependencies.iss"
 
 #define MyAppName "SMZ3 Cas' Randomizer"
-#define MyAppVersion "4.1.1"
+#define MyAppVersion "4.2.0"
 #define MyAppPublisher "Vivelin"
 #define MyAppURL "https://github.com/Vivelin/SMZ3Randomizer"
 #define MyAppExeName "Randomizer.App.exe"

src/Randomizer.App/App.xaml.cs

@@ -79,7 +79,7 @@ protected static void ConfigureServices(IServiceCollection services)
             services.AddScoped<TrackerLocationSyncer>();
 
             // Chat
-            services.AddSingleton<IChatClient, TwitchChatClient>();
+            services.AddScoped<IChatClient, TwitchChatClient>();
             services.AddSingleton<IChatAuthenticationService, TwitchAuthenticationService>();
 
             // WPF

src/Randomizer.App/Randomizer.App.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>chozo20.ico</ApplicationIcon>
-    <Version>4.1.1</Version>
+    <Version>4.2.0</Version>
     <Title>SMZ3 Cas' Randomizer</Title>
     <AssemblyTitle>SMZ3 Cas' Randomizer</AssemblyTitle>
     <Authors>Vivelin</Authors>

src/Randomizer.SMZ3.ChatIntegration/ChatMessage.cs

@@ -8,14 +8,17 @@ namespace Randomizer.SMZ3.ChatIntegration
 {
     public abstract class ChatMessage
     {
-        protected ChatMessage(string sender, string text)
+        protected ChatMessage(string sender, string userName, string text)
         {
             Sender = sender ?? throw new ArgumentNullException(nameof(sender));
+            SenderUserName = userName ?? throw new ArgumentNullException(nameof(userName));
             Text = text ?? throw new ArgumentNullException(nameof(text));
         }
 
         public virtual string Sender { get; protected init; }
 
+        public virtual string SenderUserName { get; protected init; }
+
         public virtual string Text { get; protected init; }
     }
 }

src/Randomizer.SMZ3.Tracking/Configuration/ChatConfig.cs

@@ -22,11 +22,11 @@ public class ChatConfig
             = new("Hello chat.");
 
         /// <summary>
-        /// Gets the phrases to respond with when greeting by someone in chat.
+        /// Gets the phrases to respond with when greeted by someone in chat.
         /// </summary>
         /// <remarks>
-        /// <c>{0}</c> is a placeholder for the user name of the person in chat
-        /// to respond to.
+        /// <c>{0}</c> is a placeholder for the display name of the person in
+        /// chat to respond to.
         /// </remarks>
         public SchrodingersString GreetingResponses { get; init; }
             = new("Hey {0}");
@@ -36,11 +36,20 @@ public class ChatConfig
         /// second time in chat.
         /// </summary>
         /// <remarks>
-        /// <c>{0}</c> is a placeholder for the user name of the person in chat
-        /// to respond to.
+        /// <c>{0}</c> is a placeholder for the display name of the person in
+        /// chat to respond to.
         /// </remarks>
         public SchrodingersString? GreetedTwice { get; init; }
 
+        /// <summary>
+        /// Gets the phrases to respond with when greeted by the broadcaster.
+        /// </summary>
+        /// <remarks>
+        /// <c>{0}</c> is a placeholder for the display name of the person in
+        /// chat to respond to.
+        /// </remarks>
+        public SchrodingersString? GreetedChannel { get; init; }
+
         /// <summary>
         /// Gets a dictionary that contains usernames and their replacement for
         /// text-to-speech pronunciation purposes.

src/Randomizer.SMZ3.Tracking/Tracker.cs

@@ -297,9 +297,10 @@ public static string CorrectPronunciation(string name)
         /// </returns>
         public string CorrectUserNamePronunciation(string userName)
         {
-            if (Responses.Chat.UserNamePronunciation.TryGetValue(userName, out var correctedUserName))
-                return correctedUserName;
-            return userName;
+            var correctedUserName = Responses.Chat.UserNamePronunciation
+                .SingleOrDefault(x => x.Key.Equals(userName, StringComparison.OrdinalIgnoreCase));
+
+            return correctedUserName.Value ?? userName;
         }
 
         /// <summary>
@@ -2158,7 +2159,7 @@ private void GiveLocationComment(ItemData item, Location location, bool isTracki
             return dungeon;
         }
 
-        private void RestartIdleTimers()
+        internal void RestartIdleTimers()
         {
             foreach (var item in _idleTimers)
             {

src/Randomizer.SMZ3.Tracking/VoiceCommands/ChatIntegrationModule.cs

@@ -68,10 +68,10 @@ private void ChatClient_MessageReceived(object sender, MessageReceivedEventArgs
             var stopwatch = Stopwatch.StartNew();
             try
             {
-                var userName = Tracker.CorrectUserNamePronunciation(e.Message.Sender);
+                var senderName = Tracker.CorrectUserNamePronunciation(e.Message.SenderUserName);
 
                 if (ShouldRespondToGreetings)
-                    TryRespondToGreetings(e.Message, userName);
+                    TryRespondToGreetings(e.Message, senderName);
             }
             catch (Exception ex)
             {
@@ -89,23 +89,32 @@ private void ChatClient_MessageReceived(object sender, MessageReceivedEventArgs
             && (Tracker.Options.ChatGreetingTimeLimit == 0
                 || Tracker.TotalElapsedTime.TotalMinutes <= Tracker.Options.ChatGreetingTimeLimit);
 
-        private void TryRespondToGreetings(ChatMessage message, string userName)
+        private void TryRespondToGreetings(ChatMessage message, string senderName)
         {
             foreach (var recognizedGreeting in Tracker.Responses.Chat.RecognizedGreetings)
             {
                 if (Regex.IsMatch(message.Text, recognizedGreeting, RegexOptions.IgnoreCase | RegexOptions.Singleline))
                 {
+                    // Sass if it was the broadcaster
+                    if (message.SenderUserName.Equals(Tracker.Options.UserName)
+                        && Tracker.Responses.Chat.GreetedChannel != null)
+                    {
+                        Tracker.Say(x => x.Chat.GreetedChannel, senderName);
+                        break;
+                    }
+
+                    // Otherwise, keep track of the number of times someone said hi
                     if (_usersGreetedTimes.TryGetValue(message.Sender, out var greeted))
                     {
                         if (greeted >= 2)
                             break;
 
-                        Tracker.Say(x => x.Chat.GreetedTwice, userName);
+                        Tracker.Say(x => x.Chat.GreetedTwice, senderName);
                         _usersGreetedTimes[message.Sender]++;
                     }
                     else
                     {
-                        Tracker.Say(x => x.Chat.GreetingResponses, userName);
+                        Tracker.Say(x => x.Chat.GreetingResponses, senderName);
                         _usersGreetedTimes.Add(message.Sender, 1);
                     }
                     break;

src/Randomizer.SMZ3.Tracking/VoiceCommands/SpoilerModule.cs

@@ -636,7 +636,9 @@ private GrammarBuilder GetItemSpoilerRule()
 
             return new GrammarBuilder()
                 .Append("Hey tracker, ")
-                .OneOf("where is", "where's", "where are", "where can I find")
+                .OneOf("where is", "where's", "where are", "where can I find",
+                    "where the fuck is", "where the hell is",
+                    "where the heck is")
                 .Optional("the", "a", "an")
                 .Append(ItemNameKey, items);
         }

src/Randomizer.SMZ3.Tracking/VoiceCommands/TrackerModule.cs

@@ -276,6 +276,7 @@ protected void AddCommand(string ruleName, GrammarBuilder grammarBuilder,
                         {
                             Logger.LogInformation("Recognized \"{text}\" with {confidence:P2} confidence.",
                                 e.Result.Text, e.Result.Confidence);
+                            Tracker.RestartIdleTimers();
 
                             if (Tracker.SpeechQueueCount >= 1)
                                 Tracker.HandleInterruption();
@@ -293,6 +294,7 @@ protected void AddCommand(string ruleName, GrammarBuilder grammarBuilder,
                                 // executed, but high enough to be recognized,
                                 // let Tracker say something
                                 Tracker.Say(Tracker.Responses.Misheard);
+                                Tracker.RestartIdleTimers();
                             }
                         }
                     }