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

Implement access and retrieval of message_reference #1686

Merged
merged 19 commits into from
Jul 30, 2021
Merged

Implement access and retrieval of message_reference #1686

merged 19 commits into from
Jul 30, 2021

Conversation

arynxd
Copy link
Contributor

@arynxd arynxd commented Jun 21, 2021

Pull Request Etiquette

Changes

  • Internal code
  • Library interface (affecting end-user code)
  • Documentation
  • Other: _____

Closes Issue: NaN

Description

This PR adds support for retrieving referenced message in cases where discord does not provide one. It also adds a MessageReference class which wraps the message_reference value seen in a message's json. It also adds some getters for referenced message id

@MinnDevelopment MinnDevelopment added this to the v4.3.1 milestone Jun 29, 2021
@MinnDevelopment
Copy link
Member

Bump

@arynxd
Copy link
Contributor Author

arynxd commented Jul 8, 2021

Sorry about the late commit, i never received the notifications for this PR.

@MinnDevelopment MinnDevelopment added size: small status: documentation needed lacks documentation, either partially or completely type: feature labels Jul 8, 2021
MinnDevelopment
MinnDevelopment requested changes Jul 8, 2021
View reviewed changes
Copy link
Member

@MinnDevelopment MinnDevelopment left a comment

Choose a reason for hiding this comment

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

Please add back the things for referenced message that you removed.

src/main/java/net/dv8tion/jda/internal/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/Message.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/Message.java Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/SystemMessage.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java Outdated Show resolved Hide resolved
arynxd and others added 2 commits July 9, 2021 18:12
@arynxd @MinnDevelopment
Apply suggestions
1f36b48 
Co-authored-by: Florian Spieß <business@minnced.club>
Finished suggestions
8ef5f9e
MinnDevelopment
MinnDevelopment reviewed Jul 9, 2021
View reviewed changes
src/main/java/net/dv8tion/jda/api/entities/Message.java Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Show resolved Hide resolved
arynxd and others added 2 commits July 9, 2021 20:08
@arynxd @MinnDevelopment
Apply suggestions
dbb67c9 
Co-authored-by: Florian Spieß <business@minnced.club>
Finished suggestions
64b8ac7
MinnDevelopment
MinnDevelopment requested changes Jul 11, 2021
View reviewed changes
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/ReceivedMessage.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
arynxd and others added 4 commits July 11, 2021 18:40
@arynxd @MinnDevelopment
Apply suggestions
21b23b7 
Co-authored-by: Florian Spieß <business@minnced.club>
Finished suggestions
b6bdf67
@arynxd @MinnDevelopment
Adjust formatting
cec280b 
Co-authored-by: Florian Spieß <business@minnced.club>
Add default
dd481b6
MinnDevelopment
MinnDevelopment requested changes Jul 13, 2021
View reviewed changes
src/main/java/net/dv8tion/jda/api/entities/Message.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/Message.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/Message.java Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Show resolved Hide resolved
src/main/java/net/dv8tion/jda/internal/entities/AbstractMessage.java Outdated Show resolved Hide resolved
arynxd and others added 2 commits July 13, 2021 18:26
@arynxd @MinnDevelopment
Apply suggestions
69794a0 
Co-authored-by: Florian Spieß <business@minnced.club>
Apply suggestions
11d0c9a
@arynxd arynxd changed the title Add Message#retrieveReferencedMessage and getters for referenced message id Implement access and retrieval of message_reference Jul 13, 2021
@MinnDevelopment MinnDevelopment removed the status: documentation needed lacks documentation, either partially or completely label Jul 16, 2021
MinnDevelopment
MinnDevelopment requested changes Jul 30, 2021
View reviewed changes
Copy link
Member

@MinnDevelopment MinnDevelopment left a comment

Choose a reason for hiding this comment

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

Almost there

src/main/java/net/dv8tion/jda/api/entities/Message.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated
? referencedMessage.getTextChannel()
: api.getTextChannelById(channelId);

if (tc == null)
Copy link
Member

Choose a reason for hiding this comment

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

To prepare for threads we should do:

if (guildId == 0L)
    this.channel = api.getPrivateChannelById(channelId);
else
    this.channel = (MessageChannel) api.getGuildChannelById(channelId);
this.guild = api.getGuildById(guild); // is null if guildId = 0 anyway

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I assume we just trust that the API gave us the ID for a message channel? Is it worth instaneof checking it

Copy link
Member

Choose a reason for hiding this comment

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

Well messages should only ever be inside message channels, if discord changes this that would break lots of things anyway.

src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
src/main/java/net/dv8tion/jda/api/entities/MessageReference.java Outdated Show resolved Hide resolved
arynxd and others added 2 commits July 30, 2021 14:15
@arynxd @MinnDevelopment
Commit Suggestions
cd82cb5 
Co-authored-by: Florian Spieß <business@minnced.club>
@arynxd
Apply final suggestions
3093984
@DV8FromTheWorld DV8FromTheWorld merged commit 969f3f3 into discord-jda:development Jul 30, 2021
@DManstrator DManstrator mentioned this pull request Jul 31, 2021
Merged
6 tasks
Tais993 pushed a commit to Tais993/JDA that referenced this pull request Sep 13, 2021
@arynxd @Tais993
Implement access and retrieval of message_reference (discord-jda#1686)
e06395a
This was referenced Jan 8, 2022
Merged
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DV8FromTheWorld DV8FromTheWorld DV8FromTheWorld approved these changes

@MinnDevelopment MinnDevelopment MinnDevelopment approved these changes

Assignees
No one assigned
Labels
type: feature
Projects
None yet
Milestone
v4.3.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@arynxd @MinnDevelopment @DV8FromTheWorld