From 210ccaf6dc73e658f6bad27ff0cdc0583ecf7ae6 Mon Sep 17 00:00:00 2001 From: METO Date: Mon, 2 Oct 2017 23:58:47 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=202.0.1=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=B8=80=E5=A4=84=E4=B8=A5=E9=87=8D=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复 APlayer.min.js 路径错误 - 简单粗暴地修复网易云音乐防盗链 --- Action.php | 11 +++++++---- Plugin.php | 18 +++++++++--------- assets/Meting.min.js | 4 ++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Action.php b/Action.php index 7150b19..88af095 100644 --- a/Action.php +++ b/Action.php @@ -64,16 +64,19 @@ class Meting_Action extends Typecho_Widget implements Widget_Interface_Do { if(empty($data)){ $rate=Typecho_Widget::widget('Widget_Options')->plugin('Meting')->bitrate; $cookie=Typecho_Widget::widget('Widget_Options')->plugin('Meting')->cookie; - if($server=='netease')$api->cookie($cookie); + if($server=='netease'&&!empty($cookie))$api->cookie($cookie); $data=$api->url($id,$rate); $this->cacheWrite($EID,$data); } $data=json_decode($data,true); $url=$data['url']; - $url=str_replace('http://m8','https://m8',$url); - $url=str_replace('http://m7','https://m8',$url); - $url=str_replace('http://m10','https://m10',$url); + if($server=='netease'){ + $url=str_replace('://m8c.','://m8.',$url); + $url=str_replace('http://m8.','https://m8.',$url); + $url=str_replace('http://m7.','https://m8.',$url); + $url=str_replace('http://m10.','https://m10.',$url); + } if(empty($url))$url='https://api.i-meto.com/Public/music/empty.mp3'; $this->response->redirect($url); diff --git a/Plugin.php b/Plugin.php index a445e0f..5ccd5c2 100644 --- a/Plugin.php +++ b/Plugin.php @@ -6,13 +6,13 @@ if(!defined('__TYPECHO_ROOT_DIR__'))exit; * * @package APlayer for Typecho | Meting * @author METO - * @version 2.0.0 + * @version 2.0.1 * @dependence 14.10.10-* * @link https://github.com/MoePlayer/APlayer-Typecho * */ -define('METING_VERSION','2.0.0'); +define('METING_VERSION','2.0.1'); class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface { @@ -139,7 +139,7 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface $api=Typecho_Widget::widget('Widget_Options')->plugin('Meting')->api; $dir=Helper::options()->pluginUrl.'/Meting/assets'; $ver=METING_VERSION; - echo "\n"; + echo "\n"; echo ""; } @@ -173,11 +173,11 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface foreach($matches as $vo){ $t=self::shortcode_parse_atts(htmlspecialchars_decode($vo)); $player=array( - 'theme' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->theme?:'red', - 'preload' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->preload?:'auto', - 'autoplay' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->autoplay?:'false', - 'height' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->height?:'340px', - 'mode' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->mode?:'circulation', + 'theme' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->theme?:'red', + 'preload' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->preload?:'auto', + 'autoplay' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->autoplay?:'false', + 'listmaxheight' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->height?:'340px', + 'mode' => Typecho_Widget::widget('Widget_Options')->plugin('Meting')->mode?:'circulation', ); if(isset($t['server'])){ if(!in_array($t['server'],array('netease','tencent','xiami','baidu','kugou')))continue; @@ -205,7 +205,7 @@ class Meting_Plugin extends Typecho_Widget implements Typecho_Plugin_Interface $url=Typecho_Common::url('action/metingapi',Helper::options()->index).'?do=parse'; $dir=Helper::options()->pluginUrl.'/Meting/assets/editer.js?v='.METING_VERSION; echo " - "; + "; } # https://github.com/WordPress/WordPress/blob/master/wp-includes/shortcodes.php#L508 diff --git a/assets/Meting.min.js b/assets/Meting.min.js index 46f75d7..b61122c 100644 --- a/assets/Meting.min.js +++ b/assets/Meting.min.js @@ -1,2 +1,2 @@ -/*! meting.aplayer.js v1.2.1 | MIT License */ -!function(){function e(e,t){var a=[],r=e.dataset;a.element=e,a.music=t,a.showlrc=a.music[0].lrc?3:0,a.narrow="true"===r.narrow,a.autoplay="true"===r.autoplay,a.mutex="false"!==r.mutex,a.mode=r.mode||"circulation",a.preload=r.preload||"auto",a.listmaxheight=r.listmaxheight||"340px",a.theme=r.theme||"#ad7a86",new APlayer(a)}console.log("\n %c Meting 1.2.1 %c https://i-meto.com/ghost-aplayer/ \n\n","color: #fff; background-image: linear-gradient(90deg, rgb(47, 172, 178) 0%, rgb(45, 190, 96) 100%); padding:5px 1px;","background-image: linear-gradient(90deg, rgb(45, 190, 96) 0%, rgb(255, 255, 255) 100%); padding:5px 0;");var t="https://api.i-meto.com/meting/api?server=:server&type=:type&id=:id&r=:r";"undefined"!=typeof meting_api&&(t=meting_api);var a=document.querySelectorAll(".aplayer");Array.prototype.forEach.call(a,function(a,r){if(a.dataset.id){var i=new XMLHttpRequest,o=t;o=(o=(o=(o=o.replace(":server",a.dataset.server)).replace(":type",a.dataset.type)).replace(":id",a.dataset.id)).replace(":r",Math.random()),i.open("GET",o,!0),i.onload=function(){if(i.status>=200&&i.status<400){var t=JSON.parse(i.responseText);e(a,t)}},i.send()}else{var n=[];n.title=a.dataset.title,n.author=a.dataset.author,n.url=a.dataset.url,n.pic=a.dataset.pic,n.lrc=a.dataset.lrc,e(a,[n])}})}(); +/*! meting.aplayer.js v1.2.2 | MIT License */ +function r(e){/in/.test(document.readyState)?setTimeout("r("+e+")",9):e()}r(function(){function e(e,t){var a=[],r=e.dataset;a.element=e,a.music=t,a.showlrc=a.music[0].lrc?3:0,a.narrow="true"===r.narrow,a.autoplay="true"===r.autoplay,a.mutex="false"!==r.mutex,a.mode=r.mode||"circulation",a.preload=r.preload||"auto",a.listmaxheight=r.listmaxheight||"340px",a.theme=r.theme||"#ad7a86",new APlayer(a)}console.log("\n %c Meting 1.2.2 %c https://i-meto.com/ghost-aplayer/ \n\n","color: #fff; background-image: linear-gradient(90deg, rgb(47, 172, 178) 0%, rgb(45, 190, 96) 100%); padding:5px 1px;","background-image: linear-gradient(90deg, rgb(45, 190, 96) 0%, rgb(255, 255, 255) 100%); padding:5px 0;");var t="https://api.i-meto.com/meting/api?server=:server&type=:type&id=:id&r=:r";"undefined"!=typeof meting_api&&(t=meting_api);var a=document.querySelectorAll(".aplayer");Array.prototype.forEach.call(a,function(a,r){if(a.dataset.id){var i=new XMLHttpRequest,o=t;o=(o=(o=(o=o.replace(":server",a.dataset.server)).replace(":type",a.dataset.type)).replace(":id",a.dataset.id)).replace(":r",Math.random()),i.open("GET",o,!0),i.onload=function(){if(i.status>=200&&i.status<400){var t=JSON.parse(i.responseText);e(a,t)}},i.send()}else{var n=[];n.title=a.dataset.title,n.author=a.dataset.author,n.url=a.dataset.url,n.pic=a.dataset.pic,n.lrc=a.dataset.lrc,e(a,[n])}})});