Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Connecting the missing pieces for YtChat #298

Merged
merged 3 commits into from
Nov 13, 2023
Merged

Connecting the missing pieces for YtChat #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de4ed03
Connecting the missing pieces
csharpfritz Nov 13, 2023
658a7f0
Loading config from IConfiguration
csharpfritz Nov 13, 2023
41bd127
Applying formatting changes through GitHub Actions
github-actions[bot] Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/TagzApp.Providers.YouTubeChat/YouTubeChatProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Google.Apis.Services;
using Google.Apis.YouTube.v3;
using Google.Apis.YouTube.v3.Data;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Configuration;

namespace TagzApp.Providers.YouTubeChat;

Expand Down Expand Up @@ -35,13 +35,12 @@ public class YouTubeChatProvider : ISocialMediaProvider, IDisposable
private SocialMediaStatus _Status = SocialMediaStatus.Unhealthy;
private string _StatusMessage = "Not started";

public YouTubeChatProvider(YouTubeChatConfiguration config, IOptions<ApplicationConfiguration> appConfig)
public YouTubeChatProvider(YouTubeChatConfiguration config, IConfiguration configuration)
{
_ChatConfig = config;
var rawConfig = configuration["ApplicationConfiguration:YouTubeChatConfiguration"];

if (appConfig.Value.YouTubeChatConfiguration == "{}") return;

var youtubeConfig = JsonSerializer.Deserialize<YouTubeChatApplicationConfiguration>(appConfig.Value.YouTubeChatConfiguration);
var youtubeConfig = JsonSerializer.Deserialize<YouTubeChatApplicationConfiguration>(rawConfig);
RefreshToken = youtubeConfig.RefreshToken;
LiveChatId = youtubeConfig.LiveChatId;
YouTubeEmailId = youtubeConfig.ChannelEmail;
Expand Down
10 changes: 9 additions & 1 deletion src/TagzApp.Web/Areas/Admin/Pages/YouTubeChat.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.Extensions.Options;
using TagzApp.Communication;
using TagzApp.Providers.YouTubeChat;
using TagzApp.Storage.Postgres.ApplicationConfiguration;
using TagzApp.Web.Data;
using TagzApp.Web.Services;

Expand All @@ -17,6 +18,7 @@ public class YouTubeChatModel : PageModel
private readonly IApplicationConfigurationRepository _Repository;
private readonly ApplicationConfiguration _AppConfiguration;
private readonly UserManager<TagzAppUser> _UserManager;
private readonly IConfigurationRoot? _ConfigurationRoot;
private YouTubeChatApplicationConfiguration? _YouTubeChatConfiguration;
private YouTubeChatProvider _Provider;
private IEnumerable<YouTubeBroadcast> _Broadcasts = Enumerable.Empty<YouTubeBroadcast>();
Expand All @@ -25,14 +27,17 @@ public YouTubeChatModel(
IMessagingService messagingService,
IApplicationConfigurationRepository repository,
IOptions<ApplicationConfiguration> appConfiguration,
UserManager<TagzAppUser> userManager)
UserManager<TagzAppUser> userManager,
IConfiguration configurationRoot)
{

var providers = (messagingService as BaseProviderManager).Providers;
_Provider = providers.FirstOrDefault(p => p.Id == "YOUTUBE-CHAT") as YouTubeChatProvider;
_Repository = repository;
_AppConfiguration = appConfiguration.Value;
_UserManager = userManager;
_ConfigurationRoot = configurationRoot as IConfigurationRoot;


if (!string.IsNullOrEmpty(_AppConfiguration.YouTubeChatConfiguration.Replace("{}", "")))
{
Expand Down Expand Up @@ -143,6 +148,9 @@ public async Task<IActionResult> OnPostAsync()
_AppConfiguration.YouTubeChatConfiguration = JsonSerializer.Serialize(_YouTubeChatConfiguration);
await _Repository.SetValues(_AppConfiguration);

var thisProvider = _ConfigurationRoot.Providers.OfType<ApplicationConfigurationProvider>().First();
thisProvider.Reload();

return RedirectToPage("youtubechat", new { Area = "Admin" });

}
Expand Down
3 changes: 3 additions & 0 deletions src/TagzApp.Web/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
"ChannelName": "csharpfritz",
"Activated": true
},
"youtubechat": {
"Activated": true
},
"twitter": {
"Activated": false,
"BaseAddress": "https://api.twitter.com",
Expand Down