initial interface changes

src/Discord.Net.Core/Entities/Channels/IMessageChannel.cs

@@ -113,6 +113,66 @@ namespace Discord
         ///     contains the sent message.
         /// </returns>
         Task<IUserMessage> SendFileAsync(Stream stream, string filename, string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent component = null, ISticker[] stickers = null, Embed[] embeds = null);
+        /// <summary>
+        ///     Sends a file to this message channel with an optional caption.
+        /// </summary>
+        /// <remarks>
+        ///     This method sends a file as if you are uploading an attachment directly from your Discord client.
+        ///     <note>
+        ///         If you wish to upload an image and have it embedded in a <see cref="Discord.EmbedType.Rich"/> embed,
+        ///         you may upload the file and refer to the file with "attachment://filename.ext" in the
+        ///         <see cref="Discord.EmbedBuilder.ImageUrl"/>. See the example section for its usage.
+        ///     </note>
+        /// </remarks>
+        /// <param name="attachment">The attachment containing the file and description.</param>
+        /// <param name="text">The message to be sent.</param>
+        /// <param name="isTTS">Whether the message should be read aloud by Discord or not.</param>
+        /// <param name="embed">The <see cref="Discord.EmbedType.Rich"/> <see cref="Embed"/> to be sent.</param>
+        /// <param name="options">The options to be used when sending the request.</param>
+        /// <param name="isSpoiler">Whether the message attachment should be hidden as a spoiler.</param>
+        /// <param name="allowedMentions">
+        ///     Specifies if notifications are sent for mentioned users and roles in the message <paramref name="text"/>.
+        ///     If <c>null</c>, all mentioned roles and users will be notified.
+        /// </param>
+        /// <param name="messageReference">The message references to be included. Used to reply to specific messages.</param>
+        /// <param name="component">The message components to be included with this message. Used for interactions.</param>
+        /// <param name="stickers">A collection of stickers to send with the file.</param>
+        /// <param name="embeds">A array of <see cref="Embed"/>s to send with this response. Max 10.</param>
+        /// <returns>
+        ///     A task that represents an asynchronous send operation for delivering the message. The task result
+        ///     contains the sent message.
+        /// </returns>
+        Task<IUserMessage> SendFileAsync(FileAttachment attachment, string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent component = null, ISticker[] stickers = null, Embed[] embeds = null);
+        /// <summary>
+        ///     Sends a collection of files to this message channel.
+        /// </summary>
+        /// <remarks>
+        ///     This method sends files as if you are uploading attachments directly from your Discord client.
+        ///     <note>
+        ///         If you wish to upload an image and have it embedded in a <see cref="Discord.EmbedType.Rich"/> embed,
+        ///         you may upload the file and refer to the file with "attachment://filename.ext" in the
+        ///         <see cref="Discord.EmbedBuilder.ImageUrl"/>. See the example section for its usage.
+        ///     </note>
+        /// </remarks>
+        /// <param name="attachments">A collection of attachments to upload.</param>
+        /// <param name="text">The message to be sent.</param>
+        /// <param name="isTTS">Whether the message should be read aloud by Discord or not.</param>
+        /// <param name="embed">The <see cref="Discord.EmbedType.Rich"/> <see cref="Embed"/> to be sent.</param>
+        /// <param name="options">The options to be used when sending the request.</param>
+        /// <param name="isSpoiler">Whether the message attachment should be hidden as a spoiler.</param>
+        /// <param name="allowedMentions">
+        ///     Specifies if notifications are sent for mentioned users and roles in the message <paramref name="text"/>.
+        ///     If <c>null</c>, all mentioned roles and users will be notified.
+        /// </param>
+        /// <param name="messageReference">The message references to be included. Used to reply to specific messages.</param>
+        /// <param name="component">The message components to be included with this message. Used for interactions.</param>
+        /// <param name="stickers">A collection of stickers to send with the file.</param>
+        /// <param name="embeds">A array of <see cref="Embed"/>s to send with this response. Max 10.</param>
+        /// <returns>
+        ///     A task that represents an asynchronous send operation for delivering the message. The task result
+        ///     contains the sent message.
+        /// </returns>
+        Task<IUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent component = null, ISticker[] stickers = null, Embed[] embeds = null);
 
         /// <summary>
         ///     Gets a message from this message channel.

src/Discord.Net.Core/Entities/Messages/FileAttachment.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Discord
+{
+    public struct FileAttachment : IDisposable
+    {
+        public string FileName { get; set; }
+        public string Description { get; set; }
+
+#pragma warning disable IDISP008
+        public Stream Stream { get; }
+#pragma warning restore IDISP008 
+
+        private bool _isDisposed;
+
+        /// <summary>
+        ///     Creates a file attachment from a stream.
+        /// </summary>
+        /// <param name="stream">The stream to create the attachment from.</param>
+        /// <param name="fileName">The name of the attachment.</param>
+        /// <param name="description">The description of the attachment.</param>
+        public FileAttachment(Stream stream, string fileName, string description = null)
+        {
+            _isDisposed = false;
+            FileName = fileName;
+            Description = description;
+            Stream = stream;
+        }
+
+        /// <summary>
+        ///     Create the file attachment from a file path.
+        /// </summary>
+        /// <remarks>
+        ///     This file path is NOT validated and is passed directly into a
+        ///     <see cref="File.OpenRead"/>.
+        /// </remarks>
+        /// <param name="path">The path to the file.</param>
+        /// <exception cref="System.ArgumentException">
+        /// <paramref name="path" /> is a zero-length string, contains only white space, or contains one or more invalid
+        /// characters as defined by <see cref="Path.GetInvalidPathChars"/>.
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException"><paramref name="path" /> is <c>null</c>.</exception>
+        /// <exception cref="PathTooLongException">
+        /// The specified path, file name, or both exceed the system-defined maximum length. For example, on
+        /// Windows-based platforms, paths must be less than 248 characters, and file names must be less than 260
+        /// characters.
+        /// </exception>
+        /// <exception cref="System.NotSupportedException"><paramref name="path" /> is in an invalid format.</exception>
+        /// <exception cref="DirectoryNotFoundException">
+        /// The specified <paramref name="path"/> is invalid, (for example, it is on an unmapped drive).
+        /// </exception>
+        /// <exception cref="System.UnauthorizedAccessException">
+        /// <paramref name="path" /> specified a directory.-or- The caller does not have the required permission.
+        /// </exception>
+        /// <exception cref="FileNotFoundException">The file specified in <paramref name="path" /> was not found.
+        /// </exception>
+        /// <exception cref="IOException">An I/O error occurred while opening the file. </exception>
+        public FileAttachment(string path, string description = null)
+        {
+            _isDisposed = false;
+            Stream = File.OpenRead(path);
+            FileName = Path.GetFileName(path);
+            Description = description;
+        }
+
+        public void Dispose()
+        {
+            if (!_isDisposed)
+            {
+                Stream?.Dispose();
+                _isDisposed = true;
+            }
+        }
+    }
+}