From 7ab860c34cb0db579223f68f7035f6dc77f2348b Mon Sep 17 00:00:00 2001
From: cutls <cutls>
Date: Sun, 5 Aug 2018 12:36:23 +0900
Subject: [PATCH] TheDesk Akane (16.0.2)

---
 README.md                    | 16 ++++++++++++----
 app/index.sample.html        |  4 ++--
 app/js/lang/setting.lang.js  |  8 ++++++++
 app/js/post/post.js          | 15 ++++++++++-----
 app/js/ui/layout.js          | 21 +++++++++++++-------
 app/js/ui/post-box.js        |  6 ++++--
 app/js/ui/settings.js        | 37 +++++++++++++++++++++++++++++++++++-
 app/language/setting.en.json |  7 ++++++-
 app/language/setting.ja.json |  5 +++++
 app/oss.html                 | 25 ++++++++++++++++++++++++
 app/package.json             | 22 +++++++++++++++++----
 app/setting.html             | 17 +++++++++++++++++
 app/setting.sample.html      | 17 +++++++++++++++++
 13 files changed, 174 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index ff38539f..f696effc 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,11 @@ Contact me(bug report...):GitHub Issues, mention to [Cutls@kirishima.cloud](http
 
 ## Language/言語
 
- - 日本語(Japanese)
- - English(英語)
+- 日本語(Japanese)
+- English(英語)
 
 ### Translation/翻訳
+
 The Developer needs nice translation of TheDesk!  
 Pull Request to `language/*.json` and `js/lang/*.js`.  
 You cannot PR? You can also write Issues.  
@@ -37,18 +38,25 @@ app:そのままのファイル.ダウンロード→テスト用
 desk.icns: If you build yourself on macOS, you can use this .icns file as icon.  
 desk.icns: macOS向けアイコン.セルフビルドにどうぞ.  
 
-
 ## Requirement/環境
 
 - Windows (to launch TheDesk/実行に必要) / Linux (x64/ia32/armv7l)
 - Electron 2.0.5
 - electron-dl
-- Jimp(Node.js)
+- Jimp
+- adm-zip
 - itunes-nowplaying-mac(for macOS)
 - node-notifier
 - Ability to read unformated files!
 
+## Contributors/コントリビューター
+
+macOSビルダー  
+
+- [とねぢ](https://minohdon.jp/@toneji)
+
 ## Build/ビルド
+
 Misskey(misskey.xyz) application token is not in cutls/TheDesk  
 Misskey(misskey.xyz)のトークンは含まれておりません。  
   
diff --git a/app/index.sample.html b/app/index.sample.html
index c1823049..43952095 100644
--- a/app/index.sample.html
+++ b/app/index.sample.html
@@ -26,7 +26,7 @@
 <script type="text/javascript" src="./js/common/modal.js"></script>
 <script type="text/javascript" src="./js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Akane (16.0.1)";
+var ver="Akane (16.0.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -137,7 +137,7 @@ var lang="{{lang}}";
 <span id="vis">public</span>
 </span>
 <br>
-<input type="text" id="cw-text" placeholder="{{cwtext}}" class="mize">
+<input type="text" id="cw-text" placeholder="{{cwtext}}" class="mize" style="margin:0">
 </div>
 </div>
 <!-- 公開範囲 Dropdown Structure -->
diff --git a/app/js/lang/setting.lang.js b/app/js/lang/setting.lang.js
index 01af83e2..6cbff841 100644
--- a/app/js/lang/setting.lang.js
+++ b/app/js/lang/setting.lang.js
@@ -18,6 +18,10 @@ var lang_setting_cwtext={
     "ja":"デフォルトの警告文を「{{set}}」に設定しました。",
     "en":"Default CW text:{{set}}"
 }
+var lang_setting_cws={
+    "ja":"標準でCW:{{set}}",
+    "en":"Always CW on:{{set}}"
+}
 var lang_setting_vis={
     "ja":"デフォルトの公開設定を{{set}}に設定しました。",
     "en":"Default visibility:{{set}}"
@@ -74,6 +78,10 @@ var lang_setting_tag={
     "ja":"タグの取得範囲を「{{set}}」に設定しました。",
     "en":"Tag TL:{{set}}"
 }
+var lang_setting_box={
+    "ja":"投稿ボックスを{{set}}",
+    "en":"Post box:{{set}}"
+}
 var lang_setting_ul={
     "ja":"独自ロケール設定を{{set}}に設定しました。",
     "en":"Native locale:{{set}}"
diff --git a/app/js/post/post.js b/app/js/post/post.js
index 609fe111..4e971c43 100644
--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@@ -78,9 +78,6 @@ function post() {
 			var box = localStorage.getItem("box");
 			if (box == "yes") {
 				hide();
-			}else if (box == "hide"){
-				$("body").addClass("mini-post");
-				$(".mini-btn").text("expand_less");
 			}
 			$("#toot-post-btn").prop("disabled", false);
 			todc();
@@ -178,8 +175,16 @@ function clear() {
 	} else {
 		$("#cw-text").val("");
 	}
-	$("#cw").removeClass("yellow-text");
-	$("#cw").removeClass("cw-avail");
+	var acw = localStorage.getItem("always-cw");
+	if (acw != "yes") {
+		$("#cw").removeClass("yellow-text");
+		$("#cw").removeClass("cw-avail");
+		$("#cw-text").hide();
+	}else{
+		$("#cw").addClass("yellow-text");
+		$("#cw").addClass("cw-avail");
+		$("#cw-text").show();
+	}
 	$("#rec").text(lang_no[lang]);
 	$("#mec").text(lang_nothing[lang]);
 	loadVis();
diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js
index 1af8c525..d5277420 100644
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -159,15 +159,22 @@ function parseColumn() {
 		$(".box").css("min-width", width + "px");
 	}
 	var box = localStorage.getItem("box");
-	if (box == "yes") {
-		$("#post-box").addClass("hidenbox");
-		$("#post-box").fadeOut();
-		$("#menu-btn").fadeIn();
-	}else if (box == "hide"){
-		$("body").addClass("mini-post");
-		$(".mini-btn").text("expand_less");
+	if (box == "absolute") {
+		show();
 	}
 	favTag();
+	var cw = localStorage.getItem("always-cw");
+	if (cw == "yes") {
+		if(!$("#cw").hasClass("cw-avail")){
+			$("#cw-text").show();
+			$("#cw").addClass("yellow-text");
+			$("#cw").addClass("cw-avail");
+			var cwt=localStorage.getItem("cw-text");
+			if(cwt){
+				$("#cw-text").val(cwt);
+			}
+		}
+	}
 }
 //カラム追加
 function addColumn() {
diff --git a/app/js/ui/post-box.js b/app/js/ui/post-box.js
index 534e68e6..2a0eadae 100644
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@@ -48,8 +48,10 @@ $('#posttgl').focusin(function(e) {
 });
 
 $("#timeline-container,#group").click(function(e) {
-	if($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")){
-		hide();
+	if(localStorage.getItem("box")!="absolute"){
+		if($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")){
+			hide();
+		}
 	}
 	localStorage.removeItem("nohide")
 });
diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js
index 2feb1278..be977799 100644
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -37,6 +37,13 @@ function settings() {
 	}
 	localStorage.setItem("cw-text", cwtd);
 
+	var cwsd = $("[name=cws]:checked").val();
+	var cwst = $("[for=cws_"+cwsd+"]").text();
+	if (cwsd != localStorage.getItem("always-cw")) {
+		Materialize.toast(lang_setting_cws[lang].replace("{{set}}" ,cwst), 3000);
+	}
+	localStorage.setItem("always-cw", cwsd);
+
 	var visd = $("[name=vis]:checked").val();
 	var vist = $("[for="+visd+"]").text();
 	if (visd != localStorage.getItem("vis")) {
@@ -108,6 +115,13 @@ function settings() {
 	}
 	localStorage.setItem("img-height", heid);
 
+	var boxd = $("[name=box]:checked").val();
+	var boxt = $("[for=bx_"+boxd+"]").text();
+	if (boxd != localStorage.getItem("box")) {
+		Materialize.toast(lang_setting_box[lang].replace("{{set}}" ,boxt), 3000);
+	}
+	localStorage.setItem("box", boxd);
+
 	var tagd = $("[name=tag]:checked").val();
 	var tagt = $("[for=t_"+tagd+"]").text();
 	if (tagd != localStorage.getItem("tag-range")) {
@@ -192,6 +206,12 @@ function load() {
 	}
 	$("#c_" + cw).prop("checked", true);
 
+	var cws = localStorage.getItem("always-cw");
+	if (!cws) {
+		var cws = "no";
+	}
+	$("#cws_" + cws).prop("checked", true);
+
 	var popup = localStorage.getItem("popup");
 	if (!popup) {
 		var popup = "0";
@@ -202,7 +222,10 @@ function load() {
 	if (!box) {
 		var box = "no";
 	}
-	$("#b_" + box).prop("checked", true);
+	if(box=="absolute"){
+		var box = "abs";
+	}
+	$("#bx_" + box).prop("checked", true);
 
 	var gif = localStorage.getItem("gif");
 	if (!gif) {
@@ -233,6 +256,12 @@ function load() {
 	}
 	$("#cw-text").val(cwt);
 
+	var cws = localStorage.getItem("always-cw");
+	if (!cws) {
+		var cws = "no";
+	}
+	$("#cws_" + cws).prop("checked", true);
+
 	var vis = localStorage.getItem("vis");
 	if (!vis) {
 		var vis = "public";
@@ -269,6 +298,12 @@ function load() {
 	}
 	$("#t_" + tag).prop("checked", true);
 
+	var box = localStorage.getItem("box");
+	if (!box) {
+		var box = "yes";
+	}
+	$("#bx_" + box).prop("checked", true);
+
 	var uld = localStorage.getItem("locale");
 	if (!uld) {
 		var uld = "yes";
diff --git a/app/language/setting.en.json b/app/language/setting.en.json
index b3094036..5b9754f2 100644
--- a/app/language/setting.en.json
+++ b/app/language/setting.en.json
@@ -38,11 +38,15 @@
     "nsfwwarn":"Strong blur effect",
     "cw":"Hide CW contents",
     "gif":"Animated GIF images animation",
+    "box":"Action of posting-box",
+    "boxyes":"Folding",
+    "boxabs":"Absolutely open",
+    "boxno":"Open after posting",
     "tag":"Tag TL Search",
     "tagfed":"Use federated network",
     "taglocal":"Use local network",
     "via":"Show via",
-    "mouseover":"Hide aaction buttons without mouseover",
+    "mouseover":"Hide action buttons without mouseover",
     "mouseoverwarn":"You may feel unconfortable:(",
     "autofold":"Auto folding",
     "autofoldwarn":"TheDesk does not collapse totes of 5 characters or less. Also, when collapsing, newlines are not shown. TheDesk count only newlines as the number of lines.",
@@ -52,6 +56,7 @@
     "imgheight":"Height of images",
     "post":"Posting Preferences",
     "defaultcw":"Default warining text",
+    "cws":"Always CW set",
     "defaultvis":"Default visibility",
     "public":"Public",
     "unlisted":"Unlisted",
diff --git a/app/language/setting.ja.json b/app/language/setting.ja.json
index 4cac7c60..73830d25 100644
--- a/app/language/setting.ja.json
+++ b/app/language/setting.ja.json
@@ -38,6 +38,10 @@
     "nsfwwarn":"きつめのぼかしがかかります。",
     "cw":"非表示設定のテキスト(CW)を隠す",
     "gif":"アイコンのアニメーションを再生する",
+    "box":"投稿ボックスの挙動",
+    "boxyes":"たたむ",
+    "boxabs":"枠外クリックで閉じない(起動時に展開)",
+    "boxno":"投稿後も隠さない",
     "tag":"タグタイムラインの表示範囲",
     "tagfed":"接続しているインスタンス",
     "taglocal":"検索対象のインスタンスのみ",
@@ -52,6 +56,7 @@
     "imgheight":"画像の高さ",
     "post":"投稿設定",
     "defaultcw":"デフォルトの警告文",
+    "cws":"標準でCWを設定",
     "defaultvis":"デフォルトの公開設定",
     "public":"公開(Public)",
     "unlisted":"未収載(Unlisted)",
diff --git a/app/oss.html b/app/oss.html
index 21f1f8ec..fc6eba6e 100644
--- a/app/oss.html
+++ b/app/oss.html
@@ -161,6 +161,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.<br>
 <h5>itunes-nowplaying-mac</h5>
+<i class="fa fa-github"></i><a href="https://github.com/rinsuki/itunes-nowplaying-mac" target="_blank">rinsuki/itunes-nowplaying-mac</a><br>
 MIT LICENSE
 <h5>Adobe Creative SDK</h5>
 Please visit:
@@ -169,6 +170,30 @@ Please visit:
 	<i class="material-icons">
 	picture_as_pdf
 	</i></a>
+<h5>adm-zip</h5>
+<i class="fa fa-github"></i><a href="https://github.com/cthackers/adm-zip" target="_blank">cthackers/adm-zip</a><br>
+Copyright (c) 2012 Another-D-Mention Software and other contributors, 
+http://www.another-d-mention.ro/<br>
+<br>
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:<br>
+<br>
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+<br><br>
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+<br>
 <h5>Google Fonts</h5>
 <ul>
     <li>Open Sans:<a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0"> Apache License, Version 2.0 </a></li>
diff --git a/app/package.json b/app/package.json
index e53ecd2d..feb3a5ad 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,13 +1,27 @@
 {
-  "name": "TheDesk",
-  "version": "16.0.1",
-  "description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです",
+  "name": "thedesk",
+  "version": "16.0.2",
+  "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
-  "author": "Cutls P",
+  "bugs":{ 
+    "url" : "https://github.com/cutls/TheDesk/issues",
+    "email" : "mstdn@thedesk.top"
+  },
+  "homepage":"https://thedesk.top",
+  "author": { 
+    "name": "Cutls P",
+    "url" : "https://kirishima.clooud/@Cutls",
+    "email" : "web-pro@cutls.com"
+  },
+  "contributor": [{ 
+    "name": "とねぢ",
+    "url" : "https://minohdon.jp/@toneji",
+    "email" : "solfa.tono@gmail.com"
+  }],
   "license": "TheDesk LICENSE",
   "dependencies": {
     "adm-zip": "^0.4.11",
diff --git a/app/setting.html b/app/setting.html
index 823221c8..a281ab57 100644
--- a/app/setting.html
+++ b/app/setting.html
@@ -156,6 +156,13 @@
 		<input type="text" style="width:150px" id="cw-text">
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
+		<h5>標準でCWを設定</h5>
+		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_yes" value="yes" />
+		<label for="cws_yes">はい</label>
+		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_no" value="no" />
+		<label for="cws_no">いいえ
+		</label>
+		<br>
 		<h5>デフォルトの公開設定</h5>
 		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="public" value="public" />
 		<label for="public">公開(Public)</label>
@@ -181,6 +188,15 @@
 			<!--画像を投稿し、インラインで表示(Markdownに対応したインスタンスのみ。マルチアカウント環境では非推奨。)-->
 		</label>
 		<br>
+		<h5>投稿ボックスの挙動</h5>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_yes" value="yes" />
+		<label for="bx_yes">たたむ</label>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_no" value="no" />
+		<label for="bx_no">投稿後も隠さない
+		</label>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_abs" value="absolute" />
+		<label for="bx_abs">枠外クリックで閉じない(起動時に展開)</label>
+		<br>
 		<h5>引用形式</h5>
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_simple" value="simple" />
 		<label for="q_simple">URLのみ</label>
@@ -341,6 +357,7 @@ TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のため
 <script type="text/javascript" src="./js/common/about.js"></script>
 <script type="text/javascript" src="./js/platform/end.js"></script>
 <script type="text/javascript" src="./js/login/logout.js"></script>
+<script type="text/javascript" src="./js/lang/lang.js"></script>
 <script type="text/javascript" src="./js/ui/spotify.js"></script>
 <script type="text/javascript" src="./js/tl/speech.js"></script>
 <script type="text/javascript" src="./js/ui/settings.js"></script>
diff --git a/app/setting.sample.html b/app/setting.sample.html
index 33a0869f..44092622 100644
--- a/app/setting.sample.html
+++ b/app/setting.sample.html
@@ -156,6 +156,13 @@
 		<input type="text" style="width:150px" id="cw-text">
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
 		<br>
+		<h5>{{cws}}</h5>
+		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_yes" value="yes" />
+		<label for="cws_yes">{{yes}}</label>
+		<input class="with-gap" onchange="settings()" name="cws" type="radio" id="cws_no" value="no" />
+		<label for="cws_no">{{no}}
+		</label>
+		<br>
 		<h5>{{defaultvis}}</h5>
 		<input class="with-gap" onchange="settings()" name="vis" type="radio" id="public" value="public" />
 		<label for="public">{{public}}</label>
@@ -181,6 +188,15 @@
 			<!--画像を投稿し、インラインで表示(Markdownに対応したインスタンスのみ。マルチアカウント環境では非推奨。)-->
 		</label>
 		<br>
+		<h5>{{box}}</h5>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_yes" value="yes" />
+		<label for="bx_yes">{{boxyes}}</label>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_no" value="no" />
+		<label for="bx_no">{{boxno}}
+		</label>
+		<input class="with-gap" onchange="settings()" name="box" type="radio" id="bx_abs" value="absolute" />
+		<label for="bx_abs">{{boxabs}}</label>
+		<br>
 		<h5>{{quote}}</h5>
 		<input class="with-gap" onchange="settings()" name="quote" type="radio" id="q_simple" value="simple" />
 		<label for="q_simple">{{simple}}</label>
@@ -341,6 +357,7 @@ TheDeskおよびCutls Pは<a href="https://donken.org/">被災地支援のため
 <script type="text/javascript" src="./js/common/about.js"></script>
 <script type="text/javascript" src="./js/platform/end.js"></script>
 <script type="text/javascript" src="./js/login/logout.js"></script>
+<script type="text/javascript" src="./js/lang/lang.js"></script>
 <script type="text/javascript" src="./js/ui/spotify.js"></script>
 <script type="text/javascript" src="./js/tl/speech.js"></script>
 <script type="text/javascript" src="./js/ui/settings.js"></script>