Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support sending multiple embeds #1239

Merged
merged 7 commits into from
Jul 13, 2021
Merged

Support sending multiple embeds #1239

merged 7 commits into from
Jul 13, 2021

Conversation

reinacchi
Copy link
Contributor

https://discord.com/developers/docs/resources/channel#create-message-jsonform-params
https://discord.com/developers/docs/resources/channel#edit-message-jsonform-params

Discord has deprecated embed when creating/editing messages and has changed to embeds. It's better to switch from the regular embed to embeds before Discord might remove them in the future API version 👍🏻

Linker-123
Linker-123 reviewed Jul 4, 2021
View reviewed changes
lib/Client.js
@@ -601,8 +602,10 @@ class Client extends EventEmitter {
};
} else if(content.content !== undefined && typeof content.content !== "string") {
content.content = "" + content.content;
} else if(content.content === undefined && !content.embed && !file) {
return Promise.reject(new Error("No content, file, or embed"));
} else if(content.content === undefined && !content.embed && !content.embeds && !file) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should probably check if embeds length is above 0.

bsian03
bsian03 requested changes Jul 4, 2021
View reviewed changes
lib/Client.js Outdated Show resolved Hide resolved
lib/Client.js Show resolved Hide resolved
@reinacchi reinacchi requested a review from bsian03 July 4, 2021 15:09
bsian03
bsian03 requested changes Jul 5, 2021
View reviewed changes
Copy link
Collaborator

@bsian03 bsian03 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just a quick look through, I may have other things to nitpick later

lib/Client.js Outdated Show resolved Hide resolved
@bsian03 bsian03 added the Discord label Jul 6, 2021
bsian03
bsian03 requested changes Jul 7, 2021
View reviewed changes
lib/Client.js Outdated Show resolved Hide resolved
reinacchi
reinacchi commented Jul 7, 2021
View reviewed changes
Copy link
Contributor Author

@reinacchi reinacchi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, kindly correct me if I made another mistake again.

@bsian03 bsian03 changed the title Deprecate embed Support sending multiple embeds Jul 7, 2021
@Nico105 Nico105 mentioned this pull request Jul 8, 2021
Closed
@JustCat80 JustCat80 mentioned this pull request Jul 11, 2021
Closed
DonovanDMC added a commit to DonovanDMC/eris that referenced this pull request Jul 12, 2021
@DonovanDMC
Add in abalabahaha#1239
59b7559
@JustCat80 JustCat80 mentioned this pull request Jul 12, 2021
Merged
bsian03 added a commit to bsian03/eris that referenced this pull request Jul 12, 2021
@bsian03
Support sending multiple embeds within a message (abalabahaha#1239) (a…
7672741 
…balabahaha#1244)

Co-authored-by: NotMarx <73813638+NotMarx@users.noreply.github.com>
Co-authored-by: gegdev <gegthedev@gmail.com>
bsian03 added a commit to bsian03/eris that referenced this pull request Jul 12, 2021
@bsian03 @reinacchi @gegdev
Support sending multiple embeds within a message (abalabahaha#1239) (a…
62e98eb 
…balabahaha#1244)

Co-authored-by: NotMarx <73813638+NotMarx@users.noreply.github.com>
Co-authored-by: gegdev <gegthedev@gmail.com>
@abalabahaha abalabahaha merged commit 8e9a2b7 into abalabahaha:dev Jul 13, 2021
@reinacchi reinacchi deleted the embeds branch July 13, 2021 11:06
iiFDCT added a commit to iiFDCT/eris that referenced this pull request Sep 3, 2021
@iiFDCT
Squashed commit of the following:
ef632cf 
commit daedb2b
Author: Donovan Daniels <hewwo@yiff.rocks>
Date:   Thu Sep 2 16:40:24 2021 -0500

    Sticker Sending (abalabahaha#1252)

    Co-Authored-By: Catboy <elijahchristopherjohnson@gmail.com>
    Co-authored-by: bsian03 <chharry321@gmail.com>

commit e357991
Author: 5antos <66580910+5antos@users.noreply.github.com>
Date:   Sun Aug 29 23:18:45 2021 +0100

    Enhancements for VoiceChannel join methods (abalabahaha#1195)

    Co-authored-by: Almeida <almeidx@pm.me>
    Co-authored-by: bsian03 <chharry321@gmail.com>

commit 53da0d5
Author: HeadTriXz <32986761+HeadTriXz@users.noreply.github.com>
Date:   Sat Aug 21 22:47:13 2021 +0200

    Better types for events (abalabahaha#1242)

    Co-authored-by: HeadTriXz <headtrixz@outlook.com>

commit 5246da9
Author: abalabahaha <hi@abal.moe>
Date:   Thu Aug 19 13:08:56 2021 +0000

    Bump dev version

commit 6331536
Author: NeTT <56877379+retraigo@users.noreply.github.com>
Date:   Thu Aug 19 18:29:06 2021 +0530

    Pass user data with member in Message constructor (abalabahaha#1260)

    Prevents "User associated with Member not found"

commit a58cd69
Author: bsian03 <chharry321@gmail.com>
Date:   Thu Aug 19 13:55:33 2021 +0100

    Support per-guild avatars (abalabahaha#1219)

commit 21a3ce5
Author: Erin <erin20913@gmail.com>
Date:   Thu Aug 19 08:40:54 2021 -0400

    Add decodeReasons to typings (abalabahaha#1250)

commit 120f917
Author: bsian03 <chharry321@gmail.com>
Date:   Thu Aug 19 13:05:33 2021 +0100

    Expose components (abalabahaha#1189)

    Co-authored-by: HeadTriXz <32986761+HeadTriXz@users.noreply.github.com>
    Co-authored-by: HeadTriXz <32986761+HeadTriXz@users.noreply.github.com>
    Co-authored-by: Tsumari <lucasflicky@hotmail.com>
    Co-authored-by: Catboi <50190590+Catboi8@users.noreply.github.com>

commit 1e95e62
Author: bsian03 <chharry321@gmail.com>
Date:   Thu Aug 19 12:48:23 2021 +0100

    Warn when invalid intent is supplied (abalabahaha#1261)

commit a7bff54
Author: iiFDCT <35053522+iiFDCT@users.noreply.github.com>
Date:   Thu Aug 19 12:46:51 2021 +0100

    Use new permission, intent names (abalabahaha#1257)

commit c31685e
Author: bsian03 <chharry321@gmail.com>
Date:   Thu Aug 19 12:44:57 2021 +0100

    Improve v8 ratelimit handling (abalabahaha#1256)

commit 1e4d78a
Author: bsian03 <chharry321@gmail.com>
Date:   Thu Aug 19 12:28:14 2021 +0100

    Expose audit log events 83-85 (abalabahaha#1213)

    * Audit log types 83-85

    * Update the comment

commit 840227e
Author: bsian03 <chharry321@gmail.com>
Date:   Thu Aug 19 12:19:02 2021 +0100

    Type guild features as actual values (abalabahaha#1212)

commit 4bb65f0
Author: Emad Abdullah <ea@ea.sa>
Date:   Thu Aug 5 00:04:44 2021 +0300

    fix permissions: Value "undefined" is not int for editRole & createRole (abalabahaha#1249)

commit 756943d
Author: Donovan Daniels <hewwo@yiff.rocks>
Date:   Wed Aug 4 15:58:35 2021 -0500

    Fix documentation for create/editRole (abalabahaha#1248)

commit 3d80d20
Author: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Date:   Wed Aug 4 15:10:37 2021 +0530

    Mark ClientOptions in Eris function as required (abalabahaha#1255)

commit ee960c0
Author: bsian03 <chharry321@gmail.com>
Date:   Tue Jul 13 21:25:57 2021 +0100

    Fix possibly undefined member in voiceStateUpdate (abalabahaha#1217)

    Co-authored-by: Erin <erin20913@gmail.com>

commit e194a71
Author: Khaaz <khaaz.dev@gmail.com>
Date:   Tue Jul 13 13:04:21 2021 +0200

    REST v8, Gateway v8 (abalabahaha#1038)

    Co-authored-by: macdja38 <jakeincanada@icloud.com>
    Co-authored-by: bsian03 <chharry321@gmail.com>
    Co-authored-by: abalabahaha <hi@abal.moe>

commit 0726aae
Author: geg <65479041+gegdev@users.noreply.github.com>
Date:   Tue Jul 13 06:35:08 2021 -0400

    Use embeds array in embed example (abalabahaha#1244)

commit 8e9a2b7
Author: Reinhardt <73813638+NotMarx@users.noreply.github.com>
Date:   Tue Jul 13 17:34:33 2021 +0700

    Support sending multiple embeds (abalabahaha#1239)

commit 7e55222
Author: bsian03 <chharry321@gmail.com>
Date:   Mon Jul 12 18:25:00 2021 +0100

    Allow passing a plain object to permissionsOf (abalabahaha#1224)

    Co-authored by: curtisf <caf203@gmail.com>

commit 0abf61a
Author: bsian03 <chharry321@gmail.com>
Date:   Sun Jul 11 12:14:44 2021 +0100

    Expose Guild#nsfwLevel, deprecate Guild#nsfw (abalabahaha#1207)

commit 11d21c9
Author: Avocado <43632131+Awoocado@users.noreply.github.com>
Date:   Wed Jul 7 02:20:21 2021 -0500

    Update Endpoints.js (abalabahaha#1241)

commit d4a49a6
Author: bsian03 <chharry321@gmail.com>
Date:   Tue Jul 6 23:38:36 2021 +0100

    Document disconnecting members from vc better (abalabahaha#1202)

    * Update Member.js

    * Update Guild.js

    * Update Client.js

    * No idea how that happened

commit b483ff3
Author: iiFDCT <35053522+iiFDCT@users.noreply.github.com>
Date:   Tue Jul 6 16:21:56 2021 +0100

    Update sticker properties (abalabahaha#1237)

    * Use `sticker_items`

    * Docs

    * Update docs

    * Deprecate `stickers`, use `sticker_items`

    * Add user to cache

    * Empty string

    * Use camelCase

    * Wrong func

    * Docs

    * Add back useless property

    * Pretend like this variable ever gets defined

    * Newlines

commit 15546c4
Author: bsian03 <chharry321@gmail.com>
Date:   Mon Jul 5 22:53:50 2021 +0100

    Make purgeChannel use getMessages options (abalabahaha#1236)
@JustCat80 JustCat80 mentioned this pull request Sep 7, 2021
Merged
bsian03 pushed a commit to bsian03/eris that referenced this pull request Oct 10, 2021
@reinacchi @bsian03
Support sending multiple embeds (abalabahaha#1239)
f6d8208
@abalabahaha abalabahaha added this to the 0.16.0 milestone Nov 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Linker-123 Linker-123 Linker-123 left review comments

@bsian03 bsian03 bsian03 approved these changes

@JustCat80 JustCat80 JustCat80 approved these changes

Assignees
No one assigned
Labels
Discord
Projects
None yet
Milestone
0.16.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@reinacchi @bsian03 @JustCat80 @Linker-123 @abalabahaha