aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Pull upstream and resolve conflicts.Gravatar rohan2021-05-10-522/+1372
|\
| * Merge pull request #724 from ToxicKidz/fix/mosaic-commandGravatar Dennis Pham2021-05-07-1/+1
| |\ | | | | | | Fix the .mosaic command check that is missing a `not`
| | * fix: Add a missing 'not'Gravatar ToxicKidz2021-05-07-1/+1
| |/
| * Merge pull request #716 from ToxicKidz/feat/mosaic-commandGravatar Janine vN2021-05-07-7/+209
| |\ | | | | | | feat: Add the .mosaic command
| | * chore: Get the next perfect squareGravatar ToxicKidz2021-05-07-2/+4
| | | | | | | | | | | | If the amount of squares is not a perfect square, get the next highest perfect square
| | * chore: Check if the number of squares first is bigger than the max firstGravatar ToxicKidz2021-05-06-6/+3
| | | | | | | | | Co-authored-by: Anand Krishna <[email protected]>
| | * Merge branch 'main' into feat/mosaic-commandGravatar ToxicKidz2021-05-05-1/+2
| | |\ | | |/ | |/|
| * | Merge pull request #720 from ToxicKidz/catify-cooldownGravatar Hassan Abouelela2021-05-05-0/+1
| |\ \ | | | | | | | | Add a 5 second cooldown per user to .catify
| | * | chore: Add a 5 second cooldown per user to .catifyGravatar ToxicKidz2021-05-05-0/+1
| |/ /
| * | Merge pull request #717 from ToxicKidz/pr-template-spelling-fixGravatar ChrisJL2021-04-30-1/+1
| |\ \ | | | | | | | | Fix the spelling mistake in the PR template
| | * | fix: tempelate -> templateGravatar ToxicKidz2021-04-30-1/+1
| |/ /
| | * chore: Use the name AvatarModify instead of PfpModifyGravatar ToxicKidz2021-05-05-1/+1
| | |
| | * chore: Prefer double quotes over single quotesGravatar ToxicKidz2021-05-05-9/+9
| | |
| | * chore: Fetch the member and use Colours.blue in the embed for the .mosaic ↵Gravatar ToxicKidz2021-05-05-2/+9
| | | | | | | | | | | | command
| | * feat: Add the .mosaic commandGravatar ToxicKidz2021-04-30-6/+202
| |/
| * Merge pull request #713 from python-discord/vcokltfre/fix/avatar-filenamesGravatar ChrisJL2021-04-30-1/+1
| |\ | | | | | | fix: remove () from list of safe filename chars
| | * fix: remove () from list of safe filename charsGravatar vcokltfre2021-04-30-1/+1
| |/
| * Merge pull request #597 from python-discord/Enforce-image-processing-concurrencyGravatar ks1292021-04-30-413/+605
| |\ | | | | | | Move avatar commands into executors
| | * Merge branch 'main' into Enforce-image-processing-concurrencyGravatar ks1292021-04-30-268/+748
| | |\ | | |/ | |/|
| * | Merge pull request #709 from chincholikarsalil/fix-grammatical-errorGravatar ChrisJL2021-04-27-1/+1
| |\ \ | | | | | | | | Reworded/fixed grammatical error
| | * | Updated bot/utils/exceptions.pyGravatar Salil Chincholikar2021-04-27-1/+1
| | | | | | | | | | | | Co-authored-by: Joe Banks <[email protected]>
| | * | Reworded/fixed grammatical errorGravatar Salil Chincholikar2021-04-27-1/+1
| |/ /
| * | Merge pull request #700 from python-discord/update-pr-templateGravatar Xithrius2021-04-24-20/+10
| |\ \ | | | | | | | | Reword PR Template
| | * \ Merge branch 'main' into update-pr-templateGravatar Xithrius2021-04-24-3/+3
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #702 from python-discord/fix-reddit-index-errorGravatar ChrisJL2021-04-23-3/+3
| |\ \ \ | | | | | | | | | | Fix errors when a subreddit has <5 posts.
| | * \ \ Merge branch 'main' into fix-reddit-index-errorGravatar ChrisJL2021-04-23-2/+16
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Fix spelling of a user facing message in reddit cogGravatar ChrisJL2021-04-23-1/+1
| | | | | | | | | | | | | | | Co-authored-by: Xithrius <[email protected]>
| | * | | Fix errors when a subreddit has <5 posts.Gravatar Chris2021-04-22-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a subreddit has <2 posts, the posts[1] check would fail with an IndexError. If the subreddit had less that 5 posts, then the k=5 check would also error. These changes harden the command for these edge cases.
| | | * | Merge branch 'main' into update-pr-templateGravatar Hassan Abouelela2021-04-23-2/+16
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #704 from python-discord/link-suppressingGravatar Hassan Abouelela2021-04-23-2/+16
| |\ \ \ \ | | |/ / / | |/| | | Suppress Links In Certain Commands
| | * | | Suppresses Links In CommandsGravatar Hassan Abouelela2021-04-23-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppresses links in certain commands that can echo back user input. Signed-off-by: Hassan Abouelela <[email protected]>
| | * | | Adds Link Suppressing HelperGravatar Hassan Abouelela2021-04-23-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | Adds a helper to find and escape links in a message. Signed-off-by: Hassan Abouelela <[email protected]>
| | * | Reword Issues CommentGravatar Hassan Abouelela2021-04-23-1/+1
| | | |
| | * | Updates Punctuation In PR TemplateGravatar Hassan Abouelela2021-04-22-3/+3
| | | |
| | * | Rewords PR TemplateGravatar Hassan Abouelela2021-04-22-20/+10
| |/ / | | | | | | | | | | | | | | | | | | This is a rewording of the comments in the PR template, to hopefully clarify intentions. It also removes unneeded fields. Signed-off-by: Hassan Abouelela <[email protected]>
| * | Merge pull request #697 from ToxicKidz/fix_catifyGravatar Janine vN2021-04-21-19/+27
| |\ \ | | | | | | | | Fixed the .catify command producing UnboundLocal and Forbidden Errors
| | * | chore: use 'nickname' and 'display name' in the right places and use ↵Gravatar ToxicKidz2021-04-20-2/+5
| | | | | | | | | | | | | | | | allowed_mentions
| | * | fix: Use name.replace not text.replaceGravatar ToxicKidz2021-04-20-3/+3
| | | |
| | * | chore: lower the input to fine more catsGravatar ToxicKidz2021-04-20-3/+4
| | | |
| | * | chore: Fix UnboundLocalError and discord.ForbiddenErrors in the catify commandGravatar ToxicKidz2021-04-20-17/+21
| |/ /
| * | Add Catify command (#694)Gravatar Dillon Runke2021-04-20-0/+83
| | | | | | | | | | | | Co-authored-by: Joe Banks <[email protected]> Co-authored-by: hypergamer80 <[email protected]>
| * | Merge pull request #673 from janine9vn/int-evalGravatar Matteo Bertucci2021-04-17-0/+435
| |\ \ | | | | | | | | Adding Internal Eval to Sir Lancebot
| | * \ Merge branch 'main' into int-evalGravatar Matteo Bertucci2021-04-17-472/+730
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #686 from python-discord/remove-ffmpgGravatar Xithrius2021-04-16-87/+12
| |\ \ \ | | | | | | | | | | Remove ffmpg
| | * | | Remove un-used sound resourcesGravatar Chris2021-04-16-41/+0
| | | | |
| | * | | Remove ffmpg and discord.py voice extraGravatar Chris2021-04-16-46/+12
| |/ / /
| | * | Remove check for `exit` to reset contextGravatar Janine vN2021-04-12-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the `exit` check if someone were to use this: `.int e exit` to clear the context. The check would prevent `.int e exit()` from restarting the bot container. With the `.int reset` and `.int exit` ability to clear the context the check for `exit` to clear the context isn't necessary.
| | * | Add constants for common string filenamesGravatar Janine vN2021-04-12-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Added a constant for the same filenames used in several locations. Because the now-a-constant string is used in several locations this will allow for it to be updated more easily down the line.
| | * | Ensure output will be robust for discord markdownGravatar Janine vN2021-04-11-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added in an extra `\n` at the end of the output. Sometimes discord won't properly format the codeblock in the triple ` is not on a newline. This changes ensures that it should.
| | * | Change command help formatGravatar Janine vN2021-04-11-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `.int` with nothing else now uses the `invoke_help_command()` utility that formats the help command much more nicely than the default version