Browse Source

Use my-name-is-url regex for urls

master
Luke Childs 9 years ago
parent
commit
66d40fe4b9
  1. 4
      package.json
  2. 3
      src/parser.js

4
package.json

@ -3,7 +3,9 @@
"version": "0.0.0", "version": "0.0.0",
"description": "Social text parser", "description": "Social text parser",
"main": "dist/athash.js", "main": "dist/athash.js",
"dependencies": {}, "dependencies": {
"my-name-is-url": "^1.3.1"
},
"devDependencies": { "devDependencies": {
"babel-cli": "^6.7.5", "babel-cli": "^6.7.5",
"babel-plugin-add-module-exports": "^0.1.2", "babel-plugin-add-module-exports": "^0.1.2",

3
src/parser.js

@ -1,4 +1,5 @@
import defaultFilters from './filters'; import defaultFilters from './filters';
import { regex as urlRegex } from 'my-name-is-url';
export default class Parser { export default class Parser {
@ -12,7 +13,7 @@ export default class Parser {
regex: /\B@\w*[a-zA-Z]+\w*/g regex: /\B@\w*[a-zA-Z]+\w*/g
}, },
urls: { urls: {
regex: /https?:\/\/[^\s,]*[^\s,.]/g, regex: urlRegex,
filter: url => `<a target="_blank" href="${url}">${url}</a>` filter: url => `<a target="_blank" href="${url}">${url}</a>`
} }
}; };

Loading…
Cancel
Save