Merge pull request #44 from inertia42/main

修复获取标签功能

_locales/en/messages.json

@@ -85,5 +85,8 @@
    },
    "memoFailed":{
       "message": "Failed! 😭"
+   },
+   "invalidToken":{
+      "message": "Invalid token or url 😭"
    }
 }

_locales/zh_CN/messages.json

@@ -88,5 +88,8 @@
    },
    "memoFailed":{
       "message": "发送失败 😭"
+   },
+   "invalidToken":{
+      "message": "无效的 token 或 url 😭"
    }
 }

js/oper.js

@@ -11,6 +11,7 @@ function get_info(callback) {
       memo_lock: '',
       open_action: '',
       open_content: '',
+      userid: '',
       resourceIdList: []
     },
     function (items) {
@@ -32,6 +33,7 @@ function get_info(callback) {
       returnObject.memo_lock = items.memo_lock
       returnObject.open_content = items.open_content
       returnObject.open_action = items.open_action
+      returnObject.userid = items.userid
       returnObject.resourceIdList = items.resourceIdList
 
       if (callback) callback(returnObject)
@@ -45,17 +47,17 @@ get_info(function (info) {
     $('#blog_info').hide()
   }
   var memoNow = info.memo_lock
-  if(memoNow == ''){
+  if (memoNow == '') {
     chrome.storage.sync.set(
-      { memo_lock: 'PUBLIC'}
+      { memo_lock: 'PUBLIC' }
     )
     $("#lock-now").text(chrome.i18n.getMessage("lockPublic"))
   }
-  if(memoNow == "PUBLIC"){
+  if (memoNow == "PUBLIC") {
     $("#lock-now").text(chrome.i18n.getMessage("lockPublic"))
-  }else if(memoNow == "PRIVATE"){
+  } else if (memoNow == "PRIVATE") {
     $("#lock-now").text(chrome.i18n.getMessage("lockPrivate"))
-  }else if(memoNow == "PROTECTED"){
+  } else if (memoNow == "PROTECTED") {
     $("#lock-now").text(chrome.i18n.getMessage("lockProtected"))
   }
   $('#apiUrl').val(info.apiUrl)
@@ -126,7 +128,7 @@ function initDrag() {
     ev.preventDefault()
     var files = ev.dataTransfer.files || ev.target.files
     for (var i = 0; i < files.length; i++) {
-        file = files[i]
+      file = files[i]
     }
     uploadImage(file)
   }
@@ -165,7 +167,7 @@ function uploadImage(data) {
         processData: false,
         contentType: false,
         dataType: 'json',
-        headers : {'Authorization':'Bearer ' + info.apiTokens},
+        headers: { 'Authorization': 'Bearer ' + info.apiTokens },
         success: function (data) {
           console.log(data)
           if (data.id) {
@@ -209,19 +211,48 @@ function uploadImage(data) {
 }
 
 $('#saveKey').click(function () {
-  chrome.storage.sync.set(
+  var apiUrl = $('#apiUrl').val()
-    {
+  var apiTokens = $('#apiTokens').val()
-      apiUrl: $('#apiUrl').val(),
+  // 设置请求参数
-      apiTokens: $('#apiTokens').val()
+  const settings = {
-    },
+    async: true,
-    function () {
+    crossDomain: true,
-      $.message({
+    url: apiUrl + 'api/v1/auth/status',
-        message: chrome.i18n.getMessage("saveSuccess")
+    method: 'POST',
-      })
+    headers: {
-      $('#blog_info').hide()
+      'Authorization': 'Bearer ' + apiTokens
     }
-  )
+  };
-})
+
+  $.ajax(settings).done(function (response) {
+    if (response && response.id) {
+      // 如果响应包含用户 ID，存储 apiUrl 和 apiTokens
+      chrome.storage.sync.set(
+        {
+          apiUrl: apiUrl,
+          apiTokens: apiTokens,
+          userid: response.id
+        },
+        function () {
+          $.message({
+            message: chrome.i18n.getMessage("saveSuccess")
+          });
+          $('#blog_info').hide();
+        }
+      );
+    } else {
+      // 如果响应不包含用户 ID，显示错误消息
+      $.message({
+        message: chrome.i18n.getMessage("invalidToken")
+      });
+    }
+  }).fail(function () {
+    // 请求失败时显示错误消息
+    $.message({
+      message: chrome.i18n.getMessage("invalidToken")
+    });
+  });
+});
 
 $('#opensite').click(function () {
   get_info(function (info) {
@@ -232,17 +263,20 @@ $('#opensite').click(function () {
 $('#tags').click(function () {
   get_info(function (info) {
     if (info.apiUrl) {
-      var tagUrl = info.apiUrl+'api/v1/tag'
+      var parent = "memos/-";
-      var tagDom = ""
+      // 如果不使用 user 过滤，会返回所有用户的标签
+      var filter = "?filter=" + encodeURIComponent(`creator == 'users/${info.userid}'`);
+      var tagUrl = info.apiUrl + 'api/v1/' + parent + '/tags' + filter;
+      var tagDom = "";
       $.ajax({
-        url:tagUrl,
+        url: tagUrl,
-        type:"GET",
+        type: "GET",
-        contentType:"application/json;",
+        contentType: "application/json;",
-        dataType:"json",
+        dataType: "json",
-        headers : {'Authorization':'Bearer ' + info.apiTokens},
+        headers: { 'Authorization': 'Bearer ' + info.apiTokens },
-        success: function(data){
+        success: function (data) {
-          $.each(data, function(i,obj){
+          $.each(data.tagAmounts, function (tag, amount) {
-            tagDom += '<span class="item-container">#'+obj+'</span>'
+            tagDom += '<span class="item-container">#' + tag + '</span>';
           });
           tagDom += '<svg id="hideTag" class="hidetag" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M78.807 362.435c201.539 314.275 666.962 314.188 868.398-.241 16.056-24.99 13.143-54.241-4.04-62.54-17.244-8.377-40.504 3.854-54.077 24.887-174.484 272.338-577.633 272.41-752.19.195-13.573-21.043-36.874-33.213-54.113-24.837-17.177 8.294-20.06 37.545-3.978 62.536z" fill="#fff"/><path d="M894.72 612.67L787.978 494.386l38.554-34.785 106.742 118.251-38.554 34.816zM635.505 727.51l-49.04-147.123 49.255-16.41 49.054 147.098-49.27 16.435zm-236.18-12.001l-49.568-15.488 43.29-138.48 49.557 15.513-43.28 138.455zM154.49 601.006l-38.743-34.565 95.186-106.732 38.763 34.566-95.206 106.731z" fill="#fff"/></svg>'
           $("#taglist").html(tagDom).slideToggle(500)