Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Defective4/JavaBot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Java-Discord/JavaBot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 12 files changed
  • 2 contributors

Commits on Apr 6, 2026

  1. add custom notification for kicked users

    @danthe1st
    danthe1st committed Apr 6, 2026
    Configuration menu
    Copy the full SHA
    6852580 View commit details
    Browse the repository at this point in the history

  2. Merge pull request Java-Discord#546 from danthe1st/kick-notif 

    add custom notification for kicked users
    @danthe1st
    danthe1st authored Apr 6, 2026
    Configuration menu
    Copy the full SHA
    629ca9f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2026

  1. fix automatic removal of QOTW champions

    @danthe1st
    danthe1st committed May 31, 2026
    Configuration menu
    Copy the full SHA
    2a54ce0 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2026

  1. Merge pull request Java-Discord#547 from danthe1st/remove-qotw-champions 

    fix automatic removal of QOTW champions
    @danthe1st
    danthe1st authored Jun 5, 2026
    Configuration menu
    Copy the full SHA
    b3970e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2026

  1. fix formatting of code longer than Discord's message limit

    @Neil-Tomar
    Neil-Tomar committed Jun 20, 2026
    Configuration menu
    Copy the full SHA
    7679c4b View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2026

  1. add javadocs, and fixed requested changes.

    @Neil-Tomar
    Neil-Tomar committed Jun 23, 2026
    Configuration menu
    Copy the full SHA
    d2f25e6 View commit details
    Browse the repository at this point in the history

  2. added javadocs, and fixed requested changes, fixed build issue.

    @Neil-Tomar
    Neil-Tomar committed Jun 23, 2026
    Configuration menu
    Copy the full SHA
    1cdeef7 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/fix/format-code-long-messages' i… 

    …nto fix/format-code-long-messages

# Conflicts:
#	src/main/java/net/discordjug/javabot/systems/user_commands/format_code/Code.java
#	src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeDispatcher.java
#	src/main/java/net/discordjug/javabot/systems/user_commands/format_code/Language.java
    @Neil-Tomar
    Neil-Tomar committed Jun 23, 2026
    Configuration menu
    Copy the full SHA
    50e0594 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2026

  1. refactor: address format-code review feedback

    @Neil-Tomar
    Neil-Tomar committed Jun 24, 2026
    Configuration menu
    Copy the full SHA
    f5c3037 View commit details
    Browse the repository at this point in the history

  2. fix: normalize line endings in IndentationHelperTest

    @Neil-Tomar
    Neil-Tomar committed Jun 24, 2026
    Configuration menu
    Copy the full SHA
    6e47314 View commit details
    Browse the repository at this point in the history

  3. fix: minor fixes

    @Neil-Tomar
    Neil-Tomar committed Jun 24, 2026
    Configuration menu
    Copy the full SHA
    6556600 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2026

  1. fix: more minor fixes

    @Neil-Tomar
    Neil-Tomar committed Jun 25, 2026
    Configuration menu
    Copy the full SHA
    fd2be73 View commit details
    Browse the repository at this point in the history

  2. fix: typo fix.

    @Neil-Tomar
    Neil-Tomar committed Jun 25, 2026
    Configuration menu
    Copy the full SHA
    f1a6a9f View commit details
    Browse the repository at this point in the history

  3. fix: typo fix.

    @Neil-Tomar
    Neil-Tomar committed Jun 25, 2026
    Configuration menu
    Copy the full SHA
    ba03c61 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/fix/format-code-long-messages' i… 

    …nto fix/format-code-long-messages

# Conflicts:
#	src/main/java/net/discordjug/javabot/systems/user_commands/format_code/FormatCodeDispatcher.java
    @Neil-Tomar
    Neil-Tomar committed Jun 25, 2026
    Configuration menu
    Copy the full SHA
    3467109 View commit details
    Browse the repository at this point in the history

  5. acknowledge interaction immediately for format-code, remove unused code

    @danthe1st
    danthe1st committed Jun 25, 2026
    Configuration menu
    Copy the full SHA
    c6e158e View commit details
    Browse the repository at this point in the history

  6. Merge pull request Java-Discord#549 from Neil-Tomar/fix/format-code-l… 

    …ong-messages

Fix formatting of code longer than Discord's message limit
    @danthe1st
    danthe1st authored Jun 25, 2026
    Configuration menu
    Copy the full SHA
    9a03a81 View commit details
    Browse the repository at this point in the history
Loading