final

config, package to build

app/js/common/version.js

@@ -16,7 +16,31 @@ function verck(ver,winstore) {
 			$("#release-"+verp).show();
 		  });
 	}
-	
+	var electron = require("electron");
+	var remote=electron.remote;
+	var dialog=remote.dialog;
+	const options = {
+		type: 'info',
+		title: "Select your platform",
+		message: lang.lang_version_platform,
+		buttons: [lang.lang_no,lang.lang_yesno]
+	  }
+	  var platform=remote.process.platform;
+	  if(platform=="win32"){
+		  console.log(localStorage.getItem("winstore"))
+		  if(!localStorage.getItem("winstore")){
+			  
+				dialog.showMessageBox(options, function(arg) {
+				  if(arg==1){
+					  localStorage.setItem("winstore","winstore")
+					}else{
+					  localStorage.setItem("winstore","localinstall")
+					}
+			  });
+		  }
+	  }else{
+		  localStorage.setItem("winstore","unix")
+	  }
 	var l = 5;
 	// 生成する文字列に含める文字セット
 	var c = "abcdefghijklmnopqrstuvwxyz0123456789";

app/js/lang/lang.en.js

@@ -21,6 +21,7 @@ var lang={
     //common/version.js
     "lang_version_usever":"No update is found({{ver}})",
     "lang_version_skipver":"Update was ignored.",
+    "lang_version_platform":"Was this software installed at Microsoft Store? When select 'yes', any update was ignored.",
     //login
     //login/login.js
     "lang_login_noauth":"Show TL of unlogined accounts",

app/js/lang/lang.ja.js

@@ -22,6 +22,7 @@ var lang={
 //common/version.js
     "lang_version_usever":"お使いのバージョン{{ver}}は最新です。",
     "lang_version_skipver":"アップデートはスキップされました。",
+    "lang_version_platform":"このソフトウェアはMicrosoft Storeからダウンロードされましたか？(「はい」を選択すると次回からアップデート通知を無視します。)",
 //login
 //login/login.js
     "lang_login_noauth":"認証せずに見る",

app/js/login/manager.js

@@ -60,7 +60,7 @@ function load() {
 	var electron = require("electron");
           var remote=electron.remote;
           var platform=remote.process.platform;
-	    if(platform=="win32"){
+	    if(localStorage.getItem("winstore")!="localinstall"){
 			$("#linux").prop("checked", false);
         }else{
 			$("#linux").prop("checked", true);

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "17.0.2",
+  "version": "17.1.1",
   "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {
@@ -38,11 +38,11 @@
     "font-manager": "^0.3.0",
     "jimp": "^0.2.28",
     "node-notifier": "^5.2.1",
-    "nowplaying-node": "^0.1.3",
     "sumchecker": "^2.0.2"
   },
   "optionalDependencies": {
-    "itunes-nowplaying-mac": "^0.2.3"
+    "itunes-nowplaying-mac": "^0.2.3",
+    "nowplaying-node": "^0.1.3"
   },
   "build": {
     "productName": "TheDesk",

app/view/en/index.html

@@ -32,7 +32,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="Miria (17.1.0) beta1";
+var ver="Miria (17.1.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -263,8 +263,8 @@ var tlid=0;
 			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon">
-	
+		<div id="votedon" class="poll-provider hide">
+	WIP
 		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="Choice1">

app/view/ja/index.html

@@ -32,7 +32,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="Miria (17.1.0) beta1";
+var ver="Miria (17.1.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -263,8 +263,8 @@ var tlid=0;
 			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon">
-	
+		<div id="votedon" class="poll-provider hide">
+	WIP
 		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="選択肢1">

app/view/make/index.sample.html

@@ -263,8 +263,8 @@ var tlid=0;
 			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon">
-	
+		<div id="votedon" class="poll-provider hide">
+	WIP
 		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="{{choice}}1">
@@ -582,7 +582,7 @@ var tlid=0;
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 		<br>
-			<div id="release-Miria_17-1-0" class="release-do" style="display:none; ">
+			<div id="release-Miria_17-1-1" class="release-do" style="display:none; ">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>

app/view/ps/index.html

@@ -32,7 +32,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="Miria (17.1.0) beta1";
+var ver="Miria (17.1.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -263,8 +263,8 @@ var tlid=0;
 			<option value="votedon">votedon.</option>
 			<option value="mastodon-poll">Mastodon(2.8~)</option>
 		</select>
-		<div id="votedon">
-	
+		<div id="votedon" class="poll-provider hide">
+	WIP
 		</div>
 		<div id="mastodon-poll" class="poll-provider hide">
 			<input type="text" class="mastodon-choice" placeholder="{{choice}}1">