Merge branch 'Bardaky-dev' into dev

Author: csharpfritz

Fritz.Chatbot/Commands/AttentionCommand.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Text;
+using System.Threading.Tasks;
+using Fritz.StreamLib.Core;
+using Microsoft.Extensions.Configuration;
+
+
+namespace Fritz.Chatbot.Commands
+{
+	public class AttentionCommand : IBasicCommand
+	{
+		private readonly IConfiguration Configuration;
+
+		public AttentionCommand(IAttentionClient client, IConfiguration configuration)
+		{
+			this.Configuration = configuration;
+			this.Client = client;
+		}
+
+		protected IAttentionClient Client { get; }
+
+		public string Trigger => "attention";
+
+		public string Description => "Play audio queue to divert attention to chat";
+
+	public TimeSpan? Cooldown => TimeSpan.Parse(Configuration["FritzBot:AttentionCommand:Cooldown"]);
+
+		public async Task Execute(IChatService chatService, string userName, ReadOnlyMemory<char> rhs)
+		{
+			await this.Client.AlertFritz();
+
+			var attentionText = Configuration["FritzBot:AttentionCommand:TemplateText"];
+
+			var sb = new StringBuilder();
+			sb.AppendFormat(attentionText, userName);
+
+			await chatService.SendMessageAsync(attentionText);
+		}
+	}
+}

Fritz.Chatbot/Fritz.Chatbot.csproj

@@ -14,6 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
+		<PackageReference Include="NetCoreAudio" Version="1.4.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 
@@ -22,6 +23,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="hey_listen.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="SkeetQuotes.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

Fritz.StreamLib.Core/IAttentionClient.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Fritz.StreamLib.Core
+{
+	public interface IAttentionClient
+	{
+		Task AlertFritz();
+	}
+}

Fritz.StreamTools/Controllers/AttentionController.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Fritz.StreamTools.Controllers
+{
+	public class AttentionController : Controller
+	{
+		public IActionResult Index()
+		{
+			return View();
+		}
+
+		public IActionResult TestClient()
+		{
+			return View();
+		}
+	}
+}

Fritz.StreamTools/Fritz.StreamTools.csproj

@@ -11,6 +11,9 @@
 		<EmbeddedResource Remove="ClientApp\**" />
 		<None Remove="ClientApp\**" />
 	</ItemGroup>
+	<ItemGroup>
+	  <Content Remove="wwwroot\hey_listen.wav" />
+	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="BuildBundlerMinifier" Version="2.8.391" />
 		<PackageReference Include="Bundgaard.MixerLib" Version="1.2.65" />
@@ -24,6 +27,9 @@
 		<PackageReference Include="System.Memory" Version="4.5.1" />
 	</ItemGroup>
 	<ItemGroup>
+		<None Include="wwwroot\contents\hey_listen.wav">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 		<None Include="wwwroot\js\GoalConfiguration\GoalConfiguration.js" />
 		<None Include="wwwroot\js\GoalConfiguration\GoogleFonts.js" />
 		<None Include="wwwroot\js\GoalConfiguration\Preview.js" />

Fritz.StreamTools/Hubs/AttentionHub.cs

@@ -0,0 +1,31 @@
+using Fritz.StreamLib.Core;
+using Microsoft.AspNetCore.SignalR;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Fritz.StreamTools.Hubs
+{
+	public interface IAttentionHubClient
+	{
+
+		// Cheer 100 parithon 12/18/2018
+		// Cheer 500 pharewings 12/18/2018
+		Task AlertFritz();
+		Task ClientConnected(string connectionId);
+	}
+
+	public class AttentionHub : Hub<IAttentionHubClient>, IAttentionClient
+	{
+		public override Task OnConnectedAsync()
+		{
+			return this.Clients.Others.ClientConnected(this.Context.ConnectionId);
+		}
+
+		public Task AlertFritz()
+		{
+			return this.Clients.Others.AlertFritz();
+		}
+	}
+}

Fritz.StreamTools/Startup.cs

@@ -55,6 +55,7 @@ public void Configure(IApplicationBuilder app, Microsoft.Extensions.Hosting.IHos
 			{
 				configure.MapHub<FollowerHub>("/followerstream");
 				configure.MapHub<GithubyMcGithubFace>("/github");
+				configure.MapHub<AttentionHub>("/attentionhub");
 			});
 
 			app.UseMvc(routes =>

Fritz.StreamTools/StartupServices/ConfigureServices.cs

@@ -38,6 +38,8 @@ public static void Execute(
 			services.AddSingleton<IConfigureOptions<SignalrTagHelperOptions>, ConfigureSignalrTagHelperOptions>();
 			services.AddSingleton<SignalrTagHelperOptions>(cfg => cfg.GetService<IOptions<SignalrTagHelperOptions>>().Value);
 
+			services.AddSingleton<IAttentionClient, AttentionHub>();
+
 			services.AddSingleton<IHostedService, FritzBot>();
 			services.AddSingleton(new GitHubClient(new ProductHeaderValue("Fritz.StreamTools")));
 	  	FritzBot.RegisterCommands(services);

Fritz.StreamTools/Views/Attention/Index.cshtml

@@ -0,0 +1,32 @@
+@{
+	Layout = null;
+}
+
+<!DOCTYPE html>
+
+<html>
+<head>
+	<title>Attention</title>
+</head>
+<body>	
+	<script src="~/lib/signalr/signalr-client.js"></script>
+	<script src="~/js/attentionhub.js"></script>
+	<script>
+		var audio = new Audio('@Url.Content(@"~/contents/hey_listen.wav")');
+		
+		var hub = new AttentionHub();
+		hub.onAlertFritz = () => {
+			alertFritz();
+		}
+
+		function alertFritz() {
+			audio.play();
+		}
+
+		(function () {
+			hub.start();
+		})();
+
+	</script>
+</body>
+</html>

Fritz.StreamTools/Views/Attention/TestClient.cshtml

@@ -0,0 +1,24 @@
+
+@{
+	ViewData["Title"] = "Test Client";
+}
+
+<h2>Test Client</h2>
+
+<a class="btn btn-primary" href="javascript:alertFritz();">Send Alert</a>
+
+@section scripts {
+	<script src="~/lib/signalr/signalr-client.js"></script>
+	<script src="~/js/attentionhub.js"></script>
+	<script type="text/javascript">
+		var attentionHub = new AttentionHub();
+
+		(function () {
+			attentionHub.start();
+		})();
+
+		function alertFritz() {
+			attentionHub.sendTest();
+		}
+	</script>
+}