From 294a3e0ece938cfca951fc556deb8f32398bbf5f Mon Sep 17 00:00:00 2001
From: bvn13 <mail4bvn@gmail.com>
Date: Sun, 10 Mar 2019 17:02:48 +0300
Subject: [PATCH] implemented command description for DuckDuckGo search

---
 .../documentation/DocumentationProvider.java  |  2 --
 .../listeners/DuckDuckGoSearchListener.java   | 28 +++++++++++++------
 .../listeners/GoogleSearchListener.java       |  2 --
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/main/java/ru/bvn13/jircbot/documentation/DocumentationProvider.java b/src/main/java/ru/bvn13/jircbot/documentation/DocumentationProvider.java
index bccf681..5f0e694 100644
--- a/src/main/java/ru/bvn13/jircbot/documentation/DocumentationProvider.java
+++ b/src/main/java/ru/bvn13/jircbot/documentation/DocumentationProvider.java
@@ -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.
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/DuckDuckGoSearchListener.java b/src/main/java/ru/bvn13/jircbot/listeners/DuckDuckGoSearchListener.java
index bd20d5c..5f8b486 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/DuckDuckGoSearchListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/DuckDuckGoSearchListener.java
@@ -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 {
         }
 
     }
+
 }
diff --git a/src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java b/src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java
index 2204372..4984d92 100644
--- a/src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java
+++ b/src/main/java/ru/bvn13/jircbot/listeners/GoogleSearchListener.java
@@ -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;