From ebcef891acbe52b5f1b33d0f9aafd05e7a969ff9 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           |  7 +++----
 js/filters.js        |  9 +++++++++
 js/plugins.js        | 12 ++++++++----
 test/unit/plugins.js |  4 ++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/index.html b/index.html
index 9314a56..3ef1f5a 100644
--- a/index.html
+++ b/index.html
@@ -222,8 +222,7 @@ chown -R <strong>username</strong>:<strong>username</strong> ~<strong>username</
         </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':{rel:'noopener noreferrer'} | 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">
@@ -288,7 +287,7 @@ chown -R <strong>username</strong>:<strong>username</strong> ~<strong>username</
               <td class="prefix"><span ng-class="::{'repeated-prefix': bufferline.prefixtext==bufferlines[$index-1].prefixtext}"><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></span></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':{rel:'noopener noreferrer'} | DOMfilter:'irclinky' | DOMfilter:'inlinecolour' | DOMfilter:'latexmath':('.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':{rel:'noopener noreferrer'} | linksForCordova | DOMfilter:'irclinky' | DOMfilter:'inlinecolour' | DOMfilter:'latexmath':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></span>
               </td>
             </tr>
             <tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
@@ -452,7 +451,7 @@ chown -R <strong>username</strong>:<strong>username</strong> ~<strong>username</
           <div class="modal-header">
             <button type="button" class="close" ng-click="closeModal($event)" aria-hidden="true">&times;</button>
             <h4 class="modal-title">Channel topic</h4>
-            <p ng-repeat="part in activeBuffer().title" ng-class="::part.classes" ng-bind-html="::(part.text | linky:'_blank':{rel:'noopener noreferrer'} | DOMfilter:'irclinky')"></p>
+            <p ng-repeat="part in activeBuffer().title" ng-class="::part.classes" ng-bind-html="::(part.text | linky:'_system':{rel:'noopener noreferrer'} | linksForCordova | DOMfilter:'irclinky')"></p>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-primary" ng-click="closeModal($event)">Close</button>
diff --git a/js/filters.js b/js/filters.js
index 93ab9ef..1e28196 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 (rel="[a-z ]+"\s)?(?:target="_[a-z]+"\s)?href="([^"]+)"/gi, "<a $1 onClick=\"window.open('$2', '_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 b7e7c4f..ef7e54c 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -281,8 +281,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");
@@ -354,7 +354,7 @@ plugins.factory('userPlugins', function() {
             };
         }
     });
-    
+
 
     /*
      * Cloud Music Embedded Players
@@ -436,6 +436,7 @@ plugins.factory('userPlugins', function() {
         }
     });
 
+/*
     // Embed GitHub gists
     var gistPlugin = new UrlPlugin('Gist', function(url) {
         // ignore trailing slashes and anchors
@@ -458,6 +459,7 @@ plugins.factory('userPlugins', function() {
             };
         }
     });
+*/
 
     var pastebinPlugin = new UrlPlugin('Pastebin', function(url) {
         var regexp = /^https?:\/\/pastebin\.com\/([^.?]+)/i;
@@ -496,6 +498,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);
@@ -520,6 +523,7 @@ plugins.factory('userPlugins', function() {
             };
         }
     });
+    */
 
     /*
      * Vine plugin
@@ -540,7 +544,7 @@ plugins.factory('userPlugins', function() {
     });
 
     return {
-        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, pastebinPlugin, giphyPlugin, tweetPlugin, vinePlugin]
+        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, pastebinPlugin, giphyPlugin, vinePlugin]
     };
 
 
diff --git a/test/unit/plugins.js b/test/unit/plugins.js
index c723a7e..21ff34b 100644
--- a/test/unit/plugins.js
+++ b/test/unit/plugins.js
@@ -134,6 +134,7 @@ describe('filter', function() {
             plugins);
         }));
 
+/*
         it('should recognize gists', inject(function(plugins) {
             expectTheseMessagesToContain([
                 'https://gist.github.com/lorenzhs/e8c1a7d56fa170320eb8',
@@ -142,6 +143,7 @@ describe('filter', function() {
             'Gist',
             plugins);
         }));
+*/
 
         it('should recognize pastebins', inject(function(plugins) {
             expectTheseMessagesToContain([
@@ -160,6 +162,7 @@ describe('filter', function() {
             plugins);
         }));
 
+/*
         it('should recognize tweets', inject(function(plugins) {
             expectTheseMessagesToContain([
                 'https://twitter.com/DFB_Team_EN/statuses/488436782959448065',
@@ -167,6 +170,7 @@ describe('filter', function() {
             'Tweet',
             plugins);
         }));
+*/
 
         it('should recognize vines', inject(function(plugins) {
             expectTheseMessagesToContain([