diff --git a/modules/ddg/DDGSearch.py b/modules/ddg/DDGSearch.py index 1ff3358..7f96742 100644 --- a/modules/ddg/DDGSearch.py +++ b/modules/ddg/DDGSearch.py @@ -62,7 +62,10 @@ class DDGSearch: @property def abstract(self): try: - return self.ddgres.getNode("Abstract").getContent() + " <" + self.ddgres.getNode("AbstractURL").getContent() + ">" + if self.ddgres.getNode("Abstract").getContent() != "": + return self.ddgres.getNode("Abstract").getContent() + " <" + self.ddgres.getNode("AbstractURL").getContent() + ">" + else: + return None except: return None diff --git a/modules/ddg/__init__.py b/modules/ddg/__init__.py index ad00b4c..4b4b256 100644 --- a/modules/ddg/__init__.py +++ b/modules/ddg/__init__.py @@ -102,7 +102,7 @@ def wiki(msg): else: lang = "en" - s = Wikipedia.Wikipedia(msg.cmd[1], lang) + s = Wikipedia.Wikipedia(' '.join(msg.cmd[1:]), lang) res = Response(msg.sender, channel=msg.channel, nomore="No more results") for result in s.nextRes: