Fixed a few more nullRef warnings and code cleanup

ErisApps · Oct 27, 2020 · fc79af3 · fc79af3
1 parent 4ce6494
commit fc79af3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/ChatCore/ChatCoreInstance.cs b/ChatCore/ChatCoreInstance.cs
@@ -66,7 +66,7 @@ public static ChatCoreInstance Create()
 	                .AddSingleton<IChatService>(x =>
 		                new ChatServiceMultiplexer(
 			                x.GetService<ILogger<ChatServiceMultiplexer>>(),
-			                new List<IChatService>()
+			                new List<IChatService>
 			                {
 				                x.GetService<TwitchService>()
 			                }

diff --git a/ChatCore/Config/ObjectSerializer.cs b/ChatCore/Config/ObjectSerializer.cs
@@ -249,7 +249,7 @@ public void Save(object obj, string path)
                 File.Move(path, backupPath);
             }
 
-            string lastConfigSection = null!;
+            string? lastConfigSection = null;
             var serializedClass = new List<string>();
 
             if (obj.GetType().GetCustomAttribute(typeof(ConfigHeader)) is ConfigHeader configHeader)
@@ -284,7 +284,7 @@ public void Save(object obj, string path)
                     lastConfigSection = configSection.Name;
                 }
 
-                var configMeta = (ConfigMeta)fieldInfo.GetCustomAttribute(typeof(ConfigMeta));
+                var configMeta = (ConfigMeta?)fieldInfo.GetCustomAttribute(typeof(ConfigMeta));
                 var valueStr = "";
                 try
                 {

diff --git a/ChatCore/Interfaces/IShortcodeAuthProvider.cs b/ChatCore/Interfaces/IShortcodeAuthProvider.cs
@@ -7,6 +7,6 @@ namespace ChatCore.Interfaces
     public interface IShortcodeAuthProvider
     {
         Task<OAuthShortcodeRequest> RequestShortcode();
-        Task<OAuthCredentials> AwaitUserApproval(CancellationToken cancellationToken, OAuthShortcodeRequest request = null, bool launchBrowserProcess = false);
+        Task<OAuthCredentials> AwaitUserApproval(CancellationToken cancellationToken, OAuthShortcodeRequest? request = null, bool launchBrowserProcess = false);
     }
 }
diff --git a/ChatCore/Models/Emoji.cs b/ChatCore/Models/Emoji.cs
@@ -16,6 +16,7 @@ public class Emoji : IChatEmote
         public ImageRect UVs { get; internal set; }
 
         public Emoji() { }
+
         public Emoji(string json)
         {
             var obj = JSON.Parse(json);
@@ -28,6 +29,7 @@ public Emoji(string json)
             if (obj.TryGetKey(nameof(Type), out var type)) { Type = Enum.TryParse<EmoteType>(type.Value, out var typeEnum) ? typeEnum : EmoteType.SingleImage; }
             if (obj.TryGetKey(nameof(UVs), out var uvs)) { UVs = new ImageRect(uvs.Value); }
         }
+
         public JSONObject ToJson()
         {
             var obj = new JSONObject();

diff --git a/ChatCore/Models/Twitch/TwitchChannel.cs b/ChatCore/Models/Twitch/TwitchChannel.cs
@@ -22,7 +22,7 @@ public JSONObject ToJson()
         {
             var obj = new JSONObject();
             obj.Add(nameof(Id), new JSONString(Id));
-            obj.Add(nameof(Roomstate), Roomstate.ToJson());
+            obj.Add(nameof(Roomstate), Roomstate!.ToJson());
             return obj;
         }
     }

diff --git a/ChatCore/Services/FrwTwemojiParser.cs b/ChatCore/Services/FrwTwemojiParser.cs
@@ -29,7 +29,7 @@ public List<IChatEmote> FindEmojis(string str)
                 {
                     continue;
                 }
-                var emoji = new Emoji()
+                var emoji = new Emoji
                 {
                     Id = $"Emoji_{unicodeStr}",
                     Name = match.Value,

diff --git a/ChatCore/Services/Twitch/TwitchService.cs b/ChatCore/Services/Twitch/TwitchService.cs
@@ -110,8 +110,8 @@ internal void Stop()
 	            _isStarted = false;
 	            _channels.Clear();
 
-	            LoggedInUser = null!;
-	            _loggedInUsername = null!;
+	            LoggedInUser = null;
+	            _loggedInUsername = null;
 
 	            _websocketService.Disconnect();
             }
@@ -197,7 +197,7 @@ private void _websocketService_OnMessageReceived(Assembly assembly, string rawMe
                                 _channels[twitchMessage.Channel.Id] = twitchMessage.Channel;
                                 _dataProvider.TryRequestChannelResources(twitchMessage.Channel.AsTwitchChannel()!, resources =>
                                 {
-                                    ChannelResourceDataCached?.InvokeAll(assembly!, this, twitchMessage.Channel, resources);
+                                    ChannelResourceDataCached.InvokeAll(assembly!, this, twitchMessage.Channel, resources);
                                 });
                                 RoomStateUpdatedCallbacks?.InvokeAll(assembly!, this, twitchMessage.Channel, _logger);
                                 continue;