Skip to content

Commit

Permalink
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mitmocc
Mitmocc authored Aug 16, 2022
2 parents 17bd2bf + e111d55 commit a04401e
Show file tree
Hide file tree
Showing 81 changed files with 6,604 additions and 8,200 deletions.
18 changes: 9 additions & 9 deletions src/main/java/net/dv8tion/jda/api/EmbedBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ public EmbedBuilder setColor(int color)
*
* <p><b>Uploading images with Embeds</b>
* <br>When uploading an <u>image</u>
* (using {@link net.dv8tion.jda.api.entities.MessageChannel#sendFile(java.io.File, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel.sendFile(...)})
* (using {@link net.dv8tion.jda.api.entities.MessageChannel#sendFiles(net.dv8tion.jda.api.utils.FileUpload...) MessageChannel.sendFiles(...)})
* you can reference said image using the specified filename as URI {@code attachment://filename.ext}.
*
* <p><u>Example</u>
Expand All @@ -442,7 +442,7 @@ public EmbedBuilder setColor(int color)
* InputStream file = new URL("https://http.cat/500").openStream();
* embed.setThumbnail("attachment://cat.png") // we specify this in sendFile as "cat.png"
* .setDescription("This is a cute cat :3");
* channel.sendFile(file, "cat.png").setEmbeds(embed.build()).queue();
* channel.sendFiles(FileUpload.fromData(file, "cat.png")).setEmbeds(embed.build()).queue();
* </code></pre>
*
* @param url
Expand Down Expand Up @@ -479,7 +479,7 @@ public EmbedBuilder setThumbnail(@Nullable String url)
*
* <p><b>Uploading images with Embeds</b>
* <br>When uploading an <u>image</u>
* (using {@link net.dv8tion.jda.api.entities.MessageChannel#sendFile(java.io.File, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel.sendFile(...)})
* (using {@link net.dv8tion.jda.api.entities.MessageChannel#sendFiles(net.dv8tion.jda.api.utils.FileUpload...) MessageChannel.sendFiles(...)})
* you can reference said image using the specified filename as URI {@code attachment://filename.ext}.
*
* <p><u>Example</u>
Expand All @@ -489,7 +489,7 @@ public EmbedBuilder setThumbnail(@Nullable String url)
* InputStream file = new URL("https://http.cat/500").openStream();
* embed.setImage("attachment://cat.png") // we specify this in sendFile as "cat.png"
* .setDescription("This is a cute cat :3");
* channel.sendFile(file, "cat.png").setEmbeds(embed.build()).queue();
* channel.sendFiles(FileUpload.fromData(file, "cat.png")).setEmbeds(embed.build()).queue();
* </code></pre>
*
* @param url
Expand All @@ -504,7 +504,7 @@ public EmbedBuilder setThumbnail(@Nullable String url)
*
* @return the builder after the image has been set
*
* @see net.dv8tion.jda.api.entities.MessageChannel#sendFile(java.io.File, String, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel.sendFile(...)
* @see net.dv8tion.jda.api.entities.MessageChannel#sendFiles(net.dv8tion.jda.api.utils.FileUpload...) MessageChannel.sendFiles(...)
*/
@Nonnull
public EmbedBuilder setImage(@Nullable String url)
Expand Down Expand Up @@ -580,7 +580,7 @@ public EmbedBuilder setAuthor(@Nullable String name, @Nullable String url)
*
* <p><b>Uploading images with Embeds</b>
* <br>When uploading an <u>image</u>
* (using {@link net.dv8tion.jda.api.entities.MessageChannel#sendFile(java.io.File, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel.sendFile(...)})
* (using {@link net.dv8tion.jda.api.entities.MessageChannel#sendFiles(net.dv8tion.jda.api.utils.FileUpload...) MessageChannel.sendFiles(...)})
* you can reference said image using the specified filename as URI {@code attachment://filename.ext}.
*
* <p><u>Example</u>
Expand All @@ -590,7 +590,7 @@ public EmbedBuilder setAuthor(@Nullable String name, @Nullable String url)
* InputStream file = new URL("https://http.cat/500").openStream();
* embed.setAuthor("Minn", null, "attachment://cat.png") // we specify this in sendFile as "cat.png"
* .setDescription("This is a cute cat :3");
* channel.sendFile(file, "cat.png").setEmbeds(embed.build()).queue();
* channel.sendFiles(FileUpload.fromData(file, "cat.png")).setEmbeds(embed.build()).queue();
* </code></pre>
*
* @param name
Expand Down Expand Up @@ -660,7 +660,7 @@ public EmbedBuilder setFooter(@Nullable String text)
*
* <p><b>Uploading images with Embeds</b>
* <br>When uploading an <u>image</u>
* (using {@link net.dv8tion.jda.api.entities.MessageChannel#sendFile(java.io.File, net.dv8tion.jda.api.utils.AttachmentOption...) MessageChannel.sendFile(...)})
* (using {@link net.dv8tion.jda.api.entities.MessageChannel#sendFiles(net.dv8tion.jda.api.utils.FileUpload...) MessageChannel.sendFiles(...)})
* you can reference said image using the specified filename as URI {@code attachment://filename.ext}.
*
* <p><u>Example</u>
Expand All @@ -670,7 +670,7 @@ public EmbedBuilder setFooter(@Nullable String text)
* InputStream file = new URL("https://http.cat/500").openStream();
* embed.setFooter("Cool footer!", "attachment://cat.png") // we specify this in sendFile as "cat.png"
* .setDescription("This is a cute cat :3");
* channel.sendFile(file, "cat.png").setEmbeds(embed.build()).queue();
* channel.sendFiles(FileUpload.fromData(file, "cat.png")).setEmbeds(embed.build()).queue();
* </code></pre>
*
* @param text
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/dv8tion/jda/api/JDAInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
public class JDAInfo
{
public static final int DISCORD_GATEWAY_VERSION = 10;
public static final int DISCORD_GATEWAY_VERSION = 9;
public static final int DISCORD_REST_VERSION = 10;
public static final int AUDIO_GATEWAY_VERSION = 4;
public static final String GITHUB = "https://github.com/DV8FromTheWorld/JDA";
Expand Down
Loading

0 comments on commit a04401e

Please sign in to comment.