Browse Source

use consistent naming

pull/1255/head
Chris Johnston 6 years ago
parent
commit
f04242aab7
2 changed files with 5 additions and 5 deletions
  1. +4
    -4
      src/Discord.Net.Rest/API/Rest/UploadFileParams.cs
  2. +1
    -1
      src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs

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

@@ -19,7 +19,7 @@ namespace Discord.API.Rest
public Optional<string> Nonce { get; set; } public Optional<string> Nonce { get; set; }
public Optional<bool> IsTTS { get; set; } public Optional<bool> IsTTS { get; set; }
public Optional<Embed> Embed { get; set; } public Optional<Embed> Embed { get; set; }
public bool HasSpoiler { get; set; } = false;
public bool IsSpoiler { get; set; } = false;


public UploadFileParams(Stream file) public UploadFileParams(Stream file)
{ {
@@ -30,7 +30,7 @@ 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 (HasSpoiler && !filename.StartsWith("SPOILER_"))
if (IsSpoiler && !filename.StartsWith("SPOILER_"))
filename = filename.Insert(0, "SPOILER_"); filename = filename.Insert(0, "SPOILER_");
d["file"] = new MultipartFile(File, filename); d["file"] = new MultipartFile(File, filename);


@@ -43,8 +43,8 @@ namespace Discord.API.Rest
payload["nonce"] = Nonce.Value; payload["nonce"] = Nonce.Value;
if (Embed.IsSpecified) if (Embed.IsSpecified)
payload["embed"] = Embed.Value; payload["embed"] = Embed.Value;
if (HasSpoiler)
payload["hasSpoiler"] = HasSpoiler.ToString();
if (IsSpoiler)
payload["hasSpoiler"] = IsSpoiler.ToString();


var json = new StringBuilder(); var json = new StringBuilder();
using (var text = new StringWriter(json)) using (var text = new StringWriter(json))


+ 1
- 1
src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs View File

@@ -210,7 +210,7 @@ namespace Discord.Rest
public static async Task<RestUserMessage> SendFileAsync(IMessageChannel channel, BaseDiscordClient client, public static async Task<RestUserMessage> SendFileAsync(IMessageChannel channel, BaseDiscordClient client,
Stream stream, string filename, string text, bool isTTS, Embed embed, RequestOptions options, bool isSpoiler) Stream stream, string filename, string text, bool isTTS, Embed embed, RequestOptions options, bool isSpoiler)
{ {
var args = new UploadFileParams(stream) { Filename = filename, Content = text, IsTTS = isTTS, Embed = embed != null ? embed.ToModel() : Optional<API.Embed>.Unspecified, HasSpoiler = isSpoiler };
var args = new UploadFileParams(stream) { Filename = filename, Content = text, IsTTS = isTTS, Embed = embed != null ? embed.ToModel() : Optional<API.Embed>.Unspecified, IsSpoiler = isSpoiler };
var model = await client.ApiClient.UploadFileAsync(channel.Id, args, options).ConfigureAwait(false); var model = await client.ApiClient.UploadFileAsync(channel.Id, args, options).ConfigureAwait(false);
return RestUserMessage.Create(client, channel, client.CurrentUser, model); return RestUserMessage.Create(client, channel, client.CurrentUser, model);
} }


Loading…
Cancel
Save