From ea066c2612973a24c06e1bd112ffe60b1c8afef3 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 8 Sep 2018 11:53:46 -0400 Subject: [PATCH 1/2] Fix IsUpdatesChannel missing from ToApi() --- src/Tgstation.Server.Host/Models/ChatChannel.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tgstation.Server.Host/Models/ChatChannel.cs b/src/Tgstation.Server.Host/Models/ChatChannel.cs index 2fe4de19cb..17e1d0c367 100644 --- a/src/Tgstation.Server.Host/Models/ChatChannel.cs +++ b/src/Tgstation.Server.Host/Models/ChatChannel.cs @@ -29,6 +29,7 @@ namespace Tgstation.Server.Host.Models DiscordChannelId = DiscordChannelId, IsAdminChannel = IsAdminChannel, IsWatchdogChannel = IsWatchdogChannel, + IsUpdatesChannel = IsUpdatesChannel, IrcChannel = IrcChannel }; } From 90a785a9bde2a23bd1d7c05711ed736a1d8eed43 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 8 Sep 2018 11:54:14 -0400 Subject: [PATCH 2/2] Fix InvalidOperationException when updating chat bots without setting Provider property --- src/Tgstation.Server.Host/Controllers/ChatController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/ChatController.cs b/src/Tgstation.Server.Host/Controllers/ChatController.cs index 7a2d765a54..baca707185 100644 --- a/src/Tgstation.Server.Host/Controllers/ChatController.cs +++ b/src/Tgstation.Server.Host/Controllers/ChatController.cs @@ -180,7 +180,7 @@ namespace Tgstation.Server.Host.Controllers if (model == null) throw new ArgumentNullException(nameof(model)); - if (!model.ValidateProviderChannelTypes()) + if (model.Provider.HasValue && !model.ValidateProviderChannelTypes()) return BadRequest(new ErrorMessage { Message = "One or more of channels aren't formatted correctly for the given provider!" }); var query = DatabaseContext.ChatBots.Where(x => x.InstanceId == Instance.Id && x.Id == model.Id).Include(x => x.Channels);