Added news from Discover.NET to the ticker

Co-authored-by: Dave Glick <[email protected]>

Author: csharpfritz

Fritz.StreamTools/Controllers/GitHubController.cs

@@ -8,6 +8,10 @@
 using LazyCache;
 using Microsoft.Extensions.Logging;
 using Fritz.StreamTools.Services;
+using System.Collections.Generic;
+using System.Net.Http;
+using Newtonsoft.Json;
+using System.IO;
 
 namespace Fritz.StreamTools.Controllers
 {
@@ -18,13 +22,15 @@ public GitHubController(
 			GitHubRepository repository,
 			GithubyMcGithubFaceClient client,
 			ILogger<GitHubController> logger,
-			IOptions<GitHubConfiguration> githubConfiguration)
+			IOptions<GitHubConfiguration> githubConfiguration,
+			IHttpClientFactory httpClientFactory)
 		{
 			this.Cache = cache;
 			this.Logger = logger;
 			this.Client = client;
 			_gitHubRepository = repository;
 			_gitHubConfiguration = githubConfiguration.Value;
+			_httpClient = httpClientFactory.CreateClient("DiscoverDotNet");
 		}
 
 		public IAppCache Cache { get; }
@@ -35,6 +41,10 @@ public GitHubController(
 
 		private readonly GitHubConfiguration _gitHubConfiguration;
 
+		private readonly HttpClient _httpClient;
+
+		private static JsonSerializer _serializer = new JsonSerializer();
+
 		public async Task<IActionResult> ContributorsInformation(string repo, string userName, int count)
 		{
 			var outModel = await _gitHubRepository.GetRecentContributors(_gitHubConfiguration.RepositoryCsv);
@@ -49,14 +59,35 @@ public async Task<IActionResult> ContributorsInformation(string repo, string use
 				});
 			}
 
-
+			var newsPosts = await GetNewsFromDiscoverDotNet();
+			var outViewModel = new TickerViewModel()
+			{
+				GitHubInformation = outModel.ToArray(),
+				News = newsPosts
+			};
 
 			ViewBag.Configuration = _gitHubConfiguration;
 
-			return View($"contributor_{_gitHubConfiguration.DisplayMode}", outModel.ToArray());
+			return View($"contributor_{_gitHubConfiguration.DisplayMode}", outViewModel);
 
 		}
 
+		private async Task<(string source, string color, IEnumerable<BlogPostModel> blogPosts)> GetNewsFromDiscoverDotNet()
+		{
+			IList<BlogPostModel> posts;
+			using(Stream response = await _httpClient.GetStreamAsync("https://discoverdot.net/data/news.json"))
+			{
+				using(StreamReader reader = new StreamReader(response))
+				{
+					using(JsonTextReader json = new JsonTextReader(reader))
+					{
+						posts = _serializer.Deserialize<IList<BlogPostModel>>(json);
+					}
+				}
+			}		
+			return ("Discover .NET", "#551A8B", posts.Take(5).ToArray());
+		}
+
 		public IActionResult Configuration()
 		{
 			return View(_gitHubConfiguration);
@@ -145,4 +176,21 @@ public async Task<IActionResult> VerifyRepository(string repositoryName, string
 			return Json(true);
 		}
 	}
+
+	public class TickerViewModel {
+
+		public IEnumerable<GitHubInformation> GitHubInformation { get; set; }
+
+		public (string source, string color, IEnumerable<BlogPostModel> blogPosts) News { get; set; }
+
+	}
+
+	public class BlogPostModel
+	{
+		public string Title { get; set; }
+		public string FeedTitle { get; set; }
+		public string Link { get; set; }
+		public DateTime Published { get; set; }
+	}
+
 }

Fritz.StreamTools/StartupServices/ConfigureServices.cs

@@ -68,6 +68,8 @@ private static void RegisterGitHubServices(IServiceCollection services, IConfigu
 				c.DefaultRequestHeaders.Add("Accept", "applications/json");
 			});
 
+			services.AddHttpClient("DiscoverDotNet");
+
 			services.AddHttpClient("ShoutoutCommand", c =>
 			{
 				c.BaseAddress = new Uri("https://api.twitch.tv/kraken/channels/");

Fritz.StreamTools/Views/GitHub/Contributor_h-scroll.cshtml

@@ -1,4 +1,4 @@
-@model IEnumerable<GitHubInformation>
+@model Fritz.StreamTools.Controllers.TickerViewModel
 @{
 	Layout = null;
 	var Config = ViewBag.Configuration as GitHubConfiguration;
@@ -41,7 +41,7 @@
 
 <p id="marquee">
 
-	@foreach (var repo in Model)
+	@foreach (var repo in Model.GitHubInformation)
 	{
 
 		<span id="[email protected]">
@@ -83,6 +83,16 @@
 
 		</span>
 
+		<span id="news">
+
+			<b style="color: @Model.News.color!important">Latest news from @Model.News.source</b>
+
+			@foreach(var article in Model.News.blogPosts) {
+				<span style="margin-right: 3px; text-decoration: underline;">@article.Title</span>
+			}
+
+		</span>
+
 	}
 
 </p>