-
-
Notifications
You must be signed in to change notification settings - Fork 736
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.
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
Add support for guild security incidents #2577
Open
MinnDevelopment
wants to merge
1
commit into
master
Choose a base branch
from
feature/security-incidents
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
121 changes: 121 additions & 0 deletions
121
src/main/java/net/dv8tion/jda/api/entities/SecurityIncidents.java
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 |
---|---|---|
@@ -0,0 +1,121 @@ | ||
/* | ||
* Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package net.dv8tion.jda.api.entities; | ||
|
||
import net.dv8tion.jda.internal.utils.Helpers; | ||
|
||
import javax.annotation.Nonnull; | ||
import javax.annotation.Nullable; | ||
import java.time.OffsetDateTime; | ||
import java.util.Objects; | ||
|
||
/** | ||
* The active security incidents in a {@link Guild}. | ||
* | ||
* <p>Security incidents are used to temporarily disable features for the purpose of moderation. | ||
* | ||
* @see #enabled(OffsetDateTime, OffsetDateTime) | ||
* @see #disabled() | ||
*/ | ||
public class SecurityIncidents | ||
{ | ||
private static final SecurityIncidents disabled = new SecurityIncidents(0, 0); | ||
|
||
private final long invitesDisabledUntil; | ||
private final long directMessagesDisabledUntil; | ||
|
||
private SecurityIncidents(long invitesDisabledUntil, long directMessagesDisabledUntil) | ||
{ | ||
this.invitesDisabledUntil = invitesDisabledUntil; | ||
this.directMessagesDisabledUntil = directMessagesDisabledUntil; | ||
} | ||
|
||
/** | ||
* The time until when invites are paused. | ||
* | ||
* @return The time until invites are paused, or null if unpaused | ||
*/ | ||
@Nullable | ||
public OffsetDateTime getInvitesDisabledUntil() | ||
{ | ||
return invitesDisabledUntil == 0 ? null : Helpers.toOffset(invitesDisabledUntil); | ||
} | ||
|
||
/** | ||
* The time until when direct messages are paused. | ||
* | ||
* @return The time until direct messages are paused, or null if unpaused | ||
*/ | ||
@Nullable | ||
public OffsetDateTime getDirectMessagesDisabledUntil() | ||
{ | ||
return directMessagesDisabledUntil == 0 ? null : Helpers.toOffset(directMessagesDisabledUntil); | ||
} | ||
|
||
/** | ||
* Incidents state, which disables all active security incidents. | ||
* <br>The resulting object is used with {@link Guild#modifySecurityIncidents(SecurityIncidents)} to update the active incidents of the guild. | ||
* | ||
* @return The new security incidents | ||
*/ | ||
@Nonnull | ||
public static SecurityIncidents disabled() | ||
{ | ||
return disabled; | ||
} | ||
|
||
/** | ||
* Incidents state, which enables security incidents based on the provided deadlines. | ||
* <br>The resulting object is used with {@link Guild#modifySecurityIncidents(SecurityIncidents)} to update the active incidents of the guild. | ||
* | ||
* @param invitesDisabledUntil | ||
* The time until invites are paused | ||
* @param directMessagesDisabledUntil | ||
* The time until direct messages are paused | ||
* | ||
* @return The new security incidents | ||
*/ | ||
@Nonnull | ||
public static SecurityIncidents enabled( | ||
@Nullable | ||
OffsetDateTime invitesDisabledUntil, | ||
@Nullable | ||
OffsetDateTime directMessagesDisabledUntil | ||
) { | ||
return new SecurityIncidents( | ||
invitesDisabledUntil == null ? 0 : invitesDisabledUntil.toInstant().toEpochMilli(), | ||
directMessagesDisabledUntil == null ? 0 : directMessagesDisabledUntil.toInstant().toEpochMilli() | ||
); | ||
} | ||
|
||
@Override | ||
public int hashCode() | ||
{ | ||
return Objects.hash(invitesDisabledUntil, directMessagesDisabledUntil); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object obj) | ||
{ | ||
if (obj == this) | ||
return true; | ||
if (!(obj instanceof SecurityIncidents)) | ||
return false; | ||
SecurityIncidents other = (SecurityIncidents) obj; | ||
return this.invitesDisabledUntil == other.invitesDisabledUntil && this.directMessagesDisabledUntil == other.directMessagesDisabledUntil; | ||
} | ||
} |
63 changes: 63 additions & 0 deletions
63
src/main/java/net/dv8tion/jda/api/events/guild/update/GuildUpdateSecurityIncidentsEvent.java
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 |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
* Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package net.dv8tion.jda.api.events.guild.update; | ||
|
||
import net.dv8tion.jda.api.JDA; | ||
import net.dv8tion.jda.api.entities.Guild; | ||
import net.dv8tion.jda.api.entities.SecurityIncidents; | ||
|
||
import javax.annotation.Nonnull; | ||
import javax.annotation.Nullable; | ||
|
||
/** | ||
* Indicates that the {@link SecurityIncidents} of a {@link Guild Guild} changed. | ||
* | ||
* <p>Can be used to detect when a guild pauses or unpauses invites. | ||
* | ||
* <p>Identifier: {@code security_incidents} | ||
*/ | ||
public class GuildUpdateSecurityIncidentsEvent extends GenericGuildUpdateEvent<SecurityIncidents> | ||
{ | ||
public static final String IDENTIFIER = "security_incidents"; | ||
|
||
public GuildUpdateSecurityIncidentsEvent(@Nonnull JDA api, long responseNumber, @Nonnull Guild guild, @Nullable SecurityIncidents previous) | ||
{ | ||
super(api, responseNumber, guild, previous, guild.getSecurityIncidents(), IDENTIFIER); | ||
} | ||
|
||
/** | ||
* The old security incidents, or null if disabled. | ||
* | ||
* @return The old incidents | ||
*/ | ||
@Nullable | ||
public SecurityIncidents getOldSecurityIncidents() | ||
{ | ||
return getOldValue(); | ||
} | ||
|
||
/** | ||
* The new security incidents, or null if disabled. | ||
* | ||
* @return The new incidents | ||
*/ | ||
@Nullable | ||
public SecurityIncidents getNewSecurityIncidents() | ||
{ | ||
return getNewValue(); | ||
} | ||
} |
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
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
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
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.
Why can't we check for this?
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.
We might in the future, but since they still haven't merged docs it might be bad to check limits.