aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| | | | * | | | Merge branch 'master' into remove-prometheusGravatar Joseph2020-02-02-1/+1
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| | | | * | | | Remove prometheus related codeGravatar Joseph Banks2020-02-02-272/+128
| | | | | | | |
| | | | | * | | Made searching even stricter by searching from start of each wordGravatar Shirayuki Nekomata2020-02-05-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added regex back to sub and split by non-alphabet. - Now use two pointers to move from words to words.
| | | | | * | | Removed regex, implemented a stricter letter searching.Gravatar Shirayuki Nekomata2020-02-05-10/+12
| | | | | | | |
| | | | | * | | Increased default thresholds from just [100, 80] to [100, 90, 80, 70, 60]Gravatar Shirayuki Nekomata2020-02-05-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Since it is returning as soon as there are suggestions found for a threshold, this will give a better reflection of what the bot thinks user is searching for.
| | | | | * | | Removed non-alphabets from both search and tag_name when scoring.Gravatar Shirayuki Nekomata2020-02-05-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added a regex to remove non-alphabet ( `[^a-z]` with `re.IGNORECASE` )
| | | | | * | | Refactored _get_suggestions following Mark's suggestions about inefficiency.Gravatar Shirayuki Nekomata2020-02-04-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Matching scores will be calculated once now and stored in the dict `scores`. - Allow `_get_suggestions()` to go through a list of score threshold and return the first list of matching tags that's not empty and above the threshold. This avoid calling the function multiple time like before ( `self._get_suggestions(tag_name, 100) or self._get_suggestions(tag_name, 80)` for example, is calling this function twice, and is inefficient ) - Deleted commented line. - Added `typing` module for more typehints.
| | | | | * | | Fixed _last_fetch not being updated after each api call.Gravatar Shirayuki Nekomata2020-02-04-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed type of `self._last_fetch` to `float` and give it the initial value of `0.0` instead of `None` - Assigned `time.time()` to `time_now` to avoid calling this function twice. - Added `self._last_fetch = time_now` after calling the api call.
| | | | | * | | Merge branch 'master' into fuzzy-tag-searchGravatar Joseph2020-02-02-2959/+6887
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| | | | | * | | Make it easier for user to search for tagsGravatar Shirayuki Nekomata2019-10-18-9/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #### Closes #231 Applying the algorithm for `Needles and Haystack` to find and match tag in tags, for example: ![Example](https://cdn.discordapp.com/attachments/634243438459486219/634592981915140107/unknown.png) This only applies to searching tag_name with more than 3 in length, and at least 80% of its letters are found, from left to right. There are 3 levels of checking, stop at first found: - Check if exact name ( case insensitive ) O(1) getting from a dictionary Dict[str, Tag] - Check for all tags that has 100% matching via algorithm - Check for all tags that has >= 80% matching If there are more than one hit, it will be shown as suggestions: ![Suggestions](https://cdn.discordapp.com/attachments/634243438459486219/634595369531211778/unknown.png) In order to avoid api being called multiple times, I've implemented a cache to only refresh itself when the is a gap of more than 5 minutes from the last api call to get all tags. Editing / Adding / Deleting tags will also modify the cache directly. ##### What about other solution like fuzzywuzzy? fuzzywuzzy was considered for using, but from testing, it was giving much lower scores than expected: Code used to test: ```py from fuzzywuzzy import fuzz def _fuzzy_search(search: str, target: str) -> bool: found = 0 index = 0 _search = search.lower().replace(' ', '') _target = target.lower().replace(' ', '') for letter in _search: index = _target.find(letter, index) if index == -1: break found += index > 0 # return found / len(_search) * 100 return ( found / len(_search) * 100, fuzz.ratio(search, target), fuzz.partial_ratio(search, target) ) tests = ( 'this-is-gonna-be-fun', 'this-too-will-be-fun' ) for test in tests: print(test, '->', _fuzzy_search('this too fun', test)) ``` Result from test: ```py this-is-gonna-be-fun -> (30.0, 50, 50) this-too-will-be-fun -> (90.0, 62, 58) ```
| | | | | | * | Fix linting errorGravatar kosayoda2019-10-28-2/+2
| | | | | | | |
| | | | | | * | Apply suggestions from code review Gravatar Kieran Siek2019-10-28-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect docstring and comment Co-Authored-By: Mark <[email protected]>
| | | | | | * | Add delete emoji to paginationGravatar kosayoda2019-10-28-10/+21
| | | | | | | |
| | | | | | * | Revert "Remove dev-test limit for filtering debugging"Gravatar kosayoda2019-10-28-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 56696b3b1858ad27dc7f3dce2898c7a6eb151f43.
| | | | | | * | Remove dev-test limit for filtering debuggingGravatar kosayoda2019-10-27-2/+2
| | | | | | | |
| | | | | | * | Differentiate clear and delete emoji in help cogGravatar kosayoda2019-10-27-10/+13
| | | | | | | |
| | | | | | * | Use trashcan emoji for message deletionGravatar kosayoda2019-10-27-1/+9
| | | | | | | |
| | | | | | | * Add unit test for newlines antispam ruleGravatar kwzrd2020-02-04-0/+105
| | | | | | | |
| | | | | | | * Add unit test for duplicates antispam ruleGravatar kwzrd2020-02-04-0/+66
| | | | | | | |
| | | | | | | * Merge branch 'master' into unittest-antispam-rulesGravatar Joseph2020-02-02-1/+10
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Update CODEOWNERSGravatar Joseph2020-02-02-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #736 from python-discord/tagptroll1-md-filefilterGravatar kwzrd2020-02-02-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update config-default.yml - Allow .md files
| * | | | | | | Update config-default.ymlGravatar Thomas Petersson2020-02-02-0/+1
|/ / / / / / /
* | | | | | | Create CODEOWNERSGravatar Joseph2020-02-02-0/+1
| | | | | | |
* | | | | | | Merge pull request #735 from python-discord/test-resourcesGravatar Leon Sandøy2020-01-30-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add additional resources to the test readme
| * | | | | | | Merge the note with the additional resources sectionGravatar Matteo Bertucci2020-01-30-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Move the link to Ned Batchelder’s talk and link the note to the section
| * | | | | | | Add additional resources to the test readmeGravatar Matteo Bertucci2020-01-30-0/+6
|/ / / / / / /
| | | | | | * Make RuleTest use ABCMetaGravatar kwzrd2020-02-02-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent child classes to be instantiated unless they implement all abstract methods, leading to a more descriptive error message.
| | | | | | * Adjust existing tests to inherit from RuleTest ABCGravatar kwzrd2020-02-02-294/+157
| | | | | | |
| | | | | | * Implement RuleTest ABCGravatar kwzrd2020-02-02-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will serve as an ABC for tests for individual rules. The base class provides runners for allowed and disallowed cases, and the children classes then only provide the cases and implementations of helper methods specific to each rule.
| | | | | | * Adjust multi-line docstrings to prevailing styleGravatar kwzrd2020-01-31-3/+6
| | | | | | |
| | | | | | * Refactor msg helper function name to make_msgGravatar kwzrd2020-01-26-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The name msg is less descriptive and creates a needless name conflict in local gen exp.
| | | | | | * Fix incorrect config key in attachments antispam ruleGravatar kwzrd2020-01-26-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rule was incorrectly printing out the maximum amount of allowed attachments instead of the configured interval. This commit also adjusts the rule's unit test case.
| | | | | | * Add unit test case for role mentions antispam ruleGravatar kwzrd2020-01-26-0/+66
| | | | | | |
| | | | | | * Add unit test case for discord emojis antispam ruleGravatar kwzrd2020-01-26-0/+68
| | | | | | |
| | | | | | * Add unit test case for chars antispam ruleGravatar kwzrd2020-01-26-0/+75
| | | | | | |
| | | | | | * Add unit test case for burst shared antispam ruleGravatar kwzrd2020-01-26-0/+65
| | | | | | |
| | | | | | * Add unit test case for burst antispam ruleGravatar kwzrd2020-01-26-0/+69
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #730 from python-discord/user-info-fixGravatar Mark2020-01-16-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix user command error for empty custom status
| * \ \ \ \ \ Merge branch 'master' into user-info-fixGravatar Mark2020-01-16-122/+272
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #701 from manusaurio/fetched-userGravatar Shirayuki Nekomata2020-01-16-114/+171
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Support applying infractions to users not in the DB via Converter `FetchedUser`
| * \ \ \ \ \ \ Merge branch 'master' into fetched-userGravatar manusaurio2020-01-16-284/+658
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #686 from python-discord/feature/645-voice-event-logGravatar Shirayuki Nekomata2020-01-16-8/+101
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Log voice channel events
| * \ \ \ \ \ \ \ Merge branch 'master' into feature/645-voice-event-logGravatar Shirayuki Nekomata2020-01-16-577/+1298
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | ModLog: support self_stream voice stateGravatar MarkKoz2019-12-18-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature will be available in discord.py 1.3.
| * | | | | | | | ModLog: change voice state embed icon and colourGravatar MarkKoz2019-12-18-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a red icon when leaving or mute/deafened. Use a green icon when joining or unmuted/undeafened. Use a blue icon when changing channels or any other possible change.
| * | | | | | | | Constants: add voice state emotesGravatar MarkKoz2019-12-18-0/+8
| | | | | | | | |
| * | | | | | | | ModLog: exclude afk attribute from voice state logGravatar MarkKoz2019-12-11-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The log will already show that the channel changes to the AFK channel so showing the attribute change is redundant. If the channel were not clearly named "AFK" then it might've made sense to keep the attribute.
| * | | | | | | | ModLog: exclude most channel attributes from voice state diffGravatar MarkKoz2019-12-11-2/+8
| | | | | | | | |
| * | | | | | | | ModLog: make voice state event respect ignored channelsGravatar MarkKoz2019-12-11-1/+4
| | | | | | | | |