From 62102364522e1dc1e6207342c7a2d829a2efd651 Mon Sep 17 00:00:00 2001
From: Ember <emberlqr@gmail.com>
Date: Wed, 3 Jul 2024 20:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=BC=93=E5=AD=98=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/submission.js      | 52 ++++++++++++++++++++++++++++---------------
 submission/index.html | 10 ++++++++-
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/js/submission.js b/js/submission.js
index a765682..90e9934 100644
--- a/js/submission.js
+++ b/js/submission.js
@@ -70,7 +70,7 @@ function initializeUserSession() {
 
 async function f1() {
     try {
-        const r1 = await fetch('https://emberimg.oss-cn-beijing.aliyuncs.com/upload/json/s.json');
+        const r1 = await fetchNoCache('https://emberimg.oss-cn-beijing.aliyuncs.com/upload/json/s.json');
         const d1 = await r1.json();
 
         const m1 = d1.masterKey;
@@ -145,8 +145,11 @@ function showMySubmissions() {
 
 async function checkVerifiedStatus() {
     const email = curemail; 
+    const timestamp = new Date().getTime();
+    const url = `https://emberimg.oss-cn-beijing.aliyuncs.com/upload/verified-email/verified-email.json?timestamp=${timestamp}`;
+
     try {
-        const response = await fetch('https://emberimg.oss-cn-beijing.aliyuncs.com/upload/verified-email/verified-email.json');
+        const response = await fetch(url);
         const verifiedEmails = await response.json();
         
         if (verifiedEmails.includes(email)) {
@@ -160,25 +163,23 @@ async function checkVerifiedStatus() {
     }
 }
 
+
 async function updateUserInfo() {
     if (!s) {
         console.log("User is not logged in.");
         return;
     }
 
-    // 获取当前时间戳
-    const timestamp = Date.now();
-    const jsonPath = `https://emberimg.oss-cn-beijing.aliyuncs.com/user/${curemail}/p.json?timestamp=${timestamp}`;
+    const jsonPath = `https://emberimg.oss-cn-beijing.aliyuncs.com/user/${curemail}/p.json`;
 
     try {
-        const response = await fetch(jsonPath);
+        const response = await fetchNoCache(jsonPath);
         if (response.ok) {
             const data = await response.json();
             if (data && data.nickname) {
                 document.getElementById('nickname').innerText = data.nickname;
                 console.log("Nickname has been successfully updated.");
             } else {
-                // 如果JSON响应中没有nickname字段，设置默认昵称
                 document.getElementById('nickname').innerText = "Default Nickname";
                 console.log("Default nickname set due to missing 'nickname' field in response.");
             }
@@ -191,8 +192,6 @@ async function updateUserInfo() {
     }
 }
 
-
-
 async function checkAndLoadAvatar() {
     if (!s) {
         console.log("User is not logged in.");
@@ -204,7 +203,7 @@ async function checkAndLoadAvatar() {
     const defaultAvatarPath = "https://emberimg.oss-cn-beijing.aliyuncs.com/avatar/default.png";
 
     try {
-        const response = await fetch(jsonPath);
+        const response = await fetchNoCache(jsonPath);
         if (response.ok) {
             const data = await response.json();
             if (data.hasAvatar) {
@@ -224,6 +223,25 @@ async function checkAndLoadAvatar() {
     }
 }
 
+async function checkVerifiedStatus() {
+    const email = curemail; 
+    const url = 'https://emberimg.oss-cn-beijing.aliyuncs.com/upload/verified-email/verified-email.json';
+
+    try {
+        const response = await fetchNoCache(url);
+        const verifiedEmails = await response.json();
+        
+        if (verifiedEmails.includes(email)) {
+            document.getElementById('verified-icon').style.display = 'inline-flex';
+            console.log('Email is verified.');
+        } else {
+            console.log('Email is not verified.');
+        }
+    } catch (error) {
+        console.error('Error loading or parsing verified-email.json:', error);
+    }
+}
+
 async function editNickname() {
     if (!s) {
         alert("您尚未登录，请登录后再尝试修改昵称。");
@@ -243,7 +261,7 @@ async function editNickname() {
     const jsonPath = `https://emberimg.oss-cn-beijing.aliyuncs.com/user/${curemail}/p.json`;
 
     try {
-        const response = await fetch(jsonPath);
+        const response = await fetchNoCache(jsonPath);
 
         if (response.ok) {
             const data = await response.json();
@@ -277,7 +295,7 @@ async function uploadAvatar(event) {
 
             try {
                 // Try to fetch existing p.json to see if it needs updating
-                const response = await fetch(`https://emberimg.oss-cn-beijing.aliyuncs.com/${jsonPath}`);
+                const response = await fetchNoCache(`https://emberimg.oss-cn-beijing.aliyuncs.com/${jsonPath}`);
                 let data;
                 if (response.ok) {
                     data = await response.json();
@@ -339,11 +357,10 @@ input.addEventListener('input', () => {
 preview.innerHTML = marked.parse('');
 
 async function fetchSubmittedCount(email) {
-    const timestamp = new Date().getTime();
-    const url = `https://emberimg.oss-cn-beijing.aliyuncs.com/upload/${email}/submitted.json?timestamp=${timestamp}`;
+    const url = `https://emberimg.oss-cn-beijing.aliyuncs.com/upload/${email}/submitted.json`;
 
     try {
-        const response = await fetch(url);
+        const response = await fetchNoCache(url);
         if (response.ok) {
             const count = await response.json();
             submitted = count;
@@ -366,11 +383,10 @@ async function fetchSubmissionData(email, submitted) {
 |------|------|`;
 
     for (let i = 1; i <= submitted; i++) {
-        const timestamp = new Date().getTime(); // 获取当前时间戳
-        const statusUrl = `https://emberimg.oss-cn-beijing.aliyuncs.com/upload/${email}/${i}/status.json?timestamp=${timestamp}`;
+        const statusUrl = `https://emberimg.oss-cn-beijing.aliyuncs.com/upload/${email}/${i}/status.json`;
 
         try {
-            const response = await fetch(statusUrl);
+            const response = await fetchNoCache(statusUrl);
             if (response.ok) {
                 const data = await response.json();
                 const { title, status } = data;
diff --git a/submission/index.html b/submission/index.html
index c9a0ee9..6246dc0 100644
--- a/submission/index.html
+++ b/submission/index.html
@@ -213,7 +213,15 @@ markdown 基本语法教程 空格与换行 markdown 语法对于空格与换行
 
 <div class="post-content">
   
-  <div id="login">
+  <script>
+    
+async function fetchNoCache(url) {
+    const timestamp = new Date().getTime(); 
+    const noCacheUrl = `${url}?timestamp=${timestamp}`; 
+    return fetch(noCacheUrl); 
+
+</script>
+<div id="login">
         <h1>投稿者中心</h1>
         <form id="loginForm">
             <label for="email">邮箱：</label>