From c9cf89adeba362aaad677a64ef29597ecead2c2e Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Sun, 22 Sep 2019 20:36:11 +0900
Subject: [PATCH] TheDesk Usain (18.10.1)

---
 app/js/tl/notification.js       |  6 +++---
 app/js/tl/tl.js                 |  6 +++---
 app/js/ui/layout.js             |  6 +++---
 app/package.json                |  2 +-
 app/view/make/index.sample.html | 15 ++++++++-------
 app/view/make/make.js           |  2 +-
 app/view/make/setting.sample.js |  2 +-
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js
index 39b39d27..f7e3d680 100644
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -100,10 +100,10 @@ function notfColumn(acct_id, tlid, sys) {
 			todc();
 			//Markers
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (markers) {
 				getMarker(tlid, "notf", acct_id)
diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js
index 039a2ef3..de4a1f43 100644
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -153,10 +153,10 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		if (type == "home" || type == "notf") {
 			//Markers
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (markers) {
 				getMarker(tlid, type, acct_id)
diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js
index a7b48e29..aac0ed33 100644
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -217,10 +217,10 @@ function parseColumn(target, dontclose) {
 				unread = ""
 			}
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (!markers) {
 				unread = ""
diff --git a/app/package.json b/app/package.json
index a1af877c..045140cf 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.10.0",
+  "version": "18.10.1",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index f4422d25..29ade6b8 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -714,13 +714,14 @@
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note Usamin (18.10.0)</h5>
-				・全てのカラムの縦、横幅を自由に変更できるように。<br>
-				・一部トゥートがTLに表示されない不具合を修正。<br>
-				・初回起動時にガイダンスを表示<br>
-				・Featured tag(master|v3.0)<br>
-				・未読マーカー(master|v3.0)<br>
-				・引用のトゥート(設定で引用形式を「パラメーター」にすることで対応インスタンスで利用可)<br>
+				<h5>Release Note Usamin (18.10.1)</h5>
+				・Markers(3.0.0 rc1)の送信タイミングを変更。デフォルトでオフに。<br>
+				・通知音の音量が調節できる<br>
+				・v1検索API全廃に対応<br>
+				・投票ボタン押した後に情報が更新されない(投票済みにならない)不具合を修正<br>
+				・Unknownなメディアの拡張子を表示<br>
+				・Pleromaでタグメニューが出ずにTL追加になる不具合を修正<br>
+				・削除して再編集でアカウントが切り替えできてしまう不具合を修正<br>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>
diff --git a/app/view/make/make.js b/app/view/make/make.js
index ebd98c5d..0f1150f1 100644
--- a/app/view/make/make.js
+++ b/app/view/make/make.js
@@ -1,5 +1,5 @@
 const fs = require("fs")
-let ver = "Usamin (18.10.1)-beta"
+let ver = "Usamin (18.10.1)"
 const execSync = require('child_process').execSync;
 let gitHash = execSync("git rev-parse HEAD").toString().trim()
 fs.writeFileSync("../../git", gitHash)
diff --git a/app/view/make/setting.sample.js b/app/view/make/setting.sample.js
index ee4913a3..d4ced04f 100644
--- a/app/view/make/setting.sample.js
+++ b/app/view/make/setting.sample.js
@@ -311,7 +311,7 @@ var tlConstruction = [
         id: "markers",
         storage: "markers",
         checkbox: true,
-        setValue: "yes",
+        setValue: "no",
         text: {
             head: "@@markers@@",
             desc: "@@markerswarn@@",