Merge branch 'dev' of https://github.com/csharpfritz/Fritz.StreamTools into dev

Author: csharpfritz

.gitignore

@@ -292,3 +292,6 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+
+# Ignore mp3 files
+*.mp3

ConsoleChatbot/ConsoleChatbot.csproj

@@ -16,11 +16,11 @@
   </ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
 	</ItemGroup>
 
 </Project>

Fritz.Chatbot/AttentionHub.cs

@@ -7,34 +7,46 @@
 
 namespace Fritz.StreamTools.Hubs
 {
-	public interface IAttentionHubClient
-	{
+  public interface IAttentionHubClient
+  {
 
-		// Cheer 200 parithon 12/18/2018
-		// Cheer 500 pharewings 12/18/2018
+	// Cheer 200 parithon 12/18/2018
+	// Cheer 500 pharewings 12/18/2018
 		Task AlertFritz();
 		Task ClientConnected(string connectionId);
 		Task SummonScott();
+
+		Task PlaySoundEffect(string fileName);
+
+		Task NotifyChannelPoints(ChannelPointRedemption redemption);
+
+  }
+
+  public class AttentionHub : Hub<IAttentionHubClient>, IAttentionClient
+  {
+	public override Task OnConnectedAsync()
+	{
+	  return this.Clients.Others.ClientConnected(this.Context.ConnectionId);
 	}
 
-	public class AttentionHub : Hub<IAttentionHubClient>, IAttentionClient
+	public Task AlertFritz()
+	{
+	  return this.Clients.Others.AlertFritz();
+	}
+
+	public Task SummonScott()
 	{
-		public override Task OnConnectedAsync()
-		{
-			return this.Clients.Others.ClientConnected(this.Context.ConnectionId);
-		}
 
-		public Task AlertFritz()
-		{
-			return this.Clients.Others.AlertFritz();
-		}
+	  return this.Clients.Others.SummonScott();
 
-		public Task SummonScott()
-		{
+	}
 
-			return this.Clients.Others.SummonScott();
+	public Task PlaySoundEffect(string fileName)
+	{
 
-		}
+	  return this.Clients.Others.PlaySoundEffect(fileName);
 
 	}
+
+  }
 }

Fritz.Chatbot/Commands/HelpCommand.cs

@@ -24,14 +24,15 @@ public HelpCommand(IServiceProvider serviceProvider)
 		public async Task Execute(IChatService chatService, string userName, ReadOnlyMemory<char> rhs)
 		{
 			var commands = _serviceProvider.GetServices<IBasicCommand>();
+			var textCommandArray = TextCommand._Commands.Select(kv => "!" + kv.Key.ToLower());
+			var soundFxCommands = SoundFxCommand.Effects.Select(kv => "!" + kv.Key.ToLower());
 
 			if (rhs.IsEmpty)
 			{
 
 				var availableCommandArray = commands.Where(c => !string.IsNullOrEmpty(c.Trigger)).Select(c => $"!{c.Trigger.ToLower()}");
-				var textCommandArray = TextCommand._Commands.Select(kv => "!" + kv.Key.ToLower());
 
-				var availableCommands = string.Join(' ', availableCommandArray.Union(textCommandArray).OrderBy(s => s));
+				var availableCommands = string.Join(' ', availableCommandArray.Union(textCommandArray).Union(soundFxCommands).OrderBy(s => s));
 
 				await chatService.SendMessageAsync($"Supported commands: {availableCommands}");
 				return;
@@ -40,7 +41,19 @@ public async Task Execute(IChatService chatService, string userName, ReadOnlyMem
 			var cmd = commands.FirstOrDefault(c => rhs.Span.Equals(c.Trigger.AsSpan(), StringComparison.OrdinalIgnoreCase));
 			if (cmd == null)
 			{
-				await chatService.SendMessageAsync("Unknown command to provide help with.");
+
+				if (textCommandArray.Contains("!" + rhs.Span.ToString()))
+				{
+					await chatService.SendMessageAsync($"{rhs}: A helpful text message");
+				}
+				else if (soundFxCommands.Contains("!" + rhs.Span.ToString()))
+				{
+					await chatService.SendMessageAsync($"{rhs}: A fun sound effect");
+				}
+				else
+				{
+					await chatService.SendMessageAsync("Unknown command to provide help with.");
+				}
 				return;
 			}
 

Fritz.Chatbot/Commands/IBasicCommand.cs

@@ -43,7 +43,7 @@ public interface IBasicCommand2 : IBasicCommand {
 		/// <param name="userName">User that invoked the command</param>
 		/// <param name="badges">Badges carried by the user</param>
 		/// <param name="rhs">The remaining text after the trigger keyword</param>
-		Task Execute(IChatService chatService, string userName, bool isModerator, bool isBroadcaster, ReadOnlyMemory<char> rhs);
+		Task Execute(IChatService chatService, string userName, bool isModerator, bool isVip, bool isBroadcaster, ReadOnlyMemory<char> rhs);
 
 	}
 

Fritz.Chatbot/Commands/ProjectCommand.cs

@@ -22,7 +22,7 @@ public ProjectCommand(IConfiguration configuration)
 
 		private static string CurrentProject = null;
 
-		public async Task Execute(IChatService chatService, string userName, bool isModerator, bool isBroadcaster, ReadOnlyMemory<char> rhs)
+		public async Task Execute(IChatService chatService, string userName, bool isModerator, bool isVip, bool isBroadcaster, ReadOnlyMemory<char> rhs)
 		{
 			if ((isModerator || isBroadcaster) && !rhs.IsEmpty)
 			{

Fritz.Chatbot/Commands/ScottCommand.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Fritz.StreamLib.Core;
+
+namespace Fritz.Chatbot.Commands
+{
+	public class SentimentCommand : IBasicCommand
+	{
+		public string Trigger => "sentiment";
+		public string Description => "Information about the sentiment analysis features of the chat room";
+		public TimeSpan? Cooldown => TimeSpan.FromSeconds(30);
+
+		public async Task Execute(IChatService chatService, string userName, ReadOnlyMemory<char> rhs)
+		{
+
+			var sb = new StringBuilder();
+			sb.Append($"The sentiment over the last minute is {SentimentSink.Sentiment1Minute.ToString("00.0%")} percent positive ");
+			sb.Append((SentimentSink.Sentiment1Minute < SentimentSink.Sentiment5Minute) ? "and trending upward (up arrow) " : "and trending downward (down arrow) ");
+			sb.Append("compared to the last five minutes ");
+			sb.Append($"The most recent messages were {((SentimentSink.SentimentInstant >=0.5) ? "positive" : "negative")} (smiley face)");
+
+			await chatService.SendMessageAsync(sb.ToString());
+
+		}
+	}
+}

Fritz.Chatbot/Commands/SentimentCommand.cs

@@ -10,6 +10,12 @@ public class SentimentSink
 
 		public static Queue<string> RecentChatMessages { get; } = new Queue<string>();
 
+		public static double SentimentInstant { get; set; }
+
+		public static double Sentiment1Minute { get; set; }
+
+		public static double Sentiment5Minute { get; set; }
+
 	}
 
 }

Fritz.Chatbot/Commands/SentimentSink.cs

@@ -3,17 +3,22 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Fritz.StreamLib.Core;
+using Microsoft.Extensions.Logging;
 
 namespace Fritz.Chatbot.Commands
 {
 	public class ShoutoutCommand : IBasicCommand2
 	{
 		private readonly HttpClient _HttpClient;
+		private readonly ILogger _Logger;
 
-		public ShoutoutCommand(IHttpClientFactory httpClientFactory)
+		public ShoutoutCommand(IHttpClientFactory httpClientFactory, ILoggerFactory logger)
 		{
 
 			_HttpClient = httpClientFactory.CreateClient("ShoutoutCommand");
+			_HttpClient.BaseAddress = new Uri("https://api.twitch.tv/helix/users");
+
+			_Logger = logger.CreateLogger(nameof(ShoutoutCommand));
 
 		}
 
@@ -24,19 +29,23 @@ public ShoutoutCommand(IHttpClientFactory httpClientFactory)
 
 		public TimeSpan? Cooldown => TimeSpan.FromSeconds(5);
 
-		public async Task Execute(IChatService chatService, string userName, bool isModerator, bool isBroadcaster, ReadOnlyMemory<char> rhs)
+		public async Task Execute(IChatService chatService, string userName, bool isModerator, bool isVip, bool isBroadcaster, ReadOnlyMemory<char> rhs)
 		{
 
-			if (!(isModerator || isBroadcaster)) return;
+			if (!(isModerator || isVip || isBroadcaster)) return;
 
 			var rhsTest = rhs.ToString();
 			if (rhsTest.StartsWith("@")) rhsTest = rhsTest.Substring(1);
 			if (rhsTest.StartsWith("http")) return;
 			if (rhsTest.Contains(" ")) return;
 
 			rhsTest = WebUtility.UrlEncode(rhsTest);
-			var result = await _HttpClient.GetAsync(rhsTest);
-			if (result.StatusCode != HttpStatusCode.OK) return;
+			var result = await _HttpClient.GetAsync($"?login={rhsTest}");
+			if (result.StatusCode != HttpStatusCode.OK)
+			{
+				_Logger.LogWarning($"Unable to verify Shoutout for {rhsTest}");
+				return;
+			}
 
 			await chatService.SendMessageAsync($"Please follow @{rhsTest} at: https://twitch.tv/{rhsTest}");