Command rework, attempt number 2 #558

Tais993 · 2022-09-03T13:30:15Z

Changes in this PR

Added interfaces

BotCommand (contains logic for every Discord command)
MessageContextCommand
UserContextCommand

Added adapters

BotCommandAdapter

Added general classes

CommandReloadUtil (reload command has been deleted, commands will be updated automatically every restart)

Renamed

SlashCommandVisibility to CommandVisibility
SlashCommandProvider to CommandProvider

For more info, see #368

After these changes, there's support for multiple interactors with the same name, they just need to be of a different type (slash-command, message context-command, user context-command, or just a basic interactor)

… have to waste another 500 commits like i am right now cause its such a messy and annoying setup

Tais993 · 2022-09-08T08:59:44Z

Reviews would be appreciated! The sooner @illuminator3 will stop complaining :p

Taz03 · 2022-09-10T08:30:39Z

TJ-Bot/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractor.java

Lines 21 to 22 in ac84310

    
                * Requirements for this are documented in 
        
                * {@link net.dv8tion.jda.api.interactions.commands.build.Commands#slash(String, String)}.

change the comments, currently it only mentions slash commands add other commands as well

TJ-Bot/application/src/main/java/org/togetherjava/tjbot/commands/UserInteractor.java

Lines 11 to 12 in ac84310

    
            * Represents a feature that can interact with users. The most important implementation is 
        
            * {@link SlashCommand}.

here also it only mentions about slash command add other commands as well

application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java

application/src/main/java/org/togetherjava/tjbot/commands/BotCommandAdapter.java

java-coding-prodigy · 2022-09-12T10:45:52Z

This branch needs to be updated in accordance with #541 and #548

application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java

application/src/main/java/org/togetherjava/tjbot/commands/UserInteractorPrefix.java

Order has been modified, the BotCore now only gets created after JDA is ready. Also removed the registerReloadCommand method from BotCore, the reload command has been removed, so that method served no purpose.

The BotCore gets after JDA is ready, because JDA is ready now, routines can be started on construction of BotCore, and commands have access to JDA's caches So now the BotCore constructor is now responsible for reloading commands and scheduling routines

For all the methods that expect a prefix name, the variable has been renamed from name to prefixedName to clarify what it means. Documentation has also been improved across the board.

Tais993 · 2022-09-29T11:18:13Z

Also @Zabuzard, if you accept this PR, can it be merged already?
Hasn't been much interest in anyone else accepting the PR, so I much rather don't want to wait a full week.

System has been tested now and should not contain any bugs!

application/src/main/java/org/togetherjava/tjbot/CommandReloading.java

application/src/main/java/org/togetherjava/tjbot/commands/system/CommandProvider.java

Documentation changes Added MAX_COMMAND_COUNT constant to CommandReloading And our beloved friend, spotless :p

Zabuzard

application/src/main/java/org/togetherjava/tjbot/Application.java

application/src/main/java/org/togetherjava/tjbot/CommandReloading.java

application/src/main/java/org/togetherjava/tjbot/commands/UserInteractorPrefix.java

application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java

application/src/main/java/org/togetherjava/tjbot/CommandReloading.java

application/src/main/java/org/togetherjava/tjbot/commands/BotCommand.java

application/src/main/java/org/togetherjava/tjbot/commands/UserInteractorPrefix.java

Spotless really is useful, huh? Co-authored-by: Tanish Azad <73871477+Taz03@users.noreply.github.com>

sonarqubecloud · 2022-09-30T12:05:37Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

0.0% Coverage
0.0% Duplication

Copy paste of old command rework from #382

a0fb71e

Tais993 added documentation Improvements or additions to documentation enhancement New feature or request priority: major labels Sep 3, 2022

Tais993 self-assigned this Sep 3, 2022

Tais993 requested review from a team as code owners September 3, 2022 13:30

Tais993 marked this pull request as draft September 3, 2022 13:30

Removed ReloadCommand.java and added automatic reloading on bot launch

e3aa80b

Taz03 linked an issue Sep 4, 2022 that may be closed by this pull request

Rework command system to add context command and autocomplete support #368

Closed

14 tasks

Applied Spotless, and reworked CommandProvider

4332c74

After these changes, there's support for multiple interactors with the same name, they just need to be of a different type (slash-command, message context-command, user context-command, or just a basic interactor)

Tais993 marked this pull request as ready for review September 7, 2022 13:50

Tais993 added 8 commits September 7, 2022 15:52

I like SpotlasSS!!!!!!!!

154a24d

Removed unused method

2d837b1

homicide

8ded6d3

I just commited homicide

e10afcc

It's over, but not for me

acfecbc

okay this one was my fault ngl

d5dbaee

now it should work pepepls

fe10a3c

i should find out how i can make spotless run automatically so i dont…

7ddf0e0

… have to waste another 500 commits like i am right now cause its such a messy and annoying setup

Tais993 requested review from illuminator3, marko-radosavljevic, SquidXTV, talentedasian and Zabuzard September 9, 2022 12:12

illuminator3 reviewed Sep 10, 2022

View reviewed changes

application/src/main/java/org/togetherjava/tjbot/commands/system/BotCore.java Outdated Show resolved Hide resolved

Taz03 requested changes Sep 11, 2022

View reviewed changes

application/src/main/java/org/togetherjava/tjbot/commands/BotCommandAdapter.java Outdated Show resolved Hide resolved

i hate this shit so fucking much

04b56b1

Tais993 requested a review from Zabuzard September 27, 2022 11:54

Zabuzard requested changes Sep 27, 2022

View reviewed changes

Tais993 added 5 commits September 27, 2022 16:32

CR fixes

3af6108

CR fixes

5df1f0a

Minor changes to command reloading

aa4e098

Order has been modified, the BotCore now only gets created after JDA is ready. Also removed the registerReloadCommand method from BotCore, the reload command has been removed, so that method served no purpose.

Improved documentation surrounding prefixed and unprefixed names

bebccc5

For all the methods that expect a prefix name, the variable has been renamed from name to prefixedName to clarify what it means. Documentation has also been improved across the board.

Tais993 requested a review from Zabuzard September 29, 2022 11:17

Tais993 added 5 commits September 29, 2022 13:19

spotless

41a5009

Added documentation to scheduleRoutines

775a0b2

spotless

c52a4ad

Fixed bugs

edc1158

System has been tested now and should not contain any bugs!

spotless runs automatically yes mhmhhm

d8a1fdb

Zabuzard mentioned this pull request Sep 30, 2022

Added ComponentIdInteractor delegate #588

Merged

4 tasks

Zabuzard requested changes Sep 30, 2022

View reviewed changes

CR

8a93265

Documentation changes Added MAX_COMMAND_COUNT constant to CommandReloading And our beloved friend, spotless :p

Tais993 requested a review from Zabuzard September 30, 2022 10:15

Zabuzard previously approved these changes Sep 30, 2022

View reviewed changes

Taz03 requested changes Sep 30, 2022

View reviewed changes

Tais993 dismissed Zabuzard’s stale review via f71e4fe September 30, 2022 11:53

Removed useless extra lines (CR)

f71e4fe

Taz03 requested changes Sep 30, 2022

View reviewed changes

Added missing empty lines between methods

befa3a8

Spotless really is useful, huh? Co-authored-by: Tanish Azad <73871477+Taz03@users.noreply.github.com>

Taz03 approved these changes Sep 30, 2022

View reviewed changes

Zabuzard approved these changes Sep 30, 2022

View reviewed changes

Tais993 merged commit 0d315c8 into develop Sep 30, 2022

Tais993 deleted the feature/command-rework branch September 30, 2022 12:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Command rework, attempt number 2 #558

Command rework, attempt number 2 #558

Tais993 commented Sep 3, 2022 •

edited

Loading

Tais993 commented Sep 8, 2022

Taz03 commented Sep 10, 2022

java-coding-prodigy commented Sep 12, 2022

Tais993 commented Sep 29, 2022 •

edited

Loading

Zabuzard left a comment •

edited

Loading

sonarqubecloud bot commented Sep 30, 2022

Command rework, attempt number 2 #558

Command rework, attempt number 2 #558

Conversation

Tais993 commented Sep 3, 2022 • edited Loading

Changes in this PR

Added interfaces

Added adapters

Added general classes

Renamed

Tais993 commented Sep 8, 2022

Taz03 commented Sep 10, 2022

java-coding-prodigy commented Sep 12, 2022

Tais993 commented Sep 29, 2022 • edited Loading

Zabuzard left a comment • edited Loading

Choose a reason for hiding this comment

sonarqubecloud bot commented Sep 30, 2022

Tais993 commented Sep 3, 2022 •

edited

Loading

Tais993 commented Sep 29, 2022 •

edited

Loading

Zabuzard left a comment •

edited

Loading