diff --git a/LICENSE b/LICENSE index 7b1fa0732..de2df6645 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.3.6 - 2014-02-13 +* 4chan X - Version 1.3.6 - 2014-02-15 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 783b60d30..1ddbe171c 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -23,7 +23,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.3.6 - 2014-02-13 +* 4chan X - Version 1.3.6 - 2014-02-15 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE @@ -8095,6 +8095,14 @@ }); } }, + Twitter: { + regExp: /.*twitter.com\/(.+\/status\/\d+)/, + el: function(a) { + return $.el('iframe', { + src: "https://twitframe.com/show?url=https://twitter.com/" + a.dataset.uid + }); + } + }, LiveLeak: { regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/, el: function(a) { @@ -9944,8 +9952,8 @@ }, archives: { "Foolz": { - boards: ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"], - files: ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"], + boards: ["a", "biz", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"], + files: ["a", "biz", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"], data: { domain: "archive.foolz.us", http: false, diff --git a/builds/crx/script.js b/builds/crx/script.js index 6cae9b44c..e0d3f8510 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.3.6 - 2014-02-13 +* 4chan X - Version 1.3.6 - 2014-02-15 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE @@ -8076,6 +8076,14 @@ }); } }, + Twitter: { + regExp: /.*twitter.com\/(.+\/status\/\d+)/, + el: function(a) { + return $.el('iframe', { + src: "https://twitframe.com/show?url=https://twitter.com/" + a.dataset.uid + }); + } + }, LiveLeak: { regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/, el: function(a) { @@ -9931,8 +9939,8 @@ }, archives: { "Foolz": { - boards: ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"], - files: ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"], + boards: ["a", "biz", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"], + files: ["a", "biz", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"], data: { domain: "archive.foolz.us", http: false, diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee index f156d0a12..8b159b2f8 100755 --- a/src/Linkification/Linkify.coffee +++ b/src/Linkification/Linkify.coffee @@ -284,6 +284,12 @@ Linkify = el: (a) -> $.el 'iframe', src: "http://paste.installgentoo.com/view/embed/#{a.dataset.uid}" + + Twitter: + regExp: /.*twitter.com\/(.+\/status\/\d+)/ + el: (a) -> + $.el 'iframe', + src: "https://twitframe.com/show?url=https://twitter.com/#{a.dataset.uid}" LiveLeak: regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/