From f6930d0950a8d868076c34c633fac180543f77f2 Mon Sep 17 00:00:00 2001
From: Kan Fushihara <kan.fushihara@gmail.com>
Date: Wed, 15 Jul 2015 23:36:22 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=B9=E5=AE=9A=E3=81=AE=E3=82=B5?=
 =?UTF-8?q?=E3=83=BC=E3=83=93=E3=82=B9=E3=81=AEURL=E3=81=AF=E5=B1=95?=
 =?UTF-8?q?=E9=96=8B=E3=81=97=E3=81=A6=E5=9F=8B=E3=82=81=E8=BE=BC=E3=82=80?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/jquery.auto-link.js | 38 ++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/assets/js/jquery.auto-link.js b/assets/js/jquery.auto-link.js
index baf9d49..5adace9 100644
--- a/assets/js/jquery.auto-link.js
+++ b/assets/js/jquery.auto-link.js
@@ -7,9 +7,28 @@
  */
 
 $(function(){
+	// load twitter widget
+	window.twttr = (function(d, s, id) {
+		var js, fjs = d.getElementsByTagName(s)[0],
+			t = window.twttr || {};
+		if (d.getElementById(id)) return t;
+		js = d.createElement(s);
+		js.id = id;
+		js.src = "https://platform.twitter.com/widgets.js";
+		fjs.parentNode.insertBefore(js, fjs);
+
+		t._e = [];
+		t.ready = function(f) {
+			t._e.push(f);
+		};
+
+		return t;
+	}(document, "script", "twitter-wjs"));
+
 	$.fn.autoLink = function(config){
 		this.each(function(){
 			var re = /((https?|ftp):\/\/[\(\)%#!\/0-9a-zA-Z_$@.&+-,'"*=;?:~-]+|^#[^#\s]+|\s#[^#\s]+)/g;
+			var embed = "";
 			$(this).html(
 				$(this).html().replace(re, function(u){
 					try {
@@ -20,12 +39,29 @@ $(function(){
 							return prefix + '<a href="/search?q='+encodeURIComponent(tag)+'">'+tag+'</a>';
 						} else {
 							var url = $.url(u);
+							if (u.match(/https?:\/\/twitter\.com\/.+\/status\/(\d+)$/)) {
+								// embed tweet
+								var tweet_id = RegExp.$1;
+								embed += '<div id="tw' + tweet_id + '"></div>';
+								twttr.ready(function() {
+									twttr.widgets.createTweet(tweet_id, $('#tw'+tweet_id).get(0),{cards:'hidden'});
+								});
+							}
+							else if (u.match(/https?:\/\/www\.youtube\.com\/watch\?v=([0-9a-zA-Z_]+)/)) {
+								embed += '<iframe id="ytplayer" type="text/html" src="//www.youtube.com/embed/' +
+										RegExp.$1 + '" frameborder="0" />';
+							}
+							else if (u.match(/https?:\/\/www\.nicovideo\.jp\/watch\/([0-9a-z]+)/)) {
+								embed += '<iframe width="312" height="176" src="http://ext.nicovideo.jp/thumb/' + RegExp.$1 +
+										 '" scrolling="no" style="border:solid 1px #CCC;" frameborder="0">';
+							}
+
 							return '[<a href="'+u+'" target="_blank">'+url.attr('host')+'</a>]';
 						}
 					}catch(e){
 						return u;
 					}
-				})
+				}) + embed
 			);
 		});
 		return this;

From e0f56510b70ec522a223fd8dafd7160492e48c43 Mon Sep 17 00:00:00 2001
From: Kan Fushihara <kan.fushihara@gmail.com>
Date: Thu, 16 Jul 2015 17:49:48 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9F=8B=E3=82=81=E8=BE=BC=E3=81=BF?=
 =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E5=AF=BE=E5=BF=9C=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ニコ動の埋め込みはHTTPS非対応のため見送り
- URLのみ投稿した場合にレイアウトが崩れるので、Youtubeのiframeをdivで囲った
---
 assets/js/jquery.auto-link.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/assets/js/jquery.auto-link.js b/assets/js/jquery.auto-link.js
index 5adace9..d00b40d 100644
--- a/assets/js/jquery.auto-link.js
+++ b/assets/js/jquery.auto-link.js
@@ -48,12 +48,8 @@ $(function(){
 								});
 							}
 							else if (u.match(/https?:\/\/www\.youtube\.com\/watch\?v=([0-9a-zA-Z_]+)/)) {
-								embed += '<iframe id="ytplayer" type="text/html" src="//www.youtube.com/embed/' +
-										RegExp.$1 + '" frameborder="0" />';
-							}
-							else if (u.match(/https?:\/\/www\.nicovideo\.jp\/watch\/([0-9a-z]+)/)) {
-								embed += '<iframe width="312" height="176" src="http://ext.nicovideo.jp/thumb/' + RegExp.$1 +
-										 '" scrolling="no" style="border:solid 1px #CCC;" frameborder="0">';
+								embed += '<div><iframe id="ytplayer" type="text/html" src="//www.youtube.com/embed/' +
+										RegExp.$1 + '" frameborder="0" /></div>';
 							}
 
 							return '[<a href="'+u+'" target="_blank">'+url.attr('host')+'</a>]';