Merge pull request #108 from nullinside-development-group/feat/configure

Feat/configure

Author: ProgrammingByPermutation

src/TwitchStreamingTools/Services/TwitchAccountService.cs

@@ -42,7 +42,7 @@ public TwitchAccountService(ITwitchClientProxy twitchClient, IConfiguration conf
       Interval = TimeSpan.FromSeconds(5)
     };
 
-    _timer.Tick += async (_, _) => await OnCheckCredentials();
+    _timer.Tick += async (_, _) => await OnCheckCredentials().ConfigureAwait(false);
     _ = OnCheckCredentials();
   }
 
@@ -72,7 +72,7 @@ public async Task UpdateCredentials(string bearer, string refresh, DateTime expi
 
     User? user = null;
     try {
-      user = await twitchApi.GetUser();
+      user = await twitchApi.GetUser().ConfigureAwait(false);
     }
     catch {
       // Do nothing
@@ -86,7 +86,7 @@ public async Task UpdateCredentials(string bearer, string refresh, DateTime expi
     _twitchClient.TwitchOAuthToken = bearer;
 
     OnCredentialsChanged?.Invoke(oauth);
-    await OnCheckCredentials();
+    await OnCheckCredentials().ConfigureAwait(false);
   }
 
   /// <inheritdoc />
@@ -113,11 +113,11 @@ private async Task OnCheckCredentials() {
 
     try {
       // Refresh the token
-      await DoTokenRefreshIfNearExpiration();
+      await DoTokenRefreshIfNearExpiration().ConfigureAwait(false);
 
       // Make sure the new token works
       var twitchApi = new TwitchApiWrapper();
-      string? username = (await twitchApi.GetUser())?.Login;
+      string? username = (await twitchApi.GetUser().ConfigureAwait(false))?.Login;
 
       // Update the credentials
       CredentialsAreValid = !string.IsNullOrWhiteSpace(username);
@@ -157,7 +157,7 @@ private async Task DoTokenRefreshIfNearExpiration() {
     }
 
     // Refresh the token
-    await twitchApi.RefreshAccessToken();
+    await twitchApi.RefreshAccessToken().ConfigureAwait(false);
 
     // Update the configuration
     _configuration.OAuth = new TwitchAccessToken {

src/TwitchStreamingTools/TwitchStreamingTools.csproj.DotSettings

@@ -1,2 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib"
+                        xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                        xml:space="preserve">
 	<s:String x:Key="/Default/CodeInspection/Daemon/ConfigureAwaitAnalysisMode/@EntryValue">Library</s:String></wpf:ResourceDictionary>

src/TwitchStreamingTools/Utilities/TwitchApiWrapper.cs

@@ -42,17 +42,17 @@ public TwitchApiWrapper() : base(
     try {
       // If the secret is specified, then this isn't using our API to authenticate, it's using the twitch api directly.
       if (!string.IsNullOrWhiteSpace(TwitchAppConfig?.ClientSecret)) {
-        await base.RefreshAccessToken(token);
+        await base.RefreshAccessToken(token).ConfigureAwait(false);
       }
 
       using var client = new HttpClient();
       string url = $"{Constants.API_SITE_DOMAIN}/api/v1/user/twitch-login/twitch-streaming-tools";
       var request = new HttpRequestMessage(HttpMethod.Post, url);
       var values = new Dictionary<string, string> { { "refreshToken", OAuth?.RefreshToken ?? string.Empty } };
       var content = new FormUrlEncodedContent(values);
-      using HttpResponseMessage response = await client.PostAsync(request.RequestUri, content, token);
+      using HttpResponseMessage response = await client.PostAsync(request.RequestUri, content, token).ConfigureAwait(false);
       response.EnsureSuccessStatusCode();
-      string responseBody = await response.Content.ReadAsStringAsync(token);
+      string responseBody = await response.Content.ReadAsStringAsync(token).ConfigureAwait(false);
       var oauthResp = JsonConvert.DeserializeObject<TwitchAccessToken>(responseBody);
       if (null == oauthResp) {
         return null;

src/TwitchStreamingTools/ViewModels/NewVersionWindowViewModel.cs

@@ -47,7 +47,7 @@ public NewVersionWindowViewModel() {
     // asynchronously determine the current version number.
     Task.Factory.StartNew(async () => {
       GithubLatestReleaseJson? version =
-        await GitHubUpdateManager.GetLatestVersion("nullinside-development-group", "twitch-streaming-tools");
+        await GitHubUpdateManager.GetLatestVersion("nullinside-development-group", "twitch-streaming-tools").ConfigureAwait(false);
 
       if (null == version) {
         return;

src/TwitchStreamingTools/ViewModels/Pages/AccountViewModel.cs

@@ -181,7 +181,7 @@ private async void OnCredentialsChanged(TwitchAccessToken? token) {
         ProfileImage = null;
         return;
       }
-      
+
       await LoadProfileImage().ConfigureAwait(false);
     }
     catch (Exception ex) {
@@ -286,14 +286,14 @@ private void ClearCredentials() {
       if (!Directory.Exists(PROFILE_IMAGE_FOLDER)) {
         Directory.CreateDirectory(PROFILE_IMAGE_FOLDER);
       }
-    
+
       // I don't think twitch usernames can have non-filepath friendly characters but might as well sanitize it anyway.
       string filename = SanitizeFilename(string.Format(PROFILE_IMAGE_FILENAME, user.Login));
       string imagePath = Path.Combine(PROFILE_IMAGE_FOLDER, filename);
-    
+
       // Save to disk
       await File.WriteAllBytesAsync(imagePath, imageBytes, token).ConfigureAwait(false);
-    
+
       // Return path to file, even though everyone already knows it.
       return imagePath;
     }, 10, token, TimeSpan.FromSeconds(1)).ConfigureAwait(false);

src/TwitchStreamingTools/ViewModels/Pages/SettingsView/TtsSkipUsernamesViewModel.cs

@@ -150,12 +150,12 @@ private async void UserListRefreshTimer_OnElapsed(object sender, ElapsedEventArg
         }
 
         try {
-          (string? id, string? username) userInfo = await api.GetUser(chat.TwitchChannel);
+          (string? id, string? username) userInfo = await api.GetUser(chat.TwitchChannel).ConfigureAwait(false);
           if (null == userInfo.id || null == loggedInUser?.Id) {
             continue;
           }
 
-          IEnumerable<Chatter> chatters = await api.GetChannelUsers(userInfo.id, loggedInUser.Id);
+          IEnumerable<Chatter> chatters = await api.GetChannelUsers(userInfo.id, loggedInUser.Id).ConfigureAwait(false);
           foreach (Chatter chatter in chatters) {
             usernames.Add(chatter.UserName.ToLowerInvariant());
           }

src/TwitchStreamingTools/Views/Pages/AccountView.axaml

@@ -30,8 +30,8 @@
                     VerticalContentAlignment="Top">
                 Login
             </Button>
-            <Border CornerRadius="100" Width="200" ClipToBounds="True">
-                <Image Source="{Binding ProfileImage}" Width="200" />
+            <Border CornerRadius="75" Width="150" ClipToBounds="True">
+                <Image Source="{Binding ProfileImage}" />
             </Border>
             <StackPanel IsVisible="{Binding HasValidOAuthToken}" Spacing="5">
                 <Grid>

src/TwitchStreamingTools/Views/WindowsTitleBar.axaml.cs

@@ -110,7 +110,7 @@ private async void SubscribeToWindowState() {
 
     while (hostWindow == null) {
       hostWindow = VisualRoot as Window;
-      await Task.Delay(50);
+      await Task.Delay(50).ConfigureAwait(false);
     }
 
     hostWindow.GetObservable(Window.WindowStateProperty).Subscribe(s => {