fix iroiro

tomato111 · Aug 17, 2022 · a04bcf8 · a04bcf8
1 parent 48baaf1
commit a04bcf8
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 672 deletions.
diff --git a/Lyric Show Modoki.js b/Lyric Show Modoki.js
@@ -3,7 +3,7 @@
 
 // ==PREPROCESSOR==
 // @name "Lyric Show Modoki"
-// @version "1.8.5"
+// @version "1.8.6"
 // @author "tomato111"
 // @import "%fb2k_profile_path%import\common\lib.js"
 // ==/PREPROCESSOR==
@@ -21,7 +21,7 @@ var fs = new ActiveXObject("Scripting.FileSystemObject"); // File System Object
 var ws = new ActiveXObject("WScript.Shell"); // WScript Shell Object
 var Trace = new TraceLog();
 var scriptName = "Lyric Show Modoki";
-var scriptVersion = "1.8.5";
+var scriptVersion = "1.8.6";
 var scriptdir = fb.ProfilePath + "import\\" + scriptName + "\\";
 var commondir = fb.ProfilePath + "import\\common\\";
 var align = {};

diff --git a/import/Lyric Show Modoki/plugins/dplugin_AniKasiPV.js b/import/Lyric Show Modoki/plugins/dplugin_AniKasiPV.js
diff --git a/import/Lyric Show Modoki/plugins/dplugin_Kashiget.js b/import/Lyric Show Modoki/plugins/dplugin_Kashiget.js
@@ -91,7 +91,7 @@
             var SearchRE = new RegExp('<a class="lyric-anchor" href="/lyric/(\\d+)/.+?<p class="artist"><a.+?>(.+?)</a></p>.+?' // $1:id, $2:歌手
                 + '<div class="by"><p><span>作詞：</span><em>(.+?)</em>.+?<span>作曲：</span><em>(.+?)</em></p>', 'i'); // $3:作詞, $4:作曲
 
-            var StartLyricRE = /<div id="lyric-trunk">(.+?)<\/div>/i;
+            var StartLyricRE = /<div id="lyric-trunk"><script>.+?<\/script>(.+?)<script>/i;
             var LineBreakRE = /<br ?\/?>/ig;
             var LineFeedCode = prop.Save.LineFeedCode;
 

diff --git a/import/Lyric Show Modoki/plugins/dplugin_Kasitime.js b/import/Lyric Show Modoki/plugins/dplugin_Kasitime.js
diff --git a/import/Lyric Show Modoki/plugins/dplugin_Miku_Hatsune_wiki.js b/import/Lyric Show Modoki/plugins/dplugin_Miku_Hatsune_wiki.js
@@ -37,9 +37,9 @@
 
         function createQuery(title, artist, id) {
             if (id)
-                return 'https://www5.atwiki.jp/hmiku/?pageid=' + id;
+                return 'https://w.atwiki.jp/hmiku/?pageid=' + id;
             else
-                return 'https://www5.atwiki.jp/hmiku/?cmd=search&keyword='
+                return 'https://w.atwiki.jp/hmiku/?cmd=search&keyword='
                     + encodeURIComponent(title + ' ' + artist).replaceEach("'", '%27', '\\(', '%28', '\\)', '%29', '%20', '+', 'g')
                     + '&andor=and&ignore=1';
         }

diff --git a/import/Lyric Show Modoki/plugins/dplugin_Touhoukashi.js b/import/Lyric Show Modoki/plugins/dplugin_Touhoukashi.js
@@ -37,9 +37,9 @@
 
         function createQuery(title, artist, id) {
             if (id)
-                return 'https://www31.atwiki.jp/touhoukashi/?pageid=' + id;
+                return 'https://w.atwiki.jp/touhoukashi/?pageid=' + id;
             else
-                return 'https://www31.atwiki.jp/touhoukashi/search?andor=and&keyword='
+                return 'https://w.atwiki.jp/touhoukashi/search?andor=and&keyword='
                     + encodeURIComponent(title).replaceEach("'", '%27', '\\(', '%28', '\\)', '%29', '%20', '+', '!', '%21', 'g');
         }