Update route regex

kokororin · Dec 8, 2016 · 20f53f8 · 20f53f8
1 parent a50fca6
commit 20f53f8
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/dist/404.html b/dist/404.html
@@ -1 +1 @@
-<!doctype html><html lang="ja"><head><meta charset="utf-8"><title>pixivの「ラブライブ」発見</title><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="google-site-verification" content="aHrpJZ8M_WPQb07omJ2bwC2fg2DQMgFFEovu9wsSD0E"><link rel="dns-prefetch" href="//www.pixiv.net"><link rel="shortcut icon" type="image/x-icon" href="/favicon.ico?version=0.8.7"><style>.message{text-align:center;padding:20px 0;color:#999}.message p{font-size:15px}</style></head><body><!--[if lte IE 8]><div class="message"><p>古いInternet Explorerにサ終了！</p><script type="text/javascript">!function(){try{document.getElementById("app").innerHTML="";var t=window.location.hash.replace("#/","");!isNaN(parseFloat(t))&&isFinite(t)&&(document.write("<p>あなたはpixiv.netへリダイレクトしています</p>"),setTimeout(function(){window.location.href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+t},1500))}catch(t){document.write("<p>申し訳ございません</p>")}}()</script></div><![endif]--><noscript><div class="message"><p>Javascriptが無効になっていると、サイト内の一部機能がご利用いただけません</p></div></noscript><div id="app"><div class="message"><p>あなただけが存在しませんああルート...悲しみを打ちます。</p></div></div><script type="text/javascript">!function(){var i=window.location.pathname.match(/\/([0-9]{0,}$)/);i&&i[1]&&(document.getElementById("app").innerHTML='<div class="message"><p>あなたはpixiv.netへリダイレクトしています</p></div>',setTimeout(function(){window.location.href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+i[1]},1500))}()</script><script>!function(e,a,t,n,c,o,s){e.GoogleAnalyticsObject=c,e[c]=e[c]||function(){(e[c].q=e[c].q||[]).push(arguments)},e[c].l=1*new Date,o=a.createElement(t),s=a.getElementsByTagName(t)[0],o.async=1,o.src=n,s.parentNode.insertBefore(o,s)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create","UA-70944432-2","auto"),ga("send","pageview")</script></body></html>
+<!doctype html><html lang="ja"><head><meta charset="utf-8"><title>pixivの「ラブライブ」発見</title><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="google-site-verification" content="aHrpJZ8M_WPQb07omJ2bwC2fg2DQMgFFEovu9wsSD0E"><link rel="dns-prefetch" href="//www.pixiv.net"><link rel="shortcut icon" type="image/x-icon" href="/favicon.ico?version=0.8.7"><style>.message{text-align:center;padding:20px 0;color:#999}.message p{font-size:15px}</style></head><body><!--[if lte IE 8]><div class="message"><p>古いInternet Explorerにサ終了！</p><script type="text/javascript">!function(){try{document.getElementById("app").innerHTML="";var t=window.location.hash.replace("#/","");!isNaN(parseFloat(t))&&isFinite(t)&&(document.write("<p>あなたはpixiv.netへリダイレクトしています</p>"),setTimeout(function(){window.location.href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+t},1500))}catch(t){document.write("<p>申し訳ございません</p>")}}()</script></div><![endif]--><noscript><div class="message"><p>Javascriptが無効になっていると、サイト内の一部機能がご利用いただけません</p></div></noscript><div id="app"><div class="message"><p>あなただけが存在しませんああルート...悲しみを打ちます。</p></div></div><script type="text/javascript">!function(){var i=window.location.pathname.match(/^\/([0-9]{0,}$)/);i&&i[1]&&(document.getElementById("app").innerHTML='<div class="message"><p>あなたはpixiv.netへリダイレクトしています</p></div>',setTimeout(function(){window.location.href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+i[1]},1500))}()</script><script>!function(e,a,t,n,c,o,s){e.GoogleAnalyticsObject=c,e[c]=e[c]||function(){(e[c].q=e[c].q||[]).push(arguments)},e[c].l=1*new Date,o=a.createElement(t),s=a.getElementsByTagName(t)[0],o.async=1,o.src=n,s.parentNode.insertBefore(o,s)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create","UA-70944432-2","auto"),ga("send","pageview")</script><script type="text/javascript">var _paq=_paq||[];_paq.push(["setDomains",["*.pixiv.moe"]]),_paq.push(["trackPageView"]),_paq.push(["enableLinkTracking"]),function(){var e="//analytics.kotori.love/";_paq.push(["setTrackerUrl",e+"piwik.php"]),_paq.push(["setSiteId","1"]);var a=document,p=a.createElement("script"),t=a.getElementsByTagName("script")[0];p.type="text/javascript",p.async=!0,p.defer=!0,p.src=e+"piwik.js",t.parentNode.insertBefore(p,t)}()</script><noscript><p><img src="//analytics.kotori.love/piwik.php?idsite=1" style="border:0" alt=""></p></noscript></body></html>
diff --git a/dist/assets/bundle.js b/dist/assets/bundle.js
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!doctype html><html lang="ja"><head><meta charset="utf-8"><title>pixivの「ラブライブ」発見</title><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="pixiv.moe - pixivの「ラブライブ」発見 - pixiv写真の壁"><meta name="keywords" content="pixiv,pixiv写真の壁,pixiv lovelive,lovelive,ラブライブ,μ's,Aqours,高坂穂乃果,絢瀬絵里,南ことり,園田海未,星空凛,西木野真姫,東條希,小泉花陽,矢澤にこ,綺羅ツバサ,統堂英玲奈,優木あんじゅ,高海千歌,桜内梨子,松浦果南,黒澤ダイヤ,渡辺曜,津島善子,国木田花丸,小原鞠莉,黒澤ルビィ"><meta name="google-site-verification" content="aHrpJZ8M_WPQb07omJ2bwC2fg2DQMgFFEovu9wsSD0E"><link rel="dns-prefetch" href="//api.pixiv.moe"><link rel="dns-prefetch" href="//cdn.pixiv.moe"><link rel="dns-prefetch" href="//i1.pixiv.net"><link rel="dns-prefetch" href="//i2.pixiv.net"><link rel="dns-prefetch" href="//i3.pixiv.net"><link rel="dns-prefetch" href="//i4.pixiv.net"><link rel="dns-prefetch" href="//www.pixiv.net"><link rel="shortcut icon" type="image/x-icon" href="/favicon.ico?version=0.8.7"><style>.message{text-align:center;padding:20px 0;color:#999}.message p{font-size:15px}</style><style>#index-loading{position:absolute;width:300px;height:100px;top:0;right:0;bottom:0;left:0;margin:auto}#index-loading p{font-size:30px!important;margin:0!important;line-height:0!important}</style></head><body><!--[if lte IE 8]><div class="message"><p>古いInternet Explorerにサ終了！</p><script type="text/javascript">!function(){try{document.getElementById("app").innerHTML="";var t=window.location.hash.replace("#/","");!isNaN(parseFloat(t))&&isFinite(t)&&(document.write("<p>あなたはpixiv.netへリダイレクトしています</p>"),setTimeout(function(){window.location.href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+t},1500))}catch(t){document.write("<p>申し訳ございません</p>")}}()</script></div><![endif]--><noscript><div class="message"><p>Javascriptが無効になっていると、サイト内の一部機能がご利用いただけません</p></div></noscript><div id="app"><div id="index-loading" class="message"><p>(・ω・)充填中<span id="wait"></span></p></div></div><script type="text/javascript">!function(){var n=setInterval(function(){var e=document.getElementById("index-loading");if(null!=e){var t=document.getElementById("wait");t.innerHTML.length>3?t.innerHTML="":t.innerHTML+="."}else clearInterval(n)},400)}()</script><script type="text/javascript">!function(e,t,n,d,a){var i=function(e){var t=d.createElement("script");t.setAttribute("src",e),d.body.appendChild(t)},c=function(e){if(a.execScript)a.execScript(e);else{var t=d.head,n=d.createElement("script");n.type="text/javascript",n.text=e,t.removeChild(t.appendChild(n))}};if(n)if(n.bundle&&n.hash==e)c(n.bundle);else{var s=new XMLHttpRequest;s.open("GET",t,!0),s.onload=function(){var d=s.responseText;d&&d.match(/^!function/)?(n.bundle=d,c(n.bundle),n.hash=e):i(t)},s.send()}else i(t)}("e173ed5bd518407e6e24","/assets/bundle.js?e173ed5bd518407e6e24",window.localStorage,document,window)</script></body></html>
+<!doctype html><html lang="ja"><head><meta charset="utf-8"><title>pixivの「ラブライブ」発見</title><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content="pixiv.moe - pixivの「ラブライブ」発見 - pixiv写真の壁"><meta name="keywords" content="pixiv,pixiv写真の壁,pixiv lovelive,lovelive,ラブライブ,μ's,Aqours,高坂穂乃果,絢瀬絵里,南ことり,園田海未,星空凛,西木野真姫,東條希,小泉花陽,矢澤にこ,綺羅ツバサ,統堂英玲奈,優木あんじゅ,高海千歌,桜内梨子,松浦果南,黒澤ダイヤ,渡辺曜,津島善子,国木田花丸,小原鞠莉,黒澤ルビィ"><meta name="google-site-verification" content="aHrpJZ8M_WPQb07omJ2bwC2fg2DQMgFFEovu9wsSD0E"><link rel="dns-prefetch" href="//api.pixiv.moe"><link rel="dns-prefetch" href="//cdn.pixiv.moe"><link rel="dns-prefetch" href="//i1.pixiv.net"><link rel="dns-prefetch" href="//i2.pixiv.net"><link rel="dns-prefetch" href="//i3.pixiv.net"><link rel="dns-prefetch" href="//i4.pixiv.net"><link rel="dns-prefetch" href="//www.pixiv.net"><link rel="shortcut icon" type="image/x-icon" href="/favicon.ico?version=0.8.7"><style>.message{text-align:center;padding:20px 0;color:#999}.message p{font-size:15px}</style><style>#index-loading{position:absolute;width:300px;height:100px;top:0;right:0;bottom:0;left:0;margin:auto}#index-loading p{font-size:30px!important;margin:0!important;line-height:0!important}</style></head><body><!--[if lte IE 8]><div class="message"><p>古いInternet Explorerにサ終了！</p><script type="text/javascript">!function(){try{document.getElementById("app").innerHTML="";var t=window.location.hash.replace("#/","");!isNaN(parseFloat(t))&&isFinite(t)&&(document.write("<p>あなたはpixiv.netへリダイレクトしています</p>"),setTimeout(function(){window.location.href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id="+t},1500))}catch(t){document.write("<p>申し訳ございません</p>")}}()</script></div><![endif]--><noscript><div class="message"><p>Javascriptが無効になっていると、サイト内の一部機能がご利用いただけません</p></div></noscript><div id="app"><div id="index-loading" class="message"><p>(・ω・)充填中<span id="wait"></span></p></div></div><script type="text/javascript">!function(){var n=setInterval(function(){var e=document.getElementById("index-loading");if(null!=e){var t=document.getElementById("wait");t.innerHTML.length>3?t.innerHTML="":t.innerHTML+="."}else clearInterval(n)},400)}()</script><script type="text/javascript">!function(e,t,a,n,c){var i=function(e){var t=n.createElement("script");t.setAttribute("src",e),n.body.appendChild(t)},s=function(e){if(c.execScript)c.execScript(e);else{var t=n.head,a=n.createElement("script");a.type="text/javascript",a.text=e,t.removeChild(t.appendChild(a))}};if(a)if(a.bundle&&a.hash==e)s(a.bundle);else{var d=new XMLHttpRequest;d.open("GET",t,!0),d.onload=function(){var n=d.responseText;n&&n.match(/^!function/)?(a.bundle=n,s(a.bundle),a.hash=e):i(t)},d.send()}else i(t)}("ff8acb261981aecfafa1","/assets/bundle.js?ff8acb261981aecfafa1",window.localStorage,document,window)</script></body></html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pixiv.moe",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "Source code of https://pixiv.moe",
   "main": "server.js",
   "scripts": {

diff --git a/src/404.html b/src/404.html
@@ -55,7 +55,7 @@
   </div>
   <script type="text/javascript">
   (function() {
-    var matches = window.location.pathname.match(/\/([0-9]{0,}$)/);
+    var matches = window.location.pathname.match(/^\/([0-9]{0,}$)/);
     if (matches && matches[1]) {
       document.getElementById('app').innerHTML = '<div class="message"><p>あなたはpixiv.netへリダイレクトしています</p></div>';
       setTimeout(function() {
@@ -79,6 +79,30 @@
   ga('create', 'UA-70944432-2', 'auto');
   ga('send', 'pageview');
   </script>
+  <!-- Piwik -->
+  <script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(["setDomains", ["*.pixiv.moe"]]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u = "//analytics.kotori.love/";
+    _paq.push(['setTrackerUrl', u + 'piwik.php']);
+    _paq.push(['setSiteId', '1']);
+    var d = document,
+      g = d.createElement('script'),
+      s = d.getElementsByTagName('script')[0];
+    g.type = 'text/javascript';
+    g.async = true;
+    g.defer = true;
+    g.src = u + 'piwik.js';
+    s.parentNode.insertBefore(g, s);
+  })();
+  </script>
+  <noscript>
+    <p><img src="//analytics.kotori.love/piwik.php?idsite=1" style="border:0;" alt="" /></p>
+  </noscript>
+  <!-- End Piwik Code -->
 </body>
 
 </html>
diff --git a/src/containers/AppContainer.js b/src/containers/AppContainer.js
@@ -54,10 +54,10 @@ export default class AppContainer extends React.Component {
             path={ '/' }
             handler={ GalleryContainer } />
           <Location
-            path={ /\/illust\/([0-9]{0,}$)/ }
+            path={ /^\/illust\/([0-9]{0,}$)/ }
             handler={ IllustContainer } />
           <Location
-            path={ /\/([0-9]{0,}$)/ }
+            path={ /^\/([0-9]{0,}$)/ }
             handler={ RedirectContainer } />
           <NotFound handler={ NotFoundContainer } />
         </Locations>