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 temporary bans #391

Merged
merged 6 commits into from
Apr 10, 2024
Merged

Implement temporary bans #391

merged 6 commits into from
Apr 10, 2024

Conversation

NoComment1105
Copy link
Member

This PR adds temporary bans, as suggested in #389

@NoComment1105 NoComment1105 added the PRT: new-feature This PR adds a new feature(s) label Apr 2, 2024
@NoComment1105 NoComment1105 linked an issue Apr 2, 2024 that may be closed by this pull request
Temp bans #389
Closed
@NoComment1105
Merge branch 'develop' into issue-389
7acd80c 
# Conflicts:
#	src/main/kotlin/org/hyacinthbots/lilybot/extensions/moderation/ModerationCommands.kt
tempest15
tempest15 requested changes Apr 4, 2024
View reviewed changes
Copy link
Member

@tempest15 tempest15 left a comment

Choose a reason for hiding this comment

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

I think the ban remove command should just be incorporated into the unban command.

Also, soft-ban feels redundant now. We could definitely remove it, maybe replace it by adding an optional message deletion to kick or a default duration for this command.

@NoComment1105
Merge branch 'develop' into issue-389
be1510d 
# Conflicts:
#	docs/commands.md
#	src/main/kotlin/org/hyacinthbots/lilybot/database/migrations/main/mainV10.kt
@NoComment1105
Apply review comments
0ad01b3 
- Remove temp-ban remove, incorporate into unban
- Remove soft-ban, incorporate into main ban command
tempest15
tempest15 approved these changes Apr 8, 2024
View reviewed changes
docs/commands.md Outdated Show resolved Hide resolved
@NoComment1105 NoComment1105 merged commit a61c526 into develop Apr 10, 2024
2 checks passed
@NoComment1105 NoComment1105 deleted the issue-389 branch April 10, 2024 12:22
@NoComment1105 NoComment1105 mentioned this pull request Apr 10, 2024
Closed
NoComment1105 added a commit that referenced this pull request Sep 20, 2024
@NoComment1105 @dependabot
@TheKodeToad @gdude2002
LilyBot 5.0.0 (#422)
1fd8256 
* Bump detekt from 1.23.1 to 1.23.3 (#362)

Bumps `detekt` from 1.23.1 to 1.23.3.

Updates `io.gitlab.arturbosch.detekt:detekt-formatting` from 1.23.1 to 1.23.3
- [Release notes](https://github.com/detekt/detekt/releases)
- [Commits](detekt/detekt@v1.23.1...v1.23.3)

Updates `io.gitlab.arturbosch.detekt` from 1.23.1 to 1.23.3
- [Release notes](https://github.com/detekt/detekt/releases)
- [Commits](detekt/detekt@v1.23.1...v1.23.3)

---
updated-dependencies:
- dependency-name: io.gitlab.arturbosch.detekt:detekt-formatting
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.gitlab.arturbosch.detekt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump kotlin from 1.9.10 to 1.9.20 (#363)

Bumps `kotlin` from 1.9.10 to 1.9.20.

Updates `org.jetbrains.kotlin.jvm` from 1.9.10 to 1.9.20
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](JetBrains/kotlin@v1.9.10...v1.9.20)

Updates `org.jetbrains.kotlin.plugin.serialization` from 1.9.10 to 1.9.20
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](JetBrains/kotlin@v1.9.10...v1.9.20)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.plugin.serialization
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump org.litote.kmongo:kmongo-coroutine-serialization (#364)

Bumps [org.litote.kmongo:kmongo-coroutine-serialization](https://github.com/Litote/kmongo) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/Litote/kmongo/releases)
- [Commits](Litote/kmongo@kmongo-4.10.0...kmongo-4.11.0)

---
updated-dependencies:
- dependency-name: org.litote.kmongo:kmongo-coroutine-serialization
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump io.github.oshai:kotlin-logging from 5.1.0 to 5.1.1 (#366)

Bumps [io.github.oshai:kotlin-logging](https://github.com/oshai/kotlin-logging) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/oshai/kotlin-logging/releases)
- [Changelog](https://github.com/oshai/kotlin-logging/blob/master/ChangeLog-old.md)
- [Commits](oshai/kotlin-logging@5.1.0...5.1.1)

---
updated-dependencies:
- dependency-name: io.github.oshai:kotlin-logging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump AButler/upload-release-assets from 2.0 to 3.0 (#367)

Bumps [AButler/upload-release-assets](https://github.com/abutler/upload-release-assets) from 2.0 to 3.0.
- [Release notes](https://github.com/abutler/upload-release-assets/releases)
- [Commits](AButler/upload-release-assets@v2.0...v3.0)

---
updated-dependencies:
- dependency-name: AButler/upload-release-assets
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump kotlin from 1.9.20 to 1.9.21 (#368)

* Bump kotlin from 1.9.20 to 1.9.21

Bumps `kotlin` from 1.9.20 to 1.9.21.

Updates `org.jetbrains.kotlin.jvm` from 1.9.20 to 1.9.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](JetBrains/kotlin@v1.9.20...v1.9.21)

Updates `org.jetbrains.kotlin.plugin.serialization` from 1.9.20 to 1.9.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](JetBrains/kotlin@v1.9.20...v1.9.21)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.plugin.serialization
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update libs.versions.toml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NoComment <67918617+NoComment1105@users.noreply.github.com>

* Bump detekt from 1.23.3 to 1.23.4 (#369)

Bumps `detekt` from 1.23.3 to 1.23.4.

Updates `io.gitlab.arturbosch.detekt:detekt-formatting` from 1.23.3 to 1.23.4
- [Release notes](https://github.com/detekt/detekt/releases)
- [Commits](detekt/detekt@v1.23.3...v1.23.4)

Updates `io.gitlab.arturbosch.detekt` from 1.23.3 to 1.23.4
- [Release notes](https://github.com/detekt/detekt/releases)
- [Commits](detekt/detekt@v1.23.3...v1.23.4)

---
updated-dependencies:
- dependency-name: io.gitlab.arturbosch.detekt:detekt-formatting
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.gitlab.arturbosch.detekt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ch.qos.logback:logback-classic from 1.4.11 to 1.4.14 (#371)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.11 to 1.4.14.
- [Commits](qos-ch/logback@v_1.4.11...v_1.4.14)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/setup-java from 3 to 4 (#372)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump actions/upload-artifact from 3 to 4 (#374)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update to Kordex 1.7.1-SNAPSHOT

* Remove redundant codec

* Update dependencies and upgradle (still hilarious)

* Update dependencies

* Fix cancelling reminders with moderation command.

Turns out we were trying to cancel the reminder for the command executor haha very optimal

* Add 'Auto-invite Moderator Role' option (#382)

* Add 'Auto-invite Moderator Role' option

* Fix v7 migration

* Fix compilation

* Fix unpinning/pinning of old messages causing edit log (#381)

* Update dependencies

* Bump org.kohsuke:github-api from 1.318 to 1.319 (#385)

Bumps [org.kohsuke:github-api](https://github.com/hub4j/github-api) from 1.318 to 1.319.
- [Release notes](https://github.com/hub4j/github-api/releases)
- [Changelog](https://github.com/hub4j/github-api/blob/main/CHANGELOG.md)
- [Commits](hub4j/github-api@github-api-1.318...github-api-1.319)

---
updated-dependencies:
- dependency-name: org.kohsuke:github-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump kotlin from 1.9.22 to 1.9.23 (#390)

Bumps `kotlin` from 1.9.22 to 1.9.23.

Updates `org.jetbrains.kotlin.jvm` from 1.9.22 to 1.9.23
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.23/ChangeLog.md)
- [Commits](JetBrains/kotlin@v1.9.22...v1.9.23)

Updates `org.jetbrains.kotlin.plugin.serialization` from 1.9.22 to 1.9.23
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.23/ChangeLog.md)
- [Commits](JetBrains/kotlin@v1.9.22...v1.9.23)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.jvm
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.plugin.serialization
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump ch.qos.logback:logback-classic from 1.5.0 to 1.5.3 (#388)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.0 to 1.5.3.
- [Commits](qos-ch/logback@v_1.5.0...v_1.5.3)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NoComment <67918617+NoComment1105@users.noreply.github.com>

* Create a moderation arguments class to shrink the arguments down

* Revert "Create a moderation arguments class to shrink the arguments down"

This reverts commit b82f7ef.

* Allow multiple roles to be pinged on auto-threads (#386)

* Allow multiple roles to be pinged in auto-threaded channels

* Add migration for new issue

* Fix doc file

* Update dependencies

* Implement temporary bans (#391)

* Revert "Create a moderation arguments class to shrink the arguments down"

This reverts commit b82f7ef.

* Implement temporary bans

* Apply review comments
- Remove temp-ban remove, incorporate into unban
- Remove soft-ban, incorporate into main ban command

* Fix typo in command option description

* Fix permissions being lost by locked channels when unlocked (#395)

* Begin work on storing original permissions when locking channels

* Complete work on storing original permission for locked channels

* Bump ch.qos.logback:logback-classic from 1.5.3 to 1.5.6 (#398)

Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.3 to 1.5.6.
- [Commits](qos-ch/logback@v_1.5.3...v_1.5.6)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump io.github.oshai:kotlin-logging from 6.0.4 to 6.0.9 (#397)

Bumps [io.github.oshai:kotlin-logging](https://github.com/oshai/kotlin-logging) from 6.0.4 to 6.0.9.
- [Release notes](https://github.com/oshai/kotlin-logging/releases)
- [Changelog](https://github.com/oshai/kotlin-logging/blob/master/ChangeLog-old.md)
- [Commits](oshai/kotlin-logging@6.0.4...6.0.9)

---
updated-dependencies:
- dependency-name: io.github.oshai:kotlin-logging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NoComment <67918617+NoComment1105@users.noreply.github.com>

* Fix lily being unable to unlock channels after she locks them

* Hopefully avoid funny embeds appearing when messages don't change properly

* Bump org.kohsuke:github-api from 1.321 to 1.322 (#406)

Bumps [org.kohsuke:github-api](https://github.com/hub4j/github-api) from 1.321 to 1.322.
- [Release notes](https://github.com/hub4j/github-api/releases)
- [Changelog](https://github.com/hub4j/github-api/blob/main/CHANGELOG.md)
- [Commits](hub4j/github-api@github-api-1.321...github-api-1.322)

---
updated-dependencies:
- dependency-name: org.kohsuke:github-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update to Kotlin 2

* Update to Java 21 😎

* Update dependencies and gradle

* Update KordEx, Kotlin, Gradle, fix small K2 warnings (#413)

* Update KordEx, Kotlin, Gradle, fix small K2 warnings

* Yeet unnecessary Gradle task

* Configure the about command

* Address comments

* Update KordEx to 2.1.0

Hopefully this is it!

* Update to KordEx 2.2.0, other dependencies

* Package restructure (#417)

* Refactor package structure attempt 2

* Fix package references :D

* Split out config view and clear

* More event logging (#410)

* Start work on audit-log event based logging

* Refactor it all because yes

* Create action transferring database to move important information over to the event action

* Log Kicks, send quick actions to db, generalise channel creation logs

* Start work on channel updates

* Add the rest of the channel update fields

* Fully set up channel edit logging

* Add scheduled event logging

* Invite events and Role events

* Thread creates and deletes logging + updated kordex

* Log timeouts created by lily

* Fix timeout logging, yeehaw actual code is done now

* Add docs

* Fix package references

* Remove the logging, however funny it was to me it is not needed

* Complete merge

* Add configuration, split down into two event categories

* Update migrations for utility config

* Reduce code duplication and rename some packages

* Fix formatting of applied tags

* Reduce some duplication here and there

* Dm default false (#421)

* Theoretically make the DM option default to a certain value. Needs testing :)

* Forgot migration 😎

* Well, lets do this I guess

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Co-authored-by: Gareth Coles <gdude2002@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tempest15 tempest15 tempest15 approved these changes

Assignees
No one assigned
Labels
PRT: new-feature This PR adds a new feature(s)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Temp bans
2 participants
@NoComment1105 @tempest15