Skip to content

🚧 Implemented FuzzyWuzzy as search engine, allowing typos in !docs command [postponed] #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🚧 Implemented FuzzyWuzzy as search engine, allowing typos in !docs command [postponed] #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ ext {
sdcf4j : 'v1.0.10',
okhttp : '3.9.1',
jackson : '2.9.3',
log4j : '2.11.1'
log4j : '2.11.1',
fuzzywuzzy: '1.2.0'
]
}

Expand All @@ -48,6 +49,7 @@ dependencies {
implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
implementation "org.apache.logging.log4j:log4j-api:${versions.log4j}"
implementation "me.xdrop:fuzzywuzzy:${versions.fuzzywuzzy}"

runtimeOnly "org.apache.logging.log4j:log4j-core:${versions.log4j}"
runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
Expand Down
20 changes: 12 additions & 8 deletions src/main/java/org/javacord/bot/commands/DocsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import de.btobastian.sdcf4j.Command;
import de.btobastian.sdcf4j.CommandExecutor;
import me.xdrop.fuzzywuzzy.FuzzySearch;
import me.xdrop.fuzzywuzzy.model.BoundExtractedResult;
import org.javacord.api.DiscordApi;
import org.javacord.api.entity.channel.TextChannel;
import org.javacord.api.entity.message.embed.EmbedBuilder;
Expand Down Expand Up @@ -72,10 +74,11 @@ public void onCommand(TextChannel channel, String[] args) {
* @param searchString A search string.
*/
private void populateMethods(DiscordApi api, EmbedBuilder embed, String searchString) {
Map<String, List<JavadocMethod>> methods = new JavadocParser(api, JavadocParser.getLatestJavaDocs(api).join())
.getMethods().join().stream()
.filter(method -> method.getFullName().toLowerCase().contains(searchString.toLowerCase()))
.sorted(Comparator.comparingInt(method -> method.getName().length()))
Map<String, List<JavadocMethod>> methods = FuzzySearch.extractTop(searchString,
new JavadocParser(api, JavadocParser.getLatestJavaDocs(api).join())
.getMethods().join(), JavadocMethod::getName, 15, 50)
.stream()
.map(BoundExtractedResult::getReferent)
.collect(Collectors.groupingBy(JavadocMethod::getClassName));


Expand Down Expand Up @@ -124,10 +127,11 @@ private void populateMethods(DiscordApi api, EmbedBuilder embed, String searchSt
* @param searchString A search string.
*/
private void populateClasses(DiscordApi api, EmbedBuilder embed, String searchString) {
List<JavadocClass> classes = new JavadocParser(api, JavadocParser.getLatestJavaDocs(api).join())
.getClasses().join().stream()
.filter(clazz -> clazz.getName().toLowerCase().contains(searchString.toLowerCase()))
.sorted(Comparator.comparingInt(clazz -> clazz.getName().length()))
List<JavadocClass> classes = FuzzySearch.extractTop(searchString,
new JavadocParser(api, JavadocParser.getLatestJavaDocs(api).join())
.getClasses().join(), JavadocClass::getName, 5, 50)
.stream()
.map(BoundExtractedResult::getReferent)
.collect(Collectors.toList());

embed.setTitle("Classes");
Expand Down