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

Feature: Add Ignored users for Party Commands #1469

Merged
merged 18 commits into from
May 1, 2024
Merged

Feature: Add Ignored users for Party Commands #1469

merged 18 commits into from
May 1, 2024

Conversation

martimavocado
Copy link
Contributor

@martimavocado martimavocado commented Apr 16, 2024 •
edited
Loading

What

Adds /shignore which lets you blacklist certain people from using party commands.
This has several sub-commands, including add, remove, list and clear.

  • add and remove always take another argument, being the username to add/remove.
  • list takes an optional argument, checking if a given username is ignored, or listing every username when none is given.
  • clear clears the list with a confirmation prompt.
  • when no subcommands are taken, it will assume a add/remove toggle for the given username.

https://canary.discord.com/channels/997079228510117908/1229893091285008526

Images

image

image
image

image

image
image

image

Changelog New Features

  • Added /shignore. - martimavocado
    • This lets you block users from running party commands.

CalMWolfs
CalMWolfs requested changes Apr 17, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

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

also can you please do the generic changes (make functions private and change the config variable to be called config) like in #1464

src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt Outdated Show resolved Hide resolved
@hannibal002 hannibal002 added this to the Version 0.26 milestone Apr 17, 2024
CalMWolfs
CalMWolfs approved these changes Apr 17, 2024
View reviewed changes
Copy link
Collaborator

@CalMWolfs CalMWolfs left a comment

Choose a reason for hiding this comment

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

Haven't tested in game but code looks fine

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Apr 23, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 23, 2024
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@hannibal002
Merge branch 'beta' into fork/blacklist-party-commands
733cf48 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 23, 2024
hannibal002
hannibal002 requested changes Apr 23, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

I thought we wanted to use Hypixel's /ignore list, not create our own?

@CalMWolfs
Copy link
Collaborator

I thought we wanted to use Hypixel's /ignore list, not create our own?

Own ignore list is fine here I think, this is like a list of not trusted party members but they arent bad enough to be fully blocked from being in the party, or at least that is my understanding

@martimavocado
Copy link
Contributor Author

I thought we wanted to use Hypixel's /ignore list, not create our own?

if this is the case that wasn't very clear for me from the conversation in the discord thread, but i could redo this to use hypixel's list instead of a custom one if you think that's better

@hannibal002
Copy link
Owner

i dont think thats better, i just thought we decided to do it this way. if this was not clear, im fine with the current version as well

@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 23, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 23, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@hannibal002 hannibal002 self-requested a review April 23, 2024 22:45
hannibal002
hannibal002 approved these changes Apr 25, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

works now

src/main/java/at/hannibal2/skyhanni/config/features/misc/PartyCommandsConfig.java Outdated Show resolved Hide resolved
hannibal002
hannibal002 requested changes Apr 25, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

missclick

@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Apr 30, 2024
hannibal002
hannibal002 requested changes May 1, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

merge conflicts

@martimavocado
Merge remote-tracking branch 'refs/remotes/hannibal002/beta' into bla…
d5989f1 
…cklist-party-commands

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt
@github-actions GitHub Actions
Copy link

github-actions bot commented May 1, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label May 1, 2024
hannibal002
hannibal002 approved these changes May 1, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

image

@hannibal002 hannibal002 merged commit fbfb1f1 into hannibal002:beta May 1, 2024
3 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label May 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ItsEmpa ItsEmpa ItsEmpa left review comments

@hannibal002 hannibal002 hannibal002 approved these changes

@CalMWolfs CalMWolfs Awaiting requested review from CalMWolfs

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.25
Development

Successfully merging this pull request may close these issues.
4 participants
@martimavocado @CalMWolfs @hannibal002 @ItsEmpa