-
-
Notifications
You must be signed in to change notification settings - Fork 751
Add support for guild scheduled events v2 #2047
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
Merged
MinnDevelopment
merged 156 commits into
discord-jda:master
from
Mitmocc:v5-guild_scheduled_events
Oct 23, 2022
Merged
Changes from all commits
Commits
Show all changes
156 commits
Select commit
Hold shift + click to select a range
70ebc43
Fix missing cache cleanup for news channels
Mitmocc 83a08ef
Merge branch 'master' of https://github.com/DV8FromTheWorld/JDA
Mitmocc cbb0e5a
Implementing Guild Scheduled Events
Mitmocc a5d27ce
Merge branch 'master' of https://github.com/DV8FromTheWorld/JDA
Mitmocc 149680a
Update EntityBuilder.java
Mitmocc 2372abc
Update GuildUpdateHandler.java
Mitmocc 8e1354a
event listeners for guild scheduled events
Mitmocc f07fc0b
event listeners for guild scheduled events
Mitmocc 902e500
Update WebSocketClient.java
Mitmocc 5a1939f
Update WebSocketClient.java
Mitmocc f9bc9ac
Add Intent for Guild Scheduled Events
Mitmocc 6066409
Added guild scheduled event image update event
Mitmocc 2aae8ff
Event handlers and intent for guild scheduled events
Mitmocc 77c8016
small fix status instead of entity type in event handler
Mitmocc 3c29770
bugfix null default value for channel_id
Mitmocc 3580196
Update GuildScheduledEventUpdateHandler.java
Mitmocc 9137f43
added some more guild scheduled event events to the listener adapter
Mitmocc 0e74464
fixed naming of GUILD_SCHEDULED_EVENT_USER_X events
Mitmocc 126c18b
fixed some bugs around user add and remove events
Mitmocc b739b3b
cache guild scheduled event on events if not cached
Mitmocc 0e91d43
Update GuildScheduledEventUserAddHandler.java
Mitmocc 6dbda7d
revert caching on user add and remove because its not sending the event
Mitmocc b3d56b4
revert prints used for testing
Mitmocc 19a8f0d
Update GuildScheduledEvent.java
Mitmocc 55c9fb0
Apply suggestions from code review
Mitmocc 821cc98
Implement Get Guild Scheduled Event Users/Members
Mitmocc e5fc6c1
docs for the get users/members pagination action
Mitmocc 05e0cbd
renamed getInterestedUser/Member methods and added check for start ti…
Mitmocc c4578c4
Apply suggestions from code review
Mitmocc aefbb9c
added "blank" case throwing exception to setName() docs
Mitmocc efe8b57
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc e53d15f
changed getCreatorId() null value from -1 to 0 for consistency
Mitmocc 979bc65
combined UserAddHandler and UserRemoveHandler to UserHandler with boo…
Mitmocc e499ff1
Update GuildScheduledEventUserHandler.java
Mitmocc c7edd6a
remove deleted guild scheduled events from cache as consequence of th…
Mitmocc 11dd811
Apply suggestions from code review
Mitmocc 7a049ed
removed redundant @NotNull
Mitmocc ea7d942
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc 55bc03c
Apply suggestions from code review
Mitmocc 3d28bbc
removed some "retrieve" wording on the docs to not cause confusion
Mitmocc 9d68501
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc 6e031a7
Update GuildScheduledEventUpdateLocationEvent.java
Mitmocc f368e5c
small bugfix in the Update events for Guild Scheduled events
Mitmocc 633fe62
remove blank/empty checks from description setter
Mitmocc 00050f8
Apply suggestions from code review
Mitmocc 7903813
Apply suggestions from code review
Mitmocc fa68449
Update Guild.java
Mitmocc d7b0d4f
Apply suggestions from code review
Mitmocc ca0ad04
Update Guild.java
Mitmocc b3e1163
Apply suggestions from code review
Mitmocc 07e7050
implement a general getChannel() method
Mitmocc 80eabc0
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc 9917fc0
Merge branch 'master' into v5-guild_scheduled_events
Mitmocc f9ecedd
Update GuildDeleteHandler.java
Mitmocc 563e117
minor doc fix and String.value of replace with Long.toUnsignedString
Mitmocc 1765e95
Apply suggestions from code review
Mitmocc 4c4a007
Update GuildScheduledEventUpdateLocationEvent.java
Mitmocc a8a5be7
Apply suggestions from code review
Mitmocc 7fd9698
Update GenericGuildScheduledEventGatewayEvent.java
Mitmocc 79cf740
Apply suggestions from code review
Mitmocc d24d6e7
Update JDA.java
Mitmocc e787dd1
annotation fixes
Mitmocc 7c0efae
nullable fixes for descr, endtime, image
Mitmocc e5e25cb
converted parameter from OffsetDateTime to TemporalAccessor
Mitmocc 7a5eddf
addding cacheflag for guild scheduled events
Mitmocc c119c9e
Update EntityBuilder.java
Mitmocc d752444
Update GuildScheduledEventCreateHandler.java
Mitmocc 2fcde63
cacheflag for the remaining events
Mitmocc 2e13d15
Merge branch 'master' into v5-guild_scheduled_events
Mitmocc 0d05625
cleanup after upstream fetch
Mitmocc 5f05a49
removed abstraction of Location
Mitmocc 0d73522
added getOffSetDateTime() to DataArray
Mitmocc 357380b
Update GuildImpl.java
Mitmocc ee9e26a
Update GuildImpl.java
Mitmocc 5ffd236
made type into a field in the class
Mitmocc 34e8118
indentation fix
Mitmocc a1ac34d
Update ChannelDeleteHandler.java
Mitmocc 38cff80
changed type to Guild
Mitmocc 507355a
removed the check for null
Mitmocc fcb38d8
Update GuildScheduledEventUserHandler.java
Mitmocc 3c54055
both directions for pagination
Mitmocc 612e239
removed getStageChannel() and getVoiceChannel()
Mitmocc da02298
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc 3c6a6ba
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc f1efd19
Merge branch 'master' into v5-guild_scheduled_events
Mitmocc 1f9e916
added getUser() and getMember() aswell as the retrieve functions for …
Mitmocc 8b29591
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc 66bd10e
Update GuildScheduledEventImpl.java
Mitmocc 3e5a6c2
Update GuildImpl.java
Mitmocc b17ea01
Update GuildImpl.java
Mitmocc 5fee5b5
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc 2cee0c2
Merge branch 'master' into v5-guild_scheduled_events
Mitmocc eb26482
docs fix
Mitmocc 17bd2bf
parameters into method
Mitmocc a04401e
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc 56c2f98
Update GuildScheduledEventActionImpl.java
Mitmocc 4163d84
Revert "Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled…
Mitmocc abbcda0
reverting some latest master changes so I don't have to rewrite while…
Mitmocc 6f94f14
add endtime check if not external location
Mitmocc 1591617
docs + name length check
Mitmocc 4b4695b
changed some checks and docs
Mitmocc 82acae9
location length fix
Mitmocc be24430
Update GuildScheduledEventActionImpl.java
Mitmocc ff230ca
more docs
Mitmocc 1598a98
Update src/main/java/net/dv8tion/jda/internal/requests/WebSocketClien…
Mitmocc 360bdcb
Update GuildScheduledEventManagerImpl.java
Mitmocc 6305860
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc cee43d0
Update GuildScheduledEventManagerImpl.java
Mitmocc c68dcc9
RestAction to CacheRestAction
Mitmocc 22789e0
Update src/main/java/net/dv8tion/jda/api/audit/ActionType.java
Mitmocc 4e0b879
Update Guild.java
Mitmocc 4ad530d
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc b2159e8
Update Guild.java
Mitmocc 35f232a
annotations added
Mitmocc d61002f
docs
Mitmocc 1a49e2f
Update src/main/java/net/dv8tion/jda/api/managers/GuildScheduledEvent…
Mitmocc c346c84
Apply suggestions from code review
Mitmocc c3b4524
docs and small fixes
Mitmocc cb5807b
fix forEachAsync example
Mitmocc 663b06c
Update DataArray.java
Mitmocc 5917424
nonnull annotations fixed
Mitmocc 470569c
Update src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.…
Mitmocc edeb288
Apply suggestions from code review
Mitmocc d8e8fb7
removed unnecessary null check
Mitmocc 3f1b249
code suggestions
Mitmocc 0b6ff39
entityType to enum by San32
Mitmocc ea51bb4
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc f88d43e
reverting the revert monkaS
Mitmocc 38cb312
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc d3223b3
docs for method parameters
Mitmocc 209687d
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc 4fcf8ce
Update Guild.java
Mitmocc 7fe0a61
Update src/main/java/net/dv8tion/jda/api/entities/GuildScheduledEvent…
Mitmocc e521b8a
Update Guild.java
Mitmocc 2773e87
Update src/main/java/net/dv8tion/jda/internal/requests/restaction/Gui…
Mitmocc 00074fd
entityType to enum
Mitmocc 27125ce
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc 6329d4a
Update GuildScheduledEvent.java
Mitmocc 9d07583
remove redundant throw when end time provided for non-external event
Mitmocc f24b854
Apply suggestions from code review
Mitmocc 45bb6c0
cacheflag fix
Mitmocc f76f71c
Merge branch 'v5-guild_scheduled_events' of https://github.com/Mitmoc…
Mitmocc ec961b7
adding setters and moving checks into setters
Mitmocc fe321f7
bugfix
Mitmocc e7308db
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc 05c477c
adapting channel package changes
Mitmocc 896c0d1
Merge branch 'master' into v5-guild_scheduled_events
Mitmocc db9e68f
Merge remote-tracking branch 'origin/master' into pr2047-events
MinnDevelopment 035e3aa
Cleanup some checks
MinnDevelopment 0efd358
Remove retrieveInterestedUsers
MinnDevelopment f40d1e4
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc ebde44f
added check for start/endtime to be < 5 years away
Mitmocc 9047c9a
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc 3f32de9
Merge branch 'DV8FromTheWorld:master' into v5-guild_scheduled_events
Mitmocc a34c8bd
added GenericScheduledEventUserEvent, renamed everything for GuildSch…
Mitmocc 707563b
Update src/main/java/net/dv8tion/jda/internal/handle/ChannelDeleteHan…
Mitmocc 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -42,5 +42,6 @@ public enum TargetType | |
STAGE_INSTANCE, | ||
STICKER, | ||
THREAD, | ||
SCHEDULED_EVENT, | ||
UNKNOWN | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.