bvn13
/
JIrcBot
mirror of https://github.com/bvn13/JIrcBot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

implemented command description for DuckDuckGo search

pull/6/head
bvn13 2019-03-10 17:02:48 +03:00
parent 7fffb77b14
commit 294a3e0ece
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/bvn13/jircbot/documentation/DocumentationProvider.java
View File

@ -1,12 +1,10 @@
package ru.bvn13.jircbot.documentation;
import javafx.collections.transformation.SortedList;
import lombok.Getter;
import org.modelmapper.internal.util.Lists;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.stream.Collectors;
/**
* Created by bvn13 on 28.10.2018.

28
src/main/java/ru/bvn13/jircbot/listeners/DuckDuckGoSearchListener.java
View File

@ -3,23 +3,25 @@ package ru.bvn13.jircbot.listeners;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.pircbotx.hooks.events.MessageEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import ru.bvn13.jircbot.bot.ImprovedListenerAdapter;
import ru.bvn13.jircbot.bot.JircBot;
import ru.bvn13.jircbot.database.services.ChannelSettingsService;
import ru.bvn13.jircbot.documentation.DescriptionProvided;
import ru.bvn13.jircbot.documentation.ListenerDescription;
import ru.bvn13.jircbot.services.InternetAccessor;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
import static ru.bvn13.jircbot.documentation.ListenerDescription.CommandDescription;
@Component
public class DuckDuckGoSearchListener extends ImprovedListenerAdapter {
public class DuckDuckGoSearchListener extends ImprovedListenerAdapter implements DescriptionProvided {
private static final String COMMAND = "?s";
@ -29,6 +31,19 @@ public class DuckDuckGoSearchListener extends ImprovedListenerAdapter {
@Autowired
private ChannelSettingsService channelSettingsService;
@Override
public ListenerDescription getDescription() {
return ListenerDescription.create()
.setModuleName("DuckDuckGoSearchListener")
.setModuleDescription("Make a search in DuckDuckGo for you")
.addCommand(CommandDescription.builder()
.command("s")
.description("Search it")
.example("?s [WHAT YOU WANT TO SEARCH]")
.build()
);
}
@Override
public void onMessage(MessageEvent event) throws Exception {
@ -54,10 +69,6 @@ public class DuckDuckGoSearchListener extends ImprovedListenerAdapter {
}
private String search(String phrase) throws Exception {
String encodedPhrase = URLEncoder.encode(phrase.replaceAll(" ", "+"), "utf-8");
//String link = "https://duckduckgo.com/?q="+encodedPhrase;
//String queryPage = internetAccessor.retrieveContentByLink(link);
String link = "https://duckduckgo.com/lite/";
Map<String, String> data = new HashMap<>();
data.put("q", phrase);
@ -77,4 +88,5 @@ public class DuckDuckGoSearchListener extends ImprovedListenerAdapter {
}
}
}

2
src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java
View File

@ -5,7 +5,6 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.pircbotx.hooks.events.MessageEvent;
import org.pircbotx.hooks.types.GenericMessageEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import ru.bvn13.jircbot.bot.ImprovedListenerAdapter;
@ -19,7 +18,6 @@ import ru.bvn13.jircbot.services.InternetAccessor;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.List;
import static ru.bvn13.jircbot.documentation.ListenerDescription.CommandDescription;