Browse Source

move SpoilerPrefix const outside of interface

pull/1255/head
Chris Johnston 6 years ago
parent
commit
900308eeeb
3 changed files with 7 additions and 8 deletions
  1. +0
    -5
      src/Discord.Net.Core/Entities/Messages/IAttachment.cs
  2. +5
    -1
      src/Discord.Net.Core/Extensions/AttachmentExtensions.cs
  3. +2
    -2
      src/Discord.Net.Rest/API/Rest/UploadFileParams.cs

+ 0
- 5
src/Discord.Net.Core/Entities/Messages/IAttachment.cs View File

@@ -5,11 +5,6 @@ namespace Discord
/// </summary> /// </summary>
public interface IAttachment public interface IAttachment
{ {
/// <summary>
/// The prefix applied to files to indicate that it is a spoiler.
/// </summary>
public const string SpoilerPrefix = "SPOILER_";

/// <summary> /// <summary>
/// Gets the ID of this attachment. /// Gets the ID of this attachment.
/// </summary> /// </summary>


+ 5
- 1
src/Discord.Net.Core/Extensions/AttachmentExtensions.cs View File

@@ -2,10 +2,14 @@ namespace Discord
{ {
public static class AttachmentExtensions public static class AttachmentExtensions
{ {
/// <summary>
/// The prefix applied to files to indicate that it is a spoiler.
/// </summary>
public const string SpoilerPrefix = "SPOILER_";
/// <summary> /// <summary>
/// Gets whether the message's attachments are spoilers or not. /// Gets whether the message's attachments are spoilers or not.
/// </summary> /// </summary>
public static bool IsSpoiler(this IAttachment attachment) public static bool IsSpoiler(this IAttachment attachment)
=> attachment.Filename.StartsWith(IAttachment.SpoilerPrefix);
=> attachment.Filename.StartsWith(SpoilerPrefix);
} }
} }

+ 2
- 2
src/Discord.Net.Rest/API/Rest/UploadFileParams.cs View File

@@ -30,8 +30,8 @@ namespace Discord.API.Rest
{ {
var d = new Dictionary<string, object>(); var d = new Dictionary<string, object>();
var filename = Filename.GetValueOrDefault("unknown.dat"); var filename = Filename.GetValueOrDefault("unknown.dat");
if (IsSpoiler && !filename.StartsWith(IAttachment.SpoilerPrefix))
filename = filename.Insert(0, IAttachment.SpoilerPrefix);
if (IsSpoiler && !filename.StartsWith(AttachmentExtensions.SpoilerPrefix))
filename = filename.Insert(0, AttachmentExtensions.SpoilerPrefix);
d["file"] = new MultipartFile(File, filename); d["file"] = new MultipartFile(File, filename);


var payload = new Dictionary<string, object>(); var payload = new Dictionary<string, object>();


Loading…
Cancel
Save