Update Invite to match Discord changes #2500
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -36,6 +36,15 @@ | |||||
| */ | ||||||
| public interface InviteAction extends AuditableRestAction<Invite> | ||||||
| { | ||||||
| /** | ||||||
| * The maximum age, 30 days, in seconds, for a restricted invite. | ||||||
| * | ||||||
| * <p>A restricted invite is an invite that is created in a non-community server</p> | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| * | ||||||
| * @see #hasCommunityRestrictions() | ||||||
| */ | ||||||
| int MAX_RESTRICTED_AGE = 2592000; | ||||||
|
|
||||||
| @Nonnull | ||||||
| @Override | ||||||
| InviteAction setCheck(@Nullable BooleanSupplier checks); | ||||||
|
|
@@ -48,17 +57,28 @@ public interface InviteAction extends AuditableRestAction<Invite> | |||||
| @Override | ||||||
| InviteAction deadline(long timestamp); | ||||||
|
|
||||||
| /** | ||||||
| * Invites created in non-community servers are not allowed to be permanent, | ||||||
| * and are restricted to a maximum age of 30 days. | ||||||
| * | ||||||
| * @see #MAX_RESTRICTED_AGE | ||||||
| */ | ||||||
| boolean hasCommunityRestrictions(); | ||||||
|
|
||||||
|
|
||||||
| /** | ||||||
| * Sets the max age in seconds for the invite. Set this to {@code 0} if the invite should never expire. Default is {@code 86400} (24 hours). | ||||||
| * {@code null} will reset this to the default value. | ||||||
| * | ||||||
| * <p>Invites in non-community servers are not allowed to be permanent, with an allowed range of {@code 1} (1 second) to {@code 2592000} (30 days). | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| * | ||||||
| * @param maxAge | ||||||
| * The max age for this invite or {@code null} to use the default value. | ||||||
| * | ||||||
| * @throws IllegalArgumentException | ||||||
| * If maxAge is negative, or if the guild is not a community guild and maxAge is not in the allowed range. | ||||||
| * | ||||||
| * @return The current InviteAction for chaining. | ||||||
| * @see #hasCommunityRestrictions() | ||||||
| */ | ||||||
| @Nonnull | ||||||
| @CheckReturnValue | ||||||
|
|
@@ -68,15 +88,20 @@ public interface InviteAction extends AuditableRestAction<Invite> | |||||
| * Sets the max age for the invite. Set this to {@code 0} if the invite should never expire. Default is {@code 86400} (24 hours). | ||||||
| * {@code null} will reset this to the default value. | ||||||
| * | ||||||
| * <p>Invites in non-community servers are not allowed to be permanent, with an allowed range from 1 second to 30 days. | ||||||
| * | ||||||
| * @param maxAge | ||||||
| * The max age for this invite or {@code null} to use the default value. | ||||||
| * @param timeUnit | ||||||
| * The {@link java.util.concurrent.TimeUnit TimeUnit} type of {@code maxAge}. | ||||||
| * | ||||||
| * @throws IllegalArgumentException | ||||||
| * If maxAge is negative, | ||||||
| * timeUnit is null, | ||||||
| * or if the guild is not a community guild and maxAge is not in the allowed range. | ||||||
| * | ||||||
| * @return The current InviteAction for chaining. | ||||||
| * @see #hasCommunityRestrictions() | ||||||
| */ | ||||||
| @Nonnull | ||||||
| @CheckReturnValue | ||||||
|
|
@@ -235,5 +260,4 @@ default InviteAction setTargetStream(@Nonnull final Member member) | |||||
| Checks.notNull(member, "Member"); | ||||||
| return setTargetStream(member.getIdLong()); | ||||||
| } | ||||||
| } | ||||||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2162,19 +2162,18 @@ public Invite createInvite(DataObject object) | |
| final String code = object.getString("code"); | ||
| final User inviter = object.hasKey("inviter") ? createUser(object.getObject("inviter")) : null; | ||
|
|
||
| final DataObject channelObject = object.optObject("channel").orElse(null); | ||
| final ChannelType channelType = channelObject != null ? ChannelType.fromId(channelObject.getInt("type")) : null; | ||
| final Invite.TargetType targetType = Invite.TargetType.fromId(object.getInt("target_type", 0)); | ||
|
|
||
| final Invite.InviteType type = Invite.InviteType.fromId(object.getInt("type")); | ||
| final Invite.Guild guild; | ||
| final Invite.Channel channel; | ||
| final Invite.Group group; | ||
| final Invite.InviteTarget target; | ||
|
|
||
| if (type == Invite.InviteType.GROUP) | ||
| { | ||
| guild = null; | ||
| channel = null; | ||
|
|
||
|
|
@@ -2190,10 +2189,8 @@ public Invite createInvite(DataObject object) | |
|
|
||
| group = new InviteImpl.GroupImpl(groupIconId, groupName, groupId, usernames); | ||
| } | ||
| else if (type == Invite.InviteType.GUILD) | ||
| { | ||
| final DataObject guildObject = object.getObject("guild"); | ||
|
|
||
| final String guildIconId = guildObject.getString("icon", null); | ||
|
|
@@ -2225,8 +2222,6 @@ else if (channelType.isGuild()) | |
| else | ||
| { | ||
| // Unknown channel type for invites | ||
| guild = null; | ||
| channel = null; | ||
| group = null; | ||
|
|
@@ -2254,34 +2249,28 @@ else if (channelType.isGuild()) | |
| target = new InviteImpl.InviteTargetImpl(targetType, null, null); | ||
| } | ||
|
|
||
| final int maxAge = object.getInt("max_age", -1); | ||
| final int maxUses; | ||
| final boolean temporary = object.getBoolean("temporary", false); | ||
| final int uses; | ||
| final boolean expanded = object.hasKey("max_uses"); | ||
|
|
||
| if (expanded) | ||
| { | ||
| maxUses = object.getInt("max_uses", -1); | ||
| uses = object.getInt("uses", 0); | ||
| } | ||
| else | ||
| { | ||
| maxUses = -1; | ||
| uses = -1; | ||
| } | ||
|
|
||
| final OffsetDateTime timeCreated = object.getOffsetDateTime("created_at", null); | ||
| final OffsetDateTime timeExpires = object.getOffsetDateTime("expires_at", null); | ||
|
|
||
| return new InviteImpl(getJDA(), code, expanded, inviter, maxAge, | ||
| maxUses, temporary, timeCreated, timeExpires, | ||
| uses, channel, guild, group, target, type); | ||
| } | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,11 +55,12 @@ public class InviteImpl implements Invite | |
| private final int maxUses; | ||
| private final boolean temporary; | ||
| private final OffsetDateTime timeCreated; | ||
| private final OffsetDateTime timeExpires; | ||
| private final int uses; | ||
| private final Invite.InviteType type; | ||
|
|
||
| public InviteImpl(final JDAImpl api, final String code, final boolean expanded, final User inviter, | ||
| final int maxAge, final int maxUses, final boolean temporary, final OffsetDateTime timeCreated, final OffsetDateTime timeExpires, final int uses, | ||
| final Channel channel, final Guild guild, final Group group, final InviteTarget target, final Invite.InviteType type) | ||
| { | ||
| this.api = api; | ||
|
|
@@ -70,6 +71,7 @@ public InviteImpl(final JDAImpl api, final String code, final boolean expanded, | |
| this.maxUses = maxUses; | ||
| this.temporary = temporary; | ||
| this.timeCreated = timeCreated; | ||
| this.timeExpires = timeExpires; | ||
| this.uses = uses; | ||
| this.channel = channel; | ||
| this.guild = guild; | ||
|
|
@@ -238,6 +240,13 @@ public OffsetDateTime getTimeCreated() | |
| return this.timeCreated; | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| public OffsetDateTime getTimeExpires() | ||
| { | ||
| return this.timeExpires; | ||
| } | ||
|
|
||
| @Override | ||
| public int getUses() | ||
| { | ||
|
|
@@ -251,7 +260,7 @@ public boolean isExpanded() | |
| { | ||
| return this.expanded; | ||
| } | ||
My-Name-Is-Jeff marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| @Override | ||
| public boolean isTemporary() | ||
| { | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,7 +43,7 @@ default InviteAction createInvite() | |
| { | ||
| checkPermission(Permission.CREATE_INSTANT_INVITE); | ||
|
|
||
| return new InviteActionImpl(this.getJDA(), this.getId(), !this.getGuild().getFeatures().contains("COMMUNITY")); | ||
| } | ||
|
|
||
| @Nonnull | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,6 +66,10 @@ protected Long handleInternally(DataObject content) | |
| .map(String::valueOf) | ||
| .map(OffsetDateTime::parse) | ||
| .orElse(null); | ||
| OffsetDateTime expirationTime = content.opt("expires_at") | ||
| .map(String::valueOf) | ||
| .map(OffsetDateTime::parse) | ||
| .orElse(null); | ||
|
|
||
| Optional<DataObject> inviterJson = content.optObject("inviter"); | ||
| boolean expanded = maxUses != -1; | ||
|
|
@@ -98,9 +102,9 @@ protected Long handleInternally(DataObject content) | |
| target = new InviteImpl.InviteTargetImpl(targetType, null, null); | ||
| } | ||
|
|
||
| Invite invite = new InviteImpl(getJDA(), code, expanded, inviter, maxAge, | ||
| maxUses, temporary, creationTime, expirationTime, | ||
| 0, channel, guild, null, target, Invite.InviteType.GUILD); | ||
| getJDA().handleEvent( | ||
| new GuildInviteCreateEvent( | ||
| getJDA(), responseNumber, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The docs changes here seem unrelated to the rest of this PR, please revert them.