Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
| 8d8fd0c04f |
60 changed files with 2763 additions and 8678 deletions
|
|
@ -80,23 +80,9 @@ Manage the immunity whitelist.
|
||||||
- Usage: `[p]aurora timedelta <duration>`
|
- Usage: `[p]aurora timedelta <duration>`
|
||||||
- Aliases: `tdc, td, and timedeltaconvert`
|
- Aliases: `tdc, td, and timedeltaconvert`
|
||||||
|
|
||||||
This command converts a duration to a [`timedelta`](https://docs.python.org/3/library/datetime.html#datetime.timedelta) Python object.You cannot convert years or months as they are not fixed units. Use `[p]aurora relativedelta` for that.
|
This command converts a duration to a [`timedelta`](https://docs.python.org/3/library/datetime.html#datetime.timedelta) Python object.
|
||||||
|
|
||||||
**Example usage**
|
**Example usage**
|
||||||
`[p]aurora timedelta 1 day 15hr 82 minutes 52s`
|
`[p]timedelta 1 day 15hr 82 minutes 52s`
|
||||||
|
|
||||||
**Output**
|
**Output**
|
||||||
`1 day, 16:22:52`
|
`1 day, 16:22:52`
|
||||||
|
|
||||||
### aurora relativedelta
|
|
||||||
|
|
||||||
- Usage: `[p]aurora relativedelta <duration>`
|
|
||||||
- Aliases: `rdc, rd, and relativedeltaconvert`
|
|
||||||
|
|
||||||
This command converts a duration to a [`relativedelta`](https://dateutil.readthedocs.io/en/stable/relativedelta.html) Python object.
|
|
||||||
|
|
||||||
**Example usage**
|
|
||||||
`[p]aurora relativedelta 3 years 1 day 15hr 82 minutes 52s`
|
|
||||||
|
|
||||||
**Output**
|
|
||||||
`relativedelta(years=+3, days=+1, hours=+15, minutes=+82, seconds=+52)`
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ Aurora is a fully-featured moderation system. It is heavily inspired by Galactic
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
|
[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
|
||||||
[p]cog install seacogs aurora
|
[p]cog install seacogs aurora
|
||||||
[p]cog load aurora
|
[p]cog load aurora
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -23,27 +23,19 @@ Add a note to a user.
|
||||||
|
|
||||||
Warn a user.
|
Warn a user.
|
||||||
|
|
||||||
## addrole
|
## blacklist
|
||||||
|
|
||||||
- Usage: `/addrole <target> <role> <reason> [duration] [silent]`
|
/// admonition | This command is unfinished, and doesn't currently work.
|
||||||
- `target:` (Required) Who are you adding a role to?
|
type: warning
|
||||||
- `role:` (Required) What role are you adding to the target?
|
///
|
||||||
- `reason:` (Required) Why are you adding a role to this user?
|
|
||||||
- `duration:` (Optional) How long are you adding this role for?
|
- Usage: `/blacklist <target> <role> <reason> [silent]`
|
||||||
|
- `target:` (Required) Who are you blacklisting?
|
||||||
|
- `role:` (Required) What blacklist type are you applying to the target?
|
||||||
|
- `reason:` (Required) Why are you blacklisting this user?
|
||||||
- `silent:` (Optional) Should the user be messaged?
|
- `silent:` (Optional) Should the user be messaged?
|
||||||
|
|
||||||
Add a role to a user.
|
Add a blacklist role to a user.
|
||||||
|
|
||||||
## removerole
|
|
||||||
|
|
||||||
- Usage: `/removerole <target> <role> <reason> [duration] [silent]`
|
|
||||||
- `target:` (Required) Who are you removing a role from?
|
|
||||||
- `role:` (Required) What role are you removing from the target?
|
|
||||||
- `reason:` (Required) Why are you removing a role from this user?
|
|
||||||
- `duration:` (Optional) How long are you removing this role for?
|
|
||||||
- `silent:` (Optional) Should the user be messaged?
|
|
||||||
|
|
||||||
Remove a role from a user.
|
|
||||||
|
|
||||||
## mute
|
## mute
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
# Backup
|
# Backup
|
||||||
|
|
||||||
Backup allows you to export a JSON list of all of your installed repositories and cogs, then reimport them and automatically reinstall the cogs.
|
Backup allows you to export a JSON list of all of your installed repositories and cogs, then reimport them and automatically reinstall/reload the cogs.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
|
[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
|
||||||
[p]cog install seacogs backup
|
[p]cog install seacogs backup
|
||||||
[p]cog load backup
|
[p]cog load backup
|
||||||
```
|
```
|
||||||
|
|
||||||
## Version Compatibility
|
## Version Compatibility
|
||||||
|
|
||||||
As of commit [1edb08a](https://www.coastalcommits.com/cswimr/SeaCogs/commit/1edb08a1271f12098ca0bed11a735f7162cedd14), the Backup cog no longer supports Red versions older than 3.5.6. If you want to use the cog on an earlier version (3.5.0 - 3.5.5), install the cog pinned to this commit: `43464db6a7c51bc69282b1ae3dc507a4aae851de`.
|
As of commit [1edb08a](https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs/commit/1edb08a1271f12098ca0bed11a735f7162cedd14), the Backup cog no longer supports Red versions older than 3.5.6. If you want to use the cog on an earlier version (3.5.0 - 3.5.5), install the cog pinned to this commit: `43464db6a7c51bc69282b1ae3dc507a4aae851de`.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
[p]cog installversion sea-cogs 43464db6a7c51bc69282b1ae3dc507a4aae851de backup
|
[p]cog installversion sea-cogs 43464db6a7c51bc69282b1ae3dc507a4aae851de backup
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ This cog does require an api key to work.
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
|
[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
|
||||||
[p]cog install seacogs bible
|
[p]cog install seacogs bible
|
||||||
[p]cog load bible
|
[p]cog load bible
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
# EmojiInfo
|
|
||||||
|
|
||||||
EmojiInfo allows you to retrieve information about an emoji.
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
```bash
|
|
||||||
[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
|
|
||||||
[p]cog install seacogs emojiinfo
|
|
||||||
[p]cog load emojiinfo
|
|
||||||
```
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
### emoji
|
|
||||||
|
|
||||||
- Usage: `[p]emoji <emoji> [ephemeral]`
|
|
||||||
|
|
||||||
Retrieve information about the provided emoji. If `ephemeral` is provided and the command is used as a slash command, the response will be sent as an ephemeral message.
|
|
||||||
|
|
@ -5,7 +5,7 @@ Nerdify allows you to nerdify other people's text.
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
|
[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
|
||||||
[p]cog install seacogs nerdify
|
[p]cog install seacogs nerdify
|
||||||
[p]cog load nerdify
|
[p]cog load nerdify
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ The Downloader cog allows you to add Git repositories to your bot in order to do
|
||||||
Now, use Downloader to add my repository to your bot:
|
Now, use Downloader to add my repository to your bot:
|
||||||
|
|
||||||
```
|
```
|
||||||
[p]repo add sea-cogs https://www.coastalcommits.com/cswimr/SeaCogs
|
[p]repo add sea-cogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
|
||||||
```
|
```
|
||||||
|
|
||||||
Now, install the Pterodactyl cog:
|
Now, install the Pterodactyl cog:
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ Pterodactyl allows for connecting to a Pterodactyl server through websockets. It
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
[p]repo add seacogs https://www.coastalcommits.com/cswimr/SeaCogs
|
[p]repo add seacogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
|
||||||
[p]cog install seacogs pterodactyl
|
[p]cog install seacogs pterodactyl
|
||||||
[p]cog load aurora
|
[p]cog load aurora
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ There are a few caveats to running an instance of Red on Pterodactyl.
|
||||||
|
|
||||||
- You will not receive any support from the Red developers.
|
- You will not receive any support from the Red developers.
|
||||||
- The built-in Audio cog will not work.
|
- The built-in Audio cog will not work.
|
||||||
- Depending on your host, you might have to request a [`tmpfs` size increase](https://github.com/pelican-eggs/eggs/tree/master/bots/discord/redbot#additional-requirements).
|
- Depending on your host, you might have to request a [`tmpfs` size increase](https://github.com/ign-gg/Pterodactyl-Eggs/tree/master/bots/discord/redbot#additional-requirements).
|
||||||
|
|
||||||
If these are unacceptable to you, you should [install Red normally](https://docs.discord.red/en/stable/install_guides/index.html).
|
If these are unacceptable to you, you should [install Red normally](https://docs.discord.red/en/stable/install_guides/index.html).
|
||||||
///
|
///
|
||||||
|
|
@ -64,7 +64,7 @@ Red is quite a large bot, so I'll focus on the specifics of getting the bot work
|
||||||
```
|
```
|
||||||
2. Add my repository to the bot
|
2. Add my repository to the bot
|
||||||
```bash
|
```bash
|
||||||
[p]repo add sea-cogs https://www.coastalcommits.com/cswimr/SeaCogs
|
[p]repo add sea-cogs https://www.coastalcommits.com/SeaswimmerTheFsh/SeaCogs
|
||||||
```
|
```
|
||||||
3. Install and load the Pterodactyl cog
|
3. Install and load the Pterodactyl cog
|
||||||
```bash
|
```bash
|
||||||
|
|
|
||||||
10
.envrc
10
.envrc
|
|
@ -1,10 +0,0 @@
|
||||||
if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
|
|
||||||
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
|
|
||||||
fi
|
|
||||||
|
|
||||||
watch_file flake.nix
|
|
||||||
watch_file flake.lock
|
|
||||||
if ! use flake . --no-pure-eval
|
|
||||||
then
|
|
||||||
echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
|
|
||||||
fi
|
|
||||||
23
.forgejo/ISSUE_TEMPLATE/bug-report.md
Normal file
23
.forgejo/ISSUE_TEMPLATE/bug-report.md
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
---
|
||||||
|
name: Bug Report
|
||||||
|
about: Got an issue with a cog from SeaCogs? Use this.
|
||||||
|
title: "[BUG]"
|
||||||
|
labels: bug
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Describe the bug**
|
||||||
|
A clear and concise description of what the bug is.
|
||||||
|
|
||||||
|
**To Reproduce**
|
||||||
|
What caused the error?
|
||||||
|
|
||||||
|
**Expected behavior**
|
||||||
|
A clear and concise description of what you expected to happen.
|
||||||
|
|
||||||
|
**Screenshots**
|
||||||
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context about the problem here.
|
||||||
|
|
@ -1,53 +0,0 @@
|
||||||
name: Bug Report
|
|
||||||
about: File a bug report
|
|
||||||
labels: [bug]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Thank you for taking the time to fill out this bug report!
|
|
||||||
- type: checkboxes
|
|
||||||
id: confirmation
|
|
||||||
attributes:
|
|
||||||
label: Please confirm that;
|
|
||||||
options:
|
|
||||||
- label: I have checked that this bug does not already have an opened/closed [issue](https://www.coastalcommits.com/cswimr/SeaCogs/issues) or [pull request](https://www.coastalcommits.com/cswimr/SeaCogs/pulls) associated with it.
|
|
||||||
required: true
|
|
||||||
- label: I have checked that I am on the latest version of [Red-DiscordBot](https://github.com/CogCreators/Red-DiscordBot), and SeaCogs.
|
|
||||||
required: true
|
|
||||||
- type: input
|
|
||||||
id: hosting
|
|
||||||
attributes:
|
|
||||||
label: Hosting
|
|
||||||
description: How is your bot hosted?
|
|
||||||
placeholder: Local, Docker, etc.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: what-happened
|
|
||||||
attributes:
|
|
||||||
label: What happened?
|
|
||||||
description: Also, what did you expect to happen?
|
|
||||||
placeholder: A bug happened!
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: reproduction
|
|
||||||
attributes:
|
|
||||||
label: Reproduction steps
|
|
||||||
description: Please provide detailed steps to reproduce the bug.
|
|
||||||
placeholder: |
|
|
||||||
1. Do this
|
|
||||||
2. Do that
|
|
||||||
3. Do this other thing
|
|
||||||
4. Bug happens!
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
- type: textarea
|
|
||||||
id: logs
|
|
||||||
attributes:
|
|
||||||
label: Relevant traceback or logs
|
|
||||||
description: Please copy and paste any relevant tracebacks or log output. This will be automatically formatted into code, so no need for backticks.
|
|
||||||
render: py
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
blank_issues_enabled: true
|
|
||||||
contact_links:
|
|
||||||
- name: Other Concerns?
|
|
||||||
url: https://discord.gg/eMUMe77Yb8
|
|
||||||
about: Ask in our Discord server!
|
|
||||||
26
.forgejo/ISSUE_TEMPLATE/suggestion.md
Normal file
26
.forgejo/ISSUE_TEMPLATE/suggestion.md
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
name: Suggestion
|
||||||
|
about: Trying to suggest something for SeaCogs? Use this.
|
||||||
|
title: "[SUGGESTION]"
|
||||||
|
labels: enhancement
|
||||||
|
assignees: ''
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**What cog is your feature request for?**
|
||||||
|
A cog in this repository.
|
||||||
|
|
||||||
|
**Is your feature request related to a problem? Please describe.**
|
||||||
|
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||||
|
|
||||||
|
**Describe the solution you'd like**
|
||||||
|
A clear and concise description of what you want to happen.
|
||||||
|
|
||||||
|
**Describe alternatives you've considered**
|
||||||
|
A clear and concise description of any alternative solutions or features you've considered.
|
||||||
|
|
||||||
|
**Screenshots**
|
||||||
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
|
||||||
|
**Additional context**
|
||||||
|
Add any other context about the problem here.
|
||||||
|
|
@ -1,53 +0,0 @@
|
||||||
name: Suggestion
|
|
||||||
about: Trying to suggest something for SeaCogs? Use this.
|
|
||||||
labels: [enhancement]
|
|
||||||
body:
|
|
||||||
- type: markdown
|
|
||||||
attributes:
|
|
||||||
value: |
|
|
||||||
Thank you for taking the time to suggest an enhancement!
|
|
||||||
- type: input
|
|
||||||
id: cog
|
|
||||||
attributes:
|
|
||||||
label: What cog is your feature request for?
|
|
||||||
description: Specify the cog within the repository.
|
|
||||||
placeholder: E.g., Pterodactyl
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: problem-description
|
|
||||||
attributes:
|
|
||||||
label: Is your feature request related to a problem? Please describe.
|
|
||||||
placeholder: A clear and concise description of what the problem is.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: solution-description
|
|
||||||
attributes:
|
|
||||||
label: Describe the solution you'd like
|
|
||||||
placeholder: A clear and concise description of what you want to happen.
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: textarea
|
|
||||||
id: alternatives
|
|
||||||
attributes:
|
|
||||||
label: Describe alternatives you've considered
|
|
||||||
placeholder: A clear and concise description of any alternative solutions or features you've considered.
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
- type: textarea
|
|
||||||
id: screenshots
|
|
||||||
attributes:
|
|
||||||
label: Screenshots
|
|
||||||
description: If applicable, add screenshots to help explain your problem.
|
|
||||||
placeholder: Paste image links here.
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
- type: textarea
|
|
||||||
id: additional-context
|
|
||||||
attributes:
|
|
||||||
label: Additional context
|
|
||||||
description: Add any other context about the problem here.
|
|
||||||
placeholder: Any extra information you think might be useful.
|
|
||||||
validations:
|
|
||||||
required: false
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
# Describe what your pull request does and which issue you're targeting
|
|
||||||
|
|
||||||
<!-- Create a new issue, if it doesn't exist yet -->
|
|
||||||
|
|
||||||
- [ ] By submitting this pull request, I permit cswimr to license my work under
|
|
||||||
the [Mozilla Public License Version 2.0](https://www.coastalcommits.com/cswimr/SeaCogs/src/branch/main/LICENSE).
|
|
||||||
|
|
@ -18,5 +18,4 @@
|
||||||
import-self,
|
import-self,
|
||||||
relative-beyond-top-level,
|
relative-beyond-top-level,
|
||||||
too-many-instance-attributes,
|
too-many-instance-attributes,
|
||||||
duplicate-code,
|
duplicate-code
|
||||||
too-many-nested-blocks
|
|
||||||
|
|
|
||||||
|
|
@ -1,46 +1,39 @@
|
||||||
name: Actions
|
name: Actions
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
branches:
|
||||||
|
- 'main'
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
Lint Code (Ruff & Pylint):
|
||||||
name: Lint Code (Ruff & Pylint)
|
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
container: www.coastalcommits.com/cswimr/actions:uv
|
container: www.coastalcommits.com/seaswimmerthefsh/actionscontainers-seacogs:latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Install python
|
|
||||||
run: uv python install 3.11
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: uv sync
|
run: poetry install --with dev --no-root
|
||||||
|
|
||||||
- name: Analysing code with Ruff
|
- name: Analysing code with Ruff
|
||||||
run: uv run ruff check $(git ls-files '*.py')
|
run: ./.venv/bin/ruff check $(git ls-files '*.py')
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
|
|
||||||
- name: Analysing code with Pylint
|
- name: Analysing code with Pylint
|
||||||
run: uv run pylint --rcfile=.forgejo/workflows/config/.pylintrc $(git ls-files '*.py')
|
run: ./.venv/bin/pylint --rcfile=.forgejo/workflows/config/.pylintrc $(git ls-files '*.py')
|
||||||
|
|
||||||
docs:
|
Build Documentation (MkDocs):
|
||||||
name: Build Documentation (MkDocs)
|
|
||||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
container: www.coastalcommits.com/cswimr/actions:docs
|
container: www.coastalcommits.com/seaswimmerthefsh/actionscontainers-seacogs:latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Install python
|
|
||||||
run: uv python install 3.11
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: uv sync --no-dev --extra=documentation
|
run: poetry install --with docs --no-root
|
||||||
|
|
||||||
- name: Set environment variables
|
- name: Set environment variables
|
||||||
uses: actions/env@v2
|
uses: actions/env@v2
|
||||||
|
|
@ -49,7 +42,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
export SITE_URL="https://$CI_ACTION_REF_NAME_SLUG.seacogs.coastalcommits.com"
|
export SITE_URL="https://$CI_ACTION_REF_NAME_SLUG.seacogs.coastalcommits.com"
|
||||||
export EDIT_URI="src/branch/$CI_ACTION_REF_NAME/.docs"
|
export EDIT_URI="src/branch/$CI_ACTION_REF_NAME/.docs"
|
||||||
uv run mkdocs build -v
|
./.venv/bin/mkdocs build -v
|
||||||
|
|
||||||
- name: Deploy documentation
|
- name: Deploy documentation
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -65,7 +58,7 @@ jobs:
|
||||||
npx -p "@getmeli/cli" meli upload ./site \
|
npx -p "@getmeli/cli" meli upload ./site \
|
||||||
--url "https://pages.coastalcommits.com" \
|
--url "https://pages.coastalcommits.com" \
|
||||||
--site "${{ vars.MELI_SITE_ID }}" \
|
--site "${{ vars.MELI_SITE_ID }}" \
|
||||||
--token "${{ secrets.MELI_TOKEN }}" \
|
--token "${{ secrets.MELI_SITE_SECRET }}" \
|
||||||
--release "$CI_ACTION_REF_NAME_SLUG/${{ env.GITHUB_SHA }}" \
|
--release "$CI_ACTION_REF_NAME_SLUG/${{ env.GITHUB_SHA }}" \
|
||||||
--branch "$CI_ACTION_REF_NAME_SLUG"
|
--branch "$CI_ACTION_REF_NAME_SLUG"
|
||||||
|
|
||||||
|
|
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -2,6 +2,3 @@
|
||||||
.vscode
|
.vscode
|
||||||
site
|
site
|
||||||
.venv
|
.venv
|
||||||
__pycache__
|
|
||||||
.direnv
|
|
||||||
.devenv
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ My assorted cogs for Red-DiscordBot.
|
||||||
To get started with a development environment, first clone this repository.
|
To get started with a development environment, first clone this repository.
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git clone https://coastalcommits.com/cswimr/SeaCogs.git
|
git clone https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs.git
|
||||||
```
|
```
|
||||||
|
|
||||||
Then, install Poetry.
|
Then, install Poetry.
|
||||||
|
|
|
||||||
|
|
@ -9,15 +9,14 @@ import discord
|
||||||
from red_commons.logging import getLogger
|
from red_commons.logging import getLogger
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
from redbot.core.bot import Config, Red
|
from redbot.core.bot import Config, Red
|
||||||
from redbot.core.utils.chat_formatting import bold, humanize_list
|
from redbot.core.utils.chat_formatting import humanize_list
|
||||||
|
|
||||||
|
|
||||||
class AntiPolls(commands.Cog):
|
class AntiPolls(commands.Cog):
|
||||||
"""AntiPolls deletes messages that contain polls, with a configurable per-guild role and channel whitelist and support for default Discord permissions (Manage Messages)."""
|
"""AntiPolls deletes messages that contain polls, with a configurable per-guild role and channel whitelist and support for default Discord permissions (Manage Messages)."""
|
||||||
|
|
||||||
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
__author__ = ["SeaswimmerTheFsh"]
|
||||||
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
__version__ = "1.0.0"
|
||||||
__version__ = "1.0.1"
|
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/antipolls/"
|
__documentation__ = "https://seacogs.coastalcommits.com/antipolls/"
|
||||||
|
|
||||||
def __init__(self, bot: Red):
|
def __init__(self, bot: Red):
|
||||||
|
|
@ -39,9 +38,9 @@ class AntiPolls(commands.Cog):
|
||||||
n = "\n" if "\n\n" not in pre_processed else ""
|
n = "\n" if "\n\n" not in pre_processed else ""
|
||||||
text = [
|
text = [
|
||||||
f"{pre_processed}{n}",
|
f"{pre_processed}{n}",
|
||||||
f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
|
f"Cog Version: **{self.__version__}**",
|
||||||
f"{bold('Author:')} {humanize_list(self.__author__)}",
|
f"Author: {humanize_list(self.__author__)}",
|
||||||
f"{bold('Documentation:')} {self.__documentation__}",
|
f"Documentation: {self.__documentation__}",
|
||||||
]
|
]
|
||||||
return "\n".join(text)
|
return "\n".join(text)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
{
|
{
|
||||||
"author" : ["cswimr"],
|
"author" : ["SeaswimmerTheFsh (seasw.)"],
|
||||||
"install_msg" : "Thank you for installing AntiPolls!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
|
"install_msg" : "Thank you for installing AntiPolls!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
|
||||||
"name" : "AntiPolls",
|
"name" : "AntiPolls",
|
||||||
"short" : "AntiPolls deletes messages that contain polls.",
|
"short" : "AntiPolls deletes messages that contain polls.",
|
||||||
"description" : "AntiPolls deletes messages that contain polls, with a configurable per-guild role and channel whitelist and support for default Discord permissions (Manage Messages).",
|
"description" : "AntiPolls deletes messages that contain polls, with a configurable per-guild role and channel whitelist and support for default Discord permissions (Manage Messages).",
|
||||||
"end_user_data_statement" : "This cog does not store any user data.",
|
"end_user_data_statement" : "This cog does not store any user data.",
|
||||||
"hidden": true,
|
"hidden": false,
|
||||||
"disabled": false,
|
"disabled": false,
|
||||||
"min_bot_version": "3.5.0",
|
"min_bot_version": "3.5.0",
|
||||||
"min_python_version": [3, 10, 0],
|
"min_python_version": [3, 10, 0],
|
||||||
|
|
|
||||||
284
aurora/aurora.py
284
aurora/aurora.py
|
|
@ -13,7 +13,6 @@ from datetime import datetime, timedelta, timezone
|
||||||
from math import ceil
|
from math import ceil
|
||||||
|
|
||||||
import discord
|
import discord
|
||||||
from discord import Object
|
|
||||||
from discord.ext import tasks
|
from discord.ext import tasks
|
||||||
from redbot.core import app_commands, commands, data_manager
|
from redbot.core import app_commands, commands, data_manager
|
||||||
from redbot.core.app_commands import Choice
|
from redbot.core.app_commands import Choice
|
||||||
|
|
@ -31,7 +30,7 @@ from aurora.utilities.config import config, register_config
|
||||||
from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
|
from aurora.utilities.database import connect, create_guild_table, fetch_case, mysql_log
|
||||||
from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
|
from aurora.utilities.factory import addrole_embed, case_factory, changes_factory, evidenceformat_factory, guild_embed, immune_embed, message_factory, overrides_embed
|
||||||
from aurora.utilities.logger import logger
|
from aurora.utilities.logger import logger
|
||||||
from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, get_footer_image, log, send_evidenceformat, timedelta_from_relativedelta
|
from aurora.utilities.utils import check_moddable, check_permissions, convert_timedelta_to_str, fetch_channel_dict, fetch_user_dict, generate_dict, log, send_evidenceformat, timedelta_from_relativedelta
|
||||||
|
|
||||||
|
|
||||||
class Aurora(commands.Cog):
|
class Aurora(commands.Cog):
|
||||||
|
|
@ -39,8 +38,8 @@ class Aurora(commands.Cog):
|
||||||
It is heavily inspired by GalacticBot, and is designed to be a more user-friendly alternative to Red's core Mod cogs.
|
It is heavily inspired by GalacticBot, and is designed to be a more user-friendly alternative to Red's core Mod cogs.
|
||||||
This cog stores all of its data in an SQLite database."""
|
This cog stores all of its data in an SQLite database."""
|
||||||
|
|
||||||
__author__ = ["cswimr"]
|
__author__ = ["SeaswimmerTheFsh"]
|
||||||
__version__ = "2.1.3"
|
__version__ = "2.1.2"
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/aurora/"
|
__documentation__ = "https://seacogs.coastalcommits.com/aurora/"
|
||||||
|
|
||||||
async def red_delete_data_for_user(self, *, requester, user_id: int):
|
async def red_delete_data_for_user(self, *, requester, user_id: int):
|
||||||
|
|
@ -114,20 +113,6 @@ class Aurora(commands.Cog):
|
||||||
except ConnectionRefusedError:
|
except ConnectionRefusedError:
|
||||||
return
|
return
|
||||||
|
|
||||||
@commands.Cog.listener("on_member_join")
|
|
||||||
async def addrole_on_member_join(self, member: discord.Member):
|
|
||||||
"""This method automatically adds roles to users when they join the server."""
|
|
||||||
if not await self.bot.cog_disabled_in_guild(self, member.guild):
|
|
||||||
query = f"""SELECT moderation_id, role_id, reason FROM moderation_{member.guild.id} WHERE target_id = ? AND moderation_type = 'ADDROLE' AND expired = 0 AND resolved = 0;"""
|
|
||||||
database = connect()
|
|
||||||
cursor = database.cursor()
|
|
||||||
cursor.execute(query, (member.id,))
|
|
||||||
results = cursor.fetchall()
|
|
||||||
for result in results:
|
|
||||||
role = member.guild.get_role(result[1])
|
|
||||||
reason = result[2]
|
|
||||||
await member.add_roles(role, reason=f"Role automatically added on member rejoin for: {reason} (Case #{result[0]:,})")
|
|
||||||
|
|
||||||
@commands.Cog.listener("on_audit_log_entry_create")
|
@commands.Cog.listener("on_audit_log_entry_create")
|
||||||
async def autologger(self, entry: discord.AuditLogEntry):
|
async def autologger(self, entry: discord.AuditLogEntry):
|
||||||
"""This method automatically logs moderations done by users manually ("right clicks")."""
|
"""This method automatically logs moderations done by users manually ("right clicks")."""
|
||||||
|
|
@ -224,7 +209,7 @@ class Aurora(commands.Cog):
|
||||||
moderation_type="note",
|
moderation_type="note",
|
||||||
response=await interaction.original_response(),
|
response=await interaction.original_response(),
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -283,7 +268,7 @@ class Aurora(commands.Cog):
|
||||||
moderation_type="warned",
|
moderation_type="warned",
|
||||||
response=await interaction.original_response(),
|
response=await interaction.original_response(),
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -381,16 +366,16 @@ class Aurora(commands.Cog):
|
||||||
duration=parsed_time,
|
duration=parsed_time,
|
||||||
role=role,
|
role=role,
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
await target.add_roles(
|
await target.add_roles(
|
||||||
role,
|
role,
|
||||||
reason=f"Role added by {interaction.user.id}{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''} for: {reason}",
|
reason=f"Role added by {interaction.user.id}{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')} for: {reason}",
|
||||||
)
|
)
|
||||||
response: discord.WebhookMessage = await interaction.followup.send(
|
response: discord.WebhookMessage = await interaction.followup.send(
|
||||||
content=f"{target.mention} has been given the {role.mention} role{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
|
content=f"{target.mention} has been given the {role.mention} role{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')}!\n**Reason** - `{reason}`"
|
||||||
)
|
)
|
||||||
|
|
||||||
moderation_id = await mysql_log(
|
moderation_id = await mysql_log(
|
||||||
|
|
@ -404,113 +389,7 @@ class Aurora(commands.Cog):
|
||||||
reason,
|
reason,
|
||||||
)
|
)
|
||||||
await response.edit(
|
await response.edit(
|
||||||
content=f"{target.mention} has been given the {role.mention} role{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
|
content=f"{target.mention} has been given the {role.mention} role{(' for ' + {humanize_timedelta(timedelta=parsed_time)} if parsed_time != 'NULL' else '')}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
|
||||||
)
|
|
||||||
await log(interaction, moderation_id)
|
|
||||||
|
|
||||||
case = await fetch_case(moderation_id, interaction.guild.id)
|
|
||||||
await send_evidenceformat(interaction, case)
|
|
||||||
|
|
||||||
@app_commands.command(name="removerole")
|
|
||||||
async def removerole(
|
|
||||||
self,
|
|
||||||
interaction: discord.Interaction,
|
|
||||||
target: discord.Member,
|
|
||||||
role: discord.Role,
|
|
||||||
reason: str,
|
|
||||||
duration: str = None,
|
|
||||||
silent: bool = None,
|
|
||||||
):
|
|
||||||
"""Remove a role from a user.
|
|
||||||
|
|
||||||
Parameters
|
|
||||||
-----------
|
|
||||||
target: discord.Member
|
|
||||||
Who are you removing a role from?
|
|
||||||
role: discord.Role
|
|
||||||
What role are you removing from the target?
|
|
||||||
reason: str
|
|
||||||
Why are you removing a role from this user?
|
|
||||||
duration: str
|
|
||||||
How long are you removing this role for?
|
|
||||||
silent: bool
|
|
||||||
Should the user be messaged?"""
|
|
||||||
addrole_whitelist = await config.guild(interaction.guild).addrole_whitelist()
|
|
||||||
|
|
||||||
if not addrole_whitelist:
|
|
||||||
await interaction.response.send_message(
|
|
||||||
content=error("There are no whitelisted roles set for this server!"),
|
|
||||||
ephemeral=True,
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
if duration is not None:
|
|
||||||
parsed_time = parse_timedelta(duration)
|
|
||||||
if parsed_time is None:
|
|
||||||
await interaction.response.send_message(
|
|
||||||
content=error("Please provide a valid duration!"), ephemeral=True
|
|
||||||
)
|
|
||||||
return
|
|
||||||
else:
|
|
||||||
parsed_time = "NULL"
|
|
||||||
|
|
||||||
if role.id not in addrole_whitelist:
|
|
||||||
await interaction.response.send_message(
|
|
||||||
content=error("That role isn't whitelisted!"), ephemeral=True
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
if not await check_moddable(
|
|
||||||
target, interaction, ["moderate_members", "manage_roles"]
|
|
||||||
):
|
|
||||||
return
|
|
||||||
|
|
||||||
if role.id not in [user_role.id for user_role in target.roles]:
|
|
||||||
await interaction.response.send_message(
|
|
||||||
content=error(f"{target.mention} does not have this role!"),
|
|
||||||
ephemeral=True,
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
await interaction.response.defer()
|
|
||||||
if silent is None:
|
|
||||||
silent = not await config.guild(interaction.guild).dm_users()
|
|
||||||
if silent is False:
|
|
||||||
try:
|
|
||||||
embed = await message_factory(
|
|
||||||
await self.bot.get_embed_color(interaction.channel),
|
|
||||||
guild=interaction.guild,
|
|
||||||
moderator=interaction.user,
|
|
||||||
reason=reason,
|
|
||||||
moderation_type="removerole",
|
|
||||||
response=await interaction.original_response(),
|
|
||||||
duration=parsed_time,
|
|
||||||
role=role,
|
|
||||||
)
|
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
|
||||||
except discord.errors.HTTPException:
|
|
||||||
pass
|
|
||||||
|
|
||||||
await target.remove_roles(
|
|
||||||
role,
|
|
||||||
reason=f"Role removed by {interaction.user.id}{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''} for: {reason}",
|
|
||||||
)
|
|
||||||
response: discord.WebhookMessage = await interaction.followup.send(
|
|
||||||
content=f"{target.mention} has had the {role.mention} role removed{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}!\n**Reason** - `{reason}`"
|
|
||||||
)
|
|
||||||
|
|
||||||
moderation_id = await mysql_log(
|
|
||||||
interaction.guild.id,
|
|
||||||
interaction.user.id,
|
|
||||||
"REMOVEROLE",
|
|
||||||
"USER",
|
|
||||||
target.id,
|
|
||||||
role.id,
|
|
||||||
parsed_time,
|
|
||||||
reason,
|
|
||||||
)
|
|
||||||
await response.edit(
|
|
||||||
content=f"{target.mention} has had the {role.mention} role removed{' for ' + humanize_timedelta(timedelta=parsed_time) if parsed_time != 'NULL' else ''}! (Case `#{moderation_id:,}`)\n**Reason** - `{reason}`",
|
|
||||||
)
|
)
|
||||||
await log(interaction, moderation_id)
|
await log(interaction, moderation_id)
|
||||||
|
|
||||||
|
|
@ -583,7 +462,7 @@ class Aurora(commands.Cog):
|
||||||
response=await interaction.original_response(),
|
response=await interaction.original_response(),
|
||||||
duration=parsed_time,
|
duration=parsed_time,
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -658,7 +537,7 @@ class Aurora(commands.Cog):
|
||||||
moderation_type="unmuted",
|
moderation_type="unmuted",
|
||||||
response=await interaction.original_response(),
|
response=await interaction.original_response(),
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -717,7 +596,7 @@ class Aurora(commands.Cog):
|
||||||
moderation_type="kicked",
|
moderation_type="kicked",
|
||||||
response=await interaction.original_response(),
|
response=await interaction.original_response(),
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -821,7 +700,7 @@ class Aurora(commands.Cog):
|
||||||
response=await interaction.original_response(),
|
response=await interaction.original_response(),
|
||||||
duration=parsed_time,
|
duration=parsed_time,
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -865,7 +744,7 @@ class Aurora(commands.Cog):
|
||||||
moderation_type="banned",
|
moderation_type="banned",
|
||||||
response=await interaction.original_response(),
|
response=await interaction.original_response(),
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -948,7 +827,7 @@ class Aurora(commands.Cog):
|
||||||
moderation_type="unbanned",
|
moderation_type="unbanned",
|
||||||
response=await interaction.original_response(),
|
response=await interaction.original_response(),
|
||||||
)
|
)
|
||||||
await target.send(embed=embed, file=get_footer_image(self))
|
await target.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -1427,7 +1306,7 @@ class Aurora(commands.Cog):
|
||||||
os.remove(filename)
|
os.remove(filename)
|
||||||
return
|
return
|
||||||
await interaction.response.send_message(
|
await interaction.response.send_message(
|
||||||
content=box(json.dumps(case_dict, indent=2), 'json'),
|
content=box({json.dumps(case_dict, indent=2)}),
|
||||||
ephemeral=ephemeral,
|
ephemeral=ephemeral,
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
@ -1611,9 +1490,7 @@ class Aurora(commands.Cog):
|
||||||
current_time = time.time()
|
current_time = time.time()
|
||||||
database = connect()
|
database = connect()
|
||||||
cursor = database.cursor()
|
cursor = database.cursor()
|
||||||
global_unban_num = 0
|
global_num = 0
|
||||||
global_addrole_num = 0
|
|
||||||
global_removerole_num = 0
|
|
||||||
|
|
||||||
guilds: list[discord.Guild] = self.bot.guilds
|
guilds: list[discord.Guild] = self.bot.guilds
|
||||||
for guild in guilds:
|
for guild in guilds:
|
||||||
|
|
@ -1631,7 +1508,7 @@ class Aurora(commands.Cog):
|
||||||
target_ids = [row[0] for row in result]
|
target_ids = [row[0] for row in result]
|
||||||
moderation_ids = [row[1] for row in result]
|
moderation_ids = [row[1] for row in result]
|
||||||
|
|
||||||
unban_num = 0
|
num = 0
|
||||||
for target_id, moderation_id in zip(target_ids, moderation_ids):
|
for target_id, moderation_id in zip(target_ids, moderation_ids):
|
||||||
user: discord.User = await self.bot.fetch_user(target_id)
|
user: discord.User = await self.bot.fetch_user(target_id)
|
||||||
name = (
|
name = (
|
||||||
|
|
@ -1652,7 +1529,7 @@ class Aurora(commands.Cog):
|
||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
await user.send(embed=embed, file=get_footer_image(self))
|
await user.send(embed=embed)
|
||||||
except discord.errors.HTTPException:
|
except discord.errors.HTTPException:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -1663,7 +1540,7 @@ class Aurora(commands.Cog):
|
||||||
guild.name,
|
guild.name,
|
||||||
guild.id,
|
guild.id,
|
||||||
)
|
)
|
||||||
unban_num = unban_num + 1
|
num = num + 1
|
||||||
except (
|
except (
|
||||||
discord.errors.NotFound,
|
discord.errors.NotFound,
|
||||||
discord.errors.Forbidden,
|
discord.errors.Forbidden,
|
||||||
|
|
@ -1678,87 +1555,44 @@ class Aurora(commands.Cog):
|
||||||
e,
|
e,
|
||||||
)
|
)
|
||||||
|
|
||||||
removerole_num = 0
|
expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0 AND moderation_type != 'BLACKLIST') OR (expired = 0 AND resolved = 1 AND moderation_type != 'BLACKLIST')"
|
||||||
addrole_query = f"SELECT target_id, moderation_id, role_id FROM moderation_{guild.id} WHERE end_timestamp != 0 AND end_timestamp <= ? AND moderation_type = 'ADDROLE' AND expired = 0"
|
|
||||||
try:
|
|
||||||
cursor.execute(addrole_query, (time.time(),))
|
|
||||||
result = cursor.fetchall()
|
|
||||||
except sqlite3.OperationalError:
|
|
||||||
continue
|
|
||||||
target_ids = [row[0] for row in result]
|
|
||||||
moderation_ids = [row[1] for row in result]
|
|
||||||
role_ids = [row[2] for row in result]
|
|
||||||
|
|
||||||
for target_id, moderation_id, role_id in zip(
|
|
||||||
target_ids, moderation_ids, role_ids
|
|
||||||
):
|
|
||||||
try:
|
|
||||||
member = await guild.fetch_member(target_id)
|
|
||||||
|
|
||||||
await member.remove_roles(
|
|
||||||
Object(role_id), reason=f"Automatic role removal from case #{moderation_id}"
|
|
||||||
)
|
|
||||||
|
|
||||||
removerole_num = removerole_num + 1
|
|
||||||
except (
|
|
||||||
discord.errors.NotFound,
|
|
||||||
discord.errors.Forbidden,
|
|
||||||
discord.errors.HTTPException,
|
|
||||||
) as e:
|
|
||||||
logger.error(
|
|
||||||
"Removing the role %s from user %s failed due to: \n%s",
|
|
||||||
role_id,
|
|
||||||
target_id,
|
|
||||||
e,
|
|
||||||
)
|
|
||||||
continue
|
|
||||||
|
|
||||||
addrole_num = 0
|
|
||||||
removerole_query = f"SELECT target_id, moderation_id, role_id FROM moderation_{guild.id} WHERE end_timestamp != 0 AND end_timestamp <= ? AND moderation_type = 'REMOVEROLE' AND expired = 0"
|
|
||||||
try:
|
|
||||||
cursor.execute(removerole_query, (time.time(),))
|
|
||||||
result = cursor.fetchall()
|
|
||||||
except sqlite3.OperationalError:
|
|
||||||
continue
|
|
||||||
target_ids = [row[0] for row in result]
|
|
||||||
moderation_ids = [row[1] for row in result]
|
|
||||||
role_ids = [row[2] for row in result]
|
|
||||||
|
|
||||||
for target_id, moderation_id, role_id in zip(
|
|
||||||
target_ids, moderation_ids, role_ids
|
|
||||||
):
|
|
||||||
try:
|
|
||||||
member = await guild.fetch_member(target_id)
|
|
||||||
|
|
||||||
await member.add_roles(
|
|
||||||
Object(role_id), reason=f"Automatic role addition from case #{moderation_id}"
|
|
||||||
)
|
|
||||||
|
|
||||||
addrole_num = addrole_num + 1
|
|
||||||
except (
|
|
||||||
discord.errors.NotFound,
|
|
||||||
discord.errors.Forbidden,
|
|
||||||
discord.errors.HTTPException,
|
|
||||||
) as e:
|
|
||||||
logger.error("Adding the role %s to user %s failed due to: \n%s", role_id, target_id, e)
|
|
||||||
continue
|
|
||||||
|
|
||||||
expiry_query = f"UPDATE `moderation_{guild.id}` SET expired = 1 WHERE (end_timestamp != 0 AND end_timestamp <= ? AND expired = 0) OR (expired = 0 AND resolved = 1);"
|
|
||||||
cursor.execute(expiry_query, (time.time(),))
|
cursor.execute(expiry_query, (time.time(),))
|
||||||
|
|
||||||
|
blacklist_query = f"SELECT target_id, moderation_id, role_id FROM moderation_{guild.id} WHERE end_timestamp != 0 AND end_timestamp <= ? AND moderation_type = 'BLACKLIST' AND expired = 0"
|
||||||
|
try:
|
||||||
|
cursor.execute(blacklist_query, (time.time(),))
|
||||||
|
result = cursor.fetchall()
|
||||||
|
except sqlite3.OperationalError:
|
||||||
|
continue
|
||||||
|
target_ids = [row[0] for row in result]
|
||||||
|
moderation_ids = [row[1] for row in result]
|
||||||
|
role_ids = [row[2] for row in result]
|
||||||
|
|
||||||
|
for target_id, moderation_id, role_id in zip(
|
||||||
|
target_ids, moderation_ids, role_ids
|
||||||
|
):
|
||||||
|
try:
|
||||||
|
# member: discord.Member = await guild.fetch_member(target_id)
|
||||||
|
|
||||||
|
role: discord.Role = guild.get_role(role_id)
|
||||||
|
if role is None:
|
||||||
|
raise discord.errors.NotFound
|
||||||
|
except (
|
||||||
|
discord.errors.NotFound,
|
||||||
|
discord.errors.Forbidden,
|
||||||
|
discord.errors.HTTPException,
|
||||||
|
):
|
||||||
|
continue
|
||||||
|
|
||||||
per_guild_completion_time = (time.time() - time_per_guild) * 1000
|
per_guild_completion_time = (time.time() - time_per_guild) * 1000
|
||||||
logger.debug(
|
logger.debug(
|
||||||
"Completed expiry loop for %s (%s) in %sms with %s users unbanned, %s roles added, and %s roles removed",
|
"Completed expiry loop for %s (%s) in %sms with %s users unbanned",
|
||||||
guild.name,
|
guild.name,
|
||||||
guild.id,
|
guild.id,
|
||||||
f"{per_guild_completion_time:.6f}",
|
f"{per_guild_completion_time:.6f}",
|
||||||
unban_num,
|
num,
|
||||||
addrole_num,
|
|
||||||
removerole_num,
|
|
||||||
)
|
)
|
||||||
global_unban_num = global_unban_num + unban_num
|
global_num = global_num + num
|
||||||
global_addrole_num = global_addrole_num + addrole_num
|
|
||||||
global_removerole_num = global_removerole_num + removerole_num
|
|
||||||
|
|
||||||
database.commit()
|
database.commit()
|
||||||
cursor.close()
|
cursor.close()
|
||||||
|
|
@ -1766,11 +1600,9 @@ class Aurora(commands.Cog):
|
||||||
|
|
||||||
completion_time = (time.time() - current_time) * 1000
|
completion_time = (time.time() - current_time) * 1000
|
||||||
logger.debug(
|
logger.debug(
|
||||||
"Completed expiry loop in %sms with %s users unbanned, %s roles added, and %s roles removed",
|
"Completed expiry loop in %sms with %s users unbanned",
|
||||||
f"{completion_time:.6f}",
|
f"{completion_time:.6f}",
|
||||||
global_unban_num,
|
global_num,
|
||||||
global_addrole_num,
|
|
||||||
global_removerole_num,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
########################################################################################################################
|
########################################################################################################################
|
||||||
|
|
@ -1788,16 +1620,14 @@ class Aurora(commands.Cog):
|
||||||
@aurora_settings.command(name="overrides", aliases=["override", "user"])
|
@aurora_settings.command(name="overrides", aliases=["override", "user"])
|
||||||
async def aurora_settings_overrides(self, ctx: commands.Context):
|
async def aurora_settings_overrides(self, ctx: commands.Context):
|
||||||
"""Manage Aurora's user overriddable settings."""
|
"""Manage Aurora's user overriddable settings."""
|
||||||
msg = await ctx.send(embed=await overrides_embed(ctx))
|
await ctx.send(embed=await overrides_embed(ctx), view=Overrides(ctx))
|
||||||
await msg.edit(view=Overrides(ctx, msg, 60))
|
|
||||||
|
|
||||||
@aurora_settings.command(name="guild", aliases=["server"])
|
@aurora_settings.command(name="guild", aliases=["server"])
|
||||||
@commands.admin_or_permissions(manage_guild=True)
|
@commands.admin_or_permissions(manage_guild=True)
|
||||||
@commands.guild_only()
|
@commands.guild_only()
|
||||||
async def aurora_settings_guild(self, ctx: commands.Context):
|
async def aurora_settings_guild(self, ctx: commands.Context):
|
||||||
"""Manage Aurora's guild settings."""
|
"""Manage Aurora's guild settings."""
|
||||||
msg = await ctx.send(embed=await guild_embed(ctx))
|
await ctx.send(embed=await guild_embed(ctx), view=Guild(ctx))
|
||||||
await msg.edit(view=Guild(ctx, msg, 60))
|
|
||||||
|
|
||||||
@aurora_settings.command(name="addrole", aliases=["removerole"])
|
@aurora_settings.command(name="addrole", aliases=["removerole"])
|
||||||
@commands.admin_or_permissions(manage_guild=True)
|
@commands.admin_or_permissions(manage_guild=True)
|
||||||
|
|
@ -1806,16 +1636,14 @@ class Aurora(commands.Cog):
|
||||||
"""Manage the addrole whitelist.
|
"""Manage the addrole whitelist.
|
||||||
|
|
||||||
Roles added to this list are also applied to `/removerole`."""
|
Roles added to this list are also applied to `/removerole`."""
|
||||||
msg = await ctx.send(embed=await addrole_embed(ctx))
|
await ctx.send(embed=await addrole_embed(ctx), view=Addrole(ctx))
|
||||||
await msg.edit(view=Addrole(ctx, msg, 60))
|
|
||||||
|
|
||||||
@aurora_settings.command(name="immunity")
|
@aurora_settings.command(name="immunity")
|
||||||
@commands.admin_or_permissions(manage_guild=True)
|
@commands.admin_or_permissions(manage_guild=True)
|
||||||
@commands.guild_only()
|
@commands.guild_only()
|
||||||
async def aurora_settings_immunity(self, ctx: commands.Context):
|
async def aurora_settings_immunity(self, ctx: commands.Context):
|
||||||
"""Manage the immunity whitelist."""
|
"""Manage the immunity whitelist."""
|
||||||
msg = await ctx.send(embed=await immune_embed(ctx))
|
await ctx.send(embed=await immune_embed(ctx), view=Immune(ctx))
|
||||||
await msg.edit(view=Immune(ctx, msg, 60))
|
|
||||||
|
|
||||||
@aurora.group(autohelp=True, name="import")
|
@aurora.group(autohelp=True, name="import")
|
||||||
@commands.admin()
|
@commands.admin()
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.2 KiB |
|
|
@ -43,7 +43,7 @@ class ImportAuroraView(ui.View):
|
||||||
file = await self.ctx.message.attachments[0].read()
|
file = await self.ctx.message.attachments[0].read()
|
||||||
data: list[dict] = sorted(json.loads(file), key=lambda x: x["moderation_id"])
|
data: list[dict] = sorted(json.loads(file), key=lambda x: x["moderation_id"])
|
||||||
|
|
||||||
user_mod_types = ["NOTE", "WARN", "ADDROLE", "REMOVEROLE", "MUTE", "UNMUTE", "KICK", "TEMPBAN", "BAN", "UNBAN"]
|
user_mod_types = ["NOTE", "WARN", "MUTE", "UNMUTE", "KICK", "BAN", "UNBAN"]
|
||||||
|
|
||||||
channel_mod_types = ["SLOWMODE", "LOCKDOWN"]
|
channel_mod_types = ["SLOWMODE", "LOCKDOWN"]
|
||||||
|
|
||||||
|
|
@ -58,8 +58,6 @@ class ImportAuroraView(ui.View):
|
||||||
case["target_type"] = "USER"
|
case["target_type"] = "USER"
|
||||||
elif case["moderation_type"] in channel_mod_types:
|
elif case["moderation_type"] in channel_mod_types:
|
||||||
case["target_type"] = "CHANNEL"
|
case["target_type"] = "CHANNEL"
|
||||||
else:
|
|
||||||
case["target_type"] = "USER"
|
|
||||||
|
|
||||||
if "role_id" not in case or not case["role_id"]:
|
if "role_id" not in case or not case["role_id"]:
|
||||||
case["role_id"] = 0
|
case["role_id"] = 0
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"author" : ["cswimr"],
|
"author" : ["SeaswimmerTheFsh (seasw.)"],
|
||||||
"install_msg" : "Thank you for installing Aurora!\nMost of this cog's functionality requires enabling slash commands.\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
|
"install_msg" : "Thank you for installing Aurora!\nMost of this cog's functionality requires enabling slash commands.\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
|
||||||
"name" : "Aurora",
|
"name" : "Aurora",
|
||||||
"short" : "A full replacement for Red's core Mod cogs.",
|
"short" : "A full replacement for Red's core Mod cogs.",
|
||||||
"description" : "Aurora is a fully-featured moderation system. It is heavily inspired by GalacticBot, and is designed to be a more user-friendly alternative to Red's core Mod cogs. This cog stores all of its data in an SQLite database.",
|
"description" : "Aurora is a fully-featured moderation system. It is heavily inspired by GalacticBot, and is designed to be a more user-friendly alternative to Red's core Mod cogs. This cog stores all of its data in an SQLite database.",
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from discord import ButtonStyle, Interaction, Message, ui
|
from discord import ButtonStyle, Interaction, ui
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
from redbot.core.utils.chat_formatting import error
|
from redbot.core.utils.chat_formatting import error
|
||||||
|
|
||||||
|
|
@ -7,14 +7,9 @@ from aurora.utilities.factory import addrole_embed
|
||||||
|
|
||||||
|
|
||||||
class Addrole(ui.View):
|
class Addrole(ui.View):
|
||||||
def __init__(self, ctx: commands.Context, message: Message, timeout: int = None):
|
def __init__(self, ctx: commands.Context):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.ctx = ctx
|
self.ctx = ctx
|
||||||
self.message = message
|
|
||||||
self.timeout = timeout
|
|
||||||
|
|
||||||
async def on_timeout(self):
|
|
||||||
await self.message.edit(view=None)
|
|
||||||
|
|
||||||
@ui.select(cls=ui.RoleSelect, placeholder="Select a role", min_values=0, max_values=25)
|
@ui.select(cls=ui.RoleSelect, placeholder="Select a role", min_values=0, max_values=25)
|
||||||
async def addrole_select(self, interaction: Interaction, select: ui.RoleSelect):
|
async def addrole_select(self, interaction: Interaction, select: ui.RoleSelect):
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from discord import ButtonStyle, Interaction, Message, ui
|
from discord import ButtonStyle, Interaction, ui
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
|
|
||||||
from aurora.utilities.config import config
|
from aurora.utilities.config import config
|
||||||
|
|
@ -7,14 +7,9 @@ from aurora.utilities.utils import create_pagesize_options
|
||||||
|
|
||||||
|
|
||||||
class Guild(ui.View):
|
class Guild(ui.View):
|
||||||
def __init__(self, ctx: commands.Context, message: Message, timeout: int = None):
|
def __init__(self, ctx: commands.Context):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.ctx = ctx
|
self.ctx = ctx
|
||||||
self.message = message
|
|
||||||
self.timeout = timeout
|
|
||||||
|
|
||||||
async def on_timeout(self):
|
|
||||||
await self.message.edit(view=None)
|
|
||||||
|
|
||||||
@ui.button(label="Show Moderator", style=ButtonStyle.green, row=0)
|
@ui.button(label="Show Moderator", style=ButtonStyle.green, row=0)
|
||||||
async def show_moderator(self, interaction: Interaction, button: ui.Button): # pylint: disable=unused-argument
|
async def show_moderator(self, interaction: Interaction, button: ui.Button): # pylint: disable=unused-argument
|
||||||
|
|
@ -22,7 +17,7 @@ class Guild(ui.View):
|
||||||
await interaction.response.send_message("You must have the manage guild permission to change this setting.", ephemeral=True)
|
await interaction.response.send_message("You must have the manage guild permission to change this setting.", ephemeral=True)
|
||||||
return
|
return
|
||||||
await interaction.response.defer()
|
await interaction.response.defer()
|
||||||
current_setting = await config.guild(interaction.guild).show_moderator()
|
current_setting = await config.guild(interaction.guild).show_moderator
|
||||||
await config.guild(interaction.guild).show_moderator.set(not current_setting)
|
await config.guild(interaction.guild).show_moderator.set(not current_setting)
|
||||||
await interaction.message.edit(embed=await guild_embed(self.ctx))
|
await interaction.message.edit(embed=await guild_embed(self.ctx))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from discord import ButtonStyle, Interaction, Message, ui
|
from discord import ButtonStyle, Interaction, ui
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
from redbot.core.utils.chat_formatting import error
|
from redbot.core.utils.chat_formatting import error
|
||||||
|
|
||||||
|
|
@ -7,14 +7,9 @@ from aurora.utilities.factory import immune_embed
|
||||||
|
|
||||||
|
|
||||||
class Immune(ui.View):
|
class Immune(ui.View):
|
||||||
def __init__(self, ctx: commands.Context, message: Message, timeout: int = None):
|
def __init__(self, ctx: commands.Context):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.ctx = ctx
|
self.ctx = ctx
|
||||||
self.message = message
|
|
||||||
self.timeout = timeout
|
|
||||||
|
|
||||||
async def on_timeout(self):
|
|
||||||
await self.message.edit(view=None)
|
|
||||||
|
|
||||||
@ui.select(cls=ui.RoleSelect, placeholder="Select a role", min_values=0, max_values=25)
|
@ui.select(cls=ui.RoleSelect, placeholder="Select a role", min_values=0, max_values=25)
|
||||||
async def immune_select(self, interaction: Interaction, select: ui.RoleSelect):
|
async def immune_select(self, interaction: Interaction, select: ui.RoleSelect):
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from discord import ButtonStyle, Interaction, Message, ui
|
from discord import ButtonStyle, Interaction, ui
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
|
|
||||||
from aurora.utilities.config import config
|
from aurora.utilities.config import config
|
||||||
|
|
@ -7,14 +7,9 @@ from aurora.utilities.utils import create_pagesize_options
|
||||||
|
|
||||||
|
|
||||||
class Overrides(ui.View):
|
class Overrides(ui.View):
|
||||||
def __init__(self, ctx: commands.Context, message: Message, timeout: int = None):
|
def __init__(self, ctx: commands.Context):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.ctx = ctx
|
self.ctx = ctx
|
||||||
self.message = message
|
|
||||||
self.timeout = timeout
|
|
||||||
|
|
||||||
async def on_timeout(self):
|
|
||||||
await self.message.edit(view=None)
|
|
||||||
|
|
||||||
@ui.button(label="Auto Evidence Format", style=ButtonStyle.green, row=0)
|
@ui.button(label="Auto Evidence Format", style=ButtonStyle.green, row=0)
|
||||||
async def auto_evidenceformat(self, interaction: Interaction, button: ui.Button): # pylint: disable=unused-argument
|
async def auto_evidenceformat(self, interaction: Interaction, button: ui.Button): # pylint: disable=unused-argument
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,16 @@
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
from typing import Union
|
from typing import Union
|
||||||
|
|
||||||
from discord import Color, Embed, Guild, Interaction, InteractionMessage, Member, Role, User
|
from discord import (Color, Embed, Guild, Interaction, InteractionMessage,
|
||||||
|
Member, Role, User)
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
from redbot.core.utils.chat_formatting import bold, box, error, humanize_timedelta, warning
|
from redbot.core.utils.chat_formatting import (bold, box, error,
|
||||||
|
humanize_timedelta, warning)
|
||||||
|
|
||||||
from aurora.utilities.config import config
|
from aurora.utilities.config import config
|
||||||
from aurora.utilities.utils import fetch_channel_dict, fetch_user_dict, get_bool_emoji, get_next_case_number, get_pagesize_str
|
from aurora.utilities.utils import (fetch_channel_dict, fetch_user_dict,
|
||||||
|
get_bool_emoji, get_next_case_number,
|
||||||
|
get_pagesize_str)
|
||||||
|
|
||||||
|
|
||||||
async def message_factory(
|
async def message_factory(
|
||||||
|
|
@ -46,8 +50,6 @@ async def message_factory(
|
||||||
else:
|
else:
|
||||||
guild_name = guild.name
|
guild_name = guild.name
|
||||||
|
|
||||||
title = moderation_type
|
|
||||||
|
|
||||||
if moderation_type in ["tempbanned", "muted"] and duration:
|
if moderation_type in ["tempbanned", "muted"] and duration:
|
||||||
embed_duration = f" for {humanize_timedelta(timedelta=duration)}"
|
embed_duration = f" for {humanize_timedelta(timedelta=duration)}"
|
||||||
else:
|
else:
|
||||||
|
|
@ -57,17 +59,13 @@ async def message_factory(
|
||||||
embed_desc = "received a"
|
embed_desc = "received a"
|
||||||
elif moderation_type == "addrole":
|
elif moderation_type == "addrole":
|
||||||
embed_desc = f"received the {role.name} role"
|
embed_desc = f"received the {role.name} role"
|
||||||
title = "Role Added"
|
|
||||||
moderation_type = ""
|
|
||||||
elif moderation_type == "removerole":
|
elif moderation_type == "removerole":
|
||||||
embed_desc = f"lost the {role.name} role"
|
embed_desc = f"lost the {role.name} role"
|
||||||
title = "Role Removed"
|
|
||||||
moderation_type = ""
|
|
||||||
else:
|
else:
|
||||||
embed_desc = "been"
|
embed_desc = "been"
|
||||||
|
|
||||||
embed = Embed(
|
embed = Embed(
|
||||||
title=str.title(title),
|
title=str.title(moderation_type),
|
||||||
description=f"You have {embed_desc} {moderation_type}{embed_duration} in {guild_name}.",
|
description=f"You have {embed_desc} {moderation_type}{embed_duration} in {guild_name}.",
|
||||||
color=color,
|
color=color,
|
||||||
timestamp=datetime.now(),
|
timestamp=datetime.now(),
|
||||||
|
|
@ -87,7 +85,7 @@ async def message_factory(
|
||||||
|
|
||||||
embed.set_footer(
|
embed.set_footer(
|
||||||
text=f"Case #{await get_next_case_number(guild.id):,}",
|
text=f"Case #{await get_next_case_number(guild.id):,}",
|
||||||
icon_url="attachment://arrow.png",
|
icon_url="https://cdn.discordapp.com/attachments/1070822161389994054/1159469476773904414/arrow-right-circle-icon-512x512-2p1e2aaw.png?ex=65312319&is=651eae19&hm=3cebdd28e805c13a79ec48ef87c32ca532ffa6b9ede2e48d0cf8e5e81f3a6818&",
|
||||||
)
|
)
|
||||||
|
|
||||||
return embed
|
return embed
|
||||||
|
|
@ -269,9 +267,6 @@ async def case_factory(interaction: Interaction, case_dict: dict) -> Embed:
|
||||||
else "\n**Changes:** 0"
|
else "\n**Changes:** 0"
|
||||||
)
|
)
|
||||||
|
|
||||||
if case_dict["role_id"]:
|
|
||||||
embed.description += f"\n**Role:** <@&{case_dict['role_id']}>"
|
|
||||||
|
|
||||||
if case_dict["metadata"]:
|
if case_dict["metadata"]:
|
||||||
if case_dict["metadata"]["imported_from"]:
|
if case_dict["metadata"]["imported_from"]:
|
||||||
embed.description += (
|
embed.description += (
|
||||||
|
|
@ -381,10 +376,6 @@ async def evidenceformat_factory(interaction: Interaction, case_dict: dict) -> s
|
||||||
|
|
||||||
content = f"Case: {case_dict['moderation_id']:,} ({str.title(case_dict['moderation_type'])})\nTarget: {target_name} ({target_user['id']})\nModerator: {moderator_name} ({moderator_user['id']})"
|
content = f"Case: {case_dict['moderation_id']:,} ({str.title(case_dict['moderation_type'])})\nTarget: {target_name} ({target_user['id']})\nModerator: {moderator_name} ({moderator_user['id']})"
|
||||||
|
|
||||||
if case_dict["role_id"] != "0":
|
|
||||||
role = interaction.guild.get_role(int(case_dict["role_id"]))
|
|
||||||
content += "\nRole: " + (role.name if role is not None else case_dict["role_id"])
|
|
||||||
|
|
||||||
if case_dict["duration"] != "NULL":
|
if case_dict["duration"] != "NULL":
|
||||||
hours, minutes, seconds = map(int, case_dict["duration"].split(":"))
|
hours, minutes, seconds = map(int, case_dict["duration"].split(":"))
|
||||||
td = timedelta(hours=hours, minutes=minutes, seconds=seconds)
|
td = timedelta(hours=hours, minutes=minutes, seconds=seconds)
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ from datetime import timedelta as td
|
||||||
from typing import Optional, Union
|
from typing import Optional, Union
|
||||||
|
|
||||||
from dateutil.relativedelta import relativedelta as rd
|
from dateutil.relativedelta import relativedelta as rd
|
||||||
from discord import File, Guild, Interaction, Member, SelectOption, User
|
from discord import Guild, Interaction, Member, SelectOption, User
|
||||||
from discord.errors import Forbidden, NotFound
|
from discord.errors import Forbidden, NotFound
|
||||||
from redbot.core import commands, data_manager
|
from redbot.core import commands
|
||||||
from redbot.core.utils.chat_formatting import error
|
from redbot.core.utils.chat_formatting import error
|
||||||
|
|
||||||
from .config import config
|
from .config import config
|
||||||
|
|
@ -291,8 +291,3 @@ def timedelta_from_relativedelta(relativedelta: rd) -> td:
|
||||||
now = datetime.now()
|
now = datetime.now()
|
||||||
then = now - relativedelta
|
then = now - relativedelta
|
||||||
return now - then
|
return now - then
|
||||||
|
|
||||||
def get_footer_image(coginstance: commands.Cog) -> File:
|
|
||||||
"""Returns the footer image for the embeds."""
|
|
||||||
image_path = data_manager.bundled_data_path(coginstance) / "arrow.png"
|
|
||||||
return File(image_path, filename="arrow.png", description="arrow")
|
|
||||||
|
|
|
||||||
|
|
@ -14,16 +14,15 @@ from redbot.cogs.downloader import errors
|
||||||
from redbot.cogs.downloader.converters import InstalledCog
|
from redbot.cogs.downloader.converters import InstalledCog
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
from redbot.core.bot import Red
|
from redbot.core.bot import Red
|
||||||
from redbot.core.utils.chat_formatting import bold, error, humanize_list, text_to_file
|
from redbot.core.utils.chat_formatting import error, humanize_list, text_to_file
|
||||||
|
|
||||||
|
|
||||||
# pylint: disable=protected-access
|
# pylint: disable=protected-access
|
||||||
class Backup(commands.Cog):
|
class Backup(commands.Cog):
|
||||||
"""A utility to make reinstalling repositories and cogs after migrating the bot far easier."""
|
"""A utility to make reinstalling repositories and cogs after migrating the bot far easier."""
|
||||||
|
|
||||||
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
__author__ = ["SeaswimmerTheFsh"]
|
||||||
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
__version__ = "1.1.0"
|
||||||
__version__ = "1.1.1"
|
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/backup/"
|
__documentation__ = "https://seacogs.coastalcommits.com/backup/"
|
||||||
|
|
||||||
def __init__(self, bot: Red):
|
def __init__(self, bot: Red):
|
||||||
|
|
@ -36,9 +35,9 @@ class Backup(commands.Cog):
|
||||||
n = "\n" if "\n\n" not in pre_processed else ""
|
n = "\n" if "\n\n" not in pre_processed else ""
|
||||||
text = [
|
text = [
|
||||||
f"{pre_processed}{n}",
|
f"{pre_processed}{n}",
|
||||||
f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
|
f"Cog Version: **{self.__version__}**",
|
||||||
f"{bold('Author:')} {humanize_list(self.__author__)}",
|
f"Author: {humanize_list(self.__author__)}",
|
||||||
f"{bold('Documentation:')} {self.__documentation__}",
|
f"Documentation: {self.__documentation__}",
|
||||||
]
|
]
|
||||||
return "\n".join(text)
|
return "\n".join(text)
|
||||||
|
|
||||||
|
|
@ -101,7 +100,7 @@ class Backup(commands.Cog):
|
||||||
except (json.JSONDecodeError, IndexError):
|
except (json.JSONDecodeError, IndexError):
|
||||||
try:
|
try:
|
||||||
export = json.loads(await ctx.message.reference.resolved.attachments[0].read())
|
export = json.loads(await ctx.message.reference.resolved.attachments[0].read())
|
||||||
except (json.JSONDecodeError, IndexError, AttributeError):
|
except (json.JSONDecodeError, IndexError):
|
||||||
await ctx.send(error("Please provide a valid JSON export file."))
|
await ctx.send(error("Please provide a valid JSON export file."))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
@ -197,7 +196,7 @@ class Backup(commands.Cog):
|
||||||
cog_modules = []
|
cog_modules = []
|
||||||
for cog in cogs:
|
for cog in cogs:
|
||||||
# If you're forking this cog, make sure to change these strings!
|
# If you're forking this cog, make sure to change these strings!
|
||||||
if cog["name"] == "backup" and "cswimr/SeaCogs" in url:
|
if cog["name"] == "backup" and "SeaswimmerTheFsh/SeaCogs" in url:
|
||||||
continue
|
continue
|
||||||
try:
|
try:
|
||||||
cog_module = await InstalledCog.convert(ctx, cog["name"])
|
cog_module = await InstalledCog.convert(ctx, cog["name"])
|
||||||
|
|
@ -233,7 +232,7 @@ class Backup(commands.Cog):
|
||||||
commit = None
|
commit = None
|
||||||
|
|
||||||
# If you're forking this cog, make sure to change these strings!
|
# If you're forking this cog, make sure to change these strings!
|
||||||
if cog_name == "backup" and "cswimr/SeaCogs" in url:
|
if cog_name == "backup" and "SeaswimmerTheFsh/SeaCogs" in url:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
async with repository.checkout(
|
async with repository.checkout(
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"author" : ["cswimr"],
|
"author" : ["SeaswimmerTheFsh (seasw.)"],
|
||||||
"install_msg" : "Thank you for installing Backup!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
|
"install_msg" : "Thank you for installing Backup!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
|
||||||
"name" : "Backup",
|
"name" : "Backup",
|
||||||
"short" : "A utility to make reinstalling repositories and cogs after migrating the bot far easier.",
|
"short" : "A utility to make reinstalling repositories and cogs after migrating the bot far easier.",
|
||||||
"description" : "A utility to make reinstalling repositories and cogs after migrating the bot far easier.",
|
"description" : "A utility to make reinstalling repositories and cogs after migrating the bot far easier.",
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
"hidden": false,
|
"hidden": false,
|
||||||
"disabled": false,
|
"disabled": false,
|
||||||
"min_bot_version": "3.5.6",
|
"min_bot_version": "3.5.6",
|
||||||
"max_bot_version": "3.5.13",
|
"max_bot_version": "3.5.9",
|
||||||
"min_python_version": [3, 9, 0],
|
"min_python_version": [3, 9, 0],
|
||||||
"tags": [
|
"tags": [
|
||||||
"utility",
|
"utility",
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ from PIL import Image
|
||||||
from red_commons.logging import getLogger
|
from red_commons.logging import getLogger
|
||||||
from redbot.core import Config, commands, data_manager
|
from redbot.core import Config, commands, data_manager
|
||||||
from redbot.core.bot import Red
|
from redbot.core.bot import Red
|
||||||
from redbot.core.utils.chat_formatting import bold, error, humanize_list
|
from redbot.core.utils.chat_formatting import error, humanize_list
|
||||||
|
|
||||||
import bible.errors
|
import bible.errors
|
||||||
from bible.models import Version
|
from bible.models import Version
|
||||||
|
|
@ -24,10 +24,9 @@ from bible.models import Version
|
||||||
class Bible(commands.Cog):
|
class Bible(commands.Cog):
|
||||||
"""Retrieve Bible verses from the API.bible API."""
|
"""Retrieve Bible verses from the API.bible API."""
|
||||||
|
|
||||||
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
__author__ = ["SeaswimmerTheFsh"]
|
||||||
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
__version__ = "1.1.0"
|
||||||
__version__ = "1.1.1"
|
__documentation__ = "https://seacogs.coastalcommits.com/bible/"
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/pterodactyl/"
|
|
||||||
|
|
||||||
def __init__(self, bot: Red):
|
def __init__(self, bot: Red):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
|
@ -45,13 +44,12 @@ class Bible(commands.Cog):
|
||||||
n = "\n" if "\n\n" not in pre_processed else ""
|
n = "\n" if "\n\n" not in pre_processed else ""
|
||||||
text = [
|
text = [
|
||||||
f"{pre_processed}{n}",
|
f"{pre_processed}{n}",
|
||||||
f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
|
f"Cog Version: **{self.__version__}**",
|
||||||
f"{bold('Author:')} {humanize_list(self.__author__)}",
|
f"Author: {humanize_list(self.__author__)}",
|
||||||
f"{bold('Documentation:')} {self.__documentation__}",
|
f"Documentation: {self.__documentation__}",
|
||||||
]
|
]
|
||||||
return "\n".join(text)
|
return "\n".join(text)
|
||||||
|
|
||||||
|
|
||||||
def get_icon(self, color: Colour) -> File:
|
def get_icon(self, color: Colour) -> File:
|
||||||
"""Get the docs.api.bible favicon with a given color."""
|
"""Get the docs.api.bible favicon with a given color."""
|
||||||
image_path = data_manager.bundled_data_path(self) / "api.bible-logo.png"
|
image_path = data_manager.bundled_data_path(self) / "api.bible-logo.png"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"author" : ["cswimr"],
|
"author" : ["SeaswimmerTheFsh (seasw.)"],
|
||||||
"install_msg" : "Thank you for installing Bible!\nThis cog requires setting an API key for API.Bible. Please read the [documentation](https://seacogs.coastalcommits.com/bible/#setup) for more information.\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
|
"install_msg" : "Thank you for installing Bible!\nThis cog requires setting an API key for API.Bible. Please read the [documentation](https://seacogs.coastalcommits.com/bible/#setup) for more information.\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).",
|
||||||
"name" : "Bible",
|
"name" : "Bible",
|
||||||
"short" : "Retrieve Bible verses from API.Bible.",
|
"short" : "Retrieve Bible verses from API.Bible.",
|
||||||
"description" : "Retrieve Bible verses from the API.Bible API. This cog requires an API.Bible api key.",
|
"description" : "Retrieve Bible verses from the API.Bible API. This cog requires an API.Bible api key.",
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
from .emojiinfo import EmojiInfo
|
|
||||||
|
|
||||||
|
|
||||||
async def setup(bot):
|
|
||||||
await bot.add_cog(EmojiInfo(bot))
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,130 +0,0 @@
|
||||||
import io
|
|
||||||
|
|
||||||
import aiohttp
|
|
||||||
import discord
|
|
||||||
from colorthief import ColorThief
|
|
||||||
from red_commons.logging import RedTraceLogger, getLogger
|
|
||||||
from redbot.core import app_commands, commands
|
|
||||||
from redbot.core.bot import Red
|
|
||||||
from redbot.core.utils.chat_formatting import bold, humanize_list
|
|
||||||
|
|
||||||
from .model import PartialEmoji
|
|
||||||
|
|
||||||
|
|
||||||
class EmojiInfo(commands.Cog):
|
|
||||||
"""Retrieve information about emojis."""
|
|
||||||
|
|
||||||
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
|
||||||
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
|
||||||
__version__ = "1.0.1"
|
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/emojiinfo/"
|
|
||||||
|
|
||||||
def __init__(self, bot: Red) -> None:
|
|
||||||
super().__init__()
|
|
||||||
self.bot: Red = bot
|
|
||||||
self.logger: RedTraceLogger = getLogger(name="red.SeaCogs.Emoji")
|
|
||||||
|
|
||||||
def format_help_for_context(self, ctx: commands.Context) -> str:
|
|
||||||
pre_processed = super().format_help_for_context(ctx) or ""
|
|
||||||
n = "\n" if "\n\n" not in pre_processed else ""
|
|
||||||
text = [
|
|
||||||
f"{pre_processed}{n}",
|
|
||||||
f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
|
|
||||||
f"{bold('Author:')} {humanize_list(self.__author__)}",
|
|
||||||
f"{bold('Documentation:')} {self.__documentation__}",
|
|
||||||
]
|
|
||||||
return "\n".join(text)
|
|
||||||
|
|
||||||
|
|
||||||
async def fetch_twemoji(self, unicode_emoji) -> str:
|
|
||||||
base_url = "https://cdn.jsdelivr.net/gh/jdecked/twemoji@latest/assets/72x72/"
|
|
||||||
emoji_codepoint = "-".join([hex(ord(char))[2:] for char in unicode_emoji])
|
|
||||||
segments = emoji_codepoint.split("-")
|
|
||||||
valid_segments = [seg for seg in segments if len(seg) >= 4]
|
|
||||||
emoji_url = f"{base_url}{valid_segments[0]}.png"
|
|
||||||
return emoji_url
|
|
||||||
|
|
||||||
async def fetch_primary_color(self, emoji_url: str) -> discord.Color | None:
|
|
||||||
async with aiohttp.ClientSession() as session:
|
|
||||||
async with session.get(emoji_url) as response:
|
|
||||||
if response.status != 200:
|
|
||||||
return None
|
|
||||||
image = await response.read()
|
|
||||||
dominant_color = ColorThief(io.BytesIO(image)).get_color(quality=1)
|
|
||||||
color = discord.Color.from_rgb(*dominant_color)
|
|
||||||
return color
|
|
||||||
|
|
||||||
async def get_emoji_info(self, emoji: PartialEmoji) -> tuple[str, str]:
|
|
||||||
if emoji.is_unicode_emoji():
|
|
||||||
try:
|
|
||||||
emoji_url = await self.fetch_twemoji(unicode_emoji=emoji.name)
|
|
||||||
except IndexError as e:
|
|
||||||
raise e
|
|
||||||
else:
|
|
||||||
emoji_url = emoji.url
|
|
||||||
|
|
||||||
if emoji.id is not None:
|
|
||||||
emoji_id = f"{bold('ID:')} `{emoji.id}`\n"
|
|
||||||
markdown = f"`<{'a' if emoji.animated else ''}:{emoji.name}:{emoji.id}>`"
|
|
||||||
name = f"{bold('Name:')} {emoji.name}\n"
|
|
||||||
aliases = ""
|
|
||||||
group = ""
|
|
||||||
else:
|
|
||||||
emoji_id = ""
|
|
||||||
markdown = f"`{emoji}`"
|
|
||||||
name = f"{bold('Name:')} {emoji.aliases.pop(0)}\n"
|
|
||||||
aliases = f"{bold('Aliases:')} {', '.join(emoji.aliases)}\n" if emoji.aliases else ""
|
|
||||||
group = f"{bold('Group:')} {emoji.group}\n"
|
|
||||||
|
|
||||||
return (
|
|
||||||
f"{name}"
|
|
||||||
f"{emoji_id}"
|
|
||||||
f"{bold('Native:')} {emoji.is_unicode_emoji()}\n"
|
|
||||||
f"{group}"
|
|
||||||
f"{aliases}"
|
|
||||||
f"{bold('Animated:')} {emoji.animated}\n"
|
|
||||||
f"{bold('Markdown:')} {markdown}\n"
|
|
||||||
f"{bold('URL:')} [Click Here]({emoji_url})"
|
|
||||||
), emoji_url
|
|
||||||
|
|
||||||
@app_commands.command(name="emoji")
|
|
||||||
@app_commands.describe(
|
|
||||||
emoji="What emoji would you like to get information on?",
|
|
||||||
ephemeral="Would you like the response to be hidden?"
|
|
||||||
)
|
|
||||||
async def emoji_slash(self, interaction: discord.Interaction, emoji: str, ephemeral: bool = True) -> None:
|
|
||||||
"""Retrieve information about an emoji."""
|
|
||||||
await interaction.response.defer(ephemeral=ephemeral)
|
|
||||||
|
|
||||||
try:
|
|
||||||
emoji: PartialEmoji = PartialEmoji.from_str(self, value=emoji)
|
|
||||||
string, emoji_url, = await self.get_emoji_info(emoji)
|
|
||||||
self.logger.verbose(f"Emoji:\n{string}")
|
|
||||||
except (IndexError, UnboundLocalError):
|
|
||||||
return await interaction.followup.send("Please provide a valid emoji!")
|
|
||||||
|
|
||||||
if await self.bot.embed_requested(channel=interaction.channel):
|
|
||||||
embed = embed = discord.Embed(title="Emoji Information", description=string, color = await self.fetch_primary_color(emoji_url) or await self.bot.get_embed_color(interaction.channel))
|
|
||||||
embed.set_thumbnail(url=emoji_url)
|
|
||||||
|
|
||||||
await interaction.followup.send(embed=embed)
|
|
||||||
else:
|
|
||||||
await interaction.followup.send(content=string)
|
|
||||||
|
|
||||||
@commands.command(name="emoji")
|
|
||||||
async def emoji(self, ctx: commands.Context, *, emoji: str) -> None:
|
|
||||||
"""Retrieve information about an emoji."""
|
|
||||||
try:
|
|
||||||
emoji: PartialEmoji = PartialEmoji.from_str(self, value=emoji)
|
|
||||||
string, emoji_url, = await self.get_emoji_info(emoji)
|
|
||||||
self.logger.verbose(f"Emoji:\n{string}")
|
|
||||||
except (IndexError, UnboundLocalError):
|
|
||||||
return await ctx.send("Please provide a valid emoji!")
|
|
||||||
|
|
||||||
if await ctx.embed_requested():
|
|
||||||
embed = embed = discord.Embed(title="Emoji Information", description=string, color = await self.fetch_primary_color(emoji_url) or await ctx.embed_color)
|
|
||||||
embed.set_thumbnail(url=emoji_url)
|
|
||||||
|
|
||||||
await ctx.send(embed=embed)
|
|
||||||
else:
|
|
||||||
await ctx.send(content=string)
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
{
|
|
||||||
"author" : ["cswimr"],
|
|
||||||
"install_msg" : "Thank you for installing Emoji!",
|
|
||||||
"name" : "Emoji",
|
|
||||||
"short" : "Retrieve information about emojis.",
|
|
||||||
"description" : "Retrieve information about emojis.",
|
|
||||||
"end_user_data_statement" : "This cog does not store end user data.",
|
|
||||||
"hidden": false,
|
|
||||||
"disabled": false,
|
|
||||||
"min_bot_version": "3.5.0",
|
|
||||||
"min_python_version": [3, 10, 0],
|
|
||||||
"requirements": ["colorthief"],
|
|
||||||
"tags": [
|
|
||||||
"utility"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
import json
|
|
||||||
|
|
||||||
import discord
|
|
||||||
from redbot.core import commands, data_manager
|
|
||||||
|
|
||||||
|
|
||||||
class PartialEmoji(discord.PartialEmoji):
|
|
||||||
"""Represents a "partial" emoji. Subclasses `discord.PartialEmoji`
|
|
||||||
|
|
||||||
.. container:: operations
|
|
||||||
|
|
||||||
.. describe:: x == y
|
|
||||||
|
|
||||||
Checks if two emoji are the same.
|
|
||||||
|
|
||||||
.. describe:: x != y
|
|
||||||
|
|
||||||
Checks if two emoji are not the same.
|
|
||||||
|
|
||||||
.. describe:: hash(x)
|
|
||||||
|
|
||||||
Return the emoji's hash.
|
|
||||||
|
|
||||||
.. describe:: str(x)
|
|
||||||
|
|
||||||
Returns the emoji rendered for discord.
|
|
||||||
|
|
||||||
Attributes
|
|
||||||
-----------
|
|
||||||
name: Optional[:class:`str`]
|
|
||||||
The custom emoji name, if applicable, or the unicode codepoint
|
|
||||||
of the non-custom emoji. This can be ``None`` if the emoji
|
|
||||||
got deleted (e.g. removing a reaction with a deleted emoji).
|
|
||||||
animated: :class:`bool`
|
|
||||||
Whether the emoji is animated or not.
|
|
||||||
id: Optional[:class:`int`]
|
|
||||||
The ID of the custom emoji, if applicable.
|
|
||||||
group: Optional[:class:`str`]
|
|
||||||
The group name of the emoji if it is a native emoji.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, *, name: str, animated: bool = False, id: int | None = None, group: str | None = None, aliases: list | None = None) -> None: # pylint: disable=redefined-builtin
|
|
||||||
super().__init__(name=name, animated=animated, id=id)
|
|
||||||
self.group = group
|
|
||||||
self.aliases = aliases
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_str(cls, coginstance: commands.Cog, value: str) -> "PartialEmoji":
|
|
||||||
"""Converts a Discord string representation of an emoji to a :class:`PartialEmoji`.
|
|
||||||
|
|
||||||
The formats accepted are:
|
|
||||||
|
|
||||||
- ``a:name:id``
|
|
||||||
- ``<a:name:id>``
|
|
||||||
- ``name:id``
|
|
||||||
- ``<:name:id>``
|
|
||||||
|
|
||||||
If the format does not match then it is assumed to be a unicode emoji.
|
|
||||||
|
|
||||||
.. versionadded:: 2.0
|
|
||||||
|
|
||||||
Parameters
|
|
||||||
------------
|
|
||||||
value: :class:`str`
|
|
||||||
The string representation of an emoji.
|
|
||||||
|
|
||||||
Returns
|
|
||||||
--------
|
|
||||||
:class:`PartialEmoji`
|
|
||||||
The partial emoji from this string.
|
|
||||||
"""
|
|
||||||
match = cls._CUSTOM_EMOJI_RE.match(value)
|
|
||||||
if match is not None:
|
|
||||||
groups = match.groupdict()
|
|
||||||
animated = bool(groups['animated'])
|
|
||||||
emoji_id = int(groups['id'])
|
|
||||||
name = groups['name']
|
|
||||||
return cls(name=name, animated=animated, id=emoji_id)
|
|
||||||
|
|
||||||
path: data_manager.Path = data_manager.bundled_data_path(coginstance) / "emojis.json"
|
|
||||||
with open(path, "r", encoding="UTF-8") as file:
|
|
||||||
emojis: dict = json.load(file)
|
|
||||||
emoji_aliases = []
|
|
||||||
emoji_group = None
|
|
||||||
for dict_name, group in emojis.items():
|
|
||||||
for k, v in group.items():
|
|
||||||
if v == value:
|
|
||||||
emoji_group = dict_name
|
|
||||||
if k not in emoji_aliases:
|
|
||||||
emoji_aliases.append(k)
|
|
||||||
return cls(name=value, animated=False, id=None, group=emoji_group, aliases=emoji_aliases)
|
|
||||||
303
flake.lock
303
flake.lock
|
|
@ -1,303 +0,0 @@
|
||||||
{
|
|
||||||
"nodes": {
|
|
||||||
"cachix": {
|
|
||||||
"inputs": {
|
|
||||||
"devenv": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"flake-compat": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"git-hooks": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"nixpkgs": "nixpkgs"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728672398,
|
|
||||||
"narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "cachix",
|
|
||||||
"rev": "aac51f698309fd0f381149214b7eee213c66ef0a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"ref": "latest",
|
|
||||||
"repo": "cachix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"devenv": {
|
|
||||||
"inputs": {
|
|
||||||
"cachix": "cachix",
|
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"git-hooks": "git-hooks",
|
|
||||||
"nix": "nix",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1732121232,
|
|
||||||
"narHash": "sha256-CmJt7aeSCJnJYGtYpyslRI+pC28RPVD43PD/7kkIVuM=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "devenv",
|
|
||||||
"rev": "6ff1e5f92c0d74bbb12f7454a239ca2f02e05ea1",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "devenv",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1696426674,
|
|
||||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_2": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1696426674,
|
|
||||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"devenv",
|
|
||||||
"nix",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1712014858,
|
|
||||||
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"git-hooks": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"gitignore": "gitignore",
|
|
||||||
"nixpkgs": [
|
|
||||||
"devenv",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nixpkgs-stable": [
|
|
||||||
"devenv"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730302582,
|
|
||||||
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gitignore": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"devenv",
|
|
||||||
"git-hooks",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709087332,
|
|
||||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"libgit2": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1697646580,
|
|
||||||
"narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
|
|
||||||
"owner": "libgit2",
|
|
||||||
"repo": "libgit2",
|
|
||||||
"rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "libgit2",
|
|
||||||
"repo": "libgit2",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"libgit2": "libgit2",
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"nixpkgs-23-11": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"nixpkgs-regression": [
|
|
||||||
"devenv"
|
|
||||||
],
|
|
||||||
"pre-commit-hooks": [
|
|
||||||
"devenv"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1727438425,
|
|
||||||
"narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=",
|
|
||||||
"owner": "domenkozar",
|
|
||||||
"repo": "nix",
|
|
||||||
"rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "domenkozar",
|
|
||||||
"ref": "devenv-2.24",
|
|
||||||
"repo": "nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730531603,
|
|
||||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-python": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730716553,
|
|
||||||
"narHash": "sha256-n4cibCp/ggDlSacCTnP8dVnywclQKYcHy6PRfe35Hk0=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "nixpkgs-python",
|
|
||||||
"rev": "8fcdb8ec34a1c2bae3f5326873a41b310e948ccc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "nixpkgs-python",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1717432640,
|
|
||||||
"narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "release-24.05",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731676054,
|
|
||||||
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
|
||||||
"inputs": {
|
|
||||||
"devenv": "devenv",
|
|
||||||
"nixpkgs": "nixpkgs_3",
|
|
||||||
"nixpkgs-python": "nixpkgs-python",
|
|
||||||
"systems": "systems"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": "root",
|
|
||||||
"version": 7
|
|
||||||
}
|
|
||||||
46
flake.nix
46
flake.nix
|
|
@ -1,46 +0,0 @@
|
||||||
{
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
||||||
nixpkgs-python.url = "github:cachix/nixpkgs-python";
|
|
||||||
nixpkgs-python.inputs = { nixpkgs.follows = "nixpkgs"; };
|
|
||||||
systems.url = "github:nix-systems/default";
|
|
||||||
devenv.url = "github:cachix/devenv";
|
|
||||||
devenv.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
nixConfig = {
|
|
||||||
extra-trusted-public-keys =
|
|
||||||
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw=";
|
|
||||||
extra-substituters = "https://devenv.cachix.org";
|
|
||||||
};
|
|
||||||
|
|
||||||
outputs = { self, nixpkgs, devenv, systems, ... }@inputs:
|
|
||||||
let forEachSystem = nixpkgs.lib.genAttrs (import systems);
|
|
||||||
in {
|
|
||||||
packages = forEachSystem (system: {
|
|
||||||
devenv-up = self.devShells.${system}.default.config.procfileScript;
|
|
||||||
devenv-test = self.devShells.${system}.default.config.test;
|
|
||||||
});
|
|
||||||
|
|
||||||
devShells = forEachSystem (system:
|
|
||||||
let pkgs = nixpkgs.legacyPackages.${system};
|
|
||||||
in {
|
|
||||||
default = devenv.lib.mkShell {
|
|
||||||
inherit inputs pkgs;
|
|
||||||
modules = [{
|
|
||||||
languages.python = {
|
|
||||||
enable = true;
|
|
||||||
version = "3.11";
|
|
||||||
uv = {
|
|
||||||
enable = true;
|
|
||||||
sync = {
|
|
||||||
enable = true;
|
|
||||||
allExtras = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}];
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
}
|
|
||||||
10
info.json
10
info.json
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"author": [
|
"author": [
|
||||||
"cswimr"
|
"SeaswimmerTheFsh (seasw.)"
|
||||||
],
|
],
|
||||||
"install_msg": "Thanks for installing my repo!\n\nIf you have any issues with any of the cogs, please create an issue [here](https://coastalcommits.com/cswimr/SeaCogs/issues) or join my [Discord Server](https://discord.gg/eMUMe77Yb8 ).",
|
"install_msg": "Thanks for installing my repo!\n\nIf you have any issues with any of the cogs, please create an issue [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs/issues) or join my [Discord Server](https://discord.gg/eMUMe77Yb8 ).",
|
||||||
"index_name": "sea-cogs",
|
"name": "SeaCogs",
|
||||||
"short": "Various cogs for Red, by cswimr",
|
"short": "Various cogs for Red, by SeaswimmerTheFsh (seasw.)",
|
||||||
"description": "Various cogs for Red, by cswimr"
|
"description": "Various cogs for Red, by SeaswimmerTheFsh (seasw.)"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
11
mkdocs.yml
11
mkdocs.yml
|
|
@ -1,12 +1,12 @@
|
||||||
site_name: SeaCogs Documentation
|
site_name: SeaCogs Documentation
|
||||||
site_url: !ENV [SITE_URL, 'https://seacogs.coastalcommits.com']
|
site_url: !ENV [SITE_URL, 'https://seacogs.coastalcommits.com']
|
||||||
repo_name: CoastalCommits
|
repo_name: CoastalCommits
|
||||||
repo_url: https://coastalcommits.com/cswimr/SeaCogs
|
repo_url: https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs
|
||||||
edit_uri: !ENV [EDIT_URI, 'src/branch/main/.docs']
|
edit_uri: !ENV [EDIT_URI, 'src/branch/main/.docs']
|
||||||
copyright: Copyright © 2023-2024, cswimr
|
copyright: Copyright © 2023-2024, SeaswimmerTheFsh
|
||||||
docs_dir: .docs
|
docs_dir: .docs
|
||||||
|
|
||||||
site_author: cswimr
|
site_author: SeaswimmerTheFsh
|
||||||
site_description: Documentation for my Red-DiscordBot Cogs.
|
site_description: Documentation for my Red-DiscordBot Cogs.
|
||||||
|
|
||||||
nav:
|
nav:
|
||||||
|
|
@ -18,7 +18,6 @@ nav:
|
||||||
- Configuration: aurora/configuration.md
|
- Configuration: aurora/configuration.md
|
||||||
- Bible: bible.md
|
- Bible: bible.md
|
||||||
- Backup: backup.md
|
- Backup: backup.md
|
||||||
- EmojiInfo: emojiinfo.md
|
|
||||||
- Nerdify: nerdify.md
|
- Nerdify: nerdify.md
|
||||||
- Pterodactyl:
|
- Pterodactyl:
|
||||||
- pterodactyl/index.md
|
- pterodactyl/index.md
|
||||||
|
|
@ -30,7 +29,7 @@ nav:
|
||||||
plugins:
|
plugins:
|
||||||
- git-authors
|
- git-authors
|
||||||
- search
|
- search
|
||||||
- social
|
#- social
|
||||||
- git-revision-date-localized:
|
- git-revision-date-localized:
|
||||||
enable_creation_date: true
|
enable_creation_date: true
|
||||||
type: timeago
|
type: timeago
|
||||||
|
|
@ -113,5 +112,3 @@ watch:
|
||||||
- ./bible
|
- ./bible
|
||||||
- ./nerdify
|
- ./nerdify
|
||||||
- ./pterodactyl
|
- ./pterodactyl
|
||||||
- ./emojiinfo
|
|
||||||
- ./antipolls
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"author" : ["cswimr"],
|
"author" : ["SeaswimmerTheFsh (seasw.)"],
|
||||||
"install_msg" : "Thank you for installing Nerdify!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs). Based off of PhasecoreX's [UwU](<https://github.com/PhasecoreX/PCXCogs/tree/master/uwu>) cog.",
|
"install_msg" : "Thank you for installing Nerdify!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs). Based off of PhasecoreX's [UwU](<https://github.com/PhasecoreX/PCXCogs/tree/master/uwu>) cog.",
|
||||||
"name" : "Nerdify",
|
"name" : "Nerdify",
|
||||||
"short" : "Nerdify your text!",
|
"short" : "Nerdify your text!",
|
||||||
"description" : "Nerdify your text!",
|
"description" : "Nerdify your text!",
|
||||||
|
|
|
||||||
|
|
@ -12,15 +12,13 @@ from typing import Any, Optional, Union
|
||||||
import discord
|
import discord
|
||||||
from redbot.core import commands
|
from redbot.core import commands
|
||||||
from redbot.core.utils import chat_formatting, common_filters
|
from redbot.core.utils import chat_formatting, common_filters
|
||||||
from redbot.core.utils.chat_formatting import bold, humanize_list
|
|
||||||
|
|
||||||
|
|
||||||
class Nerdify(commands.Cog):
|
class Nerdify(commands.Cog):
|
||||||
"""Nerdify your text."""
|
"""Nerdify your text."""
|
||||||
|
|
||||||
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
__author__ = ["SeaswimmerTheFsh"]
|
||||||
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
__version__ = "1.3.4"
|
||||||
__version__ = "1.3.5"
|
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/nerdify/"
|
__documentation__ = "https://seacogs.coastalcommits.com/nerdify/"
|
||||||
|
|
||||||
def __init__(self, bot):
|
def __init__(self, bot):
|
||||||
|
|
@ -31,13 +29,12 @@ class Nerdify(commands.Cog):
|
||||||
n = "\n" if "\n\n" not in pre_processed else ""
|
n = "\n" if "\n\n" not in pre_processed else ""
|
||||||
text = [
|
text = [
|
||||||
f"{pre_processed}{n}",
|
f"{pre_processed}{n}",
|
||||||
f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
|
f"Cog Version: **{self.__version__}**",
|
||||||
f"{bold('Author:')} {humanize_list(self.__author__)}",
|
f"Author: {chat_formatting.humanize_list(self.__author__)}",
|
||||||
f"{bold('Documentation:')} {self.__documentation__}",
|
f"Documentation: {self.__documentation__}"
|
||||||
]
|
]
|
||||||
return "\n".join(text)
|
return "\n".join(text)
|
||||||
|
|
||||||
|
|
||||||
@commands.command(aliases=["nerd"])
|
@commands.command(aliases=["nerd"])
|
||||||
async def nerdify(
|
async def nerdify(
|
||||||
self, ctx: commands.Context, *, text: Optional[str] = None
|
self, ctx: commands.Context, *, text: Optional[str] = None
|
||||||
|
|
|
||||||
2439
poetry.lock
generated
Normal file
2439
poetry.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
Before Width: | Height: | Size: 65 KiB |
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"author" : ["cswimr"],
|
"author" : ["SeaswimmerTheFsh (seasw.)"],
|
||||||
"install_msg" : "Thank you for installing Pterodactyl!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).\nDocumentation can be found [here](https://seacogs.coastalcommits.com/pterodactyl ).",
|
"install_msg" : "Thank you for installing Pterodactyl!\nYou can find the source code of this cog [here](https://coastalcommits.com/SeaswimmerTheFsh/SeaCogs).\nDocumentation can be found [here](https://seacogs.coastalcommits.com/pterodactyl ).",
|
||||||
"name" : "Pterodactyl",
|
"name" : "Pterodactyl",
|
||||||
"short" : "Interface with Pterodactyl through websockets.",
|
"short" : "Interface with Pterodactyl through websockets.",
|
||||||
"description" : "Interface with Pterodactyl through websockets.",
|
"description" : "Interface with Pterodactyl through websockets.",
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
"disabled": false,
|
"disabled": false,
|
||||||
"min_bot_version": "3.5.0",
|
"min_bot_version": "3.5.0",
|
||||||
"min_python_version": [3, 8, 0],
|
"min_python_version": [3, 8, 0],
|
||||||
"requirements": ["git+https://github.com/cswimr/pydactyl", "websockets"],
|
"requirements": ["git+https://github.com/SeaswimmerTheFsh/pydactyl", "websockets"],
|
||||||
"tags": [
|
"tags": [
|
||||||
"pterodactyl",
|
"pterodactyl",
|
||||||
"minecraft",
|
"minecraft",
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import aiohttp
|
import aiohttp
|
||||||
|
|
||||||
|
|
||||||
async def get_status(host: str, port: int = 25565) -> tuple[bool, dict]:
|
async def get_status(host, port = 25565) -> tuple[bool, dict]:
|
||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
async with session.get(f'https://api.mcsrvstat.us/2/{host}:{port}') as response:
|
async with session.get(f'https://api.mcsrvstat.us/2/{host}:{port}') as response:
|
||||||
response = await response.json()
|
response = await response.json()
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ from pydactyl import PterodactylClient
|
||||||
from redbot.core import app_commands, commands
|
from redbot.core import app_commands, commands
|
||||||
from redbot.core.app_commands import Choice
|
from redbot.core.app_commands import Choice
|
||||||
from redbot.core.bot import Red
|
from redbot.core.bot import Red
|
||||||
from redbot.core.utils.chat_formatting import bold, box, error, humanize_list
|
from redbot.core.utils.chat_formatting import box, error, humanize_list
|
||||||
from redbot.core.utils.views import ConfirmView
|
from redbot.core.utils.views import ConfirmView
|
||||||
|
|
||||||
from pterodactyl import mcsrvstatus
|
from pterodactyl import mcsrvstatus
|
||||||
|
|
@ -20,9 +20,8 @@ from pterodactyl.logger import logger
|
||||||
class Pterodactyl(commands.Cog):
|
class Pterodactyl(commands.Cog):
|
||||||
"""Pterodactyl allows you to manage your Pterodactyl Panel from Discord."""
|
"""Pterodactyl allows you to manage your Pterodactyl Panel from Discord."""
|
||||||
|
|
||||||
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
__author__ = ["SeaswimmerTheFsh"]
|
||||||
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
__version__ = "2.0.0"
|
||||||
__version__ = "2.0.4"
|
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/pterodactyl/"
|
__documentation__ = "https://seacogs.coastalcommits.com/pterodactyl/"
|
||||||
|
|
||||||
def __init__(self, bot: Red):
|
def __init__(self, bot: Red):
|
||||||
|
|
@ -40,29 +39,12 @@ class Pterodactyl(commands.Cog):
|
||||||
n = "\n" if "\n\n" not in pre_processed else ""
|
n = "\n" if "\n\n" not in pre_processed else ""
|
||||||
text = [
|
text = [
|
||||||
f"{pre_processed}{n}",
|
f"{pre_processed}{n}",
|
||||||
f"{bold('Cog Version:')} [{self.__version__}]({self.__git__})",
|
f"Cog Version: **{self.__version__}**",
|
||||||
f"{bold('Author:')} {humanize_list(self.__author__)}",
|
f"Author: {humanize_list(self.__author__)}",
|
||||||
f"{bold('Documentation:')} {self.__documentation__}",
|
f"Documentation: {self.__documentation__}",
|
||||||
]
|
]
|
||||||
return "\n".join(text)
|
return "\n".join(text)
|
||||||
|
|
||||||
async def cog_load(self) -> None:
|
|
||||||
pterodactyl_keys = await self.bot.get_shared_api_tokens("pterodactyl")
|
|
||||||
api_key = pterodactyl_keys.get("api_key")
|
|
||||||
if api_key is None:
|
|
||||||
self.task.cancel()
|
|
||||||
raise ValueError("Pterodactyl API key not set. Please set it using `[p]set api`.")
|
|
||||||
base_url = await config.base_url()
|
|
||||||
if base_url is None:
|
|
||||||
self.task.cancel()
|
|
||||||
raise ValueError("Pterodactyl base URL not set. Please set it using `[p]pterodactyl config url`.")
|
|
||||||
server_id = await config.server_id()
|
|
||||||
if server_id is None:
|
|
||||||
self.task.cancel()
|
|
||||||
raise ValueError("Pterodactyl server ID not set. Please set it using `[p]pterodactyl config serverid`.")
|
|
||||||
|
|
||||||
self.client = PterodactylClient(base_url, api_key).client
|
|
||||||
|
|
||||||
async def cog_unload(self) -> None:
|
async def cog_unload(self) -> None:
|
||||||
self.update_topic.cancel()
|
self.update_topic.cancel()
|
||||||
self.task.cancel()
|
self.task.cancel()
|
||||||
|
|
@ -193,47 +175,76 @@ class Pterodactyl(commands.Cog):
|
||||||
|
|
||||||
async def power(self, ctx: Union[discord.Interaction, commands.Context], action: str, action_ing: str, warning: str = '') -> None:
|
async def power(self, ctx: Union[discord.Interaction, commands.Context], action: str, action_ing: str, warning: str = '') -> None:
|
||||||
if isinstance(ctx, discord.Interaction):
|
if isinstance(ctx, discord.Interaction):
|
||||||
ctx = await self.bot.get_context(ctx)
|
author = ctx.user
|
||||||
|
else:
|
||||||
|
author = ctx.author
|
||||||
|
|
||||||
current_status = await config.current_status()
|
current_status = await config.current_status()
|
||||||
|
|
||||||
if current_status == action_ing:
|
if current_status == action_ing:
|
||||||
return await ctx.send(f"Server is already {action_ing}.", ephemeral=True)
|
if isinstance(ctx, discord.Interaction):
|
||||||
|
return await ctx.response.send_message(f"Server is already {action_ing}.", ephemeral=True)
|
||||||
|
return await ctx.send(f"Server is already {action_ing}.")
|
||||||
|
|
||||||
if current_status in ["starting", "stopping"] and action != "kill":
|
if current_status in ["starting", "stopping"] and action != "kill":
|
||||||
return await ctx.send("Another power action is already in progress.", ephemeral=True)
|
if isinstance(ctx, discord.Interaction):
|
||||||
|
return await ctx.response.send_message("Another power action is already in progress.", ephemeral=True)
|
||||||
|
return await ctx.send("Another power action is already in progress.")
|
||||||
|
|
||||||
view = ConfirmView(ctx.author, disable_buttons=True)
|
view = ConfirmView(author, disable_buttons=True)
|
||||||
|
|
||||||
message = await ctx.send(f"{warning}Are you sure you want to {action} the server?", view=view)
|
if isinstance(ctx, discord.Interaction):
|
||||||
|
await ctx.response.send_message(f"{warning}Are you sure you want to {action} the server?", view=view)
|
||||||
|
else:
|
||||||
|
message = await ctx.send(f"{warning}Are you sure you want to {action} the server?", view=view)
|
||||||
|
|
||||||
await view.wait()
|
await view.wait()
|
||||||
|
|
||||||
if view.result is True:
|
if view.result is True:
|
||||||
await message.edit(content=f"Sending websocket command to {action} server...", view=None)
|
if isinstance(ctx, discord.Interaction):
|
||||||
|
await ctx.edit_original_response(content=f"Sending websocket command to {action} server...", view=None)
|
||||||
|
else:
|
||||||
|
await message.edit(content=f"Sending websocket command to {action} server...", view=None)
|
||||||
|
|
||||||
await self.websocket.send(json.dumps({"event": "set state", "args": [action]}))
|
await self.websocket.send(json.dumps({"event": "set state", "args": [action]}))
|
||||||
|
|
||||||
await message.edit(content=f"Server {action_ing}", view=None)
|
if isinstance(ctx, discord.Interaction):
|
||||||
|
await ctx.edit_original_response(content=f"Server {action_ing}", view=None)
|
||||||
|
else:
|
||||||
|
await message.edit(content=f"Server {action_ing}", view=None)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
await message.edit(content="Cancelled.", view=None)
|
if isinstance(ctx, discord.Interaction):
|
||||||
|
await ctx.edit_original_response(content="Cancelled.", view=None)
|
||||||
|
else:
|
||||||
|
await message.edit(content="Cancelled.", view=None)
|
||||||
|
|
||||||
async def send_command(self, ctx: Union[discord.Interaction, commands.Context], command: str):
|
async def send_command(self, ctx: Union[discord.Interaction, commands.Context], command: str):
|
||||||
channel = self.bot.get_channel(await config.console_channel())
|
channel = self.bot.get_channel(await config.console_channel())
|
||||||
if isinstance(ctx, discord.Interaction):
|
if isinstance(ctx, discord.Interaction):
|
||||||
ctx = await self.bot.get_context(ctx)
|
if channel:
|
||||||
if channel:
|
await channel.send(f"Received console command from {ctx.user.id}: {command[:1900]}", allowed_mentions=discord.AllowedMentions.none())
|
||||||
await channel.send(f"Received console command from {ctx.author.id}: {command[:1900]}", allowed_mentions=discord.AllowedMentions.none())
|
try:
|
||||||
try:
|
await self.websocket.send(json.dumps({"event": "send command", "args": [command]}))
|
||||||
await self.websocket.send(json.dumps({"event": "send command", "args": [command]}))
|
await ctx.response.send_message(f"Command sent to server. {box(command, 'json')}", ephemeral=True)
|
||||||
await ctx.send(f"Command sent to server. {box(command, 'json')}")
|
except websockets.exceptions.ConnectionClosed as e:
|
||||||
except websockets.exceptions.ConnectionClosed as e:
|
logger.error("WebSocket connection closed: %s", e)
|
||||||
logger.error("WebSocket connection closed: %s", e)
|
await ctx.response.send_message(error("WebSocket connection closed."))
|
||||||
await ctx.send(error("WebSocket connection closed."))
|
self.task.cancel()
|
||||||
self.task.cancel()
|
self.retry_counter = 0
|
||||||
self.retry_counter = 0
|
self.task = self.get_task()
|
||||||
self.task = self.get_task()
|
else:
|
||||||
|
if channel:
|
||||||
|
await channel.send(f"Received console command from {ctx.author.id}: {command[:1900]}", allowed_mentions=discord.AllowedMentions.none())
|
||||||
|
try:
|
||||||
|
await self.websocket.send(json.dumps({"event": "send command", "args": [command]}))
|
||||||
|
await ctx.send(f"Command sent to server. {box(command, 'json')}")
|
||||||
|
except websockets.exceptions.ConnectionClosed as e:
|
||||||
|
logger.error("WebSocket connection closed: %s", e)
|
||||||
|
await ctx.send(error("WebSocket connection closed."))
|
||||||
|
self.task.cancel()
|
||||||
|
self.retry_counter = 0
|
||||||
|
self.task = self.get_task()
|
||||||
|
|
||||||
@commands.Cog.listener()
|
@commands.Cog.listener()
|
||||||
async def on_red_api_tokens_update(self, service_name: str, api_tokens: Mapping[str,str]): # pylint: disable=unused-argument
|
async def on_red_api_tokens_update(self, service_name: str, api_tokens: Mapping[str,str]): # pylint: disable=unused-argument
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,12 @@
|
||||||
# pylint: disable=cyclic-import
|
# pylint: disable=cyclic-import
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
from pathlib import Path
|
from typing import Optional, Union
|
||||||
from typing import Optional, Tuple, Union
|
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import discord
|
import discord
|
||||||
import websockets
|
import websockets
|
||||||
from pydactyl import PterodactylClient
|
from pydactyl import PterodactylClient
|
||||||
from redbot.core.data_manager import bundled_data_path
|
|
||||||
from redbot.core.utils.chat_formatting import bold, pagify
|
from redbot.core.utils.chat_formatting import bold, pagify
|
||||||
|
|
||||||
from pterodactyl.config import config
|
from pterodactyl.config import config
|
||||||
|
|
@ -80,12 +78,7 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None:
|
||||||
if join_message:
|
if join_message:
|
||||||
if chat_channel is not None:
|
if chat_channel is not None:
|
||||||
if coginstance.bot.embed_requested(chat_channel):
|
if coginstance.bot.embed_requested(chat_channel):
|
||||||
embed, img = await generate_join_leave_embed(coginstance=coginstance, username=join_message,join=True)
|
await chat_channel.send(embed=await generate_join_leave_embed(join_message, True))
|
||||||
if img:
|
|
||||||
with open(img, 'rb') as file:
|
|
||||||
await chat_channel.send(embed=embed, file=file)
|
|
||||||
else:
|
|
||||||
await chat_channel.send(embed=embed)
|
|
||||||
else:
|
else:
|
||||||
await chat_channel.send(f"{join_message} joined the game", allowed_mentions=discord.AllowedMentions.none())
|
await chat_channel.send(f"{join_message} joined the game", allowed_mentions=discord.AllowedMentions.none())
|
||||||
|
|
||||||
|
|
@ -93,12 +86,7 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None:
|
||||||
if leave_message:
|
if leave_message:
|
||||||
if chat_channel is not None:
|
if chat_channel is not None:
|
||||||
if coginstance.bot.embed_requested(chat_channel):
|
if coginstance.bot.embed_requested(chat_channel):
|
||||||
embed, img = await generate_join_leave_embed(coginstance=coginstance, username=leave_message,join=False)
|
await chat_channel.send(embed=await generate_join_leave_embed(leave_message, False))
|
||||||
if img:
|
|
||||||
with open(img, 'rb') as file:
|
|
||||||
await chat_channel.send(embed=embed, file=file)
|
|
||||||
else:
|
|
||||||
await chat_channel.send(embed=embed)
|
|
||||||
else:
|
else:
|
||||||
await chat_channel.send(f"{leave_message} left the game", allowed_mentions=discord.AllowedMentions.none())
|
await chat_channel.send(f"{leave_message} left the game", allowed_mentions=discord.AllowedMentions.none())
|
||||||
|
|
||||||
|
|
@ -106,7 +94,7 @@ async def establish_websocket_connection(coginstance: Pterodactyl) -> None:
|
||||||
if achievement_message:
|
if achievement_message:
|
||||||
if chat_channel is not None:
|
if chat_channel is not None:
|
||||||
if coginstance.bot.embed_requested(chat_channel):
|
if coginstance.bot.embed_requested(chat_channel):
|
||||||
await chat_channel.send(embed=await generate_achievement_embed(coginstance, achievement_message['username'], achievement_message['achievement'], achievement_message['challenge']))
|
await chat_channel.send(embed=await generate_achievement_embed(achievement_message['username'], achievement_message['achievement'], achievement_message['challenge']))
|
||||||
else:
|
else:
|
||||||
await chat_channel.send(f"{achievement_message['username']} has {'completed the challenge' if achievement_message['challenge'] else 'made the advancement'} {achievement_message['achievement']}")
|
await chat_channel.send(f"{achievement_message['username']} has {'completed the challenge' if achievement_message['challenge'] else 'made the advancement'} {achievement_message['achievement']}")
|
||||||
|
|
||||||
|
|
@ -165,7 +153,7 @@ async def check_if_server_message(text: str) -> Union[bool, str]:
|
||||||
regex = await config.server_regex()
|
regex = await config.server_regex()
|
||||||
match: Optional[re.Match[str]] = re.match(regex, text)
|
match: Optional[re.Match[str]] = re.match(regex, text)
|
||||||
if match:
|
if match:
|
||||||
logger.trace("Message is a server message")
|
logger.debug("Message is a server message")
|
||||||
return match.group(1)
|
return match.group(1)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
@ -174,7 +162,7 @@ async def check_if_chat_message(text: str) -> Union[bool, dict]:
|
||||||
match: Optional[re.Match[str]] = re.match(regex, text)
|
match: Optional[re.Match[str]] = re.match(regex, text)
|
||||||
if match:
|
if match:
|
||||||
groups = {"username": match.group(1), "message": match.group(2)}
|
groups = {"username": match.group(1), "message": match.group(2)}
|
||||||
logger.trace("Message is a chat message\n%s", json.dumps(groups))
|
logger.debug("Message is a chat message\n%s", json.dumps(groups))
|
||||||
return groups
|
return groups
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
@ -182,7 +170,7 @@ async def check_if_join_message(text: str) -> Union[bool, str]:
|
||||||
regex = await config.join_regex()
|
regex = await config.join_regex()
|
||||||
match: Optional[re.Match[str]] = re.match(regex, text)
|
match: Optional[re.Match[str]] = re.match(regex, text)
|
||||||
if match:
|
if match:
|
||||||
logger.trace("Message is a join message")
|
logger.debug("Message is a join message")
|
||||||
return match.group(1)
|
return match.group(1)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
@ -190,7 +178,7 @@ async def check_if_leave_message(text: str) -> Union[bool, str]:
|
||||||
regex = await config.leave_regex()
|
regex = await config.leave_regex()
|
||||||
match: Optional[re.Match[str]] = re.match(regex, text)
|
match: Optional[re.Match[str]] = re.match(regex, text)
|
||||||
if match:
|
if match:
|
||||||
logger.trace("Message is a leave message")
|
logger.debug("Message is a leave message")
|
||||||
return match.group(1)
|
return match.group(1)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
@ -203,23 +191,23 @@ async def check_if_achievement_message(text: str) -> Union[bool, dict]:
|
||||||
groups["challenge"] = True
|
groups["challenge"] = True
|
||||||
else:
|
else:
|
||||||
groups["challenge"] = False
|
groups["challenge"] = False
|
||||||
logger.trace("Message is an achievement message")
|
logger.debug("Message is an achievement message")
|
||||||
return groups
|
return groups
|
||||||
return False
|
return False
|
||||||
|
|
||||||
async def get_info(username: str) -> Optional[dict]:
|
async def get_info(username: str) -> Optional[dict]:
|
||||||
logger.verbose("Retrieving player info for %s", username)
|
logger.debug("Retrieving player info for %s", username)
|
||||||
endpoint = await config.api_endpoint()
|
endpoint = await config.api_endpoint()
|
||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
async with session.get(f"https://playerdb.co/api/player/{endpoint}/{username}") as response:
|
async with session.get(f"https://playerdb.co/api/player/{endpoint}/{username}") as response:
|
||||||
if response.status == 200:
|
if response.status == 200:
|
||||||
logger.verbose("Player info retrieved for %s", username)
|
logger.debug("Player info retrieved for %s", username)
|
||||||
return await response.json()
|
return await response.json()
|
||||||
logger.warning("Failed to retrieve player info for %s: %s", username, response.status)
|
logger.error("Failed to retrieve player info for %s: %s", username, response.status)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
async def send_chat_discord(coginstance: Pterodactyl, username: str, message: str, avatar_url: str) -> None:
|
async def send_chat_discord(coginstance: Pterodactyl, username: str, message: str, avatar_url: str) -> None:
|
||||||
logger.trace("Sending chat message to Discord")
|
logger.debug("Sending chat message to Discord")
|
||||||
channel = coginstance.bot.get_channel(await config.chat_channel())
|
channel = coginstance.bot.get_channel(await config.chat_channel())
|
||||||
if channel is not None:
|
if channel is not None:
|
||||||
webhooks = await channel.webhooks()
|
webhooks = await channel.webhooks()
|
||||||
|
|
@ -227,37 +215,33 @@ async def send_chat_discord(coginstance: Pterodactyl, username: str, message: st
|
||||||
if webhook is None:
|
if webhook is None:
|
||||||
webhook = await channel.create_webhook(name="Pterodactyl Chat")
|
webhook = await channel.create_webhook(name="Pterodactyl Chat")
|
||||||
await webhook.send(content=message, username=username, avatar_url=avatar_url, allowed_mentions=discord.AllowedMentions(everyone=False, roles=False, users=True))
|
await webhook.send(content=message, username=username, avatar_url=avatar_url, allowed_mentions=discord.AllowedMentions(everyone=False, roles=False, users=True))
|
||||||
logger.trace("Chat message sent to Discord")
|
logger.debug("Chat message sent to Discord")
|
||||||
else:
|
else:
|
||||||
logger.warning("Chat channel not set. Skipping sending chat message to Discord")
|
logger.warning("Chat channel not set. Skipping sending chat message to Discord")
|
||||||
|
|
||||||
async def generate_join_leave_embed(coginstance: Pterodactyl, username: str, join: bool) -> Tuple[discord.Embed, Optional[Union[str, Path]]]:
|
async def generate_join_leave_embed(username: str, join: bool) -> discord.Embed:
|
||||||
embed = discord.Embed()
|
embed = discord.Embed()
|
||||||
embed.color = discord.Color.green() if join else discord.Color.red()
|
embed.color = discord.Color.green() if join else discord.Color.red()
|
||||||
embed.description = await config.join_msg() if join else await config.leave_msg()
|
embed.description = await config.join_msg() if join else await config.leave_msg()
|
||||||
info = await get_info(username)
|
info = await get_info(username)
|
||||||
if info:
|
if info:
|
||||||
img = None
|
|
||||||
embed.set_author(name=username, icon_url=info['data']['player']['avatar'])
|
embed.set_author(name=username, icon_url=info['data']['player']['avatar'])
|
||||||
else:
|
else:
|
||||||
img = bundled_data_path(coginstance) / "unknown.png"
|
embed.set_author(name=username, icon_url='https://seafsh.cc/u/j3AzqQ.png')
|
||||||
embed.set_author(name=username, icon_url='attachment://unknown.png')
|
|
||||||
embed.timestamp = discord.utils.utcnow()
|
embed.timestamp = discord.utils.utcnow()
|
||||||
return embed, img
|
return embed
|
||||||
|
|
||||||
async def generate_achievement_embed(coginstance: Pterodactyl, username: str, achievement: str, challenge: bool) -> Tuple[discord.Embed, Optional[Union[str, Path]]]:
|
async def generate_achievement_embed(username: str, achievement: str, challenge: bool) -> discord.Embed:
|
||||||
embed = discord.Embed()
|
embed = discord.Embed()
|
||||||
embed.color = discord.Color.from_str('#a800a7') if challenge else discord.Color.from_str('#54fb54')
|
embed.color = discord.Color.from_str('#a800a7') if challenge else discord.Color.from_str('#54fb54')
|
||||||
embed.description = f"{bold(username)} has {'completed the challenge' if challenge else 'made the advancement'} {bold(achievement)}"
|
embed.description = f"{bold(username)} has {'completed the challenge' if challenge else 'made the advancement'} {bold(achievement)}"
|
||||||
info = await get_info(username)
|
info = await get_info(username)
|
||||||
if info:
|
if info:
|
||||||
img = None
|
|
||||||
embed.set_author(name=username, icon_url=info['data']['player']['avatar'])
|
embed.set_author(name=username, icon_url=info['data']['player']['avatar'])
|
||||||
else:
|
else:
|
||||||
img = bundled_data_path(coginstance) / "unknown.png"
|
embed.set_author(name=username, icon_url='https://seafsh.cc/u/j3AzqQ.png')
|
||||||
embed.set_author(name=username, icon_url='attachment://unknown.png')
|
|
||||||
embed.timestamp = discord.utils.utcnow()
|
embed.timestamp = discord.utils.utcnow()
|
||||||
return embed, img
|
return embed
|
||||||
|
|
||||||
def mask_ip(string: str) -> str:
|
def mask_ip(string: str) -> str:
|
||||||
def check(match: re.Match[str]):
|
def check(match: re.Match[str]):
|
||||||
|
|
|
||||||
|
|
@ -1,44 +1,41 @@
|
||||||
[project]
|
[tool.poetry]
|
||||||
name = "seacogs"
|
name = "seacogs"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
description = "My assorted cogs for Red-DiscordBot."
|
description = "My assorted cogs for Red-DiscordBot."
|
||||||
authors = [{name = "cswimr", email = "seaswimmerthefsh@gmail.com"}]
|
authors = ["SeaswimmerTheFsh"]
|
||||||
license = {file="LICENSE"}
|
license = "MPL 2"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.11"
|
package-mode = false
|
||||||
dependencies = [
|
|
||||||
"aiosqlite>=0.20.0",
|
|
||||||
"beautifulsoup4>=4.12.3",
|
|
||||||
"colorthief>=0.2.1",
|
|
||||||
"markdownify>=0.13.1",
|
|
||||||
"numpy>=2.1.2",
|
|
||||||
"phx-class-registry>=5.0.0",
|
|
||||||
"pillow>=10.4.0",
|
|
||||||
"py-dactyl",
|
|
||||||
"pydantic>=2.9.2",
|
|
||||||
"red-discordbot>=3.5.13",
|
|
||||||
"websockets>=13.1",
|
|
||||||
]
|
|
||||||
|
|
||||||
[project.optional-dependencies]
|
[tool.poetry.dependencies]
|
||||||
documentation = [
|
python = ">=3.11,<3.12"
|
||||||
"mkdocs>=1.6.1",
|
Red-DiscordBot = "^3.5.5"
|
||||||
"mkdocs-git-authors-plugin>=0.9.0",
|
py-dactyl = "^2.0.4"
|
||||||
"mkdocs-git-revision-date-localized-plugin>=1.2.9",
|
websockets = "^12.0"
|
||||||
"mkdocs-material[imaging]>=9.5.40",
|
pillow = "^10.3.0"
|
||||||
"mkdocstrings[python]>=0.26.1",
|
numpy = "^1.26.4"
|
||||||
"mkdocs-redirects>=1.2.1",
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.uv]
|
[tool.poetry.group.dev]
|
||||||
dev-dependencies = [
|
optional = true
|
||||||
"pylint>=3.3.1",
|
|
||||||
"ruff>=0.6.9",
|
|
||||||
"sqlite-web>=0.6.4",
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.uv.sources]
|
[tool.poetry.group.dev.dependencies]
|
||||||
py-dactyl = { git = "https://github.com/cswimr/pydactyl" }
|
ruff = "^0.3.1"
|
||||||
|
pylint = "^3.1.0"
|
||||||
|
|
||||||
|
[tool.poetry.group.docs]
|
||||||
|
optional = true
|
||||||
|
|
||||||
|
[tool.poetry.group.docs.dependencies]
|
||||||
|
mkdocs = "1.5.3"
|
||||||
|
mkdocstrings = {extras = ["python"], version = "0.24.0"}
|
||||||
|
mkdocs-git-authors-plugin = "0.7.2"
|
||||||
|
mkdocs-git-revision-date-localized-plugin = "1.2.2"
|
||||||
|
mkdocs-material = {extras = ["imaging"], version = "^9.5.2"}
|
||||||
|
mkdocs-redirects = "^1.2.1"
|
||||||
|
|
||||||
|
[build-system]
|
||||||
|
requires = ["poetry-core"]
|
||||||
|
build-backend = "poetry.core.masonry.api"
|
||||||
|
|
||||||
[tool.ruff]
|
[tool.ruff]
|
||||||
# Exclude a variety of commonly ignored directories.
|
# Exclude a variety of commonly ignored directories.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
from .seautils import SeaUtils
|
|
||||||
|
|
||||||
|
|
||||||
async def setup(bot):
|
|
||||||
await bot.add_cog(SeaUtils(bot))
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
{
|
|
||||||
"author" : ["cswimr"],
|
|
||||||
"install_msg" : "Thank you for installing SeaUtils!\nYou can find the source code of this cog [here](https://coastalcommits.com/cswimr/SeaCogs).",
|
|
||||||
"name" : "SeaUtils",
|
|
||||||
"short" : "A collection of useful utilities.",
|
|
||||||
"description" : "A collection of useful utilities.",
|
|
||||||
"end_user_data_statement" : "This cog does not store end user data.",
|
|
||||||
"hidden": true,
|
|
||||||
"disabled": false,
|
|
||||||
"min_bot_version": "3.5.0",
|
|
||||||
"min_python_version": [3, 8, 0],
|
|
||||||
"requirements": ["beautifulsoup4", "markdownify"]
|
|
||||||
}
|
|
||||||
|
|
@ -1,254 +0,0 @@
|
||||||
# _____ _
|
|
||||||
# / ____| (_)
|
|
||||||
# | (___ ___ __ _ _____ ___ _ __ ___ _ __ ___ ___ _ __
|
|
||||||
# \___ \ / _ \/ _` / __\ \ /\ / / | '_ ` _ \| '_ ` _ \ / _ \ '__|
|
|
||||||
# ____) | __/ (_| \__ \\ V V /| | | | | | | | | | | | __/ |
|
|
||||||
# |_____/ \___|\__,_|___/ \_/\_/ |_|_| |_| |_|_| |_| |_|\___|_|
|
|
||||||
|
|
||||||
import asyncio
|
|
||||||
import inspect
|
|
||||||
import operator
|
|
||||||
import re
|
|
||||||
from asyncio.subprocess import Process
|
|
||||||
from functools import partial, partialmethod
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
import aiohttp
|
|
||||||
import yaml
|
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
from discord import Color, Embed, app_commands
|
|
||||||
from discord.utils import CachedSlotProperty, cached_property
|
|
||||||
from markdownify import MarkdownConverter
|
|
||||||
from redbot.core import commands
|
|
||||||
from redbot.core.bot import Red
|
|
||||||
from redbot.core.dev_commands import cleanup_code
|
|
||||||
from redbot.core.utils import chat_formatting as cf
|
|
||||||
from redbot.core.utils.views import SimpleMenu
|
|
||||||
|
|
||||||
|
|
||||||
def md(soup: BeautifulSoup, **options) -> Any | str:
|
|
||||||
return MarkdownConverter(**options).convert_soup(soup=soup)
|
|
||||||
|
|
||||||
def format_rfc_text(text: str, number: int) -> str:
|
|
||||||
one: str = re.sub(r"\(\.\/rfc(\d+)", r"(https://www.rfc-editor.org/rfc/rfc\1.html", text)
|
|
||||||
two: str = re.sub(r"\((#(?:section|page)-\d+(?:.\d+)?)\)", f"(https://www.rfc-editor.org/rfc/rfc{number}.html\1)", one)
|
|
||||||
three: str = re.sub(r"\n{3,}", "\n\n", two)
|
|
||||||
return three
|
|
||||||
|
|
||||||
class SeaUtils(commands.Cog):
|
|
||||||
"""A collection of random utilities."""
|
|
||||||
|
|
||||||
__author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"]
|
|
||||||
__git__ = "https://www.coastalcommits.com/cswimr/SeaCogs"
|
|
||||||
__version__ = "1.0.1"
|
|
||||||
__documentation__ = "https://seacogs.coastalcommits.com/seautils/"
|
|
||||||
|
|
||||||
def __init__(self, bot: Red) -> None:
|
|
||||||
self.bot = bot
|
|
||||||
|
|
||||||
def format_help_for_context(self, ctx: commands.Context) -> str:
|
|
||||||
pre_processed = super().format_help_for_context(ctx) or ""
|
|
||||||
n = "\n" if "\n\n" not in pre_processed else ""
|
|
||||||
text = [
|
|
||||||
f"{pre_processed}{n}",
|
|
||||||
f"{cf.bold('Cog Version:')} [{self.__version__}]({self.__git__})",
|
|
||||||
f"{cf.bold('Author:')} {cf.humanize_list(self.__author__)}",
|
|
||||||
f"{cf.bold('Documentation:')} {self.__documentation__}",
|
|
||||||
]
|
|
||||||
return "\n".join(text)
|
|
||||||
|
|
||||||
|
|
||||||
def format_src(self, obj: Any) -> str:
|
|
||||||
"""A large portion of this code is repurposed from Zephyrkul's RTFS cog.
|
|
||||||
https://github.com/Zephyrkul/FluffyCogs/blob/master/rtfs/rtfs.py"""
|
|
||||||
obj = inspect.unwrap(func=obj)
|
|
||||||
src: Any = getattr(obj, "__func__", obj)
|
|
||||||
if isinstance(obj, (commands.Command, app_commands.Command)):
|
|
||||||
src = obj.callback
|
|
||||||
elif isinstance(obj, (partial, partialmethod)):
|
|
||||||
src = obj.func
|
|
||||||
elif isinstance(obj, property):
|
|
||||||
src = obj.fget
|
|
||||||
elif isinstance(obj, (cached_property, CachedSlotProperty)):
|
|
||||||
src = obj.function
|
|
||||||
return inspect.getsource(object=src)
|
|
||||||
|
|
||||||
@commands.command(aliases=["source", "src", "code", "showsource"])
|
|
||||||
@commands.is_owner()
|
|
||||||
async def showcode(self, ctx: commands.Context, *, object: str) -> None: # pylint: disable=redefined-builtin
|
|
||||||
"""Show the code for a particular object."""
|
|
||||||
try:
|
|
||||||
if object.startswith("/") and (obj := ctx.bot.tree.get_command(object[1:])):
|
|
||||||
text = self.format_src(obj)
|
|
||||||
elif obj := ctx.bot.get_cog(object):
|
|
||||||
text = self.format_src(type(obj))
|
|
||||||
elif obj := ctx.bot.get_command(object):
|
|
||||||
text = self.format_src(obj)
|
|
||||||
else:
|
|
||||||
raise AttributeError
|
|
||||||
temp_content = cf.pagify(
|
|
||||||
text=cleanup_code(text),
|
|
||||||
escape_mass_mentions=True,
|
|
||||||
page_length = 1977
|
|
||||||
)
|
|
||||||
content = []
|
|
||||||
max_i = operator.length_hint(temp_content)
|
|
||||||
i = 1
|
|
||||||
for page in temp_content:
|
|
||||||
content.append(f"**Page {i}/{max_i}**\n{cf.box(page, lang='py')}")
|
|
||||||
i += 1
|
|
||||||
await SimpleMenu(pages=content, disable_after_timeout=True, timeout=180).start(ctx)
|
|
||||||
except (OSError, AttributeError, UnboundLocalError):
|
|
||||||
if ctx.embed_requested():
|
|
||||||
embed = Embed(title="Object not found!", color=await ctx.embed_color())
|
|
||||||
await ctx.send(embed=embed, reference=ctx.message.to_reference(fail_if_not_exists=False))
|
|
||||||
else:
|
|
||||||
await ctx.send(content="Object not found!", reference=ctx.message.to_reference(fail_if_not_exists=False))
|
|
||||||
|
|
||||||
@commands.command(name='dig', aliases=['dnslookup', 'nslookup'])
|
|
||||||
@commands.is_owner()
|
|
||||||
async def dig(self, ctx: commands.Context, name: str, record_type: str | None = None, server: str | None = None, port: int = 53) -> None:
|
|
||||||
"""Retrieve DNS information for a domain.
|
|
||||||
|
|
||||||
Uses `dig` to perform a DNS query. Will fall back to `nslookup` if `dig` is not installed on the system.
|
|
||||||
`nslookup` does not provide as much information as `dig`, so only the `name` parameter will be used if `nslookup` is used.
|
|
||||||
Will return the A, AAAA, and CNAME records for a domain by default. You can specify a different record type with the `type` parameter."""
|
|
||||||
command_opts: list[str | int] = ['dig']
|
|
||||||
query_types: list[str] = [record_type] if record_type else ['A', 'AAAA', 'CNAME']
|
|
||||||
if server:
|
|
||||||
command_opts.extend(['@', server])
|
|
||||||
for query_type in query_types:
|
|
||||||
command_opts.extend([name, query_type])
|
|
||||||
command_opts.extend(['-p', str(port), '+yaml'])
|
|
||||||
|
|
||||||
try:
|
|
||||||
process: Process = await asyncio.create_subprocess_exec(*command_opts, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
|
|
||||||
stdout, stderr = await process.communicate()
|
|
||||||
if stderr:
|
|
||||||
await ctx.maybe_send_embed(message="An error was encountered!\n" + cf.box(text=stderr.decode()))
|
|
||||||
else:
|
|
||||||
data = yaml.safe_load(stdout.decode())
|
|
||||||
message_data: dict = data[0]['message']
|
|
||||||
response_data: dict = message_data['response_message_data']
|
|
||||||
if ctx.embed_requested():
|
|
||||||
embed = Embed(
|
|
||||||
title="DNS Query Result",
|
|
||||||
color=await ctx.embed_color(),
|
|
||||||
timestamp=message_data['response_time']
|
|
||||||
)
|
|
||||||
embed.add_field(name="Response Address", value=message_data['response_address'], inline=True)
|
|
||||||
embed.add_field(name="Response Port", value=message_data['response_port'], inline=True)
|
|
||||||
embed.add_field(name="Query Address", value=message_data['query_address'], inline=True)
|
|
||||||
embed.add_field(name="Query Port", value=message_data['query_port'], inline=True)
|
|
||||||
embed.add_field(name="Status", value=response_data['status'], inline=True)
|
|
||||||
embed.add_field(name="Flags", value=response_data['flags'], inline=True)
|
|
||||||
|
|
||||||
if response_data.get('status') != 'NOERROR':
|
|
||||||
embed.colour = Color.red()
|
|
||||||
embed.description = cf.error("Dig query did not return `NOERROR` status.")
|
|
||||||
|
|
||||||
questions = []
|
|
||||||
answers = []
|
|
||||||
authorities = []
|
|
||||||
for m in data:
|
|
||||||
response = m['message']['response_message_data']
|
|
||||||
if 'QUESTION_SECTION' in response:
|
|
||||||
for question in response['QUESTION_SECTION']:
|
|
||||||
if question not in questions:
|
|
||||||
questions.append(question)
|
|
||||||
|
|
||||||
if 'ANSWER_SECTION' in response:
|
|
||||||
for answer in response['ANSWER_SECTION']:
|
|
||||||
if answer not in answers:
|
|
||||||
answers.append(answer)
|
|
||||||
|
|
||||||
if 'AUTHORITY_SECTION' in response:
|
|
||||||
for authority in response['AUTHORITY_SECTION']:
|
|
||||||
if authority not in authorities:
|
|
||||||
authorities.append(authority)
|
|
||||||
|
|
||||||
if questions:
|
|
||||||
question_section = "\n".join(questions)
|
|
||||||
embed.add_field(name="Question Section", value=f"{cf.box(text=question_section, lang='prolog')}", inline=False)
|
|
||||||
|
|
||||||
if answers:
|
|
||||||
answer_section = "\n".join(answers)
|
|
||||||
if len(answer_section) > 1024:
|
|
||||||
embed.description = cf.warning("Answer section is too long to fit within embed field, falling back to description.") + cf.box(answer_section)
|
|
||||||
else:
|
|
||||||
embed.add_field(name="Answer Section", value=f"{cf.box(text=answer_section, lang='prolog')}", inline=False)
|
|
||||||
|
|
||||||
if authorities:
|
|
||||||
authority_section = "\n".join(authorities)
|
|
||||||
embed.add_field(name="Authority Section", value=f"{cf.box(text=authority_section, lang='prolog')}", inline=False)
|
|
||||||
await ctx.send(embed=embed)
|
|
||||||
else:
|
|
||||||
await ctx.send(content=cf.box(text=stdout, lang='yaml'))
|
|
||||||
except (FileNotFoundError):
|
|
||||||
try:
|
|
||||||
ns_process = await asyncio.create_subprocess_exec('nslookup', name, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE)
|
|
||||||
ns_stdout, ns_stderr = await ns_process.communicate()
|
|
||||||
if ns_stderr:
|
|
||||||
await ctx.maybe_send_embed(message="An error was encountered!\n" + cf.box(text=ns_stderr.decode()))
|
|
||||||
else:
|
|
||||||
warning = cf.warning("`dig` is not installed! Defaulting to `nslookup`.\nThis command provides more information when `dig` is installed on the system.\n")
|
|
||||||
if await ctx.embed_requested():
|
|
||||||
embed = Embed(
|
|
||||||
title="DNS Query Result",
|
|
||||||
color=await ctx.embed_color(),
|
|
||||||
timestamp=ctx.message.created_at
|
|
||||||
)
|
|
||||||
embed.description = warning + cf.box(text=ns_stdout.decode())
|
|
||||||
await ctx.send(embed=embed)
|
|
||||||
else:
|
|
||||||
await ctx.send(content = warning + cf.box(text=ns_stdout.decode()))
|
|
||||||
except (FileNotFoundError):
|
|
||||||
await ctx.maybe_send_embed(message=cf.error("Neither `dig` nor `nslookup` are installed on the system. Unable to resolve DNS query."))
|
|
||||||
|
|
||||||
@commands.command()
|
|
||||||
async def rfc(self, ctx: commands.Context, number: int) -> None:
|
|
||||||
"""Retrieve the text of an RFC document.
|
|
||||||
|
|
||||||
This command uses the [RFC Editor website](https://www.rfc-editor.org/) to fetch the text of an RFC document.
|
|
||||||
A [Request for Comments (RFC)](https://en.wikipedia.org/wiki/Request_for_Comments) is a publication in a series from the principal technical development and standards-setting bodies for the [Internet](https://en.wikipedia.org/wiki/Internet), most prominently the [Internet Engineering Task Force](https://en.wikipedia.org/wiki/Internet_Engineering_Task_Force). An RFC is authored by individuals or groups of engineers and [computer scientists](https://en.wikipedia.org/wiki/Computer_scientist) in the form of a [memorandum](https://en.wikipedia.org/wiki/Memorandum) describing methods, behaviors, research, or innovations applicable to the working of the Internet and Internet-connected systems. It is submitted either for [peer review](https://en.wikipedia.org/wiki/Peer_review) or to convey new concepts, information, or, occasionally, engineering humor.""" # noqa: E501
|
|
||||||
url = f"https://www.rfc-editor.org/rfc/rfc{number}.html"
|
|
||||||
datatracker_url = f"https://datatracker.ietf.org/doc/rfc{number}"
|
|
||||||
async with aiohttp.ClientSession() as session:
|
|
||||||
async with session.get(url=url) as response:
|
|
||||||
if response.status == 200:
|
|
||||||
html = await response.text()
|
|
||||||
soup = BeautifulSoup(html, 'html.parser')
|
|
||||||
pre_tags = soup.find_all('pre')
|
|
||||||
content: list[Embed | str] = []
|
|
||||||
for pre_tag in pre_tags:
|
|
||||||
text = format_rfc_text(md(pre_tag), number)
|
|
||||||
if len(text) > 4096:
|
|
||||||
pagified_text = cf.pagify(text, delims=["\n\n"], page_length=4096)
|
|
||||||
for page in pagified_text:
|
|
||||||
if await ctx.embed_requested():
|
|
||||||
embed = Embed(
|
|
||||||
title=f"RFC Document {number}",
|
|
||||||
url=datatracker_url,
|
|
||||||
description=page,
|
|
||||||
color=await ctx.embed_color()
|
|
||||||
)
|
|
||||||
content.append(embed)
|
|
||||||
else:
|
|
||||||
content.append(page)
|
|
||||||
else:
|
|
||||||
if await ctx.embed_requested():
|
|
||||||
embed = Embed(
|
|
||||||
title=f"RFC Document {number}",
|
|
||||||
url=datatracker_url,
|
|
||||||
description=text,
|
|
||||||
color=await ctx.embed_color()
|
|
||||||
)
|
|
||||||
content.append(embed)
|
|
||||||
else:
|
|
||||||
content.append(text)
|
|
||||||
if await ctx.embed_requested():
|
|
||||||
for embed in content:
|
|
||||||
embed.set_footer(text=f"Page {content.index(embed) + 1}/{len(content)}")
|
|
||||||
await SimpleMenu(pages=content, disable_after_timeout=True, timeout=300).start(ctx)
|
|
||||||
else:
|
|
||||||
await ctx.maybe_send_embed(message=cf.error(f"An error occurred while fetching RFC {number}. Status code: {response.status}."))
|
|
||||||
Loading…
Reference in a new issue