aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge pull request #120 from RohanJnr/small_changes_icemanGravatar scragly2019-02-27-1/+7
|\ | | | | | | | | added help message for .savethedate and edited the error_message for cooldown error
| * changed variable name from message to time_remainingGravatar Rohan2019-02-17-2/+2
| |
| * Changed the variable name error_message to messageGravatar Rohan2019-02-17-2/+2
| |
| * I did the following changes:Gravatar Rohan2019-02-17-1/+7
| | | | | | | | | | 1)Added a help text to .savethedate 2)Edited the error message for cooldowns so that it shows not only seconds remaining but also minutes(if cooldowntime>60 seconds)
* | Merge pull request #123 from RohanJnr/valentine_zodiac_icemanGravatar Chris Goes2019-02-25-0/+321
|\ \ | | | | | | Add command .partnerzodiac
| * | changed the logging debug message.Gravatar Rohan_Iceman2019-02-25-1/+1
| | |
| * | loaded json file in the init methodGravatar Rohan2019-02-23-22/+26
| | |
| * | Made the try catch block narrow and only catching KeyErrorsGravatar Rohan2019-02-21-21/+21
| | |
| * | Wrote the command as described in the issue #107Gravatar Rohan2019-02-20-0/+317
| |/
* | Merge pull request #122 from darthdelay/whoisvalentineGravatar Johannes Christ2019-02-21-0/+77
|\ \ | | | | | | Add .who_is_valentine and .valentine_facts
| * | Update whoisvalentine.py to address requested changesGravatar Darth Delay2019-02-20-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | A few things have been changed to address the changes listed under PR #122: - Changed the color tag of the embed from both commands from discord.Color.dark_magenta() to bots.constants.Colours.pink - Renamed valentine_facts to valentine_fact These changes are needed to fit the projects standards.
| * | Add .who_is_valentine and .valentine_factsGravatar Darth Delay2019-02-19-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #102 This pull request adds the commands who_is_valentine and valentine_facts. The who_is_valentine command sends information about Saint Valentine of Terni to the channel the command has been called in. This is done by making use of the valentine_facts.json file's 'whois' attribute, which has all the information stored in it. The valentine_facts command sends a random fact with a random title to the channel the command has been called in. This is done by making use of the of the valentine_facts.json file's 'titles' and 'text' attribute, in which both, the information for the titles and the facts are stored in. Both commands do have docstrings, which explain what the command does in an easy manner. At the moment, there's a really sparse amount of facts available. I seek to add a lot more in the near future.
* | | Merge pull request #121 from python-discord/emoji-updateGravatar Sebastiaan Zeeff2019-02-18-1/+11
|\ \ \ | | | | | | | | Add Terning Emoji to Constants, Update Fun Cog
| * | | Add direct reference to terning emoji to constants, fun cogGravatar sco12019-02-17-1/+11
| | |/ | |/|
* | | Merge pull request #118 from avayert/masterGravatar Leon Sandøy2019-02-17-57/+100
|\ \ \ | |/ / |/| | Refine love calculator command
| * | Escape markdown in usernamesGravatar Ava2019-02-16-9/+13
| | |
| * | Somewhat normalize argumentsGravatar Ava2019-02-16-5/+12
| | |
| * | Fix import orderingGravatar Ava2019-02-16-1/+1
| | | | | | | | | | | | | | | One of the dependencies seems to install `typing` from PyPi for some reason, which confused PyCharm's import optimizer.
| * | Improve command help docstringGravatar Ava2019-02-16-8/+17
| | |
| * | Refine love calculator commandGravatar Ava2019-02-15-61/+84
| | |
* | | Merge pull request #111 from astieman/RollMethodGravatar scragly2019-02-17-0/+35
|\ \ \ | | | | | | | | Readded fun.py file to evergreen and added roll command.
| * | | 3rd code review. Added docstring.Gravatar astieman2019-02-16-0/+3
| | | |
| * | | 2nd code review complete. Default roll once and warning to roll at least ↵Gravatar astieman2019-02-15-2/+2
| | | | | | | | | | | | | | | | once implemented.
| * | | Code review changes implemented. Reverted so error handling is done by base bot.Gravatar astieman2019-02-14-15/+7
| | | |
| * | | Readded fun.py file to evergreen and added roll command.Gravatar astieman2019-02-11-0/+40
| | | |
* | | | Merge pull request #114 from 3bodyZZ/masterGravatar Joseph2019-02-16-0/+66
|\ \ \ \ | |_|/ / |/| | | added command .romancemovie
| * | | Fixed grammar, quotation style and dictionary styleGravatar abdullah oday2019-02-16-11/+12
| | | |
| * | | Unindented commentGravatar abdullah oday2019-02-16-1/+1
| | | |
| * | | Fixed an issue with the requestGravatar abdullah oday2019-02-16-20/+19
| | | |
| * | | Fixed log.warningGravatar abdullah oday2019-02-16-1/+1
| | | |
| * | | Made warning message more explicitGravatar abdullah oday2019-02-16-3/+4
| | | |
| * | | Added logging for KeyErrorGravatar abdullah oday2019-02-16-0/+2
| | | |
| * | | Used bot.http_session instead of creating a new session, and now checking ↵Gravatar abdullah oday2019-02-16-16/+19
| | | | | | | | | | | | | | | | for KeyError
| * | | Removed "Generator" fom log.debugGravatar abdullah oday2019-02-15-1/+1
| | | |
| * | | Fixed quotation style, removed unnecessary newlineGravatar abdullah oday2019-02-15-14/+13
| | | |
| * | | Fixed grammar issues, Moved constants to the top, Changed function nameGravatar abdullah oday2019-02-15-14/+13
| | | |
| * | | changed import orderGravatar abdullah oday2019-02-14-1/+1
| | | |
| * | | removed print functionGravatar abdullah oday2019-02-14-1/+0
| | | |
| * | | Replaced urlib with aiohttp , added docstrings and fixed issuesGravatar abdullah oday2019-02-14-22/+24
| | | |
| * | | createdGravatar abdullah oday2019-02-14-1/+3
| | | |
| * | | createdGravatar abdullah oday2019-02-14-0/+59
| |/ /
* | | Merge pull request #117 from darthdelay/lovecalculatorGravatar Sebastiaan Zeeff2019-02-15-3/+3
|\ \ \ | | | | | | | | Fix LoveCalculator 0% bug
| * | | Fix LoveCalculator 0% bugGravatar Darth Delay2019-02-15-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently a test of the .love command revealed an unintentional reaction when 100% are reached. In previous versions this command had used a gigantic conditional block, checking for the current percentage given by the love_meter formula. When reaching 0 (meaning that the UserID's evenly divided with 100) it would automatically convert that 0 to 100. A big mistake from my side back then. This has been fixed with these changes. By quickly modifying the formula to use a mod 101 instead of a mod 100, we get an accurate percentage, ranging from 0-100% instead of 0-99%. love_matches.json has also been fixed to address these changes, meaning that the lowest entry now actually is 0 and the highest 100. TL;DR: -> Edited love_meter formula to calculate mod 101 instead of mod 100 -> Edited lowest and highest entry in love_matches.json to be 0 and 100
* | | | Merge pull request #100 from darthdelay/lovecalculatorGravatar Jeremiah Boby2019-02-14-0/+129
|\| | | | |/ / |/| | Add LoveCalculator as described in #96
| * | Update LoveCalculator to address requested changesGravatar Darth Delay2019-02-12-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is addressing the new change requests on #100 Here's a list of what has been changed: -> Moved `LOVE_DATA` and `LOVE_LEVELS` out of the LoveCalculator class: This change has been made, so that the **love_matches.json** file does not have to be loaded every time someone uses `.love`. Now the file is loaded once when the cog is loaded. Requested by: Scragly -> Moved the Member converter to the function parameters: I didn't know that this works. It's good to learn something new. This also removes the `else` block, as it is no longer needed. Requested by: Scragly -> Removed the Roles instance: Before these changes, an instance of `Roles` has been created inside the if block: `ctx.guild.get_role(Roles().helpers).members`. This instance has now been removed as it is unnecessary Requested by: Scragly -> Adjusted the embed's description's string length: This project is aimed at 100 character lines in the future. The descrip- tion is way longer, so its string has been split up to fit that specifi- cation. Requested by: Scragly
| * | Update LoveCalculator as in #100Gravatar Darth Delay2019-02-11-90/+100
| |/ | | | | | | | | | | | | | | | | | | | | | | Updated the LoveCalculator cog due to changes being requested + Added love_matches.json for dialogue storage + Added docstrings to LoveCalculator and the love command + Added DRY code + Added 5 seconds of cooldown to the command per user + Can now be invoked without a second name - Removed error handler 'love_error'
| * Add LoveCalculator as in #96Gravatar Darth Delay2019-02-05-2/+3
| | | | | | | | | | | | | | This love calculator uses two user-IDs, adds them together and takes the modulus of 100 from it. Invocation: .love @user1#0000 @user2#0000
| * Add LoveCalculator as in #96Gravatar Darth Delay2019-02-05-2/+2
| | | | | | | | | | | | | | This love calculator uses two user-IDs, adds them together and takes the modulus of 100 from it. Invocation: .love @user1#0000 @user2#0000
| * Added lovecalculator.py as described in #96:Gravatar Darth Delay2019-02-05-1/+1
| | | | | | | | | | | | - Includes LoveCalculator and somewhat of an error handler - Awaits two mentions like so: /love @user1#0000 @user2#0000 - Sends embed to the channel where /love has been called
| * Added lovecalculator.py as described in #96:Gravatar Darth Delay2019-02-05-1/+1
| | | | | | | | | | | | - Includes LoveCalculator and somewhat of an error handler - Awaits two mentions like so: /love @user1#0000 @user2#0000 - Sends embed to the channel where /love has been called
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-26 18:22:24 +0000