From ec221af52e00135c3cabaad5a32bdf9c48b1f23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Tue, 1 Nov 2016 11:08:40 +0100 Subject: [PATCH 1/2] Plugins: don't show plugin repeatedly for same URL in same message Fixes #636 --- js/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/plugins.js b/js/plugins.js index c7db496..d5cf249 100644 --- a/js/plugins.js +++ b/js/plugins.js @@ -33,7 +33,7 @@ var urlRegexp = /(?:(?:https?|ftp):\/\/|www\.|ftp\.)\S*[^\s.;,(){}<>]/g; var UrlPlugin = function(name, urlCallback) { return { contentForMessage: function(message) { - var urls = message.match(urlRegexp); + var urls = _.uniq(message.match(urlRegexp)); var content = []; for (var i = 0; urls && i < urls.length; i++) { From e1bdea4bdc1c24f73b2cddc20d1211777e2a26a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Wed, 2 Nov 2016 22:41:04 +0100 Subject: [PATCH 2/2] Tests: include underscore (needed now) --- test/karma.conf.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/karma.conf.js b/test/karma.conf.js index 8bafa0c..43c86e7 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -9,6 +9,7 @@ module.exports = function(config){ 'bower_components/angular-mocks/angular-mocks.js', 'bower_components/angular-sanitize/angular-sanitize.js', 'bower_components/angular-touch/angular-touch.js', + 'bower_components/underscore/underscore.js', 'js/localstorage.js', 'js/weechat.js', 'js/irc-utils.js',