Fixed the shoutout command to use the Twitch Helix endpoint

Author: csharpfritz

Fritz.Chatbot/Commands/ShoutoutCommand.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, ILogger logger)
 		{
 
 			_HttpClient = httpClientFactory.CreateClient("ShoutoutCommand");
+			_HttpClient.BaseAddress = new Uri("https://api.twitch.tv/helix/users");
+
+			_Logger = logger;
 
 		}
 
@@ -35,8 +40,12 @@ public async Task Execute(IChatService chatService, string userName, bool isMode
 			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}");
 

Fritz.StreamTools.sln

@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFiles", "SolutionFi
 		docker-compose.ci.build.yml = docker-compose.ci.build.yml
 		docker-compose.override.yml = docker-compose.override.yml
 		docker-compose.yml = docker-compose.yml
+		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection

Fritz.StreamTools/StartupServices/ConfigureServices.cs

@@ -91,7 +91,6 @@ private static void RegisterGitHubServices(IServiceCollection services, IConfigu
 
 			services.AddHttpClient("ShoutoutCommand", c =>
 			{
-				c.BaseAddress = new Uri("https://api.twitch.tv/kraken/channels/");
 				c.DefaultRequestHeaders.Add("client-id", configuration["StreamServices:Twitch:ClientId"]);
 			});
 

Test/Chatbot/ShoutoutCommandFixture.cs

@@ -0,0 +1,56 @@
+using Fritz.Chatbot.Commands;
+using Fritz.StreamLib.Core;
+using Microsoft.Extensions.Logging;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Test.Chatbot
+{
+
+	public class ShoutoutCommandFixture
+	{
+		private readonly MockRepository _Mockery;
+		private readonly Mock<IHttpClientFactory> _ClientFactory;
+		private readonly Mock<IChatService> _ChatService;
+		private readonly ILogger _Logger;
+
+		public ShoutoutCommandFixture(ITestOutputHelper output)
+		{
+			_Mockery = new MockRepository(MockBehavior.Default);
+			_ClientFactory = new Mock<IHttpClientFactory>();
+			_ChatService = new Mock<IChatService>();
+			_Logger = new XunitLogger<ShoutoutCommand>(output);
+
+		}
+
+
+		[Fact]
+		public async Task ShouldShoutoutCsharpfritz() {
+
+			// arrange
+			var client = new HttpClient();
+			client.DefaultRequestHeaders.Add("client-id", "t7y5txan5q662t7zj7p3l4wlth8zhv");
+			_ClientFactory.Setup(f => f.CreateClient(It.IsAny<string>()))
+				.Returns(client);
+			var sut = new ShoutoutCommand(_ClientFactory.Object, _Logger);
+			_ChatService.Setup(c => c.SendMessageAsync(It.Is<string>(s => s.StartsWith("Please follow @csharpfritz")))).Verifiable();
+
+			// act
+			await sut.Execute(_ChatService.Object, "csharpfritz", false, false, true, "csharpfritz".ToCharArray());
+
+			// assert
+			_ChatService.Verify();
+
+
+		}
+
+	}
+
+
+}

Test/XunitLogger.cs

@@ -0,0 +1,36 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit.Abstractions;
+
+namespace Test
+{
+	public class XunitLogger<T> : ILogger<T>, IDisposable
+	{
+		private ITestOutputHelper _output;
+
+		public XunitLogger(ITestOutputHelper output)
+		{
+			_output = output;
+		}
+		public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+		{
+			_output.WriteLine(state.ToString());
+		}
+
+		public bool IsEnabled(LogLevel logLevel)
+		{
+			return true;
+		}
+
+		public IDisposable BeginScope<TState>(TState state)
+		{
+			return this;
+		}
+
+		public void Dispose()
+		{
+		}
+	}
+}

global.json

@@ -1,5 +1,5 @@
 {
-  "sdk": {
-    "version": "2.2.300"
-  }
+	"sdk": {
+		"version": "2.2.401"
+	}
 }