From 70a85ab1f49ef8218d735f542d488d53e8e5b7be Mon Sep 17 00:00:00 2001 From: Chris Johnston Date: Thu, 31 Jan 2019 16:44:35 -0800 Subject: [PATCH] move extension method to be under core project, make spoiler prefix a const --- .../Extensions/MessageExtensions.cs | 5 ----- src/Discord.Net.Core/Entities/Messages/IAttachment.cs | 5 +++++ .../Extensions/AttachmentExtensions.cs | 11 +++++++++++ src/Discord.Net.Rest/API/Rest/UploadFileParams.cs | 4 ++-- 4 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 src/Discord.Net.Core/Extensions/AttachmentExtensions.cs diff --git a/src/Discord.Net.Commands/Extensions/MessageExtensions.cs b/src/Discord.Net.Commands/Extensions/MessageExtensions.cs index c4e4a2c07..f880e1d98 100644 --- a/src/Discord.Net.Commands/Extensions/MessageExtensions.cs +++ b/src/Discord.Net.Commands/Extensions/MessageExtensions.cs @@ -60,10 +60,5 @@ namespace Discord.Commands } return false; } - /// - /// Gets wheter the message's attachments are spoilers or not. - /// - public static bool IsSpoiler(this IAttachment attachment) - => attachment.Filename.StartsWith("SPOILER_"); } } diff --git a/src/Discord.Net.Core/Entities/Messages/IAttachment.cs b/src/Discord.Net.Core/Entities/Messages/IAttachment.cs index 655777998..938ad4495 100644 --- a/src/Discord.Net.Core/Entities/Messages/IAttachment.cs +++ b/src/Discord.Net.Core/Entities/Messages/IAttachment.cs @@ -5,6 +5,11 @@ namespace Discord /// public interface IAttachment { + /// + /// The prefix applied to files to indicate that it is a spoiler. + /// + public const string SpoilerPrefix = "SPOILER_"; + /// /// Gets the ID of this attachment. /// diff --git a/src/Discord.Net.Core/Extensions/AttachmentExtensions.cs b/src/Discord.Net.Core/Extensions/AttachmentExtensions.cs new file mode 100644 index 000000000..8a9e18dbf --- /dev/null +++ b/src/Discord.Net.Core/Extensions/AttachmentExtensions.cs @@ -0,0 +1,11 @@ +namespace Discord +{ + public static class AttachmentExtensions + { + /// + /// Gets wheter the message's attachments are spoilers or not. + /// + public static bool IsSpoiler(this IAttachment attachment) + => attachment.Filename.StartsWith(IAttachment.SpoilerPrefix); + } +} diff --git a/src/Discord.Net.Rest/API/Rest/UploadFileParams.cs b/src/Discord.Net.Rest/API/Rest/UploadFileParams.cs index 93d9247e9..28772356d 100644 --- a/src/Discord.Net.Rest/API/Rest/UploadFileParams.cs +++ b/src/Discord.Net.Rest/API/Rest/UploadFileParams.cs @@ -30,8 +30,8 @@ namespace Discord.API.Rest { var d = new Dictionary(); var filename = Filename.GetValueOrDefault("unknown.dat"); - if (IsSpoiler && !filename.StartsWith("SPOILER_")) - filename = filename.Insert(0, "SPOILER_"); + if (IsSpoiler && !filename.StartsWith(IAttachment.SpoilerPrefix)) + filename = filename.Insert(0, IAttachment.SpoilerPrefix); d["file"] = new MultipartFile(File, filename); var payload = new Dictionary();