aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| | * | | | | | | Merge branch 'master' into reorder-mod-actionsGravatar Chris Goes2019-01-16-31/+45
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #275 from python-discord/rich-embed-filter-fixGravatar S. Co12019-01-16-21/+27
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | Changing the rich embed filter to a watchlist that ignores twitter embeds
| | * | | | | | | Merge branch 'master' into rich-embed-filter-fixGravatar S. Co12019-01-16-10/+18
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #278 from python-discord/add_user_logGravatar Leon Sandøy2019-01-16-10/+18
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | Add new userlog channel support.
| | * | | | | | | Revert modlog channel for unbanned notificationGravatar S. Co12019-01-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: scragly <[email protected]>
| | * | | | | | | Revert modlog channel for banned notificationGravatar S. Co12019-01-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: scragly <[email protected]>
| | * | | | | | | Add new userlog channel support.Gravatar Scragly2019-01-17-10/+18
| |/ / / / / / /
| | * | | | | | Merge branch 'master' into rich-embed-filter-fixGravatar Chris Goes2019-01-15-1/+1
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Changing the rich embed filter to a watchlist that ignores twitter embeds; ↵Gravatar SebastiaanZ2019-01-13-21/+27
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | adding time delta check to avoid the trigger-twice problem
| | | * | | | Correct altered log_msg kwarg used.Gravatar Scragly2019-01-16-1/+1
| | | | | | |
| | | * | | | Merge branch 'master' of https://github.com/python-discord/bot into ↵Gravatar Scragly2019-01-16-296/+855
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reorder-mod-actions # Conflicts: # bot/cogs/modlog.py
| * | | | | | Merge pull request #256 from python-discord/fix-bb-emojiGravatar Sebastiaan Zeeff2019-01-14-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fix bbmessage emoji pointing to incorrect ID
| | * | | | | Merge branch 'master' into fix-bb-emojiGravatar Johannes Christ2019-01-14-95/+482
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #215 from python-discord/user_command_improvementsGravatar Sebastiaan Zeeff2019-01-13-27/+102
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Improving the `!user` command so users can use it in bot-commands if they target themselves.
| | * | | | | | Using the exception message as the description in BadArgument error embeds.Gravatar Leon Sandøy2019-01-13-2/+2
| | | | | | | |
| | * | | | | | fixing a bad conflict resolution pt2Gravatar Leon Sandøy2019-01-13-1/+1
| | | | | | | |
| | * | | | | | fixing a bad conflict resolutionGravatar Leon Sandøy2019-01-13-11/+0
| | | | | | | |
| | * | | | | | Merge branch 'master' into user_command_improvementsGravatar Leon Sandøy2019-01-13-333/+963
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #255 from fiskenslakt/masterGravatar S. Co12019-01-12-0/+154
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | !free help channel command
| | * \ \ \ \ \ \ Merge branch 'master' into masterGravatar Leon Sandøy2019-01-12-52/+141
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #272 from python-discord/edit-log-timestampGravatar Jeremiah Boby2019-01-12-9/+36
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add "last edited" delta to modlog for multi-edit messages
| | * \ \ \ \ \ \ \ Merge branch 'master' into edit-log-timestampGravatar Jeremiah Boby2019-01-12-9/+60
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #273 from python-discord/help-catch-superclassGravatar Leon Sandøy2019-01-12-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Changing the exception class caught so help doesn't break in the future
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into help-catch-superclassGravatar Jeremiah Boby2019-01-12-7/+58
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #266 from ↵Gravatar S. Co12019-01-12-7/+58
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python-discord/bigbrother-add-watch-message-to-header-embed Add watch reason to big brother header embed & fix small bug in watch command
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into bigbrother-add-watch-message-to-header-embedGravatar Sebastiaan Zeeff2019-01-12-3/+36
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into bigbrother-add-watch-message-to-header-embedGravatar Sebastiaan Zeeff2019-01-11-31/+9
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Only retrieve/cache watch reason when user becomes active; restore ↵Gravatar SebastiaanZ2019-01-11-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update_cache to synchronous as it was before
| | * | | | | | | | | | | Removing default argument for the alias <prefix>watch to require a reason ↵Gravatar SebastiaanZ2019-01-10-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via the alias as well
| | * | | | | | | | | | | Adding type annotationsGravatar SebastiaanZ2019-01-10-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Adding watch reason to the big-brother header embedsGravatar SebastiaanZ2019-01-10-9/+57
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | | * | | | | | | | Changing check-specific exception to superclass exception so help doesn't ↵Gravatar SebastiaanZ2019-01-12-2/+2
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | break when new check exceptions are added
| | | | * | | | | | | Condense logicGravatar sco12019-01-12-5/+2
| | | | | | | | | | |
| | | | * | | | | | | Add Optional type hints where appropriateGravatar sco12019-01-12-6/+6
| | | | | | | | | | |
| | | | * | | | | | | Remove debug print statementGravatar sco12019-01-11-1/+0
| | | | | | | | | | |
| | | | * | | | | | | Add edit delta to modlog for multi-edit messagesGravatar sco12019-01-11-8/+39
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To help with self-bot detection, if a message has been previously edited, generate a human-readable delta between the last edit and the new one Use message timestamp for modlog embeds generated during on_message event Visually separate send_log_message kwargs to make them easier to read
| * | | | | | | | | Merge pull request #269 from python-discord/disable-rich-embed-filterGravatar S. Co12019-01-11-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Disable rich embed filter due to false positives
| | * | | | | | | | | Disable rich embed filterGravatar sco12019-01-11-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discord adding the embeds is causing it to trigger.
| * | | | | | | | | Merge pull request #268 from python-discord/reverting-accidental-push-to-masterGravatar S. Co12019-01-11-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Revert "Catching the superclass CheckFailure instead of the subclass"
| | * | | | | | | | | Revert "Catching the superclass CheckFailure instead of the subclass"Gravatar SebastiaanZ2019-01-11-2/+2
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8f30b52fd378bb3546c84d0fdb945a4b492236b8. Accidentally pushed to master when I thought I was at a branch
| * | | | | | | | | Catching the superclass CheckFailure instead of the subclassGravatar SebastiaanZ2019-01-11-2/+2
| | | | | | | | | |
| * | | | | | | | | Merge pull request #260 from python-discord/accidental-permamuteGravatar Sebastiaan Zeeff2019-01-11-0/+32
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add mute infraction check to role restoration so users won't be accidentally permamuted when they come back to server after leaving while were tempmuted.
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into accidental-permamuteGravatar Sebastiaan Zeeff2019-01-11-53/+101
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #267 from ↵Gravatar Leon Sandøy2019-01-11-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python-discord/token-detection-warning-strong-language Using firmer language in the token removal message to the user
| | * | | | | | | | | Using stronger language in the message and emphazising the 'strongly ↵Gravatar SebastiaanZ2019-01-11-2/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recommend' with bold
| * | | | | | | | | Merge pull request #232 from python-discord/antispam-mute-infrGravatar Sebastiaan Zeeff2019-01-11-31/+9
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | Utilizes a temporary mute infraction rather than having the mute be totally contained by the AntiSpam coro, preventing non-administrators from removing the muted role in the event of a false-positive.
| | * | | | | | | | Merge branch 'master' into antispam-mute-infrGravatar sco12019-01-10-22/+91
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Invoke Moderation tempmute directlyGravatar sco12019-01-06-33/+3
| | | | | | | | | |
| | * | | | | | | | Antispam Infraction FixesGravatar sco12019-01-06-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add muted role object to cog attributes Fix unawaited coroutine in modlog Adjust modlog message ctx variable to be more explicit Fix duration being sent to API as integer instead of string Fix temporary infraction being placed into a nonexistent schedule, now placed into the moderation cog's task schedule
| | * | | | | | | | Merge branch 'master' into antispam-mute-infrGravatar sco12019-01-06-244/+490
| | |\ \ \ \ \ \ \ \