Skip to content

Commit ccb0b6f

Browse files
mashirozxmashirozx
authored
Merge pull request #185 from mashirozx/dev
update to v3.3.6
2 parents 9ddaad7 + a6e42f1 commit ccb0b6f

12 files changed

+3198
-3019
lines changed

‎functions.php

+999-872
Large diffs are not rendered by default.

‎header.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@
7878
<?php endif; ?>
7979
</head>
8080
<body <?php body_class(); ?>>
81-
<?php if(get_template_directory_uri() != get_site_url().'/wp-content/themes/Sakura') echo '<div style="position:fixed;height:100%;width:100%;top:0;left:0;font-size:20px;z-index:999999;background-color: #fff;">Plz rename the theme folder name as <span style="color:red">Sakura</span>!<br>请将主题文件夹名改为 <span style="color:red">Sakura</span>！</div>'; ?>
82-
<div class="scrollbar" id="bar"></div>
81+
<div class="scrollbar" id="bar"></div>
8382
<section id="main-container">
8483
<?php
8584
if(!akina_option('head_focus')){

‎inc/api.php

+44-44
Original file line numberDiff line numberDiff line change
@@ -325,14 +325,23 @@ function cache_search_json()
325325
* @rest api接口路径：https://sakura.2heng.xin/wp-json/sakura/v1/image/cover
326326
*/
327327
function cover_gallery() {
328-
global $wpdb,$sakura_image_array;
329-
$img_array = json_decode($sakura_image_array, true);
330-
$img = array_rand($img_array);
331-
$img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory_uri();
332-
if(strpos($_SERVER['HTTP_ACCEPT'], 'image/webp')) {
333-
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["webp"][0];
334-
} else {
335-
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["jpeg"][0];
328+
if(akina_option('cover_cdn_options')=="type_2"){
329+
$img_array = glob(get_template_directory() . "/manifest/gallary/*.{gif,jpg,png}",GLOB_BRACE);
330+
$img = array_rand($img_array);
331+
$imgurl = trim($img_array[$img]);
332+
$imgurl = str_replace(get_template_directory(), get_template_directory_uri(), $imgurl);
333+
}elseif(akina_option('cover_cdn_options')=="type_3"){
334+
$imgurl = akina_option('cover_cdn');
335+
}else{
336+
global $sakura_image_array;
337+
$img_array = json_decode($sakura_image_array, true);
338+
$img = array_rand($img_array);
339+
$img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory_uri();
340+
if(strpos($_SERVER['HTTP_ACCEPT'], 'image/webp')) {
341+
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["webp"][0];
342+
} else {
343+
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["jpeg"][0];
344+
}
336345
}
337346
$data = array('cover image');
338347
$response = new WP_REST_Response($data);
@@ -346,51 +355,42 @@ function cover_gallery() {
346355
* @rest api接口路径：https://sakura.2heng.xin/wp-json/sakura/v1/image/feature
347356
*/
348357
function feature_gallery() {
349-
global $wpdb,$sakura_image_array;
350-
$img_array = json_decode($sakura_image_array, true);
351-
$img = array_rand($img_array);
352-
$img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory_uri();
353-
if(strpos($_SERVER['HTTP_ACCEPT'], 'image/webp')) {
354-
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["webp"][0];
355-
} else {
356-
$imgurl = $img_domain . "/manifest/" . $img_array[$img]["jpeg"][0];
357-
}
358-
$data = array('cover image');
359-
$response = new WP_REST_Response($data);
360-
$response->set_status(302);
361-
$response->header('Location', $imgurl);
362-
return $response;
358+
return cover_gallery();
363359
}
364360

365361
/*
366362
* update database rest api
367363
* @rest api接口路径：https://sakura.2heng.xin/wp-json/sakura/v1/database/update
368364
*/
369365
function update_database() {
370-
global $wpdb;
371-
$sakura_table_name = $wpdb->base_prefix.'sakura';
372-
$img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory_uri();
373-
$manifest = file_get_contents($img_domain . "/manifest/manifest.json");
374-
if($manifest) {
375-
$manifest = array(
376-
"mate_key" => "manifest_json",
377-
"mate_value" => $manifest
378-
);
379-
$time = array(
380-
"mate_key" => "json_time",
381-
"mate_value" => date("Y-m-d H:i:s",time())
382-
);
383-
384-
$wpdb->query("DELETE FROM `wp_sakura` WHERE `mate_key` ='manifest_json'");
385-
$wpdb->query("DELETE FROM `wp_sakura` WHERE `mate_key` ='json_time'");
386-
$wpdb->insert($sakura_table_name,$manifest);
387-
$wpdb->insert($sakura_table_name,$time);
388-
$output = "manifest.json has been stored into database.";
366+
if(akina_option('cover_cdn_options')=="type_1"){
367+
global $wpdb;
368+
$sakura_table_name = $wpdb->base_prefix.'sakura';
369+
$img_domain = akina_option('cover_cdn') ? akina_option('cover_cdn') : get_template_directory();
370+
$manifest = file_get_contents($img_domain . "/manifest/manifest.json");
371+
if($manifest) {
372+
$manifest = array(
373+
"mate_key" => "manifest_json",
374+
"mate_value" => $manifest
375+
);
376+
$time = array(
377+
"mate_key" => "json_time",
378+
"mate_value" => date("Y-m-d H:i:s",time())
379+
);
380+
381+
$wpdb->query("DELETE FROM $sakura_table_name WHERE `mate_key` ='manifest_json'");
382+
$wpdb->query("DELETE FROM $sakura_table_name WHERE `mate_key` ='json_time'");
383+
$wpdb->insert($sakura_table_name,$manifest);
384+
$wpdb->insert($sakura_table_name,$time);
385+
$output = "manifest.json has been stored into database.";
386+
}else{
387+
$output = "manifest.json not found, please ensure your url ($img_domain) is corrent.";
388+
}
389+
$result = new WP_REST_Response($output, 200);
390+
return $result;
389391
}else{
390-
$output = "manifest.json not found, please ensure your url is corrent.";
392+
return new WP_REST_Response("Invalid access", 200);
391393
}
392-
$result = new WP_REST_Response($output, 200);
393-
return $result;
394394
}
395395

396396
/**

‎js/sakura-app.js

+4-12
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ if (mashiro_option.float_player_on) {
753753
autoplay: !1,
754754
mutex: !0,
755755
lrcType: 3,
756-
listFolded: !1,
756+
listFolded: 1,
757757
preload: 'auto',
758758
theme: '#2980b9',
759759
loop: 'all',
@@ -789,23 +789,13 @@ if (mashiro_option.float_player_on) {
789789
lrcTag = 2;
790790
});
791791
var apSwitchTag = 0;
792-
var aplayerlist = $(".aplayer-list");
793-
aplayerlist.removeClass("aplayer-list-hide").css({
794-
maxHeight: '0px'
795-
});
796792
$(".aplayer.aplayer-fixed .aplayer-body").addClass("ap-hover");
797793
$(".aplayer-miniswitcher").click(function () {
798794
if (apSwitchTag == 0) {
799-
aplayerlist.removeClass("aplayer-list-hide").animate({
800-
maxHeight: '250px'
801-
});
802795
$(".aplayer.aplayer-fixed .aplayer-body").removeClass("ap-hover");
803796
$("#secondary").addClass("active");
804797
apSwitchTag = 1;
805798
} else {
806-
aplayerlist.css({
807-
maxHeight: '0px'
808-
});
809799
$(".aplayer.aplayer-fixed .aplayer-body").addClass("ap-hover");
810800
$("#secondary").removeClass("active");
811801
apSwitchTag = 0;
@@ -999,7 +989,9 @@ function activate_widget(){
999989
$("#secondary").remove();
1000990
}
1001991
}
1002-
activate_widget();
992+
setTimeout(function () {
993+
activate_widget();
994+
}, 100);
1003995

1004996
mashiro_global.ini.normalize();
1005997
loadCSS(mashiro_option.jsdelivr_css_src);

‎languages/en_US.mo

70 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)