Add Pterodactyl cog #19

Merged

cswimr merged 139 commits from pterodactyl into main 2024-03-02 00:07:42 -05:00

Conversation 0 Commits 139 Files changed 22 +1047 -63

cswimr commented 2024-02-27 21:34:16 -05:00

Owner

Copy link

This cog will be similar in functionality to the Pterodactyl cog from the GalacticCogs repository, but will use a websocket to connect to the Pterodactyl server instead, along with using the Pydactl API wrapper instead of my own API calls.

I eventually want to move to Pytero, but due to some issues with their installation process, I'm using Pydactyl for the time being.

This cog will be similar in functionality to the [Pterodactyl cog](https://www.coastalcommits.com/GalacticFactory/GalacticCogs/src/branch/main/pterodactyl/ptero.py) from the [GalacticCogs](https://www.coastalcommits.com/GalacticFactory/GalacticCogs) repository, but will use a websocket to connect to the Pterodactyl server instead, along with using the [Pydactl](https://github.com/iamkubi/pydactyl) API wrapper instead of my own API calls. I eventually want to move to [Pytero](https://github.com/PteroPackages/Pytero), but due to [some issues with their installation process](https://github.com/PteroPackages/Pytero/issues/10), I'm using Pydactyl for the time being.

cswimr added the

cog

label 2024-02-27 21:34:16 -05:00

cswimr self-assigned this 2024-02-27 21:34:16 -05:00

cswimr added 1 commit 2024-02-27 23:02:07 -05:00

feat(pterodactyl): introduced the cog 6158d05960

cswimr added 1 commit 2024-02-27 23:18:21 -05:00

misc(pterodactyl): removed credentials from default configs ... dcf0165a8a

api key has been invalidated

cswimr added 3 commits 2024-02-28 08:11:28 -05:00

feat(pterodactyl): added more verbose debug logging to establish_websocket_connection 6e6559d80c

misc(pterodactyl): moved configuration calls into establish_websocket_connection 9d4d8b8267

feat(pterodactyl): added configuration commands 53adeb4b80

cswimr added 1 commit 2024-02-28 08:14:46 -05:00

fix(pterodactyl): fix failing to connect to the websocket due to a 403 error ea84044e73

cswimr added 1 commit 2024-02-28 08:20:41 -05:00

fix(pterodactyl): fixed debug logging causing an error in establish_websocket_connection 680f92572c

cswimr added 2 commits 2024-02-28 08:37:06 -05:00

fix(pterodactyl): added websockets as a dependency in info.json f377dc9250

fix(pterodactyl): fixed a broken debug logging statement 5e3ab08d6d

cswimr added 1 commit 2024-02-28 08:47:30 -05:00

fix(pterodactyl): fixed the cog load process being blocked by the establish_websocket_connection method 2d4e372784

cswimr added 1 commit 2024-02-28 08:49:09 -05:00

misc(pterodactyl): added a debug logging statement to the first line of establish_websocket_connection d92831f3db

cswimr added 1 commit 2024-02-28 08:56:52 -05:00

feat(pterodactyl): added more debug logging to the configuration commands d092f78502

cswimr added 1 commit 2024-02-28 10:46:45 -05:00

fix(pterodactyl): don't await something that isn't a coroutine be27d882f2

cswimr added 1 commit 2024-02-28 11:06:36 -05:00

Merge remote-tracking branch 'origin/main' into pterodactyl f485df856c

cswimr added 1 commit 2024-02-28 11:08:22 -05:00

fix(pterodactyl): pylint fixes 8a22d5ce23

cswimr added 1 commit 2024-02-28 11:30:31 -05:00

Merge branch 'main' into pterodactyl 6738ab17ca

cswimr added 1 commit 2024-02-28 11:31:52 -05:00

fix(pterodactyl): fixed broken poetry.lock file e6ca4071f3

cswimr added 1 commit 2024-02-28 11:46:04 -05:00

fix(pterodactyl): handle disconnecting from the websocket d391aeeb7b

cswimr added 1 commit 2024-02-28 11:52:39 -05:00

fix(pterodactyl): awaited a coroutine 08cd13d7c7

cswimr added 1 commit 2024-02-28 11:54:26 -05:00

Revert "fix(pterodactyl): awaited a coroutine" ... 09d48082e5

This reverts commit 08cd13d7c7.

cswimr added 1 commit 2024-02-28 11:55:51 -05:00

fix(pterodactyl): added temporary debugging logs 2312cce011

cswimr added 1 commit 2024-02-28 11:57:42 -05:00

fix(pterodactyl): enabled debug mode on the pterodactylclient 48634ac903

cswimr added 1 commit 2024-02-28 11:59:54 -05:00

cleanup(pterodactyl): removed debug loggers 7b83513d63

cswimr added 1 commit 2024-02-28 12:03:21 -05:00

fix(pterodactyl): origin, not Origin d9f5d14f40

cswimr added 1 commit 2024-02-28 12:43:31 -05:00

feat(pterodactyl): added console channel support cebc2223d9

cswimr added 1 commit 2024-02-28 12:44:16 -05:00

feat(pterodactyl): added configuration command for setting the console channel 0961985168

cswimr added 1 commit 2024-02-28 12:44:59 -05:00

fix(pterodactyl): cog ->Cog 3d8f479347

cswimr added 1 commit 2024-02-28 12:47:18 -05:00

fix(pterodactyl): awaited a coroutine ff93fd8527

cswimr added 1 commit 2024-02-28 12:50:20 -05:00

fix(pterodactyl): added a character limit to the channel.send call in the websocket method b7635f06f5

cswimr added 2 commits 2024-02-28 13:00:15 -05:00

fix(pterodactyl): set origin header through websockets.connect and not through extra_headers caa03a63e6

cleanup(pterodactyl): making some changes to establish_websocket_connection 2017cbb226

cswimr added 1 commit 2024-02-28 13:03:36 -05:00

fix(pterodactyl): hopefully fixed the websocket closing on console output event ccbce180dd

cswimr added 1 commit 2024-02-28 13:05:09 -05:00

fix(pterodactyl): testing a ""solution"" to the websocket closing problem 60f94c4499

cswimr added 1 commit 2024-02-28 13:07:35 -05:00

fix(pterodactyl): i'm dumb d297a2181d

cswimr added 1 commit 2024-02-28 13:08:28 -05:00

fix(pterodactyl): do not ratelimit yourself a8f60b1aec

cswimr added 1 commit 2024-02-28 13:18:19 -05:00

feat(pterodactyl): fixed some issues and added logging for what user executed a command through the console c740cdc6dc

cswimr added 1 commit 2024-02-28 13:21:42 -05:00

fix(pterodactyl): removed ansi escape codes ec2cd09f8e

cswimr added 1 commit 2024-02-28 13:22:49 -05:00

fix(pterodactyl): don't log console command executions f6f0a31763

cswimr added 1 commit 2024-02-28 13:32:35 -05:00

feat(pterodactyl): handle server status changes 142336e233

cswimr added 1 commit 2024-02-28 13:39:44 -05:00

fix(pterodactyl): do not log during startup/shutdown to avoid the console channel getting flooded and ratelimited 39ae8b5ea0

cswimr added 1 commit 2024-02-28 13:41:55 -05:00

fix(pterodactyl): fixed current_status 239f7cf613

cswimr added 1 commit 2024-02-28 13:44:16 -05:00

fix(pterodactyl): use running, not started dab7343ca6

cswimr added 1 commit 2024-02-29 16:47:23 -05:00

feat(pterodactyl): added one-way chat messages (minecraft --> discord) 9a698fbac6

cswimr added 1 commit 2024-02-29 16:52:14 -05:00

fix(pterodactyl): adding debug logging so i can figure out what's failing in the chat system 7e728087c4

cswimr added 1 commit 2024-02-29 16:53:14 -05:00

fix(pterodactyl): awaited a coroutine f42c536f7c

cswimr added 1 commit 2024-02-29 16:55:49 -05:00

fix(pterodactyl): fixed incorrect config name ee6e900e7d

cswimr added 1 commit 2024-02-29 16:58:24 -05:00

fix(pterodactyl): add more verbose debug logging e12ded9d42

cswimr added 1 commit 2024-02-29 17:01:05 -05:00

fix(pterodactyl): fixed incorrect dictionary key causing an error 07e2497aac

cswimr added 1 commit 2024-02-29 17:14:11 -05:00

fix(pterodactyl): fixed broken debug statement a791c27fc3

cswimr added 1 commit 2024-02-29 17:18:08 -05:00

feat(pterodactyl): added sending messages from discord to the server 510f8c788e

cswimr added 1 commit 2024-02-29 17:19:31 -05:00

fix(pterodactyl): fixed broken formatting 4f95955a04

cswimr added 1 commit 2024-02-29 17:22:46 -05:00

fix(pterodactyl): testing fix to sending chat messages to minecraft 5dc55b52e7

cswimr added 1 commit 2024-02-29 17:24:14 -05:00

fix(pterodactyl): fixing tellraw command 0e638ca9e3

cswimr added 1 commit 2024-02-29 17:27:41 -05:00

feat(pterodactyl): added console channel logging for chat messages 9023ea160b

cswimr added 1 commit 2024-02-29 18:39:05 -05:00

fix(pterodactyl): added more debug logging b0a110e4f8

cswimr added 1 commit 2024-02-29 18:50:27 -05:00

fix(pterodactyl): hopefully fixed tellraw error d00b70758a

cswimr added 1 commit 2024-02-29 18:53:22 -05:00

fix(pterodactyl): don't accept messages from bots 4174bc4be7

cswimr added 1 commit 2024-02-29 18:53:51 -05:00

feat(pterodactyl): testing allowing custom colors in tellraw d3cc445802

cswimr added 1 commit 2024-02-29 19:00:10 -05:00

feat(pterodactyl): added role coloring for discord roles 5a4dc4866c

cswimr added 1 commit 2024-02-29 19:01:22 -05:00

fix(pterodactyl): use display_name and not name f792ad58a0

cswimr added 1 commit 2024-02-29 20:28:30 -05:00

feat(pterodactyl): configuration update + a bunch of other stuff 76aa99c3f9

cswimr added 1 commit 2024-02-29 20:31:34 -05:00

fix(pterodactyl): moved chatchannel into the chat command group 4108bb22bb

cswimr added 1 commit 2024-02-29 20:40:07 -05:00

fix(pterodactyl): fixed broken tellraw string f588caf25f

cswimr added 1 commit 2024-02-29 20:43:14 -05:00

fix(pterodactyl): adding debug strings to check_if_chat_message 236cb1d815

cswimr added 1 commit 2024-02-29 20:44:49 -05:00

fix(pterodactyl): happy now? 2fb201a9cb

cswimr added 1 commit 2024-02-29 20:45:34 -05:00

fix(pterodactyl): reverted previous commit 579855af02

cswimr added 1 commit 2024-02-29 20:59:50 -05:00

fix(pterodactyl): added error messages for if the websocket connection is closed 50dd5c64b4

cswimr added 1 commit 2024-02-29 21:00:39 -05:00

fix(pterodactyl): don't try to send messages from bots to the server (for real this time) f87f4ee37f

cswimr added 1 commit 2024-02-29 21:07:30 -05:00

fix(pterodactyl): adding some debug logging 502ffbee84

cswimr added 1 commit 2024-02-29 21:08:53 -05:00

fix(pterodactyl): try to match regex early for debugging 925e402819

cswimr added 1 commit 2024-02-29 21:11:19 -05:00

fix(pterodactyl): maybe? 2e4b664760

cswimr added 1 commit 2024-02-29 21:14:14 -05:00

fix(pterodactyl): maybe? 97213a5025

cswimr added 1 commit 2024-02-29 21:15:51 -05:00

fix(pterodactyl): fixed chat messages breaking and removed debug logging d5600e8cf7

cswimr added 1 commit 2024-02-29 21:18:46 -05:00

fix(pterodactyl): don't trim content 366bafcd27

cswimr added 1 commit 2024-02-29 21:35:14 -05:00

fix(pterodactyl): fixed exceptions in the websocket task being suppressed 0aa17e8807

cswimr added 1 commit 2024-02-29 21:38:57 -05:00

fix(pterodactyl): restart the websocket task if it fails cccc941e26

cswimr added 1 commit 2024-02-29 21:41:04 -05:00

fix(pterodactyl): fixed TypeError 07835e7b13

cswimr added 1 commit 2024-02-29 21:46:49 -05:00

fix(pterodactyl): testing a fix to tellraw ef7f574306

cswimr added 1 commit 2024-02-29 21:51:23 -05:00

fix(pterodactyl): don't send chat messages to minecraft containing bot commands de5d0194c8

cswimr added 4 commits 2024-02-29 22:15:48 -05:00

fix(pterodactyl): cancel the task upon error 9e15730af9

fix(pterodactyl): remove looping functionality from websocket.connect on line 62 as it's irrelevant now and was broken regardless 839ead56eb

docs(pterodactyl): added docs pages 84b0201662

fix(pterodactyl): pylint fixes 37cdca09ec

cswimr added 1 commit 2024-02-29 22:41:10 -05:00

misc(pterodactyl): renamed tellraw to chat_command 417f297193

cswimr added 1 commit 2024-02-29 23:26:28 -05:00

cleanup(pterodactyl): split out a bunch of stuff into separate files e1c98aa78f

cswimr added 1 commit 2024-02-29 23:31:33 -05:00

fix(pterodactyl): updated typehints 2bf8629e4c

cswimr added 1 commit 2024-02-29 23:33:02 -05:00

fix(pterodactyl): fixed circular import 7f8d70ccae

cswimr added 1 commit 2024-02-29 23:42:16 -05:00

fix(pterodactyl): pylint fixes c0289a86fc

cswimr added 1 commit 2024-02-29 23:44:31 -05:00

fix(pterodactyl): pylint "fix" 457f1da7f4

cswimr added 1 commit 2024-02-29 23:50:58 -05:00

feat(pterodactyl): added support for bridging messages sent by the server 0d21a52ce3

cswimr added 1 commit 2024-02-29 23:52:49 -05:00

fix(pterodactyl): oops lol 9e63b4e798

cswimr added 1 commit 2024-02-29 23:54:39 -05:00

fix(pterodactyl): maybe fixed config issue 8387064ab4

cswimr added 1 commit 2024-02-29 23:55:54 -05:00

fix(pterodactyl): register config on cog class initialization a4f68d55eb

cswimr added 1 commit 2024-03-01 00:02:45 -05:00

feat(pterodactyl): server status will persist through reloads d39f0ba104

cswimr added 1 commit 2024-03-01 00:05:08 -05:00

feat(pterodactyl): added startup and shutdown messages 7a39c9a75d

cswimr added 1 commit 2024-03-01 00:23:02 -05:00

feat(pterodactyl): added user join/leave 2fbd8cde9e

cswimr added 1 commit 2024-03-01 00:24:03 -05:00

fix(pterodactyl): added config key I forgot to register f91cd82d1b

cswimr added 1 commit 2024-03-01 00:25:44 -05:00

fix(pterodactyl): fixed an issue with colors in generate_join_leave_embed bd7aa54efe

cswimr added 1 commit 2024-03-01 00:29:11 -05:00

fix(pterodactyl): restrict [p]pterodactyl config to bot owners f2c56e0382

cswimr added 1 commit 2024-03-01 00:30:40 -05:00

fix(pterodactyl): fixed a docstring 8954df4c1d

cswimr added 1 commit 2024-03-01 00:46:54 -05:00

feat(pterodactyl): added achievements 7e03696e10

cswimr added 1 commit 2024-03-01 01:17:36 -05:00

feat(pterodactyl): use red's api key storage system for api key storage and not a config key afc5868e9e

cswimr added 1 commit 2024-03-01 01:17:51 -05:00

fix(pterodactyl): remove useless config key dd6184ccd0

cswimr added 1 commit 2024-03-01 01:19:56 -05:00

fix(pterodactyl): updated info.json 3795d7d13a

cswimr added 1 commit 2024-03-01 01:21:13 -05:00

misc(pterodactyl): added a space to fix an embed b18b99075e

cswimr added 1 commit 2024-03-01 13:08:16 -05:00

fix(pterodactyl): adding some debugging code 6f4f13e623

cswimr added 1 commit 2024-03-01 13:13:32 -05:00

fix(pterodactyl): removed some debugging stuff 8cbad26e1d

cswimr added 1 commit 2024-03-01 13:14:57 -05:00

fix(pterodactyl): added logging for if the WebSocket task is cancelled 1bbabd495f

cswimr added 1 commit 2024-03-01 13:16:24 -05:00

fix(pterodactyl): changed a bunch of logger messages to be info and not debug 837bf4aa34

cswimr added 1 commit 2024-03-01 14:04:12 -05:00

fix(pterodactyl): use a custom logger for the websocket instead of websockets.client 8b1e42716b

cswimr added 1 commit 2024-03-01 14:09:01 -05:00

docs(pterodactyl): flushed out setup page a1a33ebfca

cswimr added 1 commit 2024-03-01 14:11:15 -05:00

fix(pterodactyl): pylint fixes 684f2559e2

cswimr added 2 commits 2024-03-01 14:42:48 -05:00

fix(pterodactyl): check if websocket_credentials is None b7f5ae644a

feat(pterodactyl): added a retry counter and sleep cooldown to the error_callback f2d54ce23b

cswimr added 1 commit 2024-03-01 14:52:18 -05:00

fix(pterodactyl): cleanup b775439967

cswimr added 1 commit 2024-03-01 14:56:49 -05:00

fix(pterodactyl): use time.sleep instead b6819192b0

cswimr added 1 commit 2024-03-01 14:57:26 -05:00

fix(pterodactyl): added another info logging statement a0b1773185

cswimr added 1 commit 2024-03-01 14:59:23 -05:00

fix(pterodactyl): asyncio sleep instead of blocking 8b50c0376d

cswimr added 1 commit 2024-03-01 15:02:47 -05:00

fix(pterodactyl): maybe? a166168507

cswimr added 1 commit 2024-03-01 15:12:02 -05:00

fix(pterodactyl): fixed retry functionality - no longer blocks the bot 1bc1c7a90e

cswimr added 1 commit 2024-03-01 15:21:45 -05:00

feat(pterodactyl): updated how placeholders are parsed in get_chat_command(), updated documentation to match 4979e44b7c

cswimr added 1 commit 2024-03-01 15:27:16 -05:00

feat(pterodactyl): added more placeholders and updated documentation to match dab56bed94

cswimr added 1 commit 2024-03-01 15:28:18 -05:00

fix(pterodactyl): alphabetized a dict and the docs 95bf863f7e

cswimr added 1 commit 2024-03-01 15:30:49 -05:00

docs(pterodactyl): consistency af29b950c2

cswimr added 1 commit 2024-03-01 15:44:30 -05:00

fix(pterodactyl): fixed error if base_url ends in / 88c77b4aa5

cswimr added 1 commit 2024-03-01 15:45:57 -05:00

docs(pterodactyl): restarting is not a server power status type b75bacb811

cswimr added 1 commit 2024-03-01 22:20:52 -05:00

feat(pterodactyl): add power commands 6a02381e89

cswimr added 1 commit 2024-03-01 22:24:04 -05:00

fix(pterodactyl): fixed server messages sometimes not logging e9523d5f70

cswimr added 1 commit 2024-03-01 22:25:25 -05:00

fix(pterodactyl): fixed broken placeholder replacement fb177ff8ad

cswimr added 1 commit 2024-03-01 22:38:52 -05:00

feat(pterodactyl): added masking of IP addresses in the console output 306148ea69

cswimr added 1 commit 2024-03-01 22:39:59 -05:00

fix(pterodactyl): use an escaped * for ip masking so markdown isn't triggered f93223fd36

cswimr added 1 commit 2024-03-01 22:53:11 -05:00

feat(pterodactyl): added [p]pterodactyl config view command 987a29afff

cswimr added 1 commit 2024-03-01 22:55:10 -05:00

fix(pterodactyl): cleaned up the pterodactyl config view command d1966fb05f

cswimr added 1 commit 2024-03-01 22:57:01 -05:00

fix(pterodactyl): forgot to move something in the config view command 0882a498b6

cswimr added 1 commit 2024-03-01 23:01:13 -05:00

fix(pterodactyl): made configuration command arguments required 9e8bcb952a

cswimr added 1 commit 2024-03-01 23:03:46 -05:00

fix(pterodactyl): docstring change 0b0afa53d6

cswimr added 1 commit 2024-03-01 23:04:37 -05:00

fix(pterodactyl): docstring change 12862ccea7

cswimr added 1 commit 2024-03-01 23:35:15 -05:00

docs(pterodactyl): flushed out the docs more 45797361a6

cswimr added 1 commit 2024-03-01 23:43:48 -05:00

fix(pterodactyl): pylint fixes 882b0386f2

cswimr changed title from WIP: Add Pterodactyl cog to Add Pterodactyl cog 2024-03-02 00:07:26 -05:00

cswimr merged commit 3a52efeac0 into main 2024-03-02 00:07:42 -05:00

cswimr deleted branch pterodactyl 2024-03-02 00:07:43 -05:00

cswimr referenced this pull request from a commit 2024-03-02 00:07:43 -05:00

Merge pull request 'Add Pterodactyl cog' (#19) from pterodactyl into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

cog

New cog

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

bug

cog

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

cswimr

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: cswimr/SeaCogs#19

No description provided.