aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* chore: remove doubled new line in ERROR_MSGGravatar brad90four2021-09-27-5/+5
|
* chore: make cmyk_to_rgb def multilineGravatar brad90four2021-09-23-1/+5
|
* chore: create subcommands for sending embedGravatar bradtimmis2021-09-23-13/+13
|
* chore: small code fixes and cleanupGravatar brad90four2021-09-22-15/+8
|
* fix: remove `get_color_fields` call in color_embedGravatar brad90four2021-09-22-2/+1
|
* fix: restructure scriptGravatar brad90four2021-09-22-110/+115
|
* fix: create subcommands and restructure scriptGravatar brad90four2021-09-22-36/+45
| | | | | | | | | | -Makes "main" function `color_embed` that takes an rgb tuple, calls `all_colors` to get all other color types, gets a name from the hex color, creates embed, calls `create_thumbnail` to get image, and then sends main embed. -Makes functions `xxx_to_rgb` functions to call `color_embed` -Creates new `hex_to_rgb` function -TODO: test all functions and continue restructure.
* fix: remove redundant rgb_color variableGravatar bradtimmis2021-09-21-6/+3
| | | | | The conversion functions from hsv, hsl and cmyk now return r, g, b instead of a variable rgb_tuple.
* Add all color modes and name matchingGravatar bradtimmis2021-09-19-36/+104
|
* Continue work on hex and rgb color commandsGravatar bradtimmis2021-09-19-18/+69
|
* Reword json file variables and mappingGravatar bradtimmis2021-09-19-5/+5
|
* Fix Flake8 spacing errorsGravatar brad90four2021-09-15-8/+8
|
* Load json file onceGravatar bradtimmis2021-09-12-5/+4
|
* Merge branch 'main' of https://github.com/python-discord/sir-lancebot into ↵Gravatar bradtimmis2021-09-11-1/+1
|\ | | | | | | color-677
| * Merge pull request #864 from NIRDERIi/hanukkah_cmd_monthGravatar Xithrius2021-09-09-1/+1
| |\ | | | | | | Added Hanukka command in November month.
| | * Added Hanukka command in November month.Gravatar NIRDERIi2021-09-08-1/+1
| |/ | | | | This is a solution for the #862 issue, which says the Hanukka holiday can also be in November and not only in December.
* | Remove placeholder commentGravatar bradtimmis2021-09-11-2/+0
| |
* | Add fuzzy match functionGravatar bradtimmis2021-09-11-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made a few changes, the biggest being the fuzzy match function to return a hex color code based on an input color name. Open items that I can think of so far: -Since the json file has color names and hex values, in order to use fuzzy matching for a color name the color must first be converted to hex. Currently there is only a rgb to anything function which returns values in a dictionary. -The main embed creation references the rgb_color before it is defined, should the command function be moved to the bottom of the file or just the main embed creation and sending? -When using the rgb mode, should the user be forced to do (r, g, b) or should the command handle an input of "r, g, b"? If you are reading this, thank you.
* | Merge branch 'color-677' of github.com:brad90four/sir-lancebot into ↵Gravatar bradtimmis2021-09-11-35/+101
|\ \ | | | | | | | | | color-677777777
| * | Added "colour information" and "colour conversion" featuresGravatar CyberCitizen012021-09-11-34/+100
| | | | | | | | | | | | | | | Details: https://github.com/python-discord/sir-lancebot/issues/677 NOTE: get_color_fields (line 122) method explicity requires a valid tuple of RGB values.
| * | Test to capture all user_inputGravatar brad90four2021-09-10-1/+1
| | |
* | | Move .json file to correct folderGravatar bradtimmis2021-09-11-0/+0
|/ /
* | Minor fixesGravatar brad90four2021-09-08-10/+5
| |
* | Merge branch 'color-677' of https://github.com/brad90four/sir-lancebot into ↵Gravatar brad90four2021-09-07-217/+299
|\ \ | | | | | | | | | color-677
| * | Merge branch 'main' into color-677Gravatar brad90four2021-09-07-217/+299
| |\|
| | * Wikiguess Game (#618)Gravatar Shivansh-0072021-09-07-217/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * (trivia-quiz): Add Wikipedia Guess Game This commit also moves all the 'dynamic' question generator to a separate class. Closes: #446 * (trivia quiz): Use tuples for command aliases * (trivia quiz): Edit congratulations message * (trivia quiz): Use default dict for storing player scores * (trivia quiz): 'done_question' to 'done_questions' * Add space after 'Congratulations' word * Use classmethods for dynamically generating questions * Don't add wiki category if max error fetches hit If the task hit max error fetches, which is 3 currently, it would remove wikipedia from listed categories and not add it to loaded questions. If it doesn't hit max fetches, then it adds them. * Don't hardcode the number of questions in RULES * Add information field only if it exists * Add "cs" and "python" categories to the `.quiz` command * add 30 questions each under the categories "cs" and "python" add the two categories into the code and modify the starting phase Co-authored-by: Xithrius <[email protected]> Co-authored-by: ToxicKidz <[email protected]> * refactor: Use yesterday's most read to make trivia questions Since random wikipedia article guess questions weren't really "knowledgeable", no one could really guess it or gain any "good" knowledge from them, so after asking wookie (this commits mentions his review comments above also), I decided to use these. * refactor: Logic to remove pronounciations from question Co-authored-by: wookie184 <[email protected]> * fix: Set to correct question limit If the number of questions are less then the default limit which can happen in the case of wikipedia guess game as it is dependent on the most read articiles on wikipedia, it would create a infinite loop sending us into infinite amount of errors, so let's prevent that, thanks wookie * chore: Add comment for d5f8205 change * refactor: Remove double mention of dataclass in quizentry * chore: Use r"" over noqa We can use r"", a raw string, here to make it clear that \* and \s aren't supposed to be handled as escape sequences and just use the "raw string". * fix: Correct off by one bug Originally, before this commit, we checked the number of questions left by comparing `len(done_questions) > self.question_limit`, so question limit had to be 1 since if it wasn't we would compare 7 > 7, which would be false and then it would send another question. To correct this bug, we now use == comparision on the two, so if the number of done questions is same as the question limit it means that the round is over. I have changed the relevant parts of the code to reflect this change i.e. where-ever we did +-1 due to the off by one bug. * refactor: Noramlize the title to remove all punctuations Since the title can sometimes contain punctuations making it very difficult to get the matching answer to the question, we originally removed all such questions. This took the question count down :( and wasn't an effective way. Therefore now we keep them but as normalized, yay! I have also updated the code documentation to make the process much clearer to anyone reading the "normalizing" code section of the wiki questions generator. * refactor: Keep answers as a list & not ",".join() Wasn't fitting in character limit so shorterned it ^^ lol. Okay, getting to the point, this mentions fix error's comment of making quiz entry except the answers as a list and not as a string which could a comma joined list. The same structure was in the json resource, where multiple answers where joined with commas. This didn't allow you to use commas in answers. So I went ahead and did a bit more than requested to change the json structure and make `answers` a list. Also now all questions are in the form of the quiz entry to keep it same through out the code and var tolerance has become a valid param in QuizEntry, this is done because it was differing between questions, if not needed this would make the process to add `var_tol` as a argument to the json easier. And that's it! Co-authored-by: Objectivitix <[email protected]> Co-authored-by: Xithrius <[email protected]> Co-authored-by: ToxicKidz <[email protected]> Co-authored-by: wookie184 <[email protected]>
* | | Update code to use 'mode' variableGravatar brad90four2021-09-07-13/+46
|/ / | | | | | | | | | | Updated the code to parse user_input depending on the color code 'mode' passed to the command. Added stub code for future color codes and embeds if mode is None or wrong code.
* | Add embed fields for Hex and RGBGravatar brad90four2021-09-07-0/+10
| |
* | Fixing flake8 errors, code styleGravatar brad90four2021-09-07-12/+10
| | | | | | | | | | Still a work in progress but commenting out stub code and unused imports. List of To-Do's still applies.
* | Fixing merge conflictsGravatar brad90four2021-09-07-411/+446
|\ \
| * | Continue work in progressGravatar bradtimmis2021-09-06-79/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented the thumbnail creation from CyberCitizen0, worked on adding some features to the program. Notable Changes: -Check if user passes in hex color -Create thumbnail based on rgb_color To-Do: -Create hex color from rgb color -Create readable rgb color from user input Co-authored-by: Mohammad Rafivulla <[email protected]>
| * | Merge branch 'main' of https://github.com/python-discord/sir-lancebot into ↵Gravatar bradtimmis2021-09-06-109/+173
| |\| | | | | | | | | | color-677
| | * CI: check license compatibility (#855)Gravatar Matteo Bertucci2021-09-06-109/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CI: check for license compatibility Port of https://github.com/python-discord/bot/pull/1779 --- Since our project is licensed under the MIT License, we can't be using any incompatible license-wise dependencies in our project, such as GPL. This commit adds a step to the CI lint phase that will use pip-licenses to verify that all the installed packages are part of an ALLOWED_LICENSE variable. This variable is currently set to be every license we currently use. We opted to use an allowlist instead of a denylist to make sure that new licenses are reviewed by hand and added to that variable. Co-authored-by: ChrisJL <[email protected]> Co-authored-by: Xithrius <[email protected]> Co-authored-by: Vivaan Verma <[email protected]>
| | * Merge pull request #850 from Numerlor/async-redisache-logsGravatar ChrisJL2021-09-06-0/+1
| | |\ | | | | | | | | Set logging level for async-rediscache to warning
| | | * Merge branch 'main' into async-redisache-logsGravatar ChrisJL2021-09-06-103/+86
| | | |\ | | | |/ | | |/|
| | | * Set logging level for async-rediscache to warningGravatar Numerlor2021-09-05-0/+1
| | | | | | | | | | | | | | | | Logs below warnings aren't relevant when working on the bot
| * | | Remove old filesGravatar bradtimmis2021-09-05-230/+0
| | | |
| * | | Move to utilities folder as recommended by XithGravatar bradtimmis2021-09-05-0/+115
| | | |
| * | | Move to bot/exts/fun folder to update restructureGravatar bradtimmis2021-09-05-0/+115
| | | |
| * | | Merge branch 'main' into color-677Gravatar Xithrius2021-09-05-188/+175
| |\| |
| | * | Merge pull request #853 from python-discord/post-restructure-fixGravatar Xithrius2021-09-05-1/+1
| | |\ \ | | | | | | | | | | Post re-structure fixs
| | | * | Correct an import path in AOC helpersGravatar Chris Lovering2021-09-05-1/+1
| | | | |
| | | * | Add a missing __init__.py causing event cogs not to loadGravatar Chris Lovering2021-09-05-0/+0
| | |/ /
| | * | Merge pull request #851 from python-discord/lance-restructureGravatar ChrisJL2021-09-05-103/+86
| | |\ \ | | | |/ | | |/| Restructure Sir Lancebot
| | | * Merge branch 'main' into lance-restructureGravatar ChrisJL2021-09-05-1/+1
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #845 from python-discord/Pin-platform-in-DockerfileGravatar Johannes Christ2021-09-04-1/+1
| | |\ \ | | | | | | | | | | Pin platform in Dockerfile
| | | * | Pin platform in DockerfileGravatar Chris Lovering2021-09-04-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Some of our deps don't have wheels for atm processors. With Mac's M1 chips becomming more common, we should make it easier for those users to build our environments.
| | | * Update rogue paths to new pathsGravatar Janine vN2021-09-05-12/+12
| | | |
| | | * Update CODEOWNERS to reflect file movesGravatar Janine vN2021-09-05-2/+3
| | | |
| | | * Move game and fun commands to Fun folder, fix ddgGravatar Janine vN2021-09-05-36/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves all the fun commands and games into the fun folder. This commit also makes changes to the duck_game. It was setting a footer during an embed init, which is no longer possible with the version of d.py we use. Additionally, an issue with editing an embed that had a local image loaded. The workaround for the time being is to update the message, not the embed.
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-23 23:53:08 +0000