Strawpoll embedding, close #206

CHANGELOG.md

@@ -1,3 +1,6 @@
+**noface**:
+- Strawpoll.me embedding support (as usual, only works on HTTP 4chan due to lack of HTTPS)
+
 ### v1.2.42 
 *2013-10-22*
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.2.42 - 2013-10-22
+* 4chan X - Version 1.2.42 - 2013-11-10
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

builds/4chan-X.user.js

@@ -22,7 +22,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.2.42 - 2013-10-22
+* 4chan X - Version 1.2.42 - 2013-11-10
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@@ -4897,6 +4897,15 @@
           }
         }
       },
+      StrawPoll: {
+        regExp: /strawpoll\.me\/(?:embed_\d+\/)?(\d+)/,
+        style: 'border: 0; width: 600px; height: 406px;',
+        el: function(a) {
+          return $.el('iframe', {
+            src: "http://strawpoll.me/embed_1/" + a.dataset.uid
+          });
+        }
+      },
       TwitchTV: {
         regExp: /.*(?:twitch.tv\/)([^#\&\?]*).*/,
         style: "border: none; width: 640px; height: 360px;",

builds/crx/script.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* 4chan X - Version 1.2.42 - 2013-10-22
+* 4chan X - Version 1.2.42 - 2013-11-10
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@@ -4904,6 +4904,15 @@
           }
         }
       },
+      StrawPoll: {
+        regExp: /strawpoll\.me\/(?:embed_\d+\/)?(\d+)/,
+        style: 'border: 0; width: 600px; height: 406px;',
+        el: function(a) {
+          return $.el('iframe', {
+            src: "http://strawpoll.me/embed_1/" + a.dataset.uid
+          });
+        }
+      },
       TwitchTV: {
         regExp: /.*(?:twitch.tv\/)([^#\&\?]*).*/,
         style: "border: none; width: 640px; height: 360px;",

json/archives.json

@@ -1,101 +0,0 @@
-[{
-  "uid": 0,
-  "name": "Foolz",
-  "domain": "archive.foolz.us",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"],
-  "files": ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"]
-}, {
-  "uid": 1,
-  "name": "NSFW Foolz",
-  "domain": "nsfw.foolz.us",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["u"],
-  "files": ["u"]
-}, {
-  "uid": 2,
-  "name": "The Dark Cave",
-  "domain": "archive.thedarkcave.org",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["c", "int", "out", "po"],
-  "files": ["c", "po"]
-}, {
-  "uid": 3,
-  "name": "4plebs",
-  "domain": "archive.4plebs.org",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["hr", "tg", "tv", "x"],
-  "files": ["hr", "tg", "tv", "x"]
-}, {
-  "uid": 4,
-  "name": "Nyafuu",
-  "domain": "archive.nyafuu.org",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["c", "w", "wg"],
-  "files": ["c", "w", "wg"]
-}, {
-  "uid": 12,
-  "name": "FapArchive",
-  "domain": "fuuka.worldathleticproject.org",
-  "http": true,
-  "https": true,
-  "software": "foolfuuka",
-  "boards": ["adv", "b", "cm", "d", "e", "h", "hc", "lgbt", "pol", "r", "s", "s4s", "soc", "trv", "u", "y"],
-  "files": ["b", "cm", "d", "e", "h", "hc", "pol", "r", "s", "s4s", "soc", "u", "y"]
-}, {
-  "uid": 7,
-  "name": "Install Gentoo",
-  "domain": "archive.installgentoo.net",
-  "http": false,
-  "https": true,
-  "software": "fuuka",
-  "boards": ["diy", "g", "sci"],
-  "files": []
-}, {
-  "uid": 8,
-  "name": "Rebecca Black Tech",
-  "domain": "rbt.asia",
-  "http": true,
-  "https": true,
-  "software": "fuuka",
-  "boards": ["cgl", "g", "mu", "w"],
-  "files": ["cgl", "g", "mu", "w"]
-}, {
-  "uid": 9,
-  "name": "Heinessen",
-  "domain": "archive.heinessen.com",
-  "http": true,
-  "https": false,
-  "software": "fuuka",
-  "boards": ["an", "fit", "k", "mlp", "r9k", "toy"],
-  "files": ["an", "fit", "k", "r9k", "toy"]
-}, {
-  "uid": 10,
-  "name": "warosu",
-  "domain": "fuuka.warosu.org",
-  "http": true,
-  "https": true,
-  "software": "fuuka",
-  "boards": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"],
-  "files": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"]
-}, {
-  "uid": 13,
-  "name": "Foolz Beta",
-  "domain": "beta.foolz.us",
-  "http": true,
-  "https": true,
-  "withCredentials": true,
-  "software": "foolfuuka",
-  "boards": ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
-  "files": ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"]
-}]

src/Linkification/Linkify.coffee

@@ -346,6 +346,13 @@ Linkify =
         api: (uid) -> "//soundcloud.com/oembed?show_artwork=false&&maxwidth=500px&show_comments=false&format=json&url=https://www.soundcloud.com/#{uid}"
         text: (_) -> _.title
 
+    StrawPoll:
+      regExp: /strawpoll\.me\/(?:embed_\d+\/)?(\d+)/
+      style: 'border: 0; width: 600px; height: 406px;'
+      el: (a) ->
+        $.el 'iframe',
+          src: "http://strawpoll.me/embed_1/#{a.dataset.uid}"
+
     TwitchTV:
       regExp: /.*(?:twitch.tv\/)([^#\&\?]*).*/
       style: "border: none; width: 640px; height: 360px;"