Resolve inline urls

ubuntu-si · Sep 20, 2017 · 2412e4f · 2412e4f
1 parent c8985c4
commit 2412e4f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- '6'
+- '8'
 dist: trusty
 sudo: false
 deploy:

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "start": "./node_modules/.bin/coffee bot.coffee"
   },
   "engines": {
-    "node": "6.9.4"
+    "node": "8.5.0"
   },
   "repository": "",
   "private": false,

diff --git a/scripts/url.coffee b/scripts/url.coffee
@@ -1,11 +1,10 @@
 module.exports = (bot) ->
 
-  is_url = /(?:^https?:\/\/|^(www\.?)).+/
+  is_url = /(https?[\w:\/\.;&\?_\-\#]+)/g;
 
   resolve = (url, cb)->
     if is_url.test url
-      if url.substring(0,3) == "www"
-        url = "http://" + url
+      url = url.match(is_url)[0]
       bot.fetchHTML url, ($)->
         if $
           stack = []

diff --git a/test/url.coffee b/test/url.coffee
@@ -14,7 +14,7 @@ describe 'url.coffee', ->
     done()
 
   it 'test .nalozi veljaven url', (done)->
-    bot.test ".nalozi http://www.ubuntu.si/", (msg)->
+    bot.test ".nalozi https://www.google.si/", (msg)->
       expect(msg).to.be.a('string')
       expect(msg.length).to.be.at.least 2
-      done()
+      done()
diff --git a/test/vreme.coffee b/test/vreme.coffee
@@ -28,7 +28,7 @@ describe 'vreme.coffee', ->
   it 'test .vreme lj', (done)->
     bot.test ".vreme lj", (msg)->
       expect(msg).to.be.a('string')
-      expect(msg.length).to.be.at.least 20
+      expect(msg.length).to.be.at.least 16
       done()
 
   it 'test .vreme katarina pri ljubljani (oblacnost ter vremenski pojav pa brez vetra)', (done)->
@@ -39,7 +39,7 @@ describe 'vreme.coffee', ->
   it 'test .vreme new york', (done)->
     bot.test ".vreme new york", (msg)->
       expect(msg).to.be.a('string')
-      expect(msg.length).to.be.at.least 20
+      expect(msg.length).to.be.at.least 16
       done()
 
   it 'test .radar', (done)->