Merge branch 'master' into dependabot/github_actions/all-867774d144

go-shiori · Aug 28, 2024 · 154715a · 154715a
2 parents 93194a6 + 2bcb890
commit 154715a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/internal/core/processing.go b/internal/core/processing.go
@@ -166,7 +166,7 @@ func ProcessBookmark(deps *dependencies.Dependencies, req ProcessRequest) (book
 		if err != nil {
 			return book, false, fmt.Errorf("failed to create temp archive: %v", err)
 		}
-		defer deps.Domains.Storage.FS().Remove(tmpFile.Name())
+		defer os.Remove(tmpFile.Name())
 
 		archivalRequest := warc.ArchivalRequest{
 			URL:         book.URL,
@@ -178,7 +178,6 @@ func ProcessBookmark(deps *dependencies.Dependencies, req ProcessRequest) (book
 
 		err = warc.NewArchive(archivalRequest, tmpFile.Name())
 		if err != nil {
-			defer os.Remove(tmpFile.Name())
 			return book, false, fmt.Errorf("failed to create archive: %v", err)
 		}
 

diff --git a/internal/view/assets/css/style.css b/internal/view/assets/css/style.css
diff --git a/internal/view/assets/js/page/home.js b/internal/view/assets/js/page/home.js
@@ -410,7 +410,7 @@ export default {
 					},
 					{
 						name: "makePublic",
-						label: "Make archive publicly available",
+						label: "Make bookmark publicly available",
 						type: "check",
 						value: this.appOptions.MakePublic,
 					},
@@ -517,7 +517,7 @@ export default {
 					},
 					{
 						name: "makePublic",
-						label: "Make archive publicly available",
+						label: "Make bookmark publicly available",
 						type: "check",
 						value: book.public >= 1,
 					},

diff --git a/internal/view/assets/js/page/setting.js b/internal/view/assets/js/page/setting.js
@@ -45,7 +45,7 @@ var template = `
             </label>
             <label>
                 <input type="checkbox" v-model="appOptions.MakePublic" @change="saveSetting">
-                Make archive publicly available by default
+                Make bookmark publicly available by default
             </label>
         </details>
         <details v-if="activeAccount.owner" open class="setting-group" id="setting-accounts">

diff --git a/internal/view/assets/less/common.less b/internal/view/assets/less/common.less
@@ -505,6 +505,12 @@ a {
 				border: 1px solid var(--border);
 			}
 		}
+		blockquote {
+			margin: 15px;
+			padding: 15px;
+			font-style: italic;
+			background: var(--bgqoute);
+		}
 	}
 }
 

diff --git a/internal/view/assets/less/theme.less b/internal/view/assets/less/theme.less
@@ -15,6 +15,7 @@
 	--contentBg: #292929;
 	--headerBg: #292929;
 	--selectedBg: #261918;
+	--bgqoute: #1f1f1f5e;
 }
 
 .light-colors {
@@ -24,6 +25,7 @@
 	--contentBg: #fff;
 	--headerBg: #fff;
 	--selectedBg: #ffe7e5;
+	--bgqoute: #eee;
 }
 
 body.dark {

diff --git a/internal/view/index.html b/internal/view/index.html
@@ -42,7 +42,7 @@
 		import pageHome from "./assets/js/page/home.js";
 		import pageSetting from "./assets/js/page/setting.js";
 		import customDialog from "./assets/js/component/dialog.js";
-        import EventBus from "../assets/js/component/eventBus.js";
+        import EventBus from "./assets/js/component/eventBus.js";
         Vue.prototype.$bus = EventBus;
 
 		var app = new Vue({

diff --git a/internal/view/login.html b/internal/view/login.html
@@ -150,7 +150,6 @@
 			},
 			mounted() {
 				// Load setting
-				this.loadSetting();
 				localStorage.removeItem("shiori-account");
 				localStorage.removeItem("shiori-token");