From 149dcab1c32b2dac11d93d000ba82b2be9599e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?=
 <lorenz-dev@lgh-alumni.de>
Date: Tue, 25 Nov 2014 16:38:30 +0100
Subject: [PATCH] Fix links and embeds

Disable semi-broken plugins
---
 index.html           |  5 ++---
 js/filters.js        |  9 +++++++++
 js/plugins.js        | 12 ++++++++----
 test/unit/plugins.js |  6 ++++--
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index c48f44c..0e03aea 100644
--- a/index.html
+++ b/index.html
@@ -204,8 +204,7 @@
         </div>
 
         <div class="title" title="{{activeBuffer().rtitle}}">
-          <span class="desktop" ng-repeat="part in activeBuffer().title" ng-class="::part.classes" ng-bind-html="::(part.text | linky:'_blank' | DOMfilter:'irclinky')"></span>
-          <span class="mobile" ng-click="showModal('topicModal')" ng-class="{'active': activeBuffer().active, 'channel': activeBuffer().type === 'channel', 'channel_hash': activeBuffer().prefix === '#', 'channel_plus': activeBuffer().prefix === '+', 'channel_ampersand': activeBuffer().prefix === '&'}">{{ activeBuffer().trimmedName || activeBuffer().fullName }}</span>
+          <span ng-click="showModal('topicModal')" ng-class="{'active': activeBuffer().active, 'channel': activeBuffer().type === 'channel', 'channel_hash': activeBuffer().prefix === '#', 'channel_plus': activeBuffer().prefix === '+', 'channel_ampersand': activeBuffer().prefix === '&'}">{{ activeBuffer().trimmedName || activeBuffer().fullName }}</span>
         </div>
 
         <div class="actions pull-right vertical-line-left">
@@ -260,7 +259,7 @@
               <td class="prefix"><a ng-click="addMention(bufferline.prefix)"><span class="hidden-bracket">&lt;</span><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text|prefixlimit:25"></span><span class="hidden-bracket">&gt;</span></a></td><!--
            --><td class="message"><!--
              --><div ng-repeat="metadata in ::bufferline.metadata" plugin data="::metadata"></div><!--
-             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes.concat(['line-' + part.$$hashKey.replace(':','_')])" ng-bind-html="::part.text | linky:'_blank' | DOMfilter:'irclinky' | DOMfilter:'inlinecolour' | DOMfilter:'mathjax':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></span>
+             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes.concat(['line-' + part.$$hashKey.replace(':','_')])" ng-bind-html="::part.text | linky:'_system' | linksForCordova | DOMfilter:'irclinky' | DOMfilter:'inlinecolour' | DOMfilter:'mathjax':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></span>
               </td>
             </tr>
             <tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
diff --git a/js/filters.js b/js/filters.js
index a8aa334..ee2e321 100644
--- a/js/filters.js
+++ b/js/filters.js
@@ -135,6 +135,15 @@ weechat.filter('DOMfilter', ['$filter', '$sce', function($filter, $sce) {
     };
 }]);
 
+weechat.filter('linksForCordova', ['$sce', function($sce) {
+    return function (text) {
+        // Cordova: need to use window.open instead of href
+        // XXX TODO this needs to be improved
+        text = text.replace(/<a (?:target="_[a-z]+"\s)?href="([^"]+)"/gi, "<a onClick=\"window.open('$1', '_system')\"");
+        return $sce.trustAsHtml(text);
+    };
+}]);
+
 weechat.filter('getBufferQuickKeys', function () {
     return function (obj, $scope) {
         if (!$scope) { return obj; }
diff --git a/js/plugins.js b/js/plugins.js
index 7ba506d..e2be396 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -278,8 +278,8 @@ plugins.factory('userPlugins', function() {
             if (url.indexOf("^https?://fukung.net/v/") != -1) {
                 url = url.replace(/.*\//, "http://media.fukung.net/imgs/");
             } else if (url.match(/^http:\/\/(i\.)?imgur\.com\//i)) {
-                // remove protocol specification to load over https if used by g-b
-                url = url.replace(/http:/, "");
+                // always load imgur over https
+                url = url.replace(/http:/, "https://");
             } else if (url.match(/^https:\/\/www\.dropbox\.com\/s\/[a-z0-9]+\//i)) {
                 // Dropbox requires a get parameter, dl=1
                 var dbox_url = document.createElement("a");
@@ -351,7 +351,7 @@ plugins.factory('userPlugins', function() {
             };
         }
     });
-    
+
 
     /*
      * Cloud Music Embedded Players
@@ -433,6 +433,7 @@ plugins.factory('userPlugins', function() {
         }
     });
 
+/*
     // Embed GitHub gists
     var gistPlugin = new UrlPlugin('Gist', function(url) {
         var regexp = /^https:\/\/gist\.github.com\/[^.?]+/i;
@@ -454,6 +455,7 @@ plugins.factory('userPlugins', function() {
             };
         }
     });
+*/
 
  /* match giphy links and display the assocaited gif images
   * sample input:  http://giphy.com/gifs/eyes-shocked-bird-feqkVgjJpYtjy
@@ -478,6 +480,7 @@ plugins.factory('userPlugins', function() {
         }
     });
 
+    /*
     var tweetPlugin = new UrlPlugin('Tweet', function(url) {
         var regexp = /^https?:\/\/twitter\.com\/(?:#!\/)?(\w+)\/status(?:es)?\/(\d+)/i;
         var match = url.match(regexp);
@@ -502,6 +505,7 @@ plugins.factory('userPlugins', function() {
             };
         }
     });
+    */
 
     /*
      * Vine plugin
@@ -522,7 +526,7 @@ plugins.factory('userPlugins', function() {
     });
 
     return {
-        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, giphyPlugin, tweetPlugin, vinePlugin]
+        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, giphyPlugin, vinePlugin]
     };
 
 
diff --git a/test/unit/plugins.js b/test/unit/plugins.js
index 34be685..e2f779b 100644
--- a/test/unit/plugins.js
+++ b/test/unit/plugins.js
@@ -130,6 +130,7 @@ describe('filter', function() {
             plugins);
         }));
 
+/*
         it('should recognize gists', inject(function(plugins) {
             expectTheseMessagesToContain([
                 'https://gist.github.com/lorenzhs/e8c1a7d56fa170320eb8',
@@ -138,7 +139,7 @@ describe('filter', function() {
             'Gist',
             plugins);
         }));
-
+*/
         it('should recognize giphy gifs', inject(function(plugins) {
             expectTheseMessagesToContain([
                 'https://giphy.com/gifs/eyes-shocked-bird-feqkVgjJpYtjy/',
@@ -147,7 +148,7 @@ describe('filter', function() {
             'Giphy',
             plugins);
         }));
-
+/*
         it('should recognize tweets', inject(function(plugins) {
             expectTheseMessagesToContain([
                 'https://twitter.com/DFB_Team_EN/statuses/488436782959448065',
@@ -155,6 +156,7 @@ describe('filter', function() {
             'Tweet',
             plugins);
         }));
+*/
 
         it('should recognize vines', inject(function(plugins) {
             expectTheseMessagesToContain([