From b7e0e2ab5860eb0707931eb460a788d0f6ab40c9 Mon Sep 17 00:00:00 2001 From: Nikita Petko Date: Thu, 27 Oct 2022 18:01:54 +0100 Subject: [PATCH] Update work queues. Add deprecation notice for RbxDiscordUsersClient. --- .../WorkQueues/RenderingWorkQueue.cs | 24 +++++++++++++------ .../WorkQueues/RenderingWorkQueueV2.cs | 15 ++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/Shared/MFDLabs.GridTasks/WorkQueues/RenderingWorkQueue.cs b/Shared/MFDLabs.GridTasks/WorkQueues/RenderingWorkQueue.cs index 4b5931f8..d00e0b4f 100644 --- a/Shared/MFDLabs.GridTasks/WorkQueues/RenderingWorkQueue.cs +++ b/Shared/MFDLabs.GridTasks/WorkQueues/RenderingWorkQueue.cs @@ -222,6 +222,7 @@ private static void ProcessItem(SocketTaskRequest item) if (contentArray.Length == 0) { +#if FEATURE_RBXDISCORDUSERS_CLIENT isAuthorCheck = true; var nullableUserId = message.Author.GetRobloxId(); @@ -238,6 +239,10 @@ private static void ProcessItem(SocketTaskRequest item) } userId = nullableUserId.Value; +#else + message.Reply("Calling the render command like this is deprecated until further notice. Please see https://github.com/mfdlabs/grid-bot-support/discussions/13."); + return; +#endif } string username = null; @@ -249,6 +254,7 @@ private static void ProcessItem(SocketTaskRequest item) if (message.MentionedUsers.Count > 0) { +#if FEATURE_RBXDISCORDUSERS_CLIENT var user = message.MentionedUsers.ElementAt(0); // we have mentioned a user. var nullableUserId = user.GetRobloxId(); @@ -265,6 +271,10 @@ private static void ProcessItem(SocketTaskRequest item) } userId = nullableUserId.Value; +#else + message.Reply("Calling the render command like this is deprecated until further notice. Please see https://github.com/mfdlabs/grid-bot-support/discussions/13."); + return; +#endif } else { @@ -346,13 +356,13 @@ private static void ProcessItem(SocketTaskRequest item) } Logger.Singleton.Info( - "Trying to render the character for the user '{0}' with the place '{1}', " + - "and the dimensions of {2}x{3}", - userId, - global::MFDLabs.Grid.Bot.Properties.Settings.Default.RenderPlaceID, - global::MFDLabs.Grid.Bot.Properties.Settings.Default.RenderSizeX, - global::MFDLabs.Grid.Bot.Properties.Settings.Default.RenderSizeY - ); + "Trying to render the character for the user '{0}' with the place '{1}', " + + "and the dimensions of {2}x{3}", + userId, + global::MFDLabs.Grid.Bot.Properties.Settings.Default.RenderPlaceID, + global::MFDLabs.Grid.Bot.Properties.Settings.Default.RenderSizeX, + global::MFDLabs.Grid.Bot.Properties.Settings.Default.RenderSizeY + ); // get a stream and temp filename var (stream, fileName) = GridServerCommandUtility.RenderUser( diff --git a/Shared/MFDLabs.GridTasks/WorkQueues/RenderingWorkQueueV2.cs b/Shared/MFDLabs.GridTasks/WorkQueues/RenderingWorkQueueV2.cs index 30d24604..d8b669ca 100644 --- a/Shared/MFDLabs.GridTasks/WorkQueues/RenderingWorkQueueV2.cs +++ b/Shared/MFDLabs.GridTasks/WorkQueues/RenderingWorkQueueV2.cs @@ -21,6 +21,7 @@ using MFDLabs.Reflection.Extensions; using MFDLabs.ErrorHandling.Extensions; using MFDLabs.Grid.Bot.PerformanceMonitors; +using System.ServiceModel.Channels; namespace MFDLabs.Grid.Bot.WorkQueues { @@ -231,6 +232,8 @@ ref bool failure case "discord_user": +#if FEATURE_RBXDISCORDUSERS_CLIENT + var userRef = (IUser)subCommand.GetOptionValue("user"); if (userRef == null) { @@ -259,8 +262,15 @@ ref bool failure break; +#else + item.RespondEphemeralPing("Calling the render command like this is deprecated until further notice. Please see https://github.com/mfdlabs/grid-bot-support/discussions/13."); + break; +#endif + case "self": +#if FEATURE_RBXDISCORDUSERS_CLIENT + var nullableUserIdFromAuthor = item.User.GetRobloxId(); if (!nullableUserIdFromAuthor.HasValue) @@ -277,6 +287,11 @@ ref bool failure userId = nullableUserIdFromAuthor.Value; break; + +#else + item.RespondEphemeralPing("Calling the render command like this is deprecated until further notice. Please see https://github.com/mfdlabs/grid-bot-support/discussions/13."); + break; +#endif } return userId;