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.

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

Update BOM for Reactor and Member Logic Fixes #1180

Merged
merged 2 commits into from
Jul 16, 2024

Conversation

EasternGamer
Copy link
Contributor

Description:

  • Updated Reactor BOM
  • Added .equal override for PartialMember.java to account for guild ID.
  • Made .equal override in User.java no longer final to enable override in PartialMember.java

Justification:

  • The current version used of Reactor has security vulnerabilities. (Though, I'm not sure why the version used it so old)
  • Comparing to members with .equals() can falsely state that two members that are the same user, but in different guilds are the same.
  • Impossible to make the above happen without removing the final modifier.

@Azn9 Azn9 added this to the 3.3.0 milestone Apr 14, 2024
@Azn9
Copy link
Member

Azn9 commented May 18, 2024

This should target 3.2.X, I'll rebase it

Added .equal override for PartialMember.java to account for guild ID.
Made .equal override in User.java no longer final to enable override in PartialMember.java
@Azn9 Azn9 changed the base branch from master to 3.2.x May 18, 2024 15:19
@Azn9 Azn9 requested a review from Doc94 May 18, 2024 15:48
@Doc94
Copy link
Member

Doc94 commented Jun 20, 2024

This require a rebase but the source branch is master.
Please open a new PR using a new branch of source.

@Doc94 Doc94 closed this Jun 20, 2024
@Azn9
Copy link
Member

Azn9 commented Jun 20, 2024

@Doc94 I already rebased this on 3.2.x, even if the branch name is "master"
Maybe this needs another rebase, in that case I'll do it (I cannot see it before re-opening the pr)

@Azn9 Azn9 reopened this Jun 20, 2024
@Azn9
Copy link
Member

Azn9 commented Jun 20, 2024

So, no, it does not need a rebase and already targets 3.2.x with only one added commit, lgtm

@Doc94
Copy link
Member

Doc94 commented Jun 20, 2024

So, no, it does not need a rebase and already targets 3.2.x with only one added commit, lgtm

okay, when try test i cannot set the branch in my setup for the branch name... then if run correctly then can be merged.

@Azn9
Copy link
Member

Azn9 commented Jun 20, 2024

So, no, it does not need a rebase and already targets 3.2.x with only one added commit, lgtm

okay, when try test i cannot set the branch in my setup for the branch name... then if run correctly then can be merged.

You can try with:
git remote add EasternGamer https://github.com/EasternGamer/Discord4J.git
git fetch EasternGamer
git checkout -b pr_1180 EasternGamer/master

@Doc94 Doc94 merged commit 3f2d602 into Discord4J:3.2.x Jul 16, 2024
6 checks passed
Doc94 added a commit that referenced this pull request Jul 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants