Making the SoundFx a configuration option

Author: csharpfritz

Fritz.Chatbot/Commands/SoundFxCommand.cs

@@ -6,17 +6,35 @@
 using Fritz.StreamLib.Core;
 using Fritz.StreamTools.Hubs;
 using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
 
 namespace Fritz.Chatbot.Commands
 {
   public class SoundFxCommand : IExtendedCommand
   {
 
-	public SoundFxCommand(IHubContext<AttentionHub, IAttentionHubClient> hubContext)
+	public SoundFxCommand(IHubContext<AttentionHub, IAttentionHubClient> hubContext, IConfiguration configuration)
 	{
 	  this.HubContext = hubContext;
+
+	  LoadConfiguration(configuration);
+
 	}
 
+	private void LoadConfiguration(IConfiguration configuration)
+	{
+
+	  var sounds = configuration.GetSection("FritzBot:SoundFxCommands").GetChildren();
+
+	  Effects = sounds.ToDictionary(s => s.Key, s => new SoundFxDefinition {
+		Cooldown = s.GetValue<int>("cooldown"),
+		Response = s.GetValue<string>("response"),
+		File = s.GetValue<string>("file")
+	  });
+
+
+	}
 
 	public IHubContext<AttentionHub, IAttentionHubClient> HubContext { get; }
 
@@ -26,13 +44,15 @@ public SoundFxCommand(IHubContext<AttentionHub, IAttentionHubClient> hubContext)
 	public bool Final => true;
 	public TimeSpan? Cooldown => TimeSpan.FromSeconds(0);
 
-	internal static readonly Dictionary<string, (string text, string fileName, TimeSpan cooldown)> Effects = new Dictionary<string, (string text, string fileName, TimeSpan cooldown)>
+	internal static Dictionary<string, SoundFxDefinition> Effects = new Dictionary<string, SoundFxDefinition>();
+		/*
 	{
 	  { "ohmy", ("Oh my... something strange is happening", "ohmy.mp3", TimeSpan.FromSeconds(30) ) },
 	  { "andthen", ("... and then ...", "andthen#.mp3", TimeSpan.FromSeconds(120) ) },
 	  { "javascript", ("Horses LOVE JavaScript!", "javascript.mp3", TimeSpan.FromSeconds(30) ) },
 		{ "rimshot", ("Ba Dum Tish!", "rimshot.mp3", TimeSpan.FromSeconds(60)) }
 	};
+	*/
 
 	private static readonly List<string> AndThens = new List<string>();
 
@@ -58,10 +78,10 @@ public Task Execute(IChatService chatService, string userName, string fullComman
 
 	  SoundCooldowns[cmdText] = (cmdText == "andthen" ? CalculateAndThenCooldownTime() : DateTime.Now);
 
-	  var fileToPlay = cmdText == "andthen" ? IdentifyAndThenFilename() : cmd.fileName;
+	  var fileToPlay = cmdText == "andthen" ? IdentifyAndThenFilename() : cmd.File;
 
 	  var soundTask = this.HubContext.Clients.All.PlaySoundEffect(fileToPlay);
-	  var textTask = chatService.SendMessageAsync($"@{userName} - {cmd.text}");
+	  var textTask = chatService.SendMessageAsync($"@{userName} - {cmd.Response}");
 
 	  return Task.WhenAll(soundTask, textTask);
 
@@ -80,7 +100,7 @@ bool InternalCooldownCheck()
 			}
 
 			if (!SoundCooldowns.ContainsKey(cmdText)) return true;
-			var cooldown = Effects[cmdText].cooldown;
+			var cooldown = TimeSpan.FromSeconds(Effects[cmdText].Cooldown);
 			return (SoundCooldowns[cmdText].Add(cooldown) < DateTime.Now);
 
 	  }
@@ -101,7 +121,7 @@ private DateTime CalculateAndThenCooldownTime()
 	private bool CheckAndThenCooldown()
 	{
 
-	  var cooldown = Effects["andthen"].cooldown;
+	  var cooldown = TimeSpan.FromSeconds( Effects["andthen"].Cooldown);
 
 	  if (SoundCooldowns.ContainsKey("andthen"))
 	  {
@@ -137,5 +157,23 @@ private string IdentifyAndThenFilename()
 	  return theFile;
 
 	}
+  }
+
+	public class SoundFxConfig
+  {
+		public SoundFxDefinition[] SoundFx { get; set; }
+  }
+
+  public class SoundFxDefinition
+  {
+
+	public string Response { get; set; }
+
+	public string File { get; set; }
+
+	public string[] Files { get; set; }
+
+	public int Cooldown { get; set; }
+
   }
 }

Fritz.Chatbot/Fritz.Chatbot.csproj

@@ -24,11 +24,11 @@
     <ProjectReference Include="..\Fritz.StreamLib.Core\Fritz.StreamLib.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <!-- ItemGroup>
     <Reference Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils">
       <HintPath>..\..\..\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.visualstudio.web.codegeneration.utils\2.1.6\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Utils.dll</HintPath>
     </Reference>
-  </ItemGroup>
+  </ItemGroup -->
 
   <ItemGroup>
     <None Update="hey_listen.wav">

Fritz.StreamTools/StartupServices/ConfigureServices.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Fritz.Chatbot;
+using Fritz.Chatbot.Commands;
 using Fritz.StreamLib.Core;
 using Fritz.StreamTools.Hubs;
 using Fritz.StreamTools.Interfaces;
@@ -33,6 +34,7 @@ public static void Execute(IServiceCollection services, IConfiguration configura
 			services.AddSingleton<IRundownService, RundownService>();
 			services.Configure<FollowerGoalConfiguration>(configuration.GetSection("FollowerGoal"));
 			services.Configure<FollowerCountConfiguration>(configuration.GetSection("FollowerCount"));
+			services.Configure<SoundFxConfig>(configuration.GetSection("FritzBot:SoundFxCommands"));
 			services.AddStreamingServices(configuration);
 			services.Configure<GitHubConfiguration>(configuration.GetSection("GitHub"));
 			services.AddSingleton<FollowerClient>();

Fritz.StreamTools/appsettings.json

@@ -56,6 +56,36 @@
 			"TemplateText": "@{0} Jeff is currently working on {1}",
 			"DefaultText": "nothing! Are we not working on anything @csharpfritz?"
 		},
+		"SoundFxCommands": {
+            "ohmy": 
+             {
+            	 	"response": "Oh my... something strange is happening",
+            		"file": "ohmy.mp3",
+            		"cooldown": 30 
+            },
+            "andthen": {
+            	"response": "... and then ...",
+	            "file": [
+  	              "andthen1.mp3",
+    	            "andthen2.mp3",
+      	          "andthen3.mp3",
+									"andthen4.mp3",
+									"andthen5.mp3",
+									"andthen6.mp3"
+							], 
+							"cooldown": 120
+        		},
+            "javascript":	{
+            	"response": "Horses LOVE JavaScript!",
+            	"file": "javascript.mp3",
+            	"cooldown": 30
+        		},
+            "rimshot": {
+              "response": "Ba Dum Tish!",
+              "file": "rimshot.mp3",
+              "cooldown": 60
+            }
+    },
 		"TextCommand": [
 			{
 				"command": "blog",