Allow attaching embeds alongside a file upload. #978
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
God damn Discord is a mess.
Didn't actually need to change this, whoops.
foxbot
requested changes
Mar 11, 2018
| @@ -29,6 +37,17 @@ public UploadFileParams(Stream file) | |||
| d["tts"] = IsTTS.Value.ToString(); | |||
| if (Nonce.IsSpecified) | |||
| d["nonce"] = Nonce.Value; | |||
| if (Embed.IsSpecified) | |||
| { | |||
| var sb = new StringBuilder(256); | |||
There was a problem hiding this comment.
Is there any cleaner approach here? The DefaultRestClient seems to support serializing Streams here, could use a MemoryStream+StreamWriter instead?
There was a problem hiding this comment.
Not really, the embed data needs to be URL encoded, something I'm not sure I can do from a MemoryStream without even more mess
|
|
||
| namespace Discord.API.Rest | ||
| { | ||
| internal class UploadFileParams | ||
| { | ||
| // Fuckin Discord man. |
There was a problem hiding this comment.
i'd replace the sentimental comments with something more informational, like "needed to serialize embeds" or something
| using (TextWriter text = new StringWriter(sb, CultureInfo.InvariantCulture)) | ||
| using (JsonWriter writer = new JsonTextWriter(text)) | ||
| { | ||
| // I apologise for the mess I've created here, god damn is this annoying. |
There was a problem hiding this comment.
don't apologize, that's what git blame is for
| using (JsonWriter writer = new JsonTextWriter(text)) | ||
| { | ||
| // I apologise for the mess I've created here, god damn is this annoying. | ||
| _serializer.Serialize(writer, new Dictionary<string, object>() { { "embed", Embed.Value } }); |
There was a problem hiding this comment.
I believe we generally prefer Dictionary-initializer style (["key"] = "value")
foxbot
added a commit
that referenced
this pull request
Mar 13, 2018
commit a8bafb9 Merge: f38dd4c 7e04285 Author: WamWooWam <wamwoowam@gmail.com> Date: Mon Mar 12 08:05:52 2018 +0000 Merge branch 'dev' of https://github.com/WamWooWam/Discord.Net into dev commit f38dd4c Author: WamWooWam <wamwoowam@gmail.com> Date: Mon Mar 12 08:05:49 2018 +0000 Cleaned up & fixed code style. commit 7e04285 Author: Thomas May <wamwoowam@gmail.com> Date: Sun Mar 11 14:11:28 2018 +0000 Revert changes to DefaultRestClient Didn't actually need to change this, whoops. commit 3f5b2c8 Author: WamWooWam <wamwoowam@gmail.com> Date: Sat Mar 10 19:30:44 2018 +0000 Enabled embeds alongside uploaded files. God damn Discord is a mess. Co-authored-by: WamWooWam <wamwoowam@gmail.com>
|
Merged via e9f9b48, thanks! |
FiniteReality
pushed a commit
to FiniteReality/Discord.Net
that referenced
this pull request
May 5, 2018
commit a8bafb9 Merge: f38dd4c 7e04285 Author: WamWooWam <wamwoowam@gmail.com> Date: Mon Mar 12 08:05:52 2018 +0000 Merge branch 'dev' of https://github.com/WamWooWam/Discord.Net into dev commit f38dd4c Author: WamWooWam <wamwoowam@gmail.com> Date: Mon Mar 12 08:05:49 2018 +0000 Cleaned up & fixed code style. commit 7e04285 Author: Thomas May <wamwoowam@gmail.com> Date: Sun Mar 11 14:11:28 2018 +0000 Revert changes to DefaultRestClient Didn't actually need to change this, whoops. commit 3f5b2c8 Author: WamWooWam <wamwoowam@gmail.com> Date: Sat Mar 10 19:30:44 2018 +0000 Enabled embeds alongside uploaded files. God damn Discord is a mess. Co-authored-by: WamWooWam <wamwoowam@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Abstract
This PR adds support for attaching embeds alongside file uploads, hopefully fixing #796.
Additions
Added an
Embedparameter toIMessageChannel#SendFileAsyncand modified the rest of the code handling this to allow it, as such it should work now in most cases.Drawbacks
This is, naturally, a breaking change, which may cause issues for people passing
RequestOptionsto these methods, but shouldn't effect anyone else.