today shinchoku

Bump chokidar from 3.3.1 to 3.4.0 in /app

README.md

@@ -1,3 +1,18 @@
+# rewrite-overallブランチへようこそ🎃
+
+このブランチはコードを最初から全部読み直して書き直そうという途方もなく壮大なプロジェクトです。
+
+1周目では、
+
+* 脱jQuery
+* 脱onclick
+* 脱コールバック地獄
+* 重複してるやつや使ってないやつを消す
+
+という極めて当たり前のやつをやっていきます。
+
+# 以下いつものREADME
+
 <img src="https://thedesk.top/img/top.png" width="300" align="left">
 <img src="https://thedesk.top/img/desk.png" width="150" align="right">
 
@@ -165,4 +180,3 @@ Please write issues to improve TheDesk affinity with Pleroma.
 ## Vulnerabilities when `npm i`???
 
 No, if your npm says materialize-css has vulnerabilities(CVE-2019-11002/3/4), look at [here](https://github.com/Dogfalo/materialize/issues/6286) under discussion.
-

app/css/acct.css

@@ -48,6 +48,12 @@ html {
 .first .hide-first {
 	display: none;
 }
+.hide-second {
+	display: none;
+}
+.first .hide-second {
+	display: inline;
+}
 
 #compt {
 	margin-top: 20px;

app/css/master.css

@@ -5,10 +5,12 @@ body {
 	overflow: hidden;
 	user-select: none;
 	cursor: default;
-	font-size: 13px;
 	height: 100vh;
 	color: var(--color);
 }
+html {
+	font-size: 13px;
+}
 .titlebar,
 .menubar-menu-container,
 .action-menu-item {
@@ -19,9 +21,12 @@ body {
 .action-menu-item:hover {
 	filter: brightness(80%) !important;
 }
-.btn {
+.btn, .btn-flat {
-	margin: 5px;
+	font-size: 1.1rem;
+	margin: 0.4rem;
 	text-transform: none;
+	height: 2.76rem;
+	line-height: 2.76rem;
 }
 .markdown {
 	display: none;
@@ -89,7 +94,7 @@ option {
 }
 .badge {
 	min-width: 0 !important;
-	margin-left: 5px !important;
+	margin-left: 0.4rem !important;
 }
 .unvisible {
 	opacity: 0;
@@ -163,16 +168,17 @@ pre {
 	display: block;
 	border-left: 5px solid;
 	border-color: #079903;
-	padding-left: 10px;
+	padding-left: 0.75rem;
-	margin-top: 5px;
+	margin-top: 0.75rem;
-	margin-bottom: 5px;
+	margin-bottom: 0.75rem;
-	margin-left: 5px;
+	margin-left: 0.75rem;
 	background-color: #000;
 	padding: 1em 1em 1em;
 	position: relative;
-	border-top-left-radius: 10px;
+	border-top-left-radius: 0.75rem;
-	border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 0.75rem;
-	border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 0.75rem;
+	white-space: normal;
 }
 blockquote,
 .quote p {
@@ -184,9 +190,9 @@ blockquote,
 	background-color: #ddd;
 	padding: 1em 1em 1em;
 	position: relative;
-	border-top-left-radius: 10px;
+	border-top-left-radius: 0.75rem;
-	border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 0.75rem;
-	border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 0.5rem;
 }
 blockquote:before,
 .quote:before {
@@ -204,9 +210,9 @@ blockquote:before,
 	background-color: #fff;
 	padding: 1em 1em 1em;
 	position: relative;
-	border-top-left-radius: 10px;
+	border-top-left-radius: 0.75rem;
-	border-bottom-right-radius: 10px;
+	border-bottom-right-radius: 0.75rem;
-	border-bottom-left-radius: 10px;
+	border-bottom-left-radius: 0.75rem;
 	border-left: 5px solid #0096fa;
 }
 .pixiv-post :before {
@@ -223,7 +229,7 @@ blockquote:before,
 	display: none;
 	position: fixed;
 	width: 100vw;
-	height: calc(100vh - 40px);
+	height: calc(100vh - 3rem);
 	background-color: var(--bg);
 	color: var(--color);
 	z-index: 99999;
@@ -318,7 +324,7 @@ blockquote:before,
 }
 .font {
 	font-size: 1.5rem;
-	margin-bottom: 5px;
+	margin-bottom: 0.4rem;
 }
 .font:hover {
 	background-color: #999;
@@ -339,9 +345,9 @@ blockquote:before,
 	width: 540px;
 	top: calc(50% - 150px);
 	left: calc(50% - 250px);
-	padding: 5px;
+	padding: 0.4rem;
 	border: thin solid gray;
-	border-radius: 5px;
+	border-radius: 0.4rem;
 	overflow: hidden;
 }
 #menu-wrapper {
@@ -351,12 +357,12 @@ blockquote:before,
 	overflow: hidden;
 }
 #left-menu {
-	width: 230px;
+	width: 17.7rem;
 }
 #left-menu a {
-	padding-left: 5px;
+	padding-left: 0.4rem;
 	width: 100%;
-	height: 50px;
+	height: 3rem;
 	display: flex;
 	align-items: center;
 	cursor: pointer;
@@ -366,7 +372,7 @@ blockquote:before,
 	background-color: var(--beforehover);
 }
 #left-menu span {
-	margin-left: 5px;
+	margin-left: 0.4rem;
 }
 #left-menu a.active {
 	background-color: var(--emphasized);
@@ -375,7 +381,7 @@ blockquote:before,
 	width: 100%;
 	overflow-y: scroll;
 	overflow-x: hidden;
-	padding: 5px;
+	padding: 0.4rem;
 }
 #tltype {
 	display: flex;
@@ -385,13 +391,13 @@ blockquote:before,
 	display: flex;
 	flex-wrap: wrap;
 	align-items: center;
-	width: 170px;
+	width: 13rem;
-	height: 40px;
+	height: 3.1rem;
 	cursor: pointer;
 	color: var(--color);
 }
 #tltype .type span {
-	width: calc(100% - 30px);
+	width: calc(100% - 2.3rem);
 }
 #tltype .type:hover {
 	background-color: var(--beforehover);
@@ -400,28 +406,28 @@ blockquote:before,
 	background-color: var(--emphasized);
 }
 #tltype i {
-	font-size: 30px;
+	font-size: 2.3rem;
 }
 #tltype i.sub-icon {
-	font-size: 20px;
+	font-size: 1.53rem;
 	position: absolute;
 	color: var(--beforehover);
-	left: 10px;
+	left: 0.9rem;
-	bottom: 5px;
+	bottom: 0.4rem;
 	background-color: #fff;
 }
 .drag-bar {
 	cursor: move;
 	text-align: center;
-	width: calc(100% + 10px);
+	width: calc(100% + 0.8rem);
 	border-radius: 5px;
 	background-color: var(--box);
 	filter: brightness(80%);
-	margin-left: -5px;
+	margin-left: -0.4rem;
-	margin-right: -5px;
+	margin-right: -0.4rem;
-	margin-top: -5px;
+	margin-top: -0.4rem;
-	font-size: 16px;
+	font-size: 1.3rem;
-	padding: 4px;
+	padding: 0.3rem;
 }
 #something-wrong {
 	flex-direction: column;
@@ -438,10 +444,10 @@ blockquote:before,
 	width: 100vw;
 	background-color: var(--box);
 	z-index: 9999;
-	padding: 10px;
+	padding: 0.8rem;
 	display: grid;
 	grid-template-columns: 3fr 1fr 1fr;
-	grid-template-rows: 1fr 36px;
+	grid-template-rows: 1fr 2.7rem;
 	grid-template-areas: 'note middle right' 'note close close';
 }
 #support-btm-en,
@@ -458,7 +464,7 @@ blockquote:before,
 	grid-area: close;
 }
 .select-wrapper .dropdown-content {
-	width: 250px !important;
+	width: 19.2rem !important;
 }
 input,
 textarea {
@@ -474,7 +480,7 @@ textarea {
 	color: var(--color) !important;
 }
 #src-contents svg {
-	margin-right: 5px;
+	margin-right: 0.4rem;
 }
 .contributor {
 	cursor: pointer;
@@ -484,11 +490,11 @@ textarea {
 }
 .tagComp {
 	display: grid;
-	grid-template-columns: 60px 80px 1fr;
+	grid-template-columns: 4.6rem 6.15rem 1fr;
 	grid-template-rows: 1fr 1fr;
 	grid-template-areas: 'svg toot user' 'svg toot tag' 'svg toots tag';
 	border-top: dotted 0.5px var(--gray);
-	padding: 5px;
+	padding: 0.4rem;
 }
 .tagCompSvg {
 	grid-area: svg;
@@ -506,7 +512,7 @@ textarea {
 }
 .tagCompTag {
 	grid-area: tag;
-	padding-top: 10px;
+	padding-top: 0.4rem;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
@@ -517,15 +523,15 @@ textarea {
 #pageSrc {
 	position: absolute;
 	top: 0;
-	left: calc(50vw - 150px);
+	left: calc(50vw - 11.53rem);
-	width: 300px;
+	width: 23rem;
 	max-width: 100%;
 	background-color: var(--box);
 	z-index: 501;
-	padding: 5px;
+	padding: 0.4rem;
 }
 #pageSrcInput {
-	width: 160px;
+	width: 12.3rem;
 }
 .voice {
 	clip: rect(1px, 1px, 1px, 1px);
@@ -576,7 +582,7 @@ textarea {
 	font-family: 'Material Icons';
 	font-weight: normal;
 	font-style: normal;
-	font-size: 24px;
+	font-size: 1.84rem;
 	line-height: 1;
 	letter-spacing: normal;
 	text-transform: none;
@@ -599,4 +605,4 @@ textarea {
 .linux .win,
 .darwin .win {
 	display: none;
-}
+}

app/css/post.css

@@ -1,145 +1,148 @@
 /*トゥートボックス向けCSS*/
 #post-box {
-  display: none;
+	display: none;
-  position: fixed;
+	position: fixed;
-  left: calc(50vw - 150px);
+	left: calc(50vw - 150px);
-  top: 50vh;
+	top: 50vh;
-  background-color: var(--postbox);
+	background-color: var(--postbox);
-  border: thin solid gray;
+	border: thin solid gray;
-  z-index: 501;
+	z-index: 501;
-  max-width: 100%;
+	max-width: 100%;
-  padding: 5px;
+	padding: 0.4rem;
-  border-radius: 5px;
+	border-radius: 0.4rem;
-  overflow: hidden;
+	overflow: hidden;
 }
 textarea {
-  min-height: 100px !important;
+	min-height: 7.7rem !important;
-  font-family: inherit;
+	font-family: inherit;
 }
-#post-box .ui-resizable-s, #post-box .ui-resizable-se{
+#post-box .ui-resizable-s,
-  display: none !important;
+#post-box .ui-resizable-se {
+	display: none !important;
 }
 
 .cancel {
-  font-size: 0.5rem;
+	font-size: 0.5rem;
-  color: gray;
+	color: gray;
-  cursor: pointer;
+	cursor: pointer;
-  position: absolute;
+	position: absolute;
-  right: 2px;
+	right: 2px;
-  top: 4px;
+	top: 4px;
 }
 .more-show {
-  display: none;
+	display: none;
 }
 #drag {
-  width: 100%;
+	width: 100%;
-  height: 100px;
+	height: 100px;
 }
 #post-btn {
-  display: none;
+	display: none;
 }
 #vis {
-  text-transform: capitalize;
+	text-transform: capitalize;
 }
 #cw-text {
-  display: none;
+	display: none;
 }
 #sch-box {
-  display: none;
+	display: none;
 }
 #sch-box input {
-  width: auto;
+	width: auto;
 }
 .picker__close,
 .picker__today,
 .picker__clear {
-  color: #26a69a !important;
+	color: #26a69a !important;
 }
 .cw {
-  display: none;
+	display: none;
 }
 .sensitive {
-  filter: blur(50px);
+	filter: blur(50px);
 }
 #emoji {
 }
 #suggest {
-  max-height: 300px;
+	max-height: 23rem;
-  overflow-y: scroll;
+	overflow-y: scroll;
 }
 #emoji-list {
-  width: 100%;
+	width: 100%;
-  height: 200px;
+	height: 15.4rem;
-  overflow-y: scroll;
+	overflow-y: scroll;
 }
 #preview-field {
-  display: none;
+	display: none;
 }
 .preview-img {
-  width: 50px;
+	width: 4rem;
-  max-height: 100px;
+	max-height: 7.6rem;
 }
 .pi-wrap {
-  display: inline-block;
+	display: inline-block;
-  width: 50px;
+	width: 3.8rem;
-  max-height: 100px;
+	max-height: 7.7rem;
 }
 #default-emoji a {
-  color: var(--color);
+	color: var(--color);
-  margin-right: 2px;
+	margin-right: 0.15rem;
 }
 .character-counter {
-  position: relative;
+	position: relative;
-  top: -25px;
+	top: -1.9rem;
 }
 .trendtag {
-  overflow-y: scroll;
+	overflow-y: scroll;
-  max-height: 100px;
+	max-height: 7.7rem;
 }
 #toot-btn-field {
-  display: flex;
+	display: flex;
 }
 #toot-post-btn {
-  width: calc(100% - 10px);
+	width: calc(100% - 0.7rem);
-  padding: 0;
+	padding: 0;
-  margin-top: 10px;
+	margin-top: 0.7rem;
+	height: 2.7rem;
 }
 #toot-sec-btn {
-  width: 30px;
+	width: 2.3rem;
-  padding: 0;
+	padding: 0;
-  margin-top: 10px;
+	margin-top: 0.7rem;
 }
 #left-side {
-  float: left;
+	float: left;
-  overflow-x: hidden;
+	overflow-x: hidden;
-  height: calc(100% - 32px);
+	height: calc(100% - 2.5rem);
 }
 #right-side {
-  display: none;
+	display: none;
-  float: left;
+	float: left;
-  width: 300px;
+	width: 23rem;
-  padding: 5px;
+	padding: 0.4rem;
-  overflow-x: hidden;
+	overflow-x: hidden;
-  height: calc(100% - 32px);
+	height: calc(100% - 2.5rem);
 }
-#posttgl,#toot-post-btn {
+#posttgl,
-  background-color: var(--accentbtn);
+#toot-post-btn {
-  color: var(--color);
+	background-color: var(--accentbtn);
+	color: var(--color);
 }
 /*mini*/
 .mini-post .mize {
-  display: none !important;
+	display: none !important;
 }
 .mini-post #textarea {
-  padding: 0;
+	padding: 0;
 }
 .mini-post #post-box {
-  width: 200px;
+	width: 15.4rem;
-  min-width: 100px;
+	min-width: 7.7rem;
 }
 .mini-post #toot-field {
-  padding: 0;
+	padding: 0;
 }
 .mini-post #toot-btn-field {
-  padding: 0;
+	padding: 0;
 }

app/css/sort.css

@@ -3,29 +3,29 @@
   cursor: move;
   user-select: none;
   background-color: var(--modalfooter);
-  margin: 5px;
+  margin: 0.4rem;
-  border-radius: 5px;
+  border-radius: 0.4rem;
   color: var(--color);
   padding: 3px;
   display: grid;
-  grid-template-columns: 43px 1fr 60px;
+  grid-template-columns: 3.3rem 1fr 4.6rem;
   grid-template-areas: "sorticon sorttitle sorttitle" "sorticon sortacct sortaction";
 }
 .sorticon {
   grid-area: sorticon;
 }
 .sorticon i {
-  font-size: 43px;
+  font-size: 3.3rem;
 }
 .sorttitle {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sorttitle;
 }
 .sortacct {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sortacct;
 }
 .sortaction {
-  margin-left: 5px;
+  margin-left: 0.4rem;
   grid-area: sortaction;
 }

app/css/tl.css

@@ -1,7 +1,7 @@
 /*TL CSS(ただしBBCode pulse:master.css/spin:font-awesome*/
 #main {
 	width: 100vw;
-	height: calc(100vh - 40px);
+	height: calc(100% - 3rem);
 }
 #timeline-container {
 	overflow-x: scroll;
@@ -11,18 +11,19 @@
 }
 #bottom {
 	position: absolute;
+	overflow: hidden;
 	bottom: 0;
 	width: 100vw;
-	height: 40px;
+	height: 3rem;
-	padding: 3px;
+	padding: 0.23rem;
 	padding-right: 0;
-	padding-left: 40px;
+	padding-left: 3rem;
 	background-color: var(--sidebar);
 	display: flex;
 	justify-content: space-between;
 	flex-wrap: wrap;
 	z-index: 500;
-	box-shadow: 10px 0 10px 10px rgba(0, 0, 0, 0.2);
+	box-shadow: 0.77rem 0 0.77rem, 0.77rem rgba(0, 0, 0, 0.2);
 }
 #demobottom {
 	width: 500px;
@@ -30,24 +31,24 @@
 }
 #bottom.reverse {
 	padding-left: 0;
-	padding-right: 40px;
+	padding-right: 3rem;
 }
 .reverse {
 	flex-direction: row-reverse;
 }
 #bottom #dambox {
-	width: 300px;
+	width: 23rem;
-	margin-right: 10px;
+	margin-right: 0.76rem;
 }
 #bottom.reverse #dambox {
 	margin-right: 0;
 }
 #bottom .trendtag {
-	height: 40px;
+	height: 3rem;
 }
 #bottom #group,
 #demogroup {
-	margin-right: 40px;
+	margin-right: 3rem;
 }
 #bottom .leftside {
 	display: flex;
@@ -57,41 +58,41 @@
 	align-items: center;
 }
 #bottom #tips img {
-	vertical-align: -3px;
+	vertical-align: -0.23rem;
 }
 #bottom a,
 #demogroup a {
 	color: var(--color);
 }
 #bottom i {
-	font-size: 30px;
+	font-size: 2.3rem;
 }
 .exc-icons {
-	font-size: 20px;
+	font-size: 1.53rem;
 }
 .exc-chb {
-	padding-left: 24px !important;
+	padding-left: 1.84rem !important;
 }
 .btnsgroup {
 	border: 1px solid;
 	padding-top: 1px;
-	padding-left: 5px;
+	padding-left: 0.4rem;
-	padding-right: 5px;
+	padding-right: 0.4rem;
-	margin-right: 15px;
+	margin-right: 1.15rem;
-	border-radius: 5px;
+	border-radius: 0.4rem;
-	height: 35px;
+	height: 2.7rem;
 }
 .bgReport {
-	height: 34px;
+	height: 2.61rem;
 	padding-top: 0.45rem;
 	text-decoration: underline;
-	padding-left: 5px;
+	padding-left: 0.4rem;
-	padding-right: 5px;
+	padding-right: 0.4rem;
 }
 #spot-box {
 	display: grid;
-	grid-template-columns: 40px 30px 2.5fr 1fr 60px;
+	grid-template-columns: 3rem 2.3rem 2.5fr 1fr 4.6rem;
-	grid-template-rows: 22px 20px;
+	grid-template-rows: 1.7rem 1.5rem;
 	grid-template-areas: 'cover name name artist refresh' 'cover progress progress progress time';
 }
 #spot-refresh {
@@ -105,14 +106,14 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
-	line-height: 25px;
+	line-height: 1.92rem;
 }
 #spot-artist {
 	grid-area: artist;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
-	line-height: 25px;
+	line-height: 1.92rem;
 }
 #spot-img {
 	width: 90%;
@@ -126,7 +127,7 @@
 }
 .btnsgroup .grouptitle {
 	font-family: Open Sans;
-	font-size: 15px;
+	font-size: 1.1rem;
 }
 @media screen and (max-width: 890px) {
 	.btnsgroup .grouptitle {
@@ -140,7 +141,7 @@
 iframe,
 .cvo video {
 	max-width: 100%;
-	max-height: 300px;
+	max-height: 23rem;
 }
 @media screen and (max-width: 600px) {
 	.mobile #timeline-container {
@@ -156,12 +157,12 @@ iframe,
 }
 .box {
 	overflow: hidden;
-	min-width: 300px;
+	min-width: 23rem;
 	flex: 1;
 	border-top: none;
 	display: flex;
 	flex-direction: column;
-	margin-bottom: -10px;
+	margin-bottom: -0.75rem;
 }
 .img_FTL {
 	display: none;
@@ -215,16 +216,16 @@ iframe,
 }
 .emoji,
 .emoji-img {
-	width: 15px;
+	width: 1.153rem;
 }
 .area-toot .emoji,
 .area-toot .emoji-img {
-	width: 20px;
+	width: 1.538rem;
 	vertical-align: middle;
 	margin: -1px 0;
 }
 .bigemoji {
-	width: 100px !important;
+	width: 7.7rem !important;
 	height: auto !important;
 	position: relative;
 	z-index: 9999;
@@ -253,13 +254,13 @@ iframe,
 }
 .cvo {
 	user-select: text;
-	padding-left: 5px;
+	padding-left: 0.4rem;
 	border-bottom: 0.5px solid;
-	padding-right: 2px;
+	padding-right: 0.15rem;
 	word-break: break-word;
 	width: 100%;
 	display: grid;
-	grid-template-columns: 43px 2fr 1fr;
+	grid-template-columns: 3.3rem 2fr 1fr;
 	grid-template-rows: auto 1.6rem 1fr auto 2.5rem;
 	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space toot toot' 'space additional additional' 'vis actions side';
 }
@@ -285,21 +286,21 @@ iframe,
 }
 
 .area-notice {
-	margin: 2px;
+	margin: 0.15rem;
 	grid-area: notice;
 }
 
 .area-icon {
-	width: 40px;
+	width: 3rem;
-	margin: 2px;
+	margin: 0.15rem;
 	grid-area: icon;
 }
 
 .area-display_name {
 	user-select: text;
 	height: 1.5em;
-	margin: 2px;
+	margin: 0.15rem;
-	margin-left: 5px;
+	margin-left: 0.4rem;
 	overflow: hidden;
 	grid-area: display_name;
 	white-space: nowrap;
@@ -310,7 +311,7 @@ iframe,
 	flex-wrap: nowrap;
 }
 .flex-name {
-	max-width: calc(100% - 60px);
+	max-width: calc(100% - 4.6rem);
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
@@ -318,9 +319,9 @@ iframe,
 .area-toot {
 	cursor: text;
 	user-select: auto;
-	margin-top: 5px;
+	margin-top: 0.4rem;
-	margin-bottom: 5px;
+	margin-bottom: 0.4rem;
-	margin-left: 5px;
+	margin-left: 0.4rem;
 	grid-area: toot;
 }
 
@@ -353,7 +354,7 @@ iframe,
 .area-actions {
 	padding: 0;
 	margin: 0;
-	top: -5px;
+	top: -0.4rem;
 	position: relative;
 	display: flex;
 	justify-content: space-around;
@@ -361,28 +362,28 @@ iframe,
 	grid-area: actions;
 }
 .area-vis {
-	margin: 2px;
+	margin: 0.4rem;
 	grid-area: vis;
 	text-align: center;
 }
 .area-side {
 	display: flex;
-	top: -5px;
+	top: -0.4rem;
 	position: relative;
 	justify-content: flex-end;
-	margin: 2px;
+	margin: 0.15rem;
 	grid-area: side;
 }
 
 .cusr {
 	user-select: text;
-	padding-left: 5px;
+	padding-left: 0.4rem;
 	border-bottom: 0.5px solid;
-	padding-right: 2px;
+	padding-right: 0.15rem;
 	word-break: break-word;
 	width: 100%;
 	display: grid;
-	grid-template-columns: 43px 2fr 1fr;
+	grid-template-columns: 3.3rem 2fr 1fr;
 	grid-template-rows: auto 1.6rem 2fr auto;
 	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
 }
@@ -391,12 +392,12 @@ iframe,
 	grid-area: status;
 	display: flex;
 	flex-wrap: wrap;
-	margin-bottom: 5px;
+	margin-bottom: 0.75rem;
 }
 
 .cusr .cbadge {
-	margin-top: 6px;
+	margin-top: 0.46rem;
-	margin-left: 6px;
+	margin-left: 0.46rem;
 }
 
 .quote-inline {
@@ -404,16 +405,16 @@ iframe,
 }
 .quote-renote {
 	display: grid;
-	grid-template-columns: 43px 2fr 25px;
+	grid-template-columns: 3.3rem 2fr 1.92rem;
 	grid-template-areas: 'ricon ruser rdet' 'ricon rtext rdet';
 	border: 1px solid;
-	margin-top: 3px;
+	margin-top: 0.23rem;
 	padding: 1px;
-	border-radius: 3px;
+	border-radius: 0.23rem;
 }
 .renote-icon {
 	grid-area: ricon;
-	padding: 5px;
+	padding: 0.4rem;
 }
 .renote-details {
 	grid-area: rdet;
@@ -432,17 +433,17 @@ iframe,
 	color: var(--color);
 }
 .area-side i {
-	margin-left: 10px;
+	margin-left: 0.75rem;
 }
 .viabadge {
-	margin-top: 10px;
+	margin-top: 0.75rem;
 }
 .action i {
 	font-size: 1.2rem;
-	margin-right: 2px;
+	margin-right: 0.15rem;
 }
 .action .fa-quote-right {
-	margin-top: 2px;
+	margin-top: 0.15rem;
 }
 .actct {
 	color: var(--beforehover);
@@ -461,24 +462,24 @@ iframe,
 	position: fixed;
 	background-color: var(--box);
 	z-index: 9999;
-	border-radius: 5px;
+	border-radius: 0.4rem;
-	padding: 5px;
+	padding: 0.4rem;
 }
 .contextMenu.bottom:before {
 	content: '';
 	position: absolute;
 	top: 100%;
-	right: 27px;
+	right: 2rem;
-	border: 15px solid transparent;
+	border: 1.2rem solid transparent;
-	border-top: 15px solid var(--box);
+	border-top: 1.2rem solid var(--box);
 }
 .contextMenu.top:before {
 	content: '';
 	position: absolute;
-	top: -30px;
+	top: -2.3rem;
-	right: 27px;
+	right: 2rem;
-	border: 15px solid transparent;
+	border: 1.5rem solid transparent;
-	border-bottom: 15px solid var(--box);
+	border-bottom: 1.5rem solid var(--box);
 }
 .contextMenu .btn-flat {
 	text-transform: none !important;
@@ -501,26 +502,26 @@ iframe,
 }
 .toot img:not(.emoji-img) {
 	max-width: 100%;
-	max-height: 300px;
+	max-height: 23rem;
 }
 .cbadge {
 	display: inline-block;
-	min-width: 10px;
+	min-width: 0.76rem;
-	max-width: 100px;
+	max-width: 7.7rem;
-	padding: 3px 7px;
+	padding: 0.23rem 0.5rem;
 	font-size: 0.8em;
-	margin-right: 5px;
+	margin-right: 0.4rem;
 	line-height: 1;
 	color: #fff;
 	text-align: center;
 	white-space: nowrap;
 	vertical-align: middle;
 	background-color: #777;
-	border-radius: 10px;
+	border-radius: 0.75rem;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-	height: calc(0.8em + 8px);
+	height: calc(0.8em + 0.6rem);
 	user-select: none;
 }
 .cbadge-hover {
@@ -534,10 +535,10 @@ iframe,
 p {
 	margin: 0;
 	margin-bottom: 0px;
-	line-height: 20px;
+	line-height: 1.53rem;
 }
 p:not(:last-child) {
-	margin-bottom: 10px;
+	margin-bottom: 0.76rem;
 }
 .shared {
 	background-color: var(--shared);
@@ -553,14 +554,14 @@ p:not(:last-child) {
 	background-color: var(--notfbox);
 	filter: brightness(110%);
 	position: relative;
-	margin-right: 10px;
+	margin-right: 0.7rem;
 	width: 100%;
-	min-height: 60px;
+	min-height: 4.6rem;
 	z-index: 500;
-	padding: 5px;
+	padding: 0.4rem;
 	display: grid;
-	grid-template-columns: 40px 65px 1fr 24px;
+	grid-template-columns: 3rem 5rem 1fr 1.8rem;
-	grid-template-rows: 30px 30px;
+	grid-template-rows: 2.3rem 2.3rem;
 	grid-template-areas: 'notice notice_name notice_name a2' 'notice a1 sta a3' 'notf-box notf-box notf-box notf-box';
 }
 .emp {
@@ -604,8 +605,8 @@ p:not(:last-child) {
 }
 #tools {
 	position: fixed;
-	top: 10px;
+	top: 0.76rem;
-	right: 10px;
+	right: 0.76rem;
 	float: right;
 }
 .setting {
@@ -618,14 +619,14 @@ p:not(:last-child) {
 }
 .notf-box {
 	position: fixed;
-	right: 70px;
+	right: 5.4rem;
 	background-color: var(--box);
 	border: thin solid gray;
 	z-index: 501;
-	width: 400px;
+	width: 30rem;
-	padding: 5px;
+	padding: 0.4rem;
-	min-height: 100px;
+	min-height: 7.7rem;
-	max-height: 500px;
+	max-height: 38.4rem;
 }
 .column-hide {
 	display: none;
@@ -633,17 +634,21 @@ p:not(:last-child) {
 	height: 0;
 }
 .prof-img {
-	border-radius: 3px;
+	border-radius: 0.23rem;
+	width: 3rem;
+}
+.prof-img-sml {
+	width: 1.5rem;
 }
 .notf-icon {
 	position: relative;
-	top: -20px;
+	top: -1.53rem;
-	width: 20px;
+	width: 1.5rem;
-	left: 20px;
+	left: 1.5rem;
 }
 .notf-indv-box {
 	width: 100%;
-	max-height: 400px;
+	max-height: 30.7rem;
 	overflow-y: scroll;
 	overflow-x: hidden;
 	border: thin solid gray;
@@ -676,44 +681,44 @@ p:not(:last-child) {
 .vote {
 	width: 100%;
 	border: 1px solid;
-	margin-top: 3px;
+	margin-top: 0.23rem;
 	padding: 1px;
-	border-radius: 3px;
+	border-radius: 0.23rem;
 	overflow: hidden;
 	position: relative;
 }
 .fa-2x > .emoji-img {
-	width: 36px !important;
+	width: 2.3rem !important;
-	height: 36px !important;
+	height: 2.3rem !important;
 }
 .fa-3x > .emoji-img {
-	width: 54px !important;
+	width: 4.15rem !important;
-	height: 54px !important;
+	height: 4.15rem !important;
 }
 .fa-4x > .emoji-img {
-	width: 72px !important;
+	width: 4.6rem !important;
-	height: 72px !important;
+	height: 4.6rem !important;
 }
 .fa-5x > .emoji-img {
-	width: 90px !important;
+	width: 6.9rem !important;
-	height: 90px !important;
+	height: 6.9rem !important;
 }
 #lists-user {
 	overflow-y: scroll;
 	overflow-x: hidden;
-	max-height: 200px;
+	max-height: 15.4rem;
 }
 .votebtn {
 	border: 1px solid;
 	color: var(--bg);
 	background-color: var(--beforehover);
 	cursor: pointer;
-	width: 50px;
+	width: 3.8rem;
-	padding: 2px;
+	height: 1.7rem;
 	display: inline-block;
 	text-align: center;
-	margin-top: 5px;
+	margin-top: 0.38rem;
-	border-radius: 10px;
+	border-radius: 0.75rem;
 	transition-duration: 0.5s;
 }
 .votebtn:hover {
@@ -722,8 +727,8 @@ p:not(:last-child) {
 .leadPoll {
 	position: absolute;
 	background-color: var(--box);
-	height: 20px;
+	height: 1.5rem;
-	border-radius: 3px;
+	border-radius: 0.23rem;
 }
 .lpAnime {
 	animation-duration: 1s;
@@ -740,7 +745,7 @@ p:not(:last-child) {
 	width: 1.2rem !important;
 	position: relative;
 	top: -1px;
-	margin-left: 5px !important;
+	margin-left: 0.38rem !important;
 }
 .jump {
 	display: inline-block;
@@ -765,6 +770,9 @@ p:not(:last-child) {
 	width: 100%;
 	height: 100%;
 }
+.fav_ct, .rt_ct, .rep_ct {
+	font-size: 1.1rem;
+}
 .shared.selectedToot {
 	background-color: var(--selectedWithShare);
 }
@@ -778,18 +786,18 @@ audio {
 	white-space: normal;
 }
 .cw_btn {
-	margin: 3px;
+	margin: 0.23rem;
 	background-color: var(--emphasized);
 	color: var(--color);
-	padding-left: 3px;
+	padding-left: 0.23rem;
-	padding-right: 3px;
+	padding-right: 0.23rem;
-	border-radius: 3px;
+	border-radius: 0.23rem;
 	border: 1px solid var(--color);
 	user-select: none;
 }
 .vis-data {
 	font-size: 1rem !important;
-	margin: 5px;
+	margin: 0.4rem;
 	user-select: none;
 }
 @keyframes jump {
@@ -863,29 +871,29 @@ audio {
 	display: none !important;
 }
 .announcement {
-	padding: 5px;
+	padding: 0.38rem;
 	border-bottom: 1px solid;
 }
 .announReaction {
-	width: 35px;
+	width: 2.7rem;
 	height: 1.7rem;
 	font-size: 1.1rem;
-	margin: 3px;
+	margin: 0.23rem;
 	cursor: pointer;
 	border: solid 1px;
-	padding-left: 2px;
+	padding-left: 0.15rem;
 	background-color: var(--notfbox);
-	border-radius: 2px;
+	border-radius: 0.15rem;
 }
 .announReaction img {
 	position: relative;
-	top: 3px;
+	top: 0.23rem;
 }
 .announReaction.reactioned {
 	background-color: var(--emphasized);
 }
 .announReaction.add {
-	width: 19px;
+	width: 1.46rem;
 }
 .reactionsPack {
 	display: flex;

app/css/userdata.css

@@ -16,27 +16,27 @@
 }
 #his-prof {
   float: left;
-  width: 100px;
+  width: 7.7rem;
-  margin-right: 5px;
+  margin-right: 0.4rem;
 }
 .his-float {
   overflow-y: scroll;
-  padding: 5px;
+  padding: 0.4rem;
 }
 #his-float-data {
   height: 100%;
   overflow-y: hidden;
 }
 #his-leftside {
-  width: 500px;
+  width: 38.4rem;
 }
 #his-float-timeline {
-  max-width: 775px;
+  max-width: 59.6rem;
   height: 100%;
   overflow-y: hidden;
 }
 #his-basic-prof {
-  min-height: 130px;
+  min-height: 10rem;
 }
 #his-field {
   vertical-align: baseline;
@@ -51,14 +51,14 @@
   padding: 0;
   background-color: #757575;
   text-align: center;
-  padding: 5px;
+  padding: 0.4rem;
   margin-bottom: 1px;
   width: 30%;
 }
 .his-field-content {
   height: 1.5rem;
   padding: 0;
-  padding-left: 5px;
+  padding-left: 0.4rem;
 }
 .his-var-content a span.ellipsis:after {
   content: "...";
@@ -72,13 +72,13 @@
   display: inline !important;
 }
 #his-data-show {
-  margin: 20px;
+  margin: 1.5rem;
-  margin-left: 50px;
+  margin-left: 3.8rem;
-  margin-right: 50px;
+  margin-right: 3.8rem;
   background-color: var(--his-data);
-  height: calc(100% - 20px);
+  height: calc(100% - 1.5rem);
   margin-bottom: 0;
-  padding: 5px;
+  padding: 0.4rem;
 }
 #his-data-wrap {
   display: flex;
@@ -86,39 +86,39 @@
 .his-var-content {
   overflow-y: scroll;
   overflow-x: hidden;
-  height: calc(100% - 45px);
+  height: calc(100% - 3.4rem);
 }
 #my-data-nav .btn {
-  width: 140px;
+  width: 10.7rem;
 }
 .active-back {
   background-color: var(--active);
 }
 #his-name .emojione,
 #his-name .emoji-img {
-  width: 20px;
+  width: 1.538rem;
 }
 #his-plus-action .btn {
-  padding-right: 5px;
+  padding-right: 0.4rem;
-  padding-left: 5px;
+  padding-left: 0.4rem;
 }
 .tabs {
   display: flex;
 }
 .tabs .tab a {
-  padding: 8px 12px;
+  padding: 0.6rem 0.9rem;
 }
 #his-des {
-  max-height: 250px;
+  max-height: 17.7rem;
   overflow-y: scroll;
 }
 #his-sign-action {
   border: 1px solid;
-  border-radius: 5px;
+  border-radius: 0.4rem;
   display: flex;
   align-items: center;
-  padding-left: 10px;
+  padding-left: 0.75rem;
-  padding-right: 10px;
+  padding-right: 0.75rem;
   flex-wrap: wrap;
 }
 #his-sign-action .btn {
@@ -129,7 +129,7 @@
   cursor: pointer;
 }
 #his-table{
-  max-height: 150px;
+  max-height: 11.538rem;
   overflow-y: scroll;
 }
 #his-float-blocked {

app/js/common/about.js

@@ -1,4 +1,5 @@
 //このソフトについて
 function about() {
 	postMessage(["sendSinmpleIpc", "about"], "*")
-}
+}
+document.getElementById('onClickAbout').addEventListener('click', about)

app/js/common/api.js

@@ -0,0 +1,38 @@
+async function getApi(start, at) {
+    let json = {}
+    let response = null
+    response = await fetch(start, {
+        method: 'GET',
+        headers: {
+            'content-type': 'application/json',
+            'Authorization': `Bearer ${at}`
+        }
+    })
+    if (!response.ok) {
+        response.text().then(function (text) {
+            setLog(response.url, response.status, text)
+        })
+    }
+    json = await response.json()
+    return json
+}
+async function postApi(url, body, at, ideKey) {
+    let json = {}
+    let response = null
+    response = await fetch(url, {
+        method: 'POST',
+        headers: {
+            'content-type': 'application/json',
+            'Authorization': `Bearer ${at}`,
+            'Idempotency-Key': ideKey
+        },
+        body: JSON.stringify(body)
+    })
+    if (!response.ok) {
+        response.text().then(function (text) {
+            setLog(response.url, response.status, text)
+        })
+    }
+    json = await response.json()
+    return json
+}

app/js/common/blurhash.js

@@ -1,4 +1,4 @@
-var digitCharacters = [
+const digitCharacters = [
     "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
     "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
     "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
@@ -10,16 +10,16 @@ var digitCharacters = [
     "|", "}", "~",
 ];
 function decode83(str) {
-    var value = 0;
+    let value = 0;
-    for (var i = 0; i < str.length; i++) {
+    for (let i = 0; i < str.length; i++) {
-        var c = str[i];
+        const c = str[i];
-        var digit = digitCharacters.indexOf(c);
+        const digit = digitCharacters.indexOf(c);
         value = value * 83 + digit;
     }
     return value;
 }
 function linearTosRGB(value) {
-    var v = Math.max(0, Math.min(1, value));
+    const v = Math.max(0, Math.min(1, value));
     if (v <= 0.0031308) {
         return Math.round(v * 12.92 * 255 + 0.5);
     }
@@ -28,7 +28,7 @@ function linearTosRGB(value) {
     }
 }
 function sRGBToLinear(value) {
-    var v = value / 255;
+    const v = value / 255;
     if (v <= 0.04045) {
         return v / 12.92;
     }
@@ -37,18 +37,18 @@ function sRGBToLinear(value) {
     }
 }
 function decodeDC(value) {
-    var intR = value >> 16;
+    const intR = value >> 16;
-    var intG = (value >> 8) & 255;
+    const intG = (value >> 8) & 255;
-    var intB = value & 255;
+    const intB = value & 255;
     return [sRGBToLinear(intR), sRGBToLinear(intG), sRGBToLinear(intB)];
 };
 function sign(n) { return (n < 0 ? -1 : 1); }
 function signPow(val, exp) { return sign(val) * Math.pow(Math.abs(val), exp); }
 function decodeDC2(value, maximumValue) {
-    var quantR = Math.floor(value / (19 * 19));
+    const quantR = Math.floor(value / (19 * 19));
-    var quantG = Math.floor(value / 19) % 19;
+    const quantG = Math.floor(value / 19) % 19;
-    var quantB = value % 19;
+    const quantB = value % 19;
-    var rgb = [
+    const rgb = [
         signPow((quantR - 9) / 9, 2.0) * maximumValue,
         signPow((quantG - 9) / 9, 2.0) * maximumValue,
         signPow((quantB - 9) / 9, 2.0) * maximumValue,
@@ -61,45 +61,45 @@ function decodeblur(blurhash, width, height, punch) {
         console.error('too short blurhash');
         return null;
     }
-    var sizeFlag = decode83(blurhash[0]);
+    const sizeFlag = decode83(blurhash[0]);
-    var numY = Math.floor(sizeFlag / 9) + 1;
+    const numY = Math.floor(sizeFlag / 9) + 1;
-    var numX = (sizeFlag % 9) + 1;
+    const numX = (sizeFlag % 9) + 1;
-    var quantisedMaximumValue = decode83(blurhash[1]);
+    const quantisedMaximumValue = decode83(blurhash[1]);
-    var maximumValue = (quantisedMaximumValue + 1) / 166;
+    const maximumValue = (quantisedMaximumValue + 1) / 166;
     if (blurhash.length !== 4 + 2 * numX * numY) {
         console.error('blurhash length mismatch', blurhash.length, 4 + 2 * numX * numY);
         return null;
     }
-    var colors = new Array(numX * numY);
+    let colors = new Array(numX * numY);
-    for (var i = 0; i < colors.length; i++) {
+    for (let i = 0; i < colors.length; i++) {
         if (i === 0) {
-            var value = decode83(blurhash.substring(2, 6));
+            const value = decode83(blurhash.substring(2, 6));
             colors[i] = decodeDC(value);
         }
         else {
-            var value = decode83(blurhash.substring(4 + i * 2, 6 + i * 2));
+            const value = decode83(blurhash.substring(4 + i * 2, 6 + i * 2));
             colors[i] = decodeDC2(value, maximumValue * punch);
         }
     }
-    var bytesPerRow = width * 4;
+    const bytesPerRow = width * 4;
-    var pixels = new Uint8ClampedArray(bytesPerRow * height);
+    let pixels = new Uint8ClampedArray(bytesPerRow * height);
     for (var y = 0; y < height; y++) {
         for (var x = 0; x < width; x++) {
             var r = 0;
             var g = 0;
             var b = 0;
-            for (var j = 0; j < numY; j++) {
+            for (let j = 0; j < numY; j++) {
-                for (var i = 0; i < numX; i++) {
+                for (let i = 0; i < numX; i++) {
-                    var basis = Math.cos(Math.PI * x * i / width) * Math.cos(Math.PI * y * j / height);
+                    let basis = Math.cos(Math.PI * x * i / width) * Math.cos(Math.PI * y * j / height);
-                    var color = colors[i + j * numX];
+                    let color = colors[i + j * numX];
                     r += color[0] * basis;
                     g += color[1] * basis;
                     b += color[2] * basis;
                 }
             }
-            var intR = linearTosRGB(r);
+            const intR = linearTosRGB(r);
-            var intG = linearTosRGB(g);
+            const intG = linearTosRGB(g);
-            var intB = linearTosRGB(b);
+            const intB = linearTosRGB(b);
             pixels[4 * x + 0 + y * bytesPerRow] = intR;
             pixels[4 * x + 1 + y * bytesPerRow] = intG;
             pixels[4 * x + 2 + y * bytesPerRow] = intB;
@@ -109,9 +109,9 @@ function decodeblur(blurhash, width, height, punch) {
     return pixels;
 }
 function parseBlur(blur) {
-    var canvas = document.getElementById('canvas');
+    const canvas = document.getElementById('canvas');
-    var ctx = canvas.getContext('2d');
+    const ctx = canvas.getContext('2d');
-    var pixels = decodeblur(blur, 32, 32)
+    const pixels = decodeblur(blur, 32, 32)
     const imageData = new ImageData(pixels, 32, 32);
 
     ctx.putImageData(imageData, 0, 0);

app/js/common/keyshortcut.js

@@ -1,26 +1,19 @@
-selectedColumn = 0
+let selectedColumn = 0
-selectedToot = 0
+let selectedToot = 0
-$(function($) {
+$(function ($) {
 	//キーボードショートカット
-	$(window).keydown(function(e) {
+	$(window).keydown(function (e) {
-		var hasFocus = $('input').is(':focus')
+		const hasFocus = isFocused('input')
-		var hasFocus2 = $('textarea').is(':focus')
+		const hasFocus2 = isFocused('textarea')
-		if (document.getElementById('webview')) {
+		const postBox = document.querySelector('#textarea')
-			if ($('#webviewsel:checked').val()) {
+		let wv = false
-				var wv = false
-			} else {
-				var wv = true
-			}
-		} else {
-			var wv = true
-		}
 		//Enter
 		if (e.keyCode === 13) {
-			if ($('#src').is(':focus')) {
+			if (isFocused('#src')) {
 				src()
 				return false
 			}
-			if ($('#list-add').is(':focus')) {
+			if (isFocused('#list-add')) {
 				makeNewList()
 				return false
 			}
@@ -92,7 +85,7 @@ $(function($) {
 			}
 			//X:開閉
 			if (e.keyCode === 88) {
-				if (!$('#post-box').hasClass('appear')) {
+				if (!document.querySelector('#post-box').classList.contains('appear')) {
 					show()
 					$('textarea').focus()
 				} else {
@@ -102,10 +95,10 @@ $(function($) {
 			}
 			//N:新トゥート
 			if (e.keyCode === 78) {
-				if (!$('#post-box').hasClass('appear')) {
+				if (!document.querySelector('#post-box').classList.contains('appear')) {
 					show()
 				}
-				$('textarea').focus()
+				postBox.focus()
 				return false
 			}
 			//Ctrl+E:全ての通知未読を既読にする
@@ -153,7 +146,7 @@ $(function($) {
 			//数字:TL
 			if (event.metaKey || event.ctrlKey) {
 				if (e.keyCode >= 49 && e.keyCode <= 57) {
-					var kz = e.keyCode - 49
+					const kz = e.keyCode - 49
 					goColumn(kz)
 					return false
 				}
@@ -161,7 +154,7 @@ $(function($) {
 			//矢印:選択
 			if (e.code == 'ArrowLeft') {
 				//left
-				if ($('#imagemodal').hasClass('open')) {
+				if (document.querySelector('#imagemodal').classList.contains('open')) {
 					imgCont('prev')
 					return false
 				}
@@ -172,7 +165,7 @@ $(function($) {
 				return false
 			} else if (e.code == 'ArrowUp') {
 				//up
-				if ($('#imagemodal').hasClass('open')) {
+				if (document.querySelector('#imagemodal').classList.contains('open')) {
 					return false
 				}
 				if (selectedToot > 0) {
@@ -182,7 +175,7 @@ $(function($) {
 				return false
 			} else if (e.code == 'ArrowRight') {
 				//right
-				if ($('#imagemodal').hasClass('open')) {
+				if (document.querySelector('#imagemodal').classList.contains('open')) {
 					imgCont('next')
 					return false
 				}
@@ -193,7 +186,7 @@ $(function($) {
 				return false
 			} else if (e.code == 'ArrowDown') {
 				//down
-				if ($('#imagemodal').hasClass('open')) {
+				if (document.querySelector('#imagemodal').classList.contains('open')) {
 					return false
 				}
 				selectedToot++
@@ -210,24 +203,21 @@ $(function($) {
 				}
 			}
 			//選択時
+			const selectedId = document.querySelector('.selectedToot').getAttribute('unique-id')
+			const selectedAcctIds = document.querySelector(`#timeline_${selectedColumn}`).getAttribute('data-acct')
 			if (e.keyCode == 70) {
-				var id = $('.selectedToot').attr('unique-id')
+				fav(selectedId, selectedAcctIds, false)
-				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
-				fav(id, acct_id, false)
 				return false
 			}
 			if (e.keyCode == 66) {
-				var id = $('.selectedToot').attr('unique-id')
+				rt(selectedId, selectedAcctIds, false)
-				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
-				rt(id, acct_id, false)
 				return false
 			}
 			if (e.keyCode == 82) {
-				var id = $('.selectedToot').attr('unique-id')
+				const target = document.querySelector('.selectedToot .rep-btn')
-				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
+				const ats_cm = target.getAttribute('data-men')
-				var ats_cm = $('.selectedToot .rep-btn').attr('data-men')
+				const mode = target.getAttribute('data-visen')
-				var mode = $('.selectedToot .rep-btn').attr('data-visen')
+				re(selectedId, ats_cm, selectedAcctIds, mode)
-				re(id, ats_cm, acct_id, mode)
 				return false
 			}
 		}
@@ -237,9 +227,10 @@ $(function($) {
 				//C+S+(No):ワンクリ
 				if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 					if (e.keyCode >= 49 && e.keyCode <= 51) {
-						var no = e.keyCode - 48
+						const no = e.keyCode - 48
-						if (localStorage.getItem('oks-' + no)) {
+						const oks = localStorage.getItem('oks-' + no)
-							$('#textarea').val($('#textarea').val() + localStorage.getItem('oks-' + no))
+						if (oks) {
+							postBox.value = postBox.value + oks
 						}
 						return false
 					}
@@ -248,28 +239,29 @@ $(function($) {
 		}
 	})
 	//クリアボタン
-	$('#clear').click(function() {
+	document.getElementById('clear').addEventListener('click', clear)
-		clear()
-	})
 })
 //選択する
 function tootSelector(column, toot) {
-	$('.cvo').removeClass('selectedToot')
+	const selectedToot = document.querySelector('.selectedToot')
-	$('#timeline_' + column + ' .cvo')
+	let rect = {top: 0}
-		.eq(toot)
+	if (selectedToot) {
-		.addClass('selectedToot')
+		selectedToot.classList.remove('selectedToot')
-	var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
+		rect = selectedToot.getBoundingClientRect()
-	var elem = $('.selectedToot').offset().top
+	}
-	var top = elem - $('.tl-box').height() + scr
+	document.querySelectorAll(`#timeline_${column} .cvo`)[toot].classList.add('selectedToot')
+	const scr = document.querySelector(`#tlBox${column}`).scrollTop
+	const elem = rect.top + document.body.scrollTop
+	let top = elem - getHeight('.tl-box') + scr
 	if (top > 0) {
-		top = top + $('.selectedToot').height()
+		top = top + getHeight('.selectedToot')
 		if (top > scr) {
-			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: top })
+			$(`#tlBox${column}`).animate({ scrollTop: top })
 		}
 	} else if (elem < 0) {
-		var to = scr + elem - $('.selectedToot').height()
+		const to = scr + elem - getHeight('.selectedToot')
 		if (to < scr) {
-			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
+			$(`#tlBox${column}`).animate({ scrollTop: to })
 		}
 	}
-}
+}

app/js/common/modal.js

@@ -1,7 +1,8 @@
 //モーダル・ドロップダウンの各種設定
 $(document).ready(function () {
   // the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered
-  $('.modal').modal({
+  const modals = document.querySelectorAll('.modal')
+  M.Modal.init(modals, {
     inDuration: 300,
     outDuration: 225,
     constrainWidth: false, // Does not change width of dropdown to that of the activator
@@ -10,8 +11,9 @@ $(document).ready(function () {
     belowOrigin: false, // Displays dropdown below the button
     alignment: 'left', // Displays dropdown with edge aligned to the left of button
     stopPropagation: false
-  });
+  })
-  $('.dropdown-trigger').dropdown({
+  const dropdown = document.querySelectorAll('.modal')
+  M.Dropdown.init(dropdown, {
     inDuration: 300,
     outDuration: 225,
     constrainWidth: false, // Does not change width of dropdown to that of the activator
@@ -20,10 +22,10 @@ $(document).ready(function () {
     belowOrigin: false, // Displays dropdown below the button
     alignment: 'left', // Displays dropdown with edge aligned to the left of button
     stopPropagation: false // Stops event propagation
-  }
+  })
-  );
+  M.Collapsible.init(document.querySelectorAll('.collapsible'));
-  $('.collapsible').collapsible();
+  const videoModal = document.querySelectorAll('#videomodal')
-  $('#videomodal').modal({
+  M.Modal.init(videoModal, {
     onCloseEnd: stopVideo
-  });
+  })
-});
+})

app/js/common/sha256.js

@@ -1,31 +1,31 @@
-var sha256 = function sha256(ascii) {
+const sha256 = function sha256(ascii) {
 	function rightRotate(value, amount) {
 		return (value >>> amount) | (value << (32 - amount));
 	};
 
-	var mathPow = Math.pow;
+	const mathPow = Math.pow;
-	var maxWord = mathPow(2, 32);
+	const maxWord = mathPow(2, 32);
-	var lengthProperty = 'length'
+	const lengthProperty = 'length'
-	var i, j; // Used as a counter across the whole file
+	let i, j; // Used as a counter across the whole file
-	var result = ''
+	let result = ''
 
-	var words = [];
+	let words = [];
-	var asciiBitLength = ascii[lengthProperty] * 8;
+	const asciiBitLength = ascii[lengthProperty] * 8;
 
 	//* caching results is optional - remove/add slash from front of this line to toggle
 	// Initial hash value: first 32 bits of the fractional parts of the square roots of the first 8 primes
 	// (we actually calculate the first 64, but extra values are just ignored)
-	var hash = sha256.h = sha256.h || [];
+	let hash = sha256.h = sha256.h || [];
 	// Round constants: first 32 bits of the fractional parts of the cube roots of the first 64 primes
-	var k = sha256.k = sha256.k || [];
+	let k = sha256.k = sha256.k || [];
-	var primeCounter = k[lengthProperty];
+	let primeCounter = k[lengthProperty];
 	/*/
 	var hash = [], k = [];
 	var primeCounter = 0;
 	//*/
 
-	var isComposite = {};
+	let isComposite = {};
-	for (var candidate = 2; primeCounter < 64; candidate++) {
+	for (let candidate = 2; primeCounter < 64; candidate++) {
 		if (!isComposite[candidate]) {
 			for (i = 0; i < 313; i += candidate) {
 				isComposite[i] = candidate;
@@ -47,21 +47,21 @@ var sha256 = function sha256(ascii) {
 
 	// process each chunk
 	for (j = 0; j < words[lengthProperty];) {
-		var w = words.slice(j, j += 16); // The message is expanded into 64 words as part of the iteration
+		let w = words.slice(j, j += 16); // The message is expanded into 64 words as part of the iteration
-		var oldHash = hash;
+		const oldHash = hash;
 		// This is now the undefinedworking hash", often labelled as variables a...g
 		// (we have to truncate as well, otherwise extra entries at the end accumulate
 		hash = hash.slice(0, 8);
 
 		for (i = 0; i < 64; i++) {
-			var i2 = i + j;
+			const i2 = i + j;
 			// Expand the message into 64 words
 			// Used below if 
-			var w15 = w[i - 15], w2 = w[i - 2];
+			const w15 = w[i - 15], w2 = w[i - 2];
 
 			// Iterate
-			var a = hash[0], e = hash[4];
+			const a = hash[0], e = hash[4];
-			var temp1 = hash[7]
+			const temp1 = hash[7]
 				+ (rightRotate(e, 6) ^ rightRotate(e, 11) ^ rightRotate(e, 25)) // S1
 				+ ((e & hash[5]) ^ ((~e) & hash[6])) // ch
 				+ k[i]
@@ -74,7 +74,7 @@ var sha256 = function sha256(ascii) {
 				) | 0
 				);
 			// This is only used once, so *could* be moved below, but it only saves 4 bytes and makes things unreadble
-			var temp2 = (rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22)) // S0
+			const temp2 = (rightRotate(a, 2) ^ rightRotate(a, 13) ^ rightRotate(a, 22)) // S0
 				+ ((a & hash[1]) ^ (a & hash[2]) ^ (hash[1] & hash[2])); // maj
 
 			hash = [(temp1 + temp2) | 0].concat(hash); // We don't bother trimming off the extra ones, they're harmless as long as we're truncating when we do the slice()
@@ -88,7 +88,7 @@ var sha256 = function sha256(ascii) {
 
 	for (i = 0; i < 8; i++) {
 		for (j = 3; j + 1; j--) {
-			var b = (hash[i] >> (j * 8)) & 255;
+			const b = (hash[i] >> (j * 8)) & 255;
 			result += ((b < 16) ? 0 : '') + b.toString(16);
 		}
 	}

app/js/common/time.js

@@ -36,7 +36,7 @@
       return inWords($.timeago.datetime(timestamp));
     }
   };
-  var $t = $.timeago;
+  const $t = $.timeago;
   $.extend($.timeago, {
     settings: {
       refreshMillis: 60000,
@@ -72,9 +72,9 @@
         throw 'timeago allowPast and allowFuture settings can not both be set to false.';
       }
 
-      var $l = this.settings.strings;
+      const $l = this.settings.strings;
-      var prefix = $l.prefixAgo;
+      let prefix = $l.prefixAgo;
-      var suffix = $l.suffixAgo;
+      let suffix = $l.suffixAgo;
       if (this.settings.allowFuture) {
         if (distanceMillis < 0) {
           prefix = $l.prefixFromNow;
@@ -86,19 +86,19 @@
         return this.settings.strings.inPast;
       }
 
-      var seconds = Math.abs(distanceMillis) / 1000;
+      const seconds = Math.abs(distanceMillis) / 1000;
-      var minutes = seconds / 60;
+      const minutes = seconds / 60;
-      var hours = minutes / 60;
+      const hours = minutes / 60;
-      var days = hours / 24;
+      const days = hours / 24;
-      var years = days / 365;
+      const years = days / 365;
 
       function substitute(stringOrFunction, number) {
-        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        const string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
-        var value = ($l.numbers && $l.numbers[number]) || number;
+        const value = ($l.numbers && $l.numbers[number]) || number;
         return string.replace(/%d/i, value);
       }
 
-      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+      const words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
         seconds < 90 && substitute($l.minute, 1) ||
         minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
         minutes < 90 && substitute($l.hour, 1) ||
@@ -110,13 +110,13 @@
         years < 1.5 && substitute($l.year, 1) ||
         substitute($l.years, Math.round(years));
 
-      var separator = $l.wordSeparator || "";
+        const separator = $l.wordSeparator || "";
       if ($l.wordSeparator === undefined) { separator = " "; }
       return $.trim([prefix, words, suffix].join(separator));
     },
 
     parse: function (iso8601) {
-      var s = $.trim(iso8601);
+      let s = $.trim(iso8601);
       s = s.replace(/\.\d+/, ""); // remove milliseconds
       s = s.replace(/-/, "/").replace(/-/, "/");
       s = s.replace(/T/, " ").replace(/Z/, " UTC");
@@ -125,7 +125,7 @@
       return new Date(s);
     },
     datetime: function (elem) {
-      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      const iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
       return $t.parse(iso8601);
     },
     isTime: function (elem) {
@@ -137,18 +137,18 @@
   // functions that can be called via $(el).timeago('action')
   // init is default when no action is given
   // functions are called with context of a single element
-  var functions = {
+  const functions = {
     init: function () {
       functions.dispose.call(this);
-      var refresh_el = $.proxy(refresh, this);
+      const refresh_el = $.proxy(refresh, this);
       refresh_el();
-      var $s = $t.settings;
+      const $s = $t.settings;
       if ($s.refreshMillis > 0) {
         this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
       }
     },
     update: function (timestamp) {
-      var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
+      const date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
       $(this).data('timeago', { datetime: date });
       if ($t.settings.localeTitle) {
         $(this).attr("title", date.toLocaleString());
@@ -168,7 +168,7 @@
   };
 
   $.fn.timeago = function (action, options) {
-    var fn = action ? functions[action] : functions.init;
+    const fn = action ? functions[action] : functions.init;
     if (!fn) {
       throw new Error("Unknown function name '" + action + "' for timeago");
     }
@@ -180,7 +180,7 @@
   };
 
   function refresh() {
-    var $s = $t.settings;
+    const $s = $t.settings;
 
     //check if it's still visible
     if ($s.autoDispose && !$.contains(document.documentElement, this)) {
@@ -189,7 +189,7 @@
       return this;
     }
 
-    var data = prepareData(this);
+    const data = prepareData(this);
 
     if (!isNaN(data.datetime)) {
       if ($s.cutoff === 0 || Math.abs(distance(data.datetime)) < $s.cutoff) {
@@ -207,7 +207,7 @@
     element = $(element);
     if (!element.data("timeago")) {
       element.data("timeago", { datetime: $t.datetime(element) });
-      var text = $.trim(element.text());
+      const text = $.trim(element.text());
       if ($t.settings.localeTitle) {
         element.attr("title", element.data('timeago').datetime.toLocaleString());
       } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {

app/js/common/version.js

@@ -1,41 +1,15 @@
 //バージョンチェッカー
-function verck(ver, jp) {
+async function verck(ver) {
 	console.log('%c Welcome😊 ' + ver, 'color: red;font-size:200%;')
-	$('body').addClass(localStorage.getItem('platform'))
+	document.querySelector('body').classList.add(localStorage.getItem('platform'))
-	var date = new Date()
+	const date = new Date()
-	var showVer = false
+	let showVer = false
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
-		//ちょっと削除とリンク解析の都合上アレ(s)
-		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
-		if (!localStorage.getItem('usamin_18_6_5_flag')) {
-			localStorage.setItem('usamin_18_6_5_flag', true)
-			var multi = localStorage.getItem('column')
-			var obj = JSON.parse(multi)
-			for (var i = 0; i < obj.length; i++) {
-				localStorage.removeItem('card_' + i)
-			}
-		}
-		//ちょっと削除とリンク解析の都合上アレ(e)
 		showVer = true
 		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-		$(document).ready(function() {
+		if (localStorage.getItem('winstore') && !pwa) {
-			if (localStorage.getItem('winstore') && !pwa) {
+			openRN()
-				$('#releasenote').modal('open')
+		}
-			}
-			verp = ver.replace('(', '')
-			verp = verp.replace('.', '-')
-			verp = verp.replace('.', '-')
-			verp = verp.replace('[', '-')
-			verp = verp.replace(']', '')
-			verp = verp.replace(')', '')
-			verp = verp.replace(' ', '_')
-			console.log('%c ' + verp, 'color: red;font-size:200%;')
-			if (lang.language == 'ja') {
-				$('#release-' + verp).show()
-			} else {
-				$('#release-en').show()
-			}
-		})
 	}
 	localStorage.setItem('ver', ver)
 	if (!showVer) {
@@ -45,295 +19,224 @@ function verck(ver, jp) {
 			!localStorage.getItem('showSupportMe')
 		) {
 			if (date.getMonth() == 11) {
-				var yrs = date.getFullYear() + 1
+				yrs = date.getFullYear() + 1
-				var nextmonth = yrs * 100 + 1
+				nextmonth = yrs * 100 + 1
 			} else {
-				var yrs = date.getFullYear() 
+				yrs = date.getFullYear()
-				var nextmonth = yrs * 100 + date.getMonth() + 2
+				nextmonth = yrs * 100 + date.getMonth() + 2
 			}
 			if (lang.language != 'ja') {
-				$('#support-btm-ja').addClass('hide')
+				document.querySelector('#support-btm-ja').classList.add('hide')
-				$('#support-btm-en').removeClass('hide')
+				document.querySelector('#support-btm-en').classList.remove('hide')
 			}
 			localStorage.setItem('showSupportMe', nextmonth)
-			$('#support-btm').removeClass('hide')
+			document.querySelector('#support-btm').classList.remove('hide')
-			$('#support-btm').animate(
+			document.querySelector('#support-btm').animate([
 				{
-					bottom: '0'
+					bottom: '-500px'
 				},
 				{
-					duration: 300
+					bottom: '0'
 				}
-			)
+			], 300);
 		}
 	}
-	var platform = localStorage.getItem('platform')
+	const platform = localStorage.getItem('platform')
 	console.log('Your platform:' + platform)
 	if (!localStorage.getItem('winstore') && !pwa) {
-		$('#start').css('display', 'flex')
+		document.querySelector('#start').style.display = 'flex'
 	}
+	let winstore = false
 	if (
 		localStorage.getItem('winstore') == 'brewcask' ||
 		localStorage.getItem('winstore') == 'snapcraft' ||
 		localStorage.getItem('winstore') == 'winstore'
 	) {
-		var winstore = true
+		winstore = true
 	} else {
-		var winstore = false
+		winstore = false
 	}
-	var l = 5
+	const l = 5
 	// 生成する文字列に含める文字セット
-	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
+	const c = 'abcdefghijklmnopqrstuvwxyz0123456789'
-	var cl = c.length
+	const cl = c.length
-	var r = ''
+	let r = ''
 	for (var i = 0; i < l; i++) {
 		r += c[Math.floor(Math.random() * cl)]
 	}
-	var start = 'https://thedesk.top/ver.json'
+	const start = 'https://thedesk.top/ver.json'
-	fetch(start, {
+	let mess
-		method: 'GET'
+	try {
-	})
+		mess = await getApi(start, null)
-		.then(function(response) {
+	} catch {
-			if (!response.ok) {
+		return false
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(mess) {
-			console.table(mess)
-			if (mess) {
-				//askjp_jp_ua: 2019年10月24日、mstdn.jpによるユーザーエージェントアクセス制限
-				if (jp && mess.jp_ua && !localStorage.getItem('askjp_jp_ua')) {
-					localStorage.setItem('askjp_jp_ua', true)
-					$('#askjp_jp_ua').removeClass('hide')
-				}
-				var platform = localStorage.getItem('platform')
-				if (platform == 'darwin') {
-					var newest = mess.desk_mac
-				} else {
-					var newest = mess.desk
-				}
-				if (newest == ver) {
-					todo(lang.lang_version_usever.replace('{{ver}}', mess.desk))
-					//betaかWinstoreならアプデチェックしない
-				} else if (ver.indexOf('beta') != -1 || winstore) {
-				} else {
-					localStorage.removeItem('instance')
-					if (localStorage.getItem('new-ver-skip')) {
-						if (localStorage.getItem('next-ver') != newest) {
-							postMessage(['sendSinmpleIpc', 'update'], '*')
-						} else {
-							console.warn(lang.lang_version_skipver)
-							todo(lang.lang_version_skipver)
-						}
-					} else {
-						postMessage(['sendSinmpleIpc', 'update'], '*')
-					}
-				}
-			}
-		})
-	if (!localStorage.getItem('last-notice-id')) {
-		localStorage.setItem('last-notice-id', 0)
 	}
-	var start = 'https://thedesk.top/notice/index.php?since_id=' + localStorage.getItem('last-notice-id')
+	console.table(mess)
-	fetch(start, {
+	if (mess) {
-		method: 'GET',
+		let newest = null
-		cors: true
+		if (platform == 'darwin') {
-	})
+			newest = mess.desk_mac
-		.then(function(response) {
+		} else {
-			if (!response.ok) {
+			newest = mess.desk
-				response.text().then(function(text) {
+		}
-					setLog(response.url, response.status, text)
+		if (newest == ver) {
-				})
+			todo(lang.lang_version_usever.replace('{{ver}}', mess.desk))
-			}
+			//betaかWinstoreならアプデチェックしない
-			return response.json()
+		} else if (ver.indexOf('beta') != -1 || winstore) {
-		})
+			//skipped
-		.catch(function(error) {
+		} else {
-			todo(error)
+			if (localStorage.getItem('new-ver-skip')) {
-			setLog(start, 'JSON', error)
+				if (localStorage.getItem('next-ver') != newest) {
-			console.error(error)
+					postMessage(['sendSinmpleIpc', 'update'], '*')
-		})
+				} else {
-		.then(function(mess) {
+					console.warn(lang.lang_version_skipver)
-			if (mess.length < 1) {
+					todo(lang.lang_version_skipver)
-				return false
-			} else {
-				var last = localStorage.getItem('last-notice-id')
-				localStorage.setItem('last-notice-id', mess[0].ID)
-				for (i = 0; i < mess.length; i++) {
-					var obj = mess[i]
-					if (obj.ID * 1 <= last) {
-						break
-					} else {
-						if (obj.type == 'textv2') {
-							if (~obj.languages.indexOf(lang.language)) {
-								var showVer = true
-								if (obj.toot != '') {
-									var toot =
-										'<button class="btn-flat toast-action" onclick="detEx(\'' +
-										obj.toot +
-										"','main')\">Show</button>"
-								} else {
-									var toot = ''
-								}
-								if (obj.ver != '') {
-									if (obj.ver == ver) {
-										showVer = true
-									} else {
-										showVer = false
-									}
-								}
-								if (obj.domain != '') {
-									var multi = localStorage.getItem('multi')
-									if (multi) {
-										showVer = false
-										var accts = JSON.parse(multi)
-										Object.keys(accts).forEach(function(key) {
-											var acct = accts[key]
-											if (acct.domain == obj.domain) {
-												showVer = true
-											}
-										})
-									}
-								}
-								if (showVer) {
-									M.toast({
-										html:
-											escapeHTML(obj.text) +
-											toot +
-											'<span class="sml grey-text">(スライドして消去)</span>',
-										displayLength: 86400
-									})
-								}
-							}
-						}
-					}
 				}
+			} else {
+				postMessage(['sendSinmpleIpc', 'update'], '*')
 			}
-		})
+		}
+	}
+	let lni = localStorage.getItem('last-notice-id')
+	if (!lni) {
+		localStorage.setItem('last-notice-id', 0)
+		lni = 0
+	}
+	const getNotice = 'https://thedesk.top/notice/index.php?since_id=' + lni
+	let notices
+	try {
+		notices = await getApi(getNotice, null)
+	} catch {
+		return false
+	}
+	if (notices.length < 1) {
+		return false
+	} else {
+		localStorage.setItem('last-notice-id', notices[0].ID)
+		for (i = 0; i < notices.length; i++) {
+			var obj = notices[i]
+			if (obj.ID * 1 <= lni) {
+				break
+			} else {
+				toastInterpret(obj)
+			}
+		}
+	}
 }
-var infostreaming = false
+let infostreaming = false
 function infowebsocket() {
 	infows = new WebSocket('wss://thedesk.top/ws/')
-	infows.onopen = function(mess) {
+	infows.onopen = function (mess) {
 		console.log([tlid, ':Connect Streaming Info:', mess])
 		infostreaming = true
 	}
-	infows.onmessage = function(mess) {
+	infows.onmessage = function (mess) {
 		console.log([tlid, ':Receive Streaming:', JSON.parse(mess.data)])
-		var obj = JSON.parse(mess.data)
+		const obj = JSON.parse(mess.data)
+		localStorage.setItem('last-notice-id', obj.id)
 		if (obj.type != 'counter') {
-			if (obj.type == 'textv2') {
+			toastInterpret(obj)
-				if (~obj.languages.indexOf(lang.language)) {
-					localStorage.setItem('last-notice-id', obj.id)
-					var showVer = true
-					if (obj.toot != '') {
-						var toot =
-							'<button class="btn-flat toast-action" onclick="detEx(\'' +
-							obj.toot +
-							"','main')\">Show</button>"
-					} else {
-						var toot = ''
-					}
-					if (obj.ver != '') {
-						if (obj.ver == ver) {
-							showVer = true
-						} else {
-							showVer = false
-						}
-					}
-					if (obj.domain != '') {
-						var multi = localStorage.getItem('multi')
-						if (multi) {
-							showVer = false
-							var accts = JSON.parse(multi)
-							Object.keys(accts).forEach(function(key) {
-								var acct = accts[key]
-								if (acct.domain == obj.domain) {
-									showVer = true
-								}
-							})
-						}
-					}
-					if (showVer) {
-						console.log(obj.text)
-						console.log(escapeHTML(obj.text))
-						M.toast({
-							html:
-								escapeHTML(obj.text) +
-								toot +
-								'<span class="sml grey-text">(スライドして消去)</span>',
-							displayLength: 86400
-						})
-					}
-				}
-			}
 		} else {
-			$('#persons').text(obj.text)
+			const people = document.querySelector('#persons')
+			if(people) {
+				people.innerText = obj.text
+			}
 		}
 	}
-	infows.onerror = function(error) {
+	infows.onerror = function (error) {
 		infostreaming = false
 		console.error('Error closing:info')
 		console.error(error)
 		return false
 	}
-	infows.onclose = function() {
+	infows.onclose = function () {
 		infostreaming = false
 		console.error('Closing:info')
 	}
 }
-setInterval(function() {
+setInterval(function () {
 	if (!infostreaming) {
 		console.log('try to connect to base-streaming')
 		infowebsocket()
 	}
 }, 10000)
-function openRN() {
+async function toastInterpret(obj) {
-	$('#releasenote').modal('open')
+	if (obj.type == 'textv2') {
-	if (lang.language == 'ja') {
+		if (~obj.languages.indexOf(lang.language)) {
-		verp = ver.replace('(', '')
+			let showVer = true
-		verp = verp.replace('.', '-')
+			let toot = null
-		verp = verp.replace('.', '-')
+			if (obj.toot != '') {
-		verp = verp.replace('[', '-')
+				toot = `<button class="btn-flat toast-action" data-toot="${obj.toot}">Show</button>`
-		verp = verp.replace(']', '')
+			}
-		verp = verp.replace(')', '')
+			if (obj.ver == ver) {
-		verp = verp.replace(' ', '_')
+				showVer = true
-		$('#release-' + verp).show()
+			} else {
-	} else {
+				showVer = false
-		$('#release-en').show()
+			}
-	}
+			if (obj.domain != '') {
-}
+				const multi = localStorage.getItem('multi')
-function closeSupport() {
+				if (multi) {
-	$('#support-btm').animate(
+					showVer = false
-		{
+					const accts = JSON.parse(multi)
-			bottom: '-300px'
+					const keys = Object.keys(accts)
-		},
+					for (let i = 0; i < accts.length; i++) {
-		{
+						const key = keys[i]
-			duration: 300,
+						const acct = accts[key]
-			complete: function() {
+						if (acct.domain == obj.domain) {
-				$('#support-btm').addClass('hide')
+							showVer = true
+							break
+						}
+					}
+				}
+			}
+			if (showVer) {
+				M.toast({
+					html: `${escapeHTML(obj.text)} ${toot} <span class="sml grey-text">(スライドして消去)</span>`,
+					displayLength: 86400
+				})
+				await sleep(500)
+				const targets = document.querySelectorAll('.toast-action')
+				for (let j = 0; j < targets.length; j++) {
+					const target = targets[j]
+					const toot = target.getAttribute('data-toot')
+					target.addEventListener('click', () => detEx(toot, 'main'))
+				}
+
 			}
 		}
-	)
+	}
+}
+function openRN() {
+	console.log(kirishima)
+	M.Modal.getInstance(document.querySelector('#releasenote')).open()
+	if (lang.language == 'ja') {
+		verp = ver.replace('(', '').replace('.', '-').replace('.', '-').replace('[', '-').replace(']', '').replace(')', '').replace(' ', '_')
+		showElm(`#release-${verp}`)
+	} else {
+		showElm('#release-en')
+	}
+}
+async function closeSupport() {
+	document.querySelector('#support-btm').animate([
+		{
+			bottom: '0'
+		},
+		{
+			bottom: '-300px'
+		}
+	], 300);
+	await sleep(300)
+	document.querySelector('#support-btm').classList.add('hide')
 }
 function storeDialog(platform, ver) {
-	if($('body').hasClass('accessibility')) return false
+	if (document.querySelector('body').classList.contain('accessibility')) return false
+	let mes = false
 	if (platform == 'win32') {
-		var mes = lang.lang_version_platform
+		mes = lang.lang_version_platform
 	} else if (platform == 'linux') {
-		var mes = lang.lang_version_platform_linux
+		mes = lang.lang_version_platform_linux
 	} else if (platform == 'darwin') {
-		var mes = lang.lang_version_platform_mac
+		mes = lang.lang_version_platform_mac
-	} else {
-		var mes = false
 	}
 	if (mes) {
 		Swal.fire({
@@ -354,52 +257,22 @@ function storeDialog(platform, ver) {
 			}
 			localStorage.setItem('ver', ver)
 			showVer = true
-			if(pwa) return false
+			if (pwa) return false
 			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-			$(document).ready(function() {
+			openRN()
-				$('#releasenote').modal('open')
-				verp = ver.replace('(', '')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('[', '-')
-				verp = verp.replace(']', '')
-				verp = verp.replace(')', '')
-				verp = verp.replace(' ', '_')
-				console.log('%c ' + verp, 'color: red;font-size:200%;')
-				if (lang.language == 'ja') {
-					$('#release-' + verp).show()
-				} else {
-					$('#release-en').show()
-				}
-			})
 		})
 	} else {
 		localStorage.setItem('ver', ver)
-			showVer = true
+		showVer = true
-			console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
+		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
-			$(document).ready(function() {
+		openRN()
-				if(pwa) return false
-				$('#releasenote').modal('open')
-				verp = ver.replace('(', '')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('.', '-')
-				verp = verp.replace('[', '-')
-				verp = verp.replace(']', '')
-				verp = verp.replace(')', '')
-				verp = verp.replace(' ', '_')
-				console.log('%c ' + verp, 'color: red;font-size:200%;')
-				if (lang.language == 'ja') {
-					$('#release-' + verp).show()
-				} else {
-					$('#release-en').show()
-				}
-			})
 	}
-	
+
 }
 function closeStart() {
 	$('#start').css('display', 'none')
-	var platform = localStorage.getItem('platform')
+	document.querySelector('#start').style.display = 'none'
-	var ver = localStorage.getItem('ver')
+	const platform = localStorage.getItem('platform')
+	const ver = localStorage.getItem('ver')
 	storeDialog(platform, ver)
 }

app/js/emoji/default-emoji.js

@@ -1,5 +1,5 @@
-var defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
+const defaultemojiList = ['activity', 'flag', 'food', 'nature', 'object', 'people', 'place', 'symbol']
-var defaultemoji = {
+const defaultemoji = {
 	activity: activity,
 	flag: flag,
 	food: food,
@@ -9,8 +9,18 @@ var defaultemoji = {
 	place: place,
 	symbol: symbol
 }
+let defaultemojiname = {
+	activity: 'Activities',
+	flag: 'Flags',
+	food: 'Foods',
+	nature: 'Nature',
+	object: 'Tools',
+	people: 'People',
+	place: 'Places',
+	symbol: 'Symbols'
+}
 if (lang == 'ja') {
-	var defaultemojiname = {
+	defaultemojiname = {
 		activity: '活動',
 		flag: '国旗',
 		food: '食べ物',
@@ -20,33 +30,23 @@ if (lang == 'ja') {
 		place: '場所',
 		symbol: '記号'
 	}
-} else {
-	var defaultemojiname = {
-		activity: 'Activities',
-		flag: 'Flags',
-		food: 'Foods',
-		nature: 'Nature',
-		object: 'Tools',
-		people: 'People',
-		place: 'Places',
-		symbol: 'Symbols'
-	}
 }
 
 function defaultEmoji(target) {
-    var announcement = false
+	let announcement = false
-    if ($('#media').val() == 'announcement') {
+	if (document.querySelector('#media').value == 'announcement') {
-        announcement = true
+		announcement = true
-    }
+	}
-	var json = defaultemoji[target]
+	const json = defaultemoji[target]
-	var emojis = ''
+	const keymap = Object.keys(json)
-	Object.keys(json).forEach(function(key) {
+	let emojis = ''
-        var emoji = json[key]
+	for (let i = 0; i < json.length; i++) {
-        if (announcement) {
+		const key = keymap[i]
-            var def = `<a onclick="emojiReactionDef('${emoji['shortcode']}')" class="pointer">`
+		const emoji = json[key]
-        } else {
+		let def = `<a data-shortcode="${emoji['shortcode']}" class="pointer defEmoji">`
-            var def = `<a onclick="defEmoji('${emoji['shortcode']}')" class="pointer">`
+		if (announcement) {
-        }
+			def = `<a data-shortcode="${emoji['shortcode']}" class="pointer defEmoji">`
+		}
 		emojis =
 			emojis +
 			`${def}
@@ -54,52 +54,39 @@ function defaultEmoji(target) {
                 width: 20px; height: 20px; display: inline-block; background-image: url('../../img/sheet.png'); background-size: 4900%;
                  background-position:${emoji['css']};"></span>
             </a>`
-	})
+	}
-	$('#emoji-list').html(emojis)
+	document.querySelector('#emoji-list').innerHTML = emojis
-	$('#now-emoji').text(lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target]))
+	document.querySelector('#now-emoji').innerText = lang.lang_defaultemojis_text.replace('{{cat}}', defaultemojiname[target])
-	$('.emoji-control').addClass('hide')
+	document.querySelector('.emoji-control').classList.add('hide')
+	const targets = document.querySelectorAll('.defEmoji')
+	for (let j = 0; j < targets.length; j++) {
+		const target = targets[j]
+		const sc = target.getAttribute('data-shortcode')
+		target.addEventListener('click', () => defEmoji(sc))
+	}
 }
+
 function customEmoji() {
-	$('#emoji-suggest').val('')
+	document.querySelector('#emoji-suggest').value = ''
-	$('.emoji-control').removeClass('hide')
+	document.querySelector('.emoji-control').classList.remove('hide')
 	emojiList('home')
 }
+
 function defEmoji(target) {
-	var selin = $('#textarea').prop('selectionStart')
+	const textarea = document.querySelector('#textarea')
+	let selin = textarea.selectionStart
 	if (!selin) {
 		selin = 0
 	}
-	var emojiraw = newpack.filter(function(item, index) {
+	const hex = emojipack[target].unified.split('-')
-		if (item.short_name == target) return true
+	let emoji = twemoji.convert.fromCodePoint(hex[0])
-	})
-	var hex = emojiraw[0].unified.split('-')
 	if (hex.length === 2) {
 		emoji = twemoji.convert.fromCodePoint(hex[0]) + twemoji.convert.fromCodePoint(hex[1])
-	} else {
-		emoji = twemoji.convert.fromCodePoint(hex[0])
 	}
-	var now = $('#textarea').val()
+	const now = textarea.value
-	var before = now.substr(0, selin)
+	const before = now.substr(0, selin)
-	var after = now.substr(selin, now.length)
+	const after = now.substr(selin, now.length)
-	newt = before + emoji + after
+	const newt = before + emoji + after
-	$('#textarea').val(newt)
+	textarea.value = newt
-	$('#textarea').focus()
+	textarea.focus()
-}
-function faicon() {
-	var json = faicons
-	var emojis = ''
-	Object.keys(json).forEach(function(key) {
-		var emoji = json[key]
-		var eje = emoji.replace(/fa-/g, '')
-		emojis =
-			emojis +
-			'<a onclick="emojiInsert(\'[faicon]' +
-			eje +
-			'[/faicon]\')" class="pointer white-text" style="font-size:24px"><i class="fa ' +
-			emoji +
-			'"></i></a>'
-	})
-	$('#emoji-list').html(emojis)
-	$('#now-emoji').text('faicon')
-	$('.emoji-control').addClass('hide')
 }

app/js/login/instance.js

@@ -1,5 +1,5 @@
 //インスタンスリスト
-var idata = {
+const idata = {
 	"kirishima.cloud": "instance",
 	"kirishima.cloud_name": "アスタルテ",
 	"kirishima.cloud_letters": "6229",
@@ -84,5 +84,3 @@ var idata = {
 	"biwakodon.com_quote":"enabled",
 	"comm.cx_quote":"enabled"
 };
-
-localStorage.setItem("instance", JSON.stringify(idata));

app/js/login/login.js

@@ -1,617 +1,276 @@
 /*ログイン処理・認証までのJS*/
 //最初に読むやつ
-//アスタルテ判定初期化
 
 localStorage.removeItem('kirishima')
 localStorage.removeItem('quoters')
 localStorage.removeItem('imas')
-localStorage.removeItem('image')
+//stable, 固定タグのことらしい。ふざけるな。
 localStorage.removeItem('stable')
-localStorage.setItem('mode_misskey.xyz', 'misskey')
+const acctList = JSON.parse(localStorage.getItem('multi'))
-function ck() {
+
-	var main = localStorage.getItem('main')
+async function ck() {
+	const main = localStorage.getItem('main')
 	if (!main) {
-		localStorage.setItem('main', 0)
+		localStorage.setItem('main', '0')
 	}
 
 	//コード受信
 	if (location.search) {
-		var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
+		const m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)
-		var mode = m[1]
+		const mode = m[1]
-		var codex = m[2]
+		const codex = m[2]
 		if (mode == 'manager' || mode == 'login') {
 			code(codex, mode)
 		} else {
 		}
 	}
-	var multi = localStorage.getItem('multi')
+	const multi = localStorage.getItem('multi')
 	if (!multi || multi == '[]') {
-		var date = new Date()
+		const date = new Date()
 		localStorage.setItem('showSupportMe', date.getMonth() + 2)
 		location.href = 'acct.html?mode=first&code=true'
 	} else {
-		var obj = JSON.parse(multi)
+		const obj = JSON.parse(multi)
-		var jp = false
+		const keymap = Object.keys(obj)
-		Object.keys(obj).forEach(function(key) {
+		let req = false
-			var acct = obj[key]
+		for (let i = 0; i < keymap.length; i++) {
+			const key = keymap[i]
+			const acct = obj[key]
 			if (acct.domain) {
-				refresh(key, true)
+				let refreshed = await refresh(key, true)
+				if (refreshed) req = true
 			}
-			if (acct.domain == 'mstdn.jp') {
+		}
-				jp = true
+		if (req) {
-			}
+			Swal.fire({
-		})
+				title: 'Reload required',
+				text: lang.lang_login_changedData,
+				type: 'info',
+				showCancelButton: true,
+				confirmButtonText: lang.lang_no,
+				cancelButtonText: lang.lang_yesno
+			}).then(result => {
+				if (result) location.reload()
+			})
+		}
 		if (obj[0].domain) {
-			$('#tl').show()
+			showElm('#tl')
 			ticker()
-			multiSelector(false)
+			parseColumn()
-			verck(ver, jp)
+			verck(ver)
-			$('.stw').show()
+			showElm('.stw')
-			if (localStorage.getItem('tips')) {
+			const tipsType = localStorage.getItem('tips')
-				tips(localStorage.getItem('tips'))
+			if (tipsType) {
+				tips(tipsType)
 			}
-			$('#something-wrong img').attr('src', '../../img/thinking.svg')
+			document.querySelector('#something-wrong img').setAttribute('src', '../../img/thinking.svg')
 		}
 	}
 }
 ck()
-
-//ログインポップアップ
-function login(url) {
-	if ($('#linux:checked').val() == 'on') {
-		var red = 'urn:ietf:wg:oauth:2.0:oob'
-	} else {
-		var red = 'thedesk://login'
-	}
-	localStorage.setItem('redirect', red)
-	var start = 'https://' + url + '/api/v1/apps'
-	var httpreq = new XMLHttpRequest()
-	httpreq.open('POST', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.responseType = 'json'
-	httpreq.send(
-		JSON.stringify({
-			scopes: 'read write follow',
-			client_name: 'TheDesk(PC)',
-			redirect_uris: red,
-			website: 'https://thedesk.top'
-		})
-	)
-	httpreq.onreadystatechange = function() {
-		if (httpreq.readyState === 4) {
-			var json = httpreq.response
-			if (this.status !== 200) {
-				setLog(start, this.status, json)
-			}
-			var auth =
-				'https://' +
-				url +
-				'/oauth/authorize?client_id=' +
-				json['client_id'] +
-				'&client_secret=' +
-				json['client_secret'] +
-				'&response_type=code&redirect_uri=' +
-				red +
-				'&scope=read+write+follow'
-			localStorage.setItem('domain_' + acct_id, url)
-			localStorage.setItem('client_id', json['client_id'])
-			localStorage.setItem('client_secret', json['client_secret'])
-			$('#auth').show()
-			$('#masara').hide()
-			postMessage(['openUrl', auth], '*')
-
-			if ($('#linux:checked').val() == 'on') {
-			} else {
-				postMessage(['sendSinmpleIpc', 'quit'], '*')
-			}
-		}
-	}
-}
-
-//テキストボックスにURL入れた
-function instance() {
-	var url = $('#url').val()
-	login(url)
-}
-
-//コードを入れた後認証
-function code(code, mode) {
-	var red = localStorage.getItem('redirect')
-	localStorage.removeItem('redirect')
-	if (!code) {
-		var code = $('#code').val()
-	}
-	if (localStorage.getItem('domain_tmp')) {
-		var url = localStorage.getItem('domain_tmp')
-	} else {
-		var url = localStorage.getItem('domain_' + acct_id)
-	}
-	var start = 'https://' + url + '/oauth/token'
-	var id = localStorage.getItem('client_id')
-	var secret = localStorage.getItem('client_secret')
-	fetch(start, {
-		method: 'POST',
-		headers: {
-			'content-type': 'application/json'
-		},
-		body: JSON.stringify({
-			grant_type: 'authorization_code',
-			redirect_uri: red,
-			client_id: id,
-			client_secret: secret,
-			code: code
-		})
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			todo(json)
-			if (json['access_token']) {
-				localStorage.setItem(url + '_at', json['access_token'])
-				if (mode == 'manager') {
-					getdataAdv(url, json['access_token'])
-				} else {
-					getdata()
-				}
-			}
-		})
-}
-
-//ユーザーデータ取得(最初)
-function getdata() {
-	var acct_id = 0
-	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
-	fetch(start, {
-		method: 'GET',
-		headers: {
-			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
-		}
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			if (json.error) {
-				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
-				return
-			}
-			var avatar = json['avatar']
-			//missingがmissingなやつ
-			if (avatar == '/avatars/original/missing.png') {
-				avatar = './img/missing.svg'
-			}
-			var obj = [
-				{
-					at: at,
-					name: json['display_name'],
-					domain: domain,
-					user: json['acct'],
-					prof: avatar,
-					id: json['id'],
-					vis: json['source']['privacy']
-				}
-			]
-			var json = JSON.stringify(obj)
-			localStorage.setItem('multi', json)
-			localStorage.setItem('name_' + acct_id, json['display_name'])
-			localStorage.setItem('user_' + acct_id, json['acct'])
-			localStorage.setItem('user-id_' + acct_id, json['id'])
-			localStorage.setItem('prof_' + acct_id, avatar)
-			$('#masara').hide()
-			$('#auth').hide()
-			$('#tl').show()
-			parseColumn()
-			ckdb()
-		})
-}
-//ユーザーデータ取得(追加)
-function getdataAdv(domain, at) {
-	var start = 'https://' + domain + '/api/v1/accounts/verify_credentials'
-	fetch(start, {
-		method: 'GET',
-		headers: {
-			'content-type': 'application/json',
-			Authorization: 'Bearer ' + at
-		}
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			if (json.error) {
-				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
-				return
-			}
-			var avatar = json['avatar']
-			//missingがmissingなやつ
-			if (avatar == '/avatars/original/missing.png') {
-				avatar = '../../img/missing.svg'
-			}
-			if (json['source']['privacy']) {
-				var priv = json['source']['privacy']
-			} else {
-				var priv = 'public'
-			}
-			var add = {
-				at: at,
-				name: json['display_name'],
-				domain: domain,
-				user: json['acct'],
-				prof: avatar,
-				id: json['id'],
-				vis: priv
-			}
-			var multi = localStorage.getItem('multi')
-			var obj = JSON.parse(multi)
-			var target = obj.lengtth
-			obj.push(add)
-			localStorage.setItem('name_' + target, json['display_name'])
-			localStorage.setItem('user_' + target, json['acct'])
-			localStorage.setItem('user-id_' + target, json['id'])
-			localStorage.setItem('prof_' + target, avatar)
-			var json = JSON.stringify(obj)
-			localStorage.setItem('multi', json)
-			location.href = 'index.html'
-		})
-}
 //ユーザーデータ更新
-function refresh(target, loadskip) {
+async function refresh(target, loadskip) {
-	var multi = localStorage.getItem('multi')
+	let obj = acctList
-	var obj = JSON.parse(multi)
+	let requireReload = false
-	if (obj[target].mode == 'misskey') {
+	const { mode, domain, at, background, text, name, prof, vis } = obj[target]
+	if (mode == 'misskey') {
 		return
 	}
-	var start = 'https://' + obj[target].domain + '/api/v1/accounts/verify_credentials'
+	const start = `https://${domain}/api/v1/accounts/verify_credentials`
-	fetch(start, {
+	let json
-		method: 'GET',
+	try {
-		headers: {
+		json = await getApi(start, at)
-			'content-type': 'application/json',
+	} catch {
-			Authorization: 'Bearer ' + obj[target].at
+		return false
+	}
+	if (json.error) {
+		console.error('Error:' + json.error)
+		M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+		return
+	}
+	if (!json) return false
+	let avatar = json['avatar']
+	//missingがmissingなやつ
+	if (avatar == '/avatars/original/missing.png' || !avatar) {
+		avatar = './img/missing.svg'
+	}
+	const newName = json.display_name
+	const newProf = avatar
+	const newVis = json.source.privacy
+	if (newName != name || newProf != prof || newVis != vis) {
+		let ref = {
+			at: at,
+			name: newName,
+			domain: domain,
+			user: json['acct'],
+			prof: avatar,
+			id: json['id'],
+			vis: newVis
 		}
-	})
+		if (background) {
-		.then(function(response) {
+			ref.background = background
-			if (!response.ok) {
+		}
-				response.text().then(function(text) {
+		if (text) {
-					setLog(response.url, response.status, text)
+			ref.text = text
-				})
+		}
-			}
+		if (json['source']['sensitive']) {
-			return response.json()
+			localStorage.setItem('nsfw_' + target, true)
-		})
+		} else {
-		.catch(function(error) {
+			localStorage.removeItem('nsfw_' + target)
-			todo(error)
+		}
-			setLog(start, 'JSON', error)
+		obj[target] = ref
-			console.error(error)
+		const save = JSON.stringify(obj)
-		})
+		localStorage.setItem('multi', save)
-		.then(function(json) {
+		requireReload = true
-			if (json.error) {
+	}
-				console.error('Error:' + json.error)
+	if (!loadskip) {
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+		load()
-				return
+	} else {
-			}
+		return requireReload
-			var avatar = json['avatar']
+	}
-			//missingがmissingなやつ
-			if (avatar == '/avatars/original/missing.png' || !avatar) {
-				avatar = './img/missing.svg'
-			}
-			var ref = {
-				at: obj[target].at,
-				name: json['display_name'],
-				domain: obj[target].domain,
-				user: json['acct'],
-				prof: avatar,
-				id: json['id'],
-				vis: json['source']['privacy']
-			}
-			if (obj[target].background) {
-				ref.background = obj[target].background
-			}
-			if (obj[target].text) {
-				ref.text = obj[target].text
-			}
-			localStorage.setItem('name_' + target, json['display_name'])
-			localStorage.setItem('user_' + target, json['acct'])
-			localStorage.setItem('user-id_' + target, json['id'])
-			localStorage.setItem('prof_' + target, avatar)
-			localStorage.setItem('follow_' + target, json['following_count'])
-			if (json['source']['sensitive']) {
-				localStorage.setItem('nsfw_' + target, 'true')
-			} else {
-				localStorage.removeItem('nsfw_' + target)
-			}
-			obj[target] = ref
-			var json = JSON.stringify(obj)
-			localStorage.setItem('multi', json)
-			if (!loadskip) {
-				load()
-			}
-		})
 }
 //MarkdownやBBCodeの対応、文字数制限をチェック
 //絶対ストリーミングを閉じさせないマン
-function ckdb(acct_id) {
+async function ckdb(acct_id) {
-	var domain = localStorage.getItem('domain_' + acct_id)
+	const domain = localStorage.getItem(`domain_${acct_id}`)
-	localStorage.removeItem('home_' + acct_id)
-	localStorage.removeItem('bb_' + acct_id)
-	localStorage.removeItem('md_' + acct_id)
-	localStorage.removeItem('local_' + acct_id)
-	localStorage.removeItem('public_' + acct_id)
-	localStorage.removeItem('notification_' + acct_id)
-	localStorage.removeItem('post_' + acct_id)
-	localStorage.removeItem('fav_' + acct_id)
-	localStorage.removeItem('bt_' + acct_id)
-	localStorage.removeItem('followlocale_' + acct_id)
 	if (domain == 'kirishima.cloud') {
-		localStorage.setItem('kirishima', 'true')
+		localStorage.setItem('kirishima', true)
 	} else if (domain == 'imastodon.net') {
-		localStorage.setItem('imas', 'true')
+		localStorage.setItem('imas', true)
-		$('.imasonly').show()
+		showElm('.imasonly')
 	}
-	var at = localStorage.getItem('acct_' + acct_id + '_at')
+	const at = localStorage.getItem(`acct_${acct_id}_at`)
-	var bbcode = domain + '_bbcode'
+	const letters = `${domain}_letters`
-	var letters = domain + '_letters'
+	const quoteMarker = `${domain}_quote`
-	var quoteMarker = domain + '_quote'
-	if (localStorage.getItem('instance')) {
-		var json = JSON.parse(localStorage.getItem('instance'))
-		if (json[quoteMarker] == 'enabled') {
-			localStorage.setItem('quoters', 'true')
-			localStorage.setItem('quote_' + acct_id, 'true')
-		}
-		if (json[bbcode]) {
-			if (json[bbcode] == 'enabled') {
-				localStorage.setItem('bb_' + acct_id, 'true')
-			} else {
-				localStorage.removeItem('bb_' + acct_id)
-				$("[data-activates='bbcode']").addClass('disabled')
-				$("[data-activates='bbcode']").prop('disabled', true)
-			}
-		} else {
-			localStorage.removeItem('bb_' + acct_id)
-			$("[data-activates='bbcode']").addClass('disabled')
-			$("[data-activates='bbcode']").addClass('disabled', true)
-		}
 
-		if (json[domain + '_markdown'] == 'enabled') {
+	if (idata) {
-			localStorage.setItem('md_' + acct_id, 'true')
+		//check and replace json to idata
-			$('.markdown').show()
+		const json = idata
-		} else {
+		if (json[quoteMarker] == 'enabled') {
-			$('.anti-markdown').hide()
+			localStorage.setItem('quoters', true)
-			$('.markdown').hide()
+			localStorage.setItem(quoteMarker, true)
-			localStorage.removeItem('bb_' + acct_id)
-		}
-		if (json[domain + '_home']) {
-			localStorage.setItem('home_' + acct_id, json[domain + '_home'])
-		}
-		if (json[domain + '_local']) {
-			localStorage.setItem('local_' + acct_id, json[domain + '_local'])
-		}
-		if (json[domain + '_public']) {
-			localStorage.setItem('public_' + acct_id, json[domain + '_public'])
-		}
-		if (json[domain + '_notification']) {
-			localStorage.setItem('notification_' + acct_id, json[domain + '_notification'])
-		}
-		if (json[domain + '_post']) {
-			localStorage.setItem('post_' + acct_id, json[domain + '_post'])
-		}
-		if (json[domain + '_fav']) {
-			localStorage.setItem('fav_' + acct_id, json[domain + '_fav'])
-		}
-		if (json[domain + '_bt']) {
-			localStorage.setItem('bt_' + acct_id, json[domain + '_bt'])
-		}
-		if (json[domain + '_follow']) {
-			localStorage.setItem('followlocale_' + acct_id, json[domain + '_follow'])
 		}
 	}
-	if (localStorage.getItem('mode_' + domain) != 'misskey') {
+	if (!isMisskey(domain)) {
-		var start = 'https://' + domain + '/api/v1/instance'
+		const start = `https://${domain}/api/v1/instance`
-		fetch(start, {
+		let json
-			method: 'GET',
+		try {
-			headers: {
+			json = await getApi(start, null)
-				'content-type': 'application/json'
+		} catch {
-			}
+			return null
-		})
+		}
-			.then(function(response) {
+		if (!json || json.error) {
-				return response.json()
+			return
-			})
+		}
-			.catch(function(error) {
+		const mtc = json['max_toot_chars']
-				console.error(error)
+		if (mtc) {
-			})
+			localStorage.setItem(letters, mtc)
-			.then(function(json) {
+		}
-				if (json.error) {
+		if (json['feature_quote']) {
-					console.error(json.error)
+			localStorage.setItem(quoteMarker, true)
-					return
+		}
-				}
+		const str = json['urls']['streaming_api']
-				if (json) {
+		if (str) {
-					if (json['max_toot_chars']) {
+			localStorage.setItem(`streaming_${domain}`, str)
-						localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
+		}
-					}
-					if (json['urls']['streaming_api']) {
-						localStorage.setItem('streaming_' + acct_id, json['urls']['streaming_api'])
-					} else {
-						localStorage.removeItem('streaming_' + acct_id)
-					}
-				}
-			})
-	} else {
 	}
 }
 
 //アカウントを選択…を実装
-function multiSelector(parseC) {
+function multiSelector() {
-	var multi = localStorage.getItem('multi')
+	let obj = acctList
-	if (!multi) {
+	//if (!obj) obj = JSON.parse(localStorage.getItem('multi'))
-		var obj = []
+	let template = ''
-		var json = JSON.stringify(obj)
+	//StringなのはlocalStorageがStringしか返さないから
-		localStorage.setItem('multi', json)
+	let lastUsed = '0'
-	} else {
-		var obj = JSON.parse(multi)
-	}
-	var templete
 	if (localStorage.getItem('mainuse') == 'main') {
-		var last = localStorage.getItem('main')
+		lastUsed = localStorage.getItem('main')
 	} else if (localStorage.getItem('last-use')) {
-		var last = localStorage.getItem('last-use')
+		lastUsed = localStorage.getItem('last-use')
-		if (last == 'webview' || last == 'noauth') {
+		if (lastUsed == 'webview' || lastUsed == 'noauth') {
-			last = '0'
+			lastUsed = '0'
 		}
 	} else {
-		var last = '0'
+		lastUsed = '0'
 	}
-	last = last + ''
+	let sel
-	var sel
 	if (obj.length < 1) {
-		$('#src-acct-sel').html('<option value="tootsearch">Tootsearch</option>')
+		document.querySelector('#src-acct-sel').innerHTML = '<option value="tootsearch">Tootsearch</option>'
-		$('#add-acct-sel').html('<option value="noauth">' + lang.lang_login_noauth + '</option>')
+		document.querySelector('#add-acct-sel').innerHTML = `<option value="noauth">${lang.lang_login_noauth}</option>`
 	} else {
-		Object.keys(obj).forEach(function(key) {
+		for (let i = 0; i < obj.length; i++) {
-			var acct = obj[key]
+			const acct = obj[i]
-			var list = key * 1 + 1
+			const strKey = i.toString()
-			if (key + '' === last) {
+			if (strKey == lastUsed) {
 				sel = 'selected'
-				var domain = acct.domain
+				const domain = acct.domain
-				localStorage.setItem('domain_' + key, domain)
+				const letters = idata[`${domain}_letters`]
-				if (idata[domain + '_letters']) {
+				const textarea = document.querySelector('#textarea')
-					$('#textarea').attr('data-length', idata[domain + '_letters'])
+				if (letters) {
+					textarea.setAttribute('data-length', letters)
 				} else {
-					var maxletters = localStorage.getItem('letters_' + key)
+					//手動でアカマネで変えれちゃうから
-					if (maxletters > 0) {
+					const maxLetters = localStorage.getItem(`${domain}_letters`)
-						$('#textarea').attr('data-length', maxletters)
+					if (maxLetters > 0) {
+						textarea.setAttribute('data-length', maxLetters)
 					} else {
-						$('#textarea').attr('data-length', 500)
+						textarea.setAttribute('data-length', 500)
 					}
 				}
-				if (idata[domain + '_glitch']) {
+				if (idata[`${domain}_glitch`]) {
-					$('#local-button').removeClass('hide')
+					document.querySelector('#local-button').classList.remove('hide')
 				}
-				var profimg = acct.prof
+				let profimg = acct.prof
-				//localStorage.setItem("prof_" + key, profimg);
 				if (!profimg) {
 					profimg = '../../img/missing.svg'
 				}
-				$('#acct-sel-prof').attr('src', profimg)
+				document.querySelector('#acct-sel-prof').setAttribute('src', profimg)
+				let cc = ''
 				if (domain) {
-					var cc = '(' + domain + ')'
+					cc = `(${domain})`
-				} else {
-					var cc = ''
 				}
-				$('#toot-post-btn').text(lang.lang_toot + cc)
+				const tpb = document.querySelector('#toot-post-btn')
+				tpb.innerText = lang.lang_toot + cc
 				if (acct.background && acct.background != 'def' && acct.text && acct.text != 'def') {
-					$('#toot-post-btn').removeClass('indigo')
+					tpb.classList.remove('indigo')
-					$('#toot-post-btn').css('background-color', '#' + acct.background)
+					tpb.style.backgroundColor = `#${acct.background}`
-					$('#toot-post-btn').css('color', acct.text)
+					tpb.style.color = `#${acct.text}`
-				} else {
-				}
-				if (domain == 'kirishima.cloud') {
-					$('#faicon-btn').show()
-				} else {
-					$('#faicon-btn').hide()
 				}
 				if (domain == 'imastodon.net') {
 					trendTag()
 				} else {
-					$('#trendtag').html('')
+					if (document.querySelector('#trendtag')) document.querySelector('#trendtag').innerHTML = ''
 				}
 			} else {
 				sel = ''
 			}
-			templete =
+			template = template + `
-				'<option value="' +
+			<option value="${strKey}" data-icon="${acct.prof}" class="left circle" ${sel}>@${acct.user}@${acct.domain}
-				key +
+			</option>
-				'" data-icon="' +
+			`
-				acct.prof +
+		}
-				'" class="left circle" ' +
+		const forSrc = template + '<option value="tootsearch">Tootsearch</option>'
-				sel +
+		const forAdd = template + `
-				'>' +
+			<option value="noauth">${lang.lang_login_noauth}</option>
-				acct.user +
+			<option value="webview">Twitter</option>
-				'@' +
+		`
-				acct.domain +
+		const forDir = template + `<option value="noauth">${lang.lang_login_noauth}</option>`
-				'</option>'
+		document.querySelector('#post-acct-sel').innerHTML = template
-			$('.acct-sel').append(templete)
+		document.querySelector('#list-acct-sel').innerHTML = template
-		})
+		document.querySelector('#filter-acct-sel').innerHTML = template
-		$('#src-acct-sel').append('<option value="tootsearch">Tootsearch</option>')
+		document.querySelector('#src-acct-sel').innerHTML = forSrc
-		$('#add-acct-sel').append(
+		document.querySelector('#add-acct-sel').innerHTML = forAdd
-			'<option value="noauth">' +
+		document.querySelector('#dir-acct-sel').innerHTML = forDir
-				lang.lang_login_noauth +
-				'</option><option value="webview">Twitter</option>'
-		)
-		$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
 	}
-	$('select').formSelect()
+	const elems = document.querySelectorAll('select')
-	if (!parseC) {
+	M.FormSelect.init(elems, null)
-		parseColumn(null, true)
-	}
-}
-
-//バージョンエンコ
-function enc(ver) {
-	var ver = ver.replace(/\s/g, '')
-	var ver = ver.replace(/\(/g, '-')
-	var ver = ver.replace(/\)/g, '')
-	var ver = ver.replace(/\[/g, '_')
-	var ver = ver.replace(/\]/g, '')
-	return ver
 }
 //インスタンスティッカー
-function ticker() {
+async function ticker() {
-	var start = 'https://toot.app/toot/index.php'
+	const start = 'https://toot-app.thedesk.top/toot/index.php'
-	fetch(start, {
+	const json = await getApi(start, null)
-		method: 'GET',
+	if (json) localStorage.setItem('ticker', JSON.stringify(json))
-		cors: true,
-		headers: {
-			'content-type': 'application/json'
-		}
-	})
-		.then(function(response) {
-			if (!response.ok) {
-				response.text().then(function(text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function(error) {
-			console.error(error)
-		})
-		.then(function(json) {
-			if (json) {
-				localStorage.setItem('ticker', JSON.stringify(json))
-			}
-		})
 }
+function isMisskey(domain) {
+	return localStorage.getItem(`mode_${domain}`) == 'misskey'
+}

app/js/login/logout.js

@@ -1,7 +1,7 @@
 //ログアウトします
 function logout() {
-	localStorage.removeItem("acct_" + acct_id + "_at");
+	localStorage.removeItem(`acct_${acct_id}_at`)
-	localStorage.removeItem("domain_" + acct_id);
+	localStorage.removeItem(`domain_${acct_id}`)
-	location.href = "index.html";
+	location.href = 'index.html'
-	todc();
+	todc()
-}
+}

app/js/platform/first.js

@@ -1,11 +1,11 @@
-$.strip_tags = function(str, allowed) {
+$.strip_tags = function (str, allowed) {
 	if (!str) {
 		return ''
 	}
 	allowed = (((allowed || '') + '').toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join('')
 	var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>?/gi,
 		commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi
-	return str.replace(commentsAndPhpTags, '').replace(tags, function($0, $1) {
+	return str.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
 		return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : ''
 	})
 }
@@ -13,12 +13,7 @@ function escapeHTML(str) {
 	if (!str) {
 		return ''
 	}
-	return str
+	return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;')
-		.replace(/&/g, '&amp;')
-		.replace(/</g, '&lt;')
-		.replace(/>/g, '&gt;')
-		.replace(/"/g, '&quot;')
-		.replace(/'/g, '&#039;')
 }
 //PHPのnl2brと同様
 function nl2br(str) {
@@ -88,17 +83,18 @@ function formattimeutc(date) {
 }
 postMessage(['sendSinmpleIpc', 'custom-css-request'], '*')
 function makeCID() {
-	return (
+	let chars = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.split('')
-		randomStr(8) +
+	for (let i = 0, len = chars.length; i < len; i++) {
-		'-' +
+		switch (chars[i]) {
-		randomStr(4) +
+			case 'x':
-		'-' +
+				chars[i] = Math.floor(Math.random() * 16).toString(16)
-		randomStr(4) +
+				break
-		'-' +
+			case 'y':
-		randomStr(4) +
+				chars[i] = (Math.floor(Math.random() * 4) + 8).toString(16)
-		'-' +
+				break
-		randomStr(12)
+		}
-	)
+	}
+	return chars.join('')
 }
 function randomStr(l) {
 	// 生成する文字列に含める文字セット
@@ -129,7 +125,7 @@ function rgbToHex(color) {
 			// RGBからHEXへ変換
 			parseInt(regex[1]).toString(16),
 			parseInt(regex[2]).toString(16),
-			parseInt(regex[3]).toString(16)
+			parseInt(regex[3]).toString(16),
 		]
 
 		for (var i = 0; i < rgb.length; ++i) {
@@ -147,15 +143,15 @@ function rgbToHex(color) {
 	console.error(color + ':第1引数はRGB形式で入力')
 }
 /*マルチバイト用切り出し*/
-$.isSurrogatePear = function(upper, lower) {
+$.isSurrogatePear = function (upper, lower) {
 	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
 }
-$.mb_strlen = function(str) {
+$.mb_strlen = function (str) {
 	var splitter = new GraphemeSplitter()
 	var arr = splitter.splitGraphemes(str)
 	return arr.length
 }
-$.mb_substr = function(str, begin, end) {
+$.mb_substr = function (str, begin, end) {
 	//配列にする
 	var splitter = new GraphemeSplitter()
 	var arr = splitter.splitGraphemes(str)
@@ -175,7 +171,7 @@ function object_array_sort(data, key, order, fn) {
 		num_a = 1
 		num_b = -1
 	}
-	data = data.sort(function(a, b) {
+	data = data.sort(function (a, b) {
 		var x = a[key]
 		var y = b[key]
 		if (x > y) return num_a
@@ -252,7 +248,7 @@ function statusModel(now) {
 		reblog: null,
 		application: {
 			name: null,
-			website: null
+			website: null,
 		},
 		account: {
 			id: '',
@@ -273,12 +269,53 @@ function statusModel(now) {
 			statuses_count: 0,
 			last_status_at: now,
 			emojis: [],
-			fields: []
+			fields: [],
 		},
 		media_attachments: [],
 		mentions: [],
 		tags: [],
 		card: null,
-		poll: null
+		poll: null,
 	}
 }
+
+function isFocused(query) {
+	const allTarget = document.querySelectorAll(query)
+	const active = document.activeElement
+	let is = false
+	for (let i = 0; i < allTarget.length; i++) {
+		if (allTarget[i] == active) {
+			is = true
+			break
+		}
+	}
+	return is
+}
+function getHeight(query) {
+	const elm = document.querySelector(query)
+	return parseFloat(getComputedStyle(elm, null).height.replace('px', ''))
+}
+function showElm(query) {
+	const allTarget = document.querySelectorAll(query)
+	for (let i = 0; i < allTarget.length; i++) {
+		const target = allTarget[i]
+		target.style.display = 'inherit'
+	}
+}
+function setAllClasses(query, className, action) {
+	const allTarget = document.querySelectorAll(query)
+	for (let i = 0; i < allTarget.length; i++) {
+		const target = allTarget[i]
+		if (action == 'add') target.classList.add(className)
+		if (action == 'remove') target.classList.remove(className)
+	}
+}
+function appendPrepend(query, elm, action) {
+	const allTarget = document.querySelectorAll(query)
+	for (let i = 0; i < allTarget.length; i++) {
+		const target = allTarget[i]
+		if (action == 'prepend') target.insertBefore(elm, target.firstChild)
+		if (action == 'append') target.appendChild(document.createTextNode(elm))
+	}
+}
+const sleep = (msec) => new Promise((resolve) => setTimeout(resolve, msec))

app/js/post/bb-md.js

@@ -2,11 +2,12 @@
 //アカウント変えた時にBBとかMDとか
 function mdCheck() {
 	var acct_id = $('#post-acct-sel').val()
-	var profimg = localStorage.getItem('prof_' + acct_id)
+	/*var profimg = localStorage.getItem('prof_' + acct_id)
 	if (!profimg) {
 		profimg = '../../img/missing.svg'
 	}
 	$('#acct-sel-prof').attr('src', profimg)
+	*/
 	if (localStorage.getItem('post_' + acct_id)) {
 		$('#toot-post-btn').text(
 			localStorage.getItem('post_' + acct_id) +
@@ -50,7 +51,7 @@ function mdCheck() {
 	if (idata[domain + '_letters']) {
 		$('#textarea').attr('data-length', idata[domain + '_letters'])
 	} else {
-		var maxletters = localStorage.getItem('letters_' + acct_id)
+		var maxletters = localStorage.getItem(domain + 'letters_')
 		if (maxletters > 0) {
 			$('#textarea').attr('data-length', maxletters)
 		} else {

app/js/post/img.js

@@ -108,7 +108,6 @@ async function media(b64, type, no, stamped) {
 	}
 	$('.toot-btn-group').prop('disabled', true)
 	$('#post-acct-sel').prop('disabled', true)
-	localStorage.setItem('image', 'busy')
 	todo('Image Upload...')
 	var media = toBlob(b64, type)
 	var fd = new FormData()
@@ -159,7 +158,6 @@ async function media(b64, type, no, stamped) {
 				M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
 				$('#imgup').text('')
 				$('#imgsel').show()
-				localStorage.removeItem('image')
 			} 
 		} catch {
 			var start = 'https://' + domain + '/api/v1/media'

app/js/post/post.js

@@ -122,6 +122,10 @@ function post(mode, postvis) {
 		console.log('This toot will be posted at:' + scheduled)
 		schedule()
 		toot.scheduled_at = scheduled
+		if($('#sch-box').hasClass('expire')) {
+			toot.scheduled_at = null
+			toot.expires_at = scheduled
+		}
 	} else {
 		var scheduled = ''
 	}
@@ -195,6 +199,20 @@ function post(mode, postvis) {
 		}
 	}
 }
+function expPostMode() {
+	$('#sch-box').toggleClass('expire')
+	if($('#sch-box').hasClass('expire')) {
+		Swal.fire({
+			type: 'info',
+			title: 'Expiring toot On'
+		})
+	} else {
+		Swal.fire({
+			type: 'info',
+			title: 'Expireing toot Off'
+		})
+	}
+}
 function misskeyPost() {
 	var str = $('#textarea').val()
 	var acct_id = $('#post-acct-sel').val()
@@ -324,7 +342,6 @@ function clear() {
 	$('.mastodon-choice').map(function() {
 		$(this).val('')
 	})
-	localStorage.removeItem('image')
 	if (localStorage.getItem('mainuse') == 'main') {
 		$('#post-acct-sel').val(localStorage.getItem('main'))
 	}

app/js/post/status.js

@@ -160,8 +160,14 @@ function bkm(id, acct_id, tlid) {
 
 //フォロー
 async function follow(acct_id, resolve) {
+	if($('#his-data').hasClass('locked')) {
+		locked = true
+	} else {
+		locked = false
+	}
 	if (!acct_id && acct_id != 'selector') {
 		var acct_id = $('#his-data').attr('use-acct')
+
 	} else if (acct_id == 'selector') {
 		var acct_id = $('#user-acct-sel').val()
 	}
@@ -172,6 +178,7 @@ async function follow(acct_id, resolve) {
 		var flag = 'follow'
 		var flagm = 'create'
 	}
+	
 	var id = $('#his-data').attr('user-id')
 	if (resolve == 'selector') {
 		var fullacct = $('#his-acct').attr('fullname')
@@ -205,7 +212,11 @@ async function follow(acct_id, resolve) {
 				$('#his-follow-btn-text').text(lang.lang_status_follow)
 			} else {
 				$('#his-data').addClass('following')
-				$('#his-follow-btn-text').text(lang.lang_status_unfollow)
+				if(locked) {
+					$('#his-follow-btn-text').text(lang.lang_status_requesting)
+				} else {
+					$('#his-follow-btn-text').text(lang.lang_status_unfollow)
+				}
 			}
 		}
 	}

app/js/tl/parse.js

@@ -393,8 +393,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					noticeavatar = toot.account.avatar_static
 				}
-				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="notf-icon udg" aria-hidden="true">
+				noticeavatar = `<a onclick="udg('${toot.account.id}','${acct_id}');" user="${toot.account.acct}" class="udg" aria-hidden="true">
-						<img draggable="false" src="${noticeavatar}" width="20" class="prof-img" 
+						<img draggable="false" src="${noticeavatar}" width="20" class="notf-icon prof-img" 
 							user="${toot.account.acct}" onerror="this.src=\'../../img/loading.svg\'">
 					</a>`
 				var rebtxt = lang.lang_parse_btedsimple
@@ -950,7 +950,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				if (!quoteUser) {
 					quoteUser = toot.quote.account.acct
 				}
-				poll =
+				if(!toot.quote.quote_muted) {
+					poll =
 					poll +
 					`<div class="quote-renote">
 						<div class="renote-icon">
@@ -974,6 +975,12 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 							</a>
 						</div>
 					</div>`
+				} else {
+					poll =
+					poll +
+					`<span class="gray sml">${lang.lang_parse_hidden}</span>`
+				}
+				
 			}
 			//menuは何個？
 			var menuct = 2

app/js/tl/tl.js

@@ -851,7 +851,7 @@ function cap(type, data, acct_id) {
 	} else if (type == 'bookmark') {
 		var response = 'Bookmarks'
 	} else if (type == 'utl') {
-		var response = 'User TL(' + data.acct + ')'
+		var response = 'User TL(' + escapeHTML(data.acct) + ')'
 	}
 	return response
 }

app/js/ui/layout.js

@@ -42,7 +42,6 @@ function parseColumn(target, dontclose) {
 	var multi = localStorage.getItem('multi')
 	if (multi) {
 		var obj = JSON.parse(multi)
-
 		var templete
 		Object.keys(obj).forEach(function (key) {
 			var acct = obj[key]
@@ -102,6 +101,7 @@ function parseColumn(target, dontclose) {
 			$('.box, .boxIn').resizable('destroy')
 		}
 	}
+	console.log(obj)
 	var basekey = 0
 	for (var key = 0; key < obj.length; key++) {
 		var next = key + 1
@@ -444,7 +444,7 @@ function parseColumn(target, dontclose) {
 					<br>
 					<div id="picker_${key}" class="color-picker"></div>
 				</div>${if_tag}
-				<div class="tl-box" tlid="${key}">
+				<div class="tl-box" tlid="${key}" id="tlBox${key}">
 					<div id="timeline_${key}" class="tl ${acct.type}-timeline " tlid="${key}" 
 						data-type="${acct.type}" data-acct="${acct.domain}" data-const="${acct.type}_${acct.domain}">
 						<div id="landing_${key}" style="text-align:center">
@@ -508,6 +508,8 @@ function parseColumn(target, dontclose) {
 			}
 		}
 	}
+	console.log('multiSelector')
+	multiSelector()
 	$('.box, .boxIn').resizable({
 		minHeight: 50,
 		minWidth: 50,
@@ -646,11 +648,15 @@ function removeColumn(tlid) {
 		if (result.value) {
 			var multi = localStorage.getItem('column')
 			var obj = JSON.parse(multi)
+			var data = obj[tlid]
 			obj.splice(tlid, 1)
 			var json = JSON.stringify(obj)
 			localStorage.setItem('column', json)
 			sortLoad()
-			$('#timeline_box_' + tlid + '_parentBox').remove()
+			$('#timeline_box_' + tlid + '_box').remove()
+			if(!data.left_fold) {
+				$('#timeline_box_' + tlid + '_parentBox').remove()
+			}
 		}
 		$('#sort-box').removeClass('hide')
 		$('#sort-box').addClass('show')
@@ -800,7 +806,7 @@ function webviewParse(url, key, insert, icnsert, css) {
 				<br>
 				<div id="picker_${key}" class="color-picker"></div>
 			</div>
-			<div class="tl-box" tlid="${key}" style="width:100%;height:100%;">
+			<div class="tl-box" tlid="${key}" style="width:100%;height:100%;" id="tlBox${key}">
 				<div id="timeline_${key}" class="tl" tlid="${key}" data-type="webview" style="width:100%;height:100%;">
 					<webview src="${url}" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview>
 				</div>
@@ -862,7 +868,7 @@ function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, anim
 			${lang.lang_layout_headercolor}<br>
 			<div id="picker_${key}" class="color-picker"></div>
 		</div>
-		<div class="tl-box" tlid="${key}">
+		<div class="tl-box" tlid="${key}" id="tlBox${key}">
 			<div id="timeline_${key}" class="tl ${type}-timeline" tlid="${key}" data-type="${type}" data-acct="${data}">
 				<div id="landing_${key}" style="text-align:center">
 					${lang.lang_layout_nodata}

app/js/ui/post-box.js

@@ -32,7 +32,6 @@ function mini() {
 function show() {
 	$('#post-box').addClass('appear')
 	$('#textarea').focus()
-	console.log('show' + localStorage.getItem('postbox-left'))
 	var left = localStorage.getItem('postbox-left')
 	if (left > $('body').width() - $('#post-box').width()) {
 		left = $('body').width() - $('#post-box').width()
@@ -55,10 +54,12 @@ function show() {
 	}
 	$('#post-box').fadeIn()
 	$('#textarea').characterCounter()
+	
 	mdCheck()
 }
 
 $(function () {
+	
 	$('#post-box').draggable({
 		handle: '#post-bar',
 		stop: function () {

app/js/ui/settings.js

@@ -99,14 +99,14 @@ function settings() {
 	var fontd = $('#font').val()
 	if (fontd) {
 		if (fontd != localStorage.getItem('font')) {
-			M.toast({ html: lang.lang_setting_font.replace('{{set}}', ct), displayLength: 3000 })
+			M.toast({ html: lang.lang_setting_font.replace('{{set}}', fontd), displayLength: 3000 })
 		}
 		localStorage.setItem('font', fontd)
 		themes()
 	} else {
 		if (localStorage.getItem('font')) {
 			localStorage.removeItem('font')
-			M.toast({ html: lang.lang_setting_font.replace('{{set}}', ct), displayLength: 3000 })
+			M.toast({ html: lang.lang_setting_font.replace('{{set}}', '"default"'), displayLength: 3000 })
 			themes()
 		}
 	}

app/js/ui/sort.js

@@ -33,7 +33,7 @@ function sortLoad () {
 			var acctdata = user + "@" + domain;
 		}
 
-		var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, escapeHTML(acct.data), acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
+		var html = '<li class="drag-content" data-id="' + key + '" data-flag="' + flag + '"' + insert + '><div class="sorticon"><i class="material-icons">' + icon(acct.type) + '</i></div><div class="sorttitle">' + cap(acct.type, acct.data, acct.domain) + '</div><div class="sortaction"><a onclick="goColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="' + lang.lang_sort_gothis + '">forward</i></a> <a onclick="removeColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">' + acctdata + '</div></li>';
 		$("#sort").append(html);

app/js/ui/tips.js

@@ -157,7 +157,7 @@ function spotifytips() {
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(json) {
+			.then(async function(json) {
 				var ms = json.progress_ms
 				if(!ms) {
 					tips('ver')
@@ -175,7 +175,7 @@ function spotifytips() {
 					}
 				}
 				artisttxt = escapeHTML(artisttxt)
-				sleep(last)
+				await sleep(last)
 				var tms = item.duration_ms
 				var per = (ms / item.duration_ms) * 100
 				ms = ms / 1000
@@ -251,10 +251,10 @@ function trendTagonTipInterval() {
 }
 //時計
 var clockint
-function clock() {
+async function clock() {
 	var now = new Date()
 	var last = 1000 - (now.getTime() % 1000)
-	sleep(last)
+	await sleep(last)
 	clockint = setInterval(clockStart, 1000)
 }
 function clockStart() {
@@ -286,10 +286,6 @@ function clockStart() {
 		'</span>'
 	$('#tips-text').html(msg)
 }
-function sleep(waitMsec) {
-	var startMsec = new Date()
-	while (new Date() - startMsec < waitMsec);
-}
 function tipsToggle() {
 	$('#tips').toggleClass('hide')
 	$('#tips-menu').toggleClass('hide')

app/js/userdata/prof-edit.js

@@ -1,65 +1,68 @@
 //プロフ編集
 //文字系
 function profedit() {
-	var acct_id = $('#his-data').attr("use-acct");
+	var acct_id = $('#his-data').attr('use-acct')
-	todo("Updating...");
+	todo('Updating...')
-	var domain = localStorage.getItem("domain_" + acct_id);
+	var domain = localStorage.getItem('domain_' + acct_id)
-	var at = localStorage.getItem("acct_" + acct_id + "_at");
+	var at = localStorage.getItem('acct_' + acct_id + '_at')
-	var start = "https://" + domain + "/api/v1/accounts/update_credentials";
+	var start = 'https://' + domain + '/api/v1/accounts/update_credentials'
-	var name = $("#his-name-val").val();
+	var name = $('#his-name-val').val()
-	var des = $("#his-des-val").val();
+	var des = $('#his-des-val').val()
-	var httpreq = new XMLHttpRequest();
+	var httpreq = new XMLHttpRequest()
-	httpreq.open('PATCH', start, true);
+	httpreq.open('PATCH', start, true)
-	httpreq.setRequestHeader('Content-Type', 'application/json');
+	httpreq.setRequestHeader('Content-Type', 'application/json')
-	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+	httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-	httpreq.responseType = "json";
+	httpreq.responseType = 'json'
-	httpreq.send(JSON.stringify({
+	httpreq.send(
-		display_name: name,
+		JSON.stringify({
-		note: des,
+			display_name: name,
-	}));
+			note: des,
+		})
+	)
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
-			$('#his-data').modal('close');
+			$('#his-data').modal('close')
-			todc();
+			todc()
 		}
 	}
 }
 
 //画像系
 function imgChange(imgfile, target) {
-	var acct_id = $('#his-data').attr("use-acct");
+	var acct_id = $('#his-data').attr('use-acct')
-	todo("アップロードしています")
+	todo('アップロードしています')
 	if (!imgfile.files.length) {
-		console.warn("No Image to upload");
+		console.warn('No Image to upload')
-		return;
+		return
 	}
-	var file = imgfile.files[0];
+	var file = imgfile.files[0]
-	var fr = new FileReader();
+	var fr = new FileReader()
 	fr.onload = function (evt) {
-		var b64 = this.result;
+		var b64 = this.result
-		var blob = toBlob(b64, 'image/png');
+		var blob = toBlob(b64, 'image/png')
-		var fd = new FormData();
+		var fd = new FormData()
-		fd.append(target, blob);
+		fd.append(target, blob)
-		var domain = localStorage.getItem("domain_" + acct_id);
+		var domain = localStorage.getItem('domain_' + acct_id)
-		var at = localStorage.getItem("acct_" + acct_id + "_at");
+		var at = localStorage.getItem('acct_' + acct_id + '_at')
-		var start = "https://" + domain + "/api/v1/accounts/update_credentials";
+		var start = 'https://' + domain + '/api/v1/accounts/update_credentials'
-		var httpreq = new XMLHttpRequest();
+		var httpreq = new XMLHttpRequest()
-		httpreq.open('PATCH', start, true);
+		httpreq.open('PATCH', start, true)
-		httpreq.upload.addEventListener("progress", progshow, false);
+		httpreq.upload.addEventListener('progress', progshow, false)
-		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
-		httpreq.responseType = "json";
+		httpreq.responseType = 'json'
-		httpreq.send(fd);
+		httpreq.send(fd)
 		httpreq.onreadystatechange = function () {
 			if (httpreq.readyState === 4) {
-				var json = httpreq.response;
+				var json = httpreq.response
-				if(this.status!==200){ setLog(start, this.status, this.response); }
+				if (this.status !== 200) {
-				$('#his-data').modal('close');
+					setLog(start, this.status, this.response)
-				todc();
+				}
-				localStorage.removeItem("image");
+				$('#his-data').modal('close')
+				todc()
 			}
 		}
 	}
-	$("#prof-change").html($("#prof-change").html());
+	$('#prof-change').html($('#prof-change').html())
-	$("#header-change").html($("#header-change").html());
+	$('#header-change').html($('#header-change').html())
-	fr.readAsDataURL(file);
+	fr.readAsDataURL(file)
 }

app/js/userdata/showOnTL.js

@@ -33,20 +33,20 @@ function udgEx(user, acct_id) {
 			Authorization: "Bearer " + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text);
 				});
 			}
 			return response.json();
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error);
 			setLog(start, "JSON", error);
 			console.error(error);
 		})
-		.then(function(json) {
+		.then(function (json) {
 			if (json.accounts[0]) {
 				var id = json.accounts[0].id;
 				udg(id, acct_id);
@@ -76,20 +76,20 @@ function udg(user, acct_id) {
 			Authorization: "Bearer " + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text);
 				});
 			}
 			return response.json();
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error);
 			setLog(start, "JSON", error);
 			console.error(error);
 		})
-		.then(function(json) {
+		.then(function (json) {
 			//一つ前のユーザーデータ
 			if (!localStorage.getItem("history")) {
 				$("#his-history-btn").prop("disabled", true);
@@ -129,7 +129,7 @@ function udg(user, acct_id) {
 			}
 			//絵文字があれば
 			if (actemojick) {
-				Object.keys(json.emojis).forEach(function(key5) {
+				Object.keys(json.emojis).forEach(function (key5) {
 					var emoji = json.emojis[key5];
 					var shortcode = emoji.shortcode;
 					var emoji_url = '<img src="' + emoji.url + '" class="emoji-img" data-emoji="' + shortcode + '" draggable="false">';
@@ -239,6 +239,11 @@ function udg(user, acct_id) {
 				$(".only-his-data").show();
 			}
 			todc();
+			if (json.locked) {
+				$('#his-data').addClass('locked')
+			} else {
+				$('#his-data').removeClass('locked')
+			}
 			//外部データ取得(死かもしれないので)
 			udAdd(acct_id, user, json.url);
 		});
@@ -266,20 +271,20 @@ function misskeyUdg(user, acct_id) {
 			userId: user
 		})
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text);
 				});
 			}
 			return response.json();
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error);
 			setLog(start, "JSON", error);
 			console.error(error);
 		})
-		.then(function(json) {
+		.then(function (json) {
 			//一つ前のユーザーデータ
 			if (!localStorage.getItem("history")) {
 				$("#his-history-btn").prop("disabled", true);
@@ -397,24 +402,29 @@ function relations(user, acct_id) {
 			Authorization: "Bearer " + at
 		}
 	})
-		.then(function(response) {
+		.then(function (response) {
 			if (!response.ok) {
-				response.text().then(function(text) {
+				response.text().then(function (text) {
 					setLog(response.url, response.status, text);
 				});
 			}
 			return response.json();
 		})
-		.catch(function(error) {
+		.catch(function (error) {
 			todo(error);
 			setLog(start, "JSON", error);
 			console.error(error);
 		})
-		.then(function(json) {
+		.then(function (json) {
 			var json = json[0];
+			if (json.requested) {
+				//フォロリク中
+				$('#his-data').addClass('following')
+				$("#his-follow-btn-text").text(lang.lang_status_requesting)
+			}
 			if (json.following) {
 				//自分がフォローしている
-				$("#his-data").addClass("following");
+				$("#his-data").addClass("following")
 				$("#his-follow-btn-text").text(lang.lang_status_unfollow);
 				hisList(user, acct_id);
 			} else {
@@ -472,7 +482,7 @@ function profbrws() {
 function setMain() {
 	var acct_id = $("#his-data").attr("use-acct");
 	localStorage.setItem("main", acct_id);
-	multiSelector(true);
+	multiSelector();
 	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 });
 }
 //オールリセット
@@ -538,8 +548,10 @@ function reset() {
 	$("#his-float-blocked").hide();
 	$("#his-main-acct").show();
 	$("#his-proof-prof").html("");
+	$('#his-data').removeClass('locked')
+	$('#his-data').removeClass('requesting')
 }
-$("#my-data-nav .anc-link").on("click", function() {
+$("#my-data-nav .anc-link").on("click", function () {
 	var target = $(this).attr("go");
 	if (target) {
 		$("#my-data-nav .anc-link").removeClass("active-back");

app/main.js

@@ -79,7 +79,11 @@ function createWindow() {
 	if(lang == 'ja') {
 		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
 		var show = maxims[Math.floor(Math.random() * maxims.length)]
-	} else {
+	} else if(lang == 'ja-KS') {
+		//ja-KSも作れたらいいね
+		const maxims = JSON.parse(fs.readFileSync(__dirname + '/maxim.ja.json'))
+		var show = maxims[Math.floor(Math.random() * maxims.length)]
+	} else{
 		var show = 'TheDesk 2018'
 	}
 	const data = JSON.parse(package)

app/maxim.ja.json

@@ -44,5 +44,11 @@
     "たまにここに何も出ないことがあるけど、なんでかはわからない",
     "Kawaii->Mayu(今ここ)->Koume->Chieri->Anastasia->Aiko",
     "言語設定を日本語以外にするとこの表示はどうなると思う？",
-    "今日も使ってくれてありがとう。利用者カウンターがキリ番ならご報告を"
+    "今日も使ってくれてありがとう。利用者カウンターがキリ番ならご報告を",
+    "Ctrl+Eで通知の赤くなって「Fav: 1」とかなってるのをリセットできる",
+    "このアプリケーションの正式な名称は小文字thedeskだけど、内部でしか使われてない",
+    "N押すとトゥートのボックスが出て、すぐ打ち込める。",
+    "Xを押すとトゥートのボックスは出るけど、打ち込めない。その代わりもう一度押すと消せる。",
+    "トゥートした後ボックスを閉じるとかそのままにしておくとかは、設定で変えられます。",
+    "ヌァ＝スコ゜、ケエンョ゛ハー゛オセム゛ヌトョ！。シレモゥチャスモハァーワ」。チスョ「ラネ゛ワフン（ァクミス"
 ]

app/netlify.toml

@@ -0,0 +1,5 @@
+[[redirects]]
+  from = "/"
+  to = "/app"
+  status = 301
+  force = true

app/package.json

@@ -1,131 +1,130 @@
 {
-  "name": "thedesk",
+    "name": "thedesk",
-  "version": "21.0.1",
+    "version": "21.0.4",
-  "codename": "Mayu",
+    "codename": "Mayu",
-  "description": "TheDesk is a Mastodon client for PC.",
+    "description": "TheDesk is a Mastodon client for PC.",
-  "repository": "https://github.com/cutls/TheDesk",
+    "repository": "https://github.com/cutls/TheDesk",
-  "main": "main.js",
+    "main": "main.js",
-  "scripts": {
+    "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+        "test": "echo \"Error: no test specified\" && exit 1",
-    "construct": "cd view/make && node make --automatic && cd ../../",
+        "construct": "cd view/make && node make --automatic && cd ../../",
-    "dev": "npx electron ./ --dev",
+        "dev": "npx electron ./ --dev",
-    "dist": "build --linux snap",
+        "dist": "build --linux snap",
-    "watchview": "node view/make/make.js --automatic --watch",
+        "watchview": "node view/make/make.js --automatic --watch",
-    "build:js": "node build.js",
+        "build:js": "node build.js",
-    "build": "node view/make/make.js --automatic && npx electron-builder",
+        "build": "node view/make/make.js --automatic && npx electron-builder",
-    "build:all": "npx electron-builder --win --linux",
+        "build:all": "npx electron-builder --win --linux",
-    "build:win": "npx electron-builder --win",
+        "build:win": "npx electron-builder --win",
-    "build:pwa": "node view/make/make.js --automatic --pwa"
+        "build:pwa": "node view/make/make.js --automatic --pwa"
-  },
-  "keywords": [
-    "mastodon",
-    "client",
-    "electron",
-    "thedesk"
-  ],
-  "bugs": {
-    "url": "https://github.com/cutls/TheDesk/issues",
-    "email": "web-pro@cutls.com"
-  },
-  "homepage": "https://thedesk.top",
-  "author": {
-    "name": "Cutls",
-    "url": "https://cutls.com/@Cutls",
-    "email": "web-pro@cutls.com"
-  },
-  "contributor": [
-    {
-      "name": "とねぢ",
-      "url": "https://minohdon.jp/@toneji",
-      "email": "solfa.tono@gmail.com"
     },
-    {
+    "keywords": [
-      "name": "ぽぷんじゃ",
+        "mastodon",
-      "url": "https://popon.pptdn.jp/@popn_ja",
+        "client",
-      "email": "popn.ja@gmail.com"
+        "electron",
-    },
+        "thedesk"
-    {
-      "name": "kPherox",
-      "url": "https://pl.kpherox.dev/kPherox",
-      "email": "admin@mail.kr-kp.com"
-    }
-  ],
-  "license": "GPL-3.0",
-  "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.13.0",
-    "custom-electron-titlebar": "^3.2.2-hotfix62",
-    "electron-dl": "^3.0.0",
-    "jimp": "^0.10.3",
-    "jquery": "^3.5.0",
-    "jquery-ui-dist": "^1.12.1",
-    "json5": "^2.1.3",
-    "lodash": "^4.17.15",
-    "materialize-css": "git://github.com/cutls/materialize#v1-dev",
-    "sumchecker": "^3.0.1",
-    "sweetalert2": "^9.10.12",
-    "system-font-families": "^0.4.1",
-    "vue": "^2.6.11"
-  },
-  "optionalDependencies": {
-    "itunes-nowplaying-mac": "0.3.1"
-  },
-  "devDependencies": {
-    "chokidar": "^3.3.1",
-    "electron": "^8.2.3",
-    "electron-builder": "^22.5.1",
-    "electron-rebuild": "^1.10.1",
-    "readline-sync": "1.4.10"
-  },
-  "build": {
-    "productName": "TheDesk",
-    "appId": "top.thedesk",
-    "asarUnpack": [
-      "node_modules/itunes-nowplaying-mac"
     ],
-    "directories": {
+    "bugs": {
-      "output": "../build"
+        "url": "https://github.com/cutls/TheDesk/issues",
+        "email": "p@cutls.com"
     },
-    "win": {
+    "homepage": "https://thedesk.top",
-      "icon": "build/thedesk.ico",
+    "author": {
-      "target": [
+        "name": "Cutls",
-        "nsis",
+        "url": "https://cutls.dev",
-        "portable",
+        "email": "p@cutls.com"
-        "appx"
-      ]
     },
-    "appx": {
+    "contributor": [{
-      "identityName": "53491Cutls.TheDesk",
+            "name": "とねぢ",
-      "applicationId": "Cutls.TheDesk",
+            "url": "https://minohdon.jp/@toneji",
-      "publisherDisplayName": "Cutls",
+            "email": "solfa.tono@gmail.com"
-      "publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+        },
-      "languages": [
+        {
-        "JA-JP",
+            "name": "ぽぷんじゃ",
-        "EN-US"
+            "url": "https://popon.pptdn.jp/@popn_ja",
-      ]
+            "email": "popn.ja@gmail.com"
+        },
+        {
+            "name": "kPherox",
+            "url": "https://pl.kpherox.dev/kPherox",
+            "email": "admin@mail.kr-kp.com"
+        }
+    ],
+    "license": "GPL-3.0",
+    "dependencies": {
+        "@fortawesome/fontawesome-free": "^5.13.1",
+        "custom-electron-titlebar": "^3.2.2-hotfix62",
+        "electron-dl": "^3.0.1",
+        "jimp": "^0.14.0",
+        "jquery": "^3.5.1",
+        "jquery-ui-dist": "^1.12.1",
+        "json5": "^2.1.3",
+        "lodash": "^4.17.15",
+        "materialize-css": "git://github.com/cutls/materialize#v1-dev",
+        "sumchecker": "^3.0.1",
+        "sweetalert2": "^9.15.2",
+        "system-font-families": "^0.4.1",
+        "vue": "^2.6.11"
     },
-    "nsis": {
+    "optionalDependencies": {
-      "oneClick": false,
+        "itunes-nowplaying-mac": "0.3.1"
-      "allowToChangeInstallationDirectory": true,
-      "artifactName": "TheDesk-setup.${ext}"
     },
-    "linux": {
+    "devDependencies": {
-      "icon": "build/icons",
+        "chokidar": "^3.4.0",
-      "target": [
+        "electron": "^9.0.5",
-        "zip",
+        "electron-builder": "^22.7.0",
-        "snap",
+        "electron-rebuild": "^1.11.0",
-        "deb"
+        "readline-sync": "1.4.10"
-      ],
-      "category": "Network"
     },
-    "mac": {
+    "build": {
-      "target": [
+        "productName": "TheDesk",
-        "dmg",
+        "appId": "top.thedesk",
-        "zip"
+        "asarUnpack": [
-      ]
+            "node_modules/itunes-nowplaying-mac"
-    },
+        ],
-    "electronDownload": {
+        "directories": {
-      "version": "8.0.0"
+            "output": "../build"
-    },
+        },
-    "electronVersion": "8.0.0"
+        "win": {
-  }
+            "icon": "build/thedesk.ico",
-}
+            "target": [
+                "nsis",
+                "portable",
+                "appx"
+            ]
+        },
+        "appx": {
+            "identityName": "53491Cutls.TheDesk",
+            "applicationId": "Cutls.TheDesk",
+            "publisherDisplayName": "Cutls",
+            "publisher": "CN=629757F5-A5EE-474F-9562-B304A89A9FD1",
+            "languages": [
+                "JA-JP",
+                "EN-US"
+            ]
+        },
+        "nsis": {
+            "oneClick": false,
+            "allowToChangeInstallationDirectory": true,
+            "artifactName": "TheDesk-setup.${ext}"
+        },
+        "linux": {
+            "icon": "build/icons",
+            "target": [
+                "zip",
+                "snap",
+                "deb"
+            ],
+            "category": "Network"
+        },
+        "mac": {
+            "target": [
+                "dmg",
+                "zip"
+            ]
+        },
+        "electronDownload": {
+            "version": "9.0.5"
+        },
+        "electronVersion": "9.0.5"
+    }
+}

app/source/version.json

@@ -1,5 +1,8 @@
 {
   "latest":[],
+  "3.1.4": [
+    "リモート限定の連合タイムライン"
+  ],
   "3.1.3": [],
   "3.1.2": [],
   "3.1.1": [],

app/view/make/acct.sample.html

@@ -53,6 +53,9 @@
 			<div id="acct-list"></div>
 			<div class="divider"></div>
 		</div>
+		<div class="hide-second">
+			<a href="setting.html">@@haveExported@@</a>
+		</div>
 		<div>
 			<h5>@@add@@</h5>
 			<br />
@@ -66,7 +69,7 @@
 						<div class="pwa">
 							@@codesetupwarn@@<br />
 							<label>
-								<input type="checkbox" class="filled-in" id="linux" />
+								<input type="checkbox" class="filled-in checked" id="linux" checked />
 								<span>@@codesetup@@</span>
 							</label>
 							<br />
@@ -125,17 +128,17 @@
 			<div id="instance-data">
 				Some instance data by
 				<a href="https://instances.social" target="_blank">instances.social API</a><br />
-				<h5 id="ins-title"></h5>
+				<h5 id="ins-title" class="ins-loading"></h5>
-				Administered by:<a id="ins-admin"></a><br />
+				Administered by:<a id="ins-admin" class="ins-loading"></a><br />
-				<span id="ins-desc"></span><br />
+				<span id="ins-desc" class="ins-loading"></span><br />
 				<img src="../../img/loading.svg" id="ins-prof" width="200" /><br />
 				<br />
-				@@domain@@:<span id="ins-name"></span><br />
+				@@domain@@:<span id="ins-name" class="ins-loading"></span><br />
-				@@connect@@:<span id="ins-connect"></span>@@ko@@<br />
+				@@connect@@:<span id="ins-connect" class="ins-loading"></span>@@ko@@<br />
-				@@toots@@:<span id="ins-toot"></span>@@ko@@<br />
+				@@toots@@:<span id="ins-toot" class="ins-loading"></span>@@ko@@<br />
-				@@users@@:<span id="ins-user"></span>@@users@@<br />
+				@@users@@:<span id="ins-user" class="ins-loading"></span>@@users@@<br />
-				@@safety@@:<span id="ins-per"></span>%<br />
+				@@safety@@:<span id="ins-per" class="ins-loading"></span>%<br />
-				@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br />
+				@@ver@@:<span id="ins-ver" class="ins-loading"></span>@<span id="ins-upd" class="ins-loading"></span><br />
 			</div>
 		</div>
 		<script type="text/javascript" src="../../js/ui/theme.js"></script>

app/view/make/index.sample.html

@@ -69,16 +69,16 @@
 					<div id="demobottom">
 						<button
 							class="btn waves-effect"
-							style="width: 300px;height: 2.5rem;line-height: 0;margin: 0; background-color: var(--accentbtn);"
+							style="width: 23rem;height: 2.5rem;line-height: 0;margin: 0; background-color: var(--accentbtn);"
 						>
 							<i
 								class="material-icons"
-								style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;"
+								style="position: relative; top: 0.4rem; font-size: 1.5rem; text-align: center; margin-right: 0.7rem;"
 								>edit</i
 							>@@toot@@
 						</button>
 						<div class="leftside reverse" id="demogroup">
-							<div class="btnsgroup" style="margin-left: 5px;">
+							<div class="btnsgroup" style="margin-left: 0.4rem;">
 								<a href="#" class="nex waves-effect">
 									<i class="material-icons nex big-icon" title="@@acctMan@@(Ctrl+Shift+M)"
 										>account_circle</i
@@ -138,11 +138,11 @@
 								id="acct-sel-prof"
 								title="@@showSelectProf@@(Ctrl+Shift+P)"
 								data-trans-title="post_box_prof"
-								width="24px"
+								style="width: 1.8rem"
 							/>
 						</a>
 					</div>
-					<div class="input-field mize" style="float:left; width:calc(100% - 24px); margin-top:0;">
+					<div class="input-field mize" style="float:left; width:calc(100% - 1.8rem); margin-top:0;">
 						<select id="post-acct-sel" class="acct-sel" onchange="mdCheck()"></select>
 					</div>
 					<span class="cancel">
@@ -260,7 +260,7 @@
 								>
 								<input
 									id="size"
-									style="width: calc(50% - 20px); margin: 0; height: 24px;"
+									style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
 									value="12"
 								/>px
 								<i
@@ -271,7 +271,7 @@
 								>
 								<input
 									id="colorhex"
-									style="width: calc(50% - 50px); margin: 0; height: 24px;"
+									style="width: calc(50% - 3.8rem); margin: 0; height: 1.8rem;"
 									type="color"
 								/>
 								<br />
@@ -283,12 +283,12 @@
 								>
 								<input
 									id="linkt"
-									style="width: calc(50% - 20px); margin: 0; height: 24px;"
+									style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
 									placeholder="リンクテキスト"
 								/>&nbsp;
 								<input
 									id="link2"
-									style="width: calc(50% - 20px); margin: 0; height: 24px;"
+									style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
 									placeholder="リンクアドレス"
 								/>
 								<br />
@@ -300,12 +300,12 @@
 								>
 								<input
 									id="image"
-									style="width: calc(50% - 20px); margin: 0; height: 24px;"
+									style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
 									placeholder="代替テキスト"
 								/>&nbsp;
 								<input
 									id="image2"
-									style="width: calc(50% - 20px); margin: 0; height: 24px;"
+									style="width: calc(50% - 1.5rem); margin: 0; height: 1.8rem;"
 									placeholder="画像アドレス"
 								/>
 							</div>
@@ -383,7 +383,7 @@
 								>clear</i
 							>
 						</div>
-						<div class="col s12 mize" style="margin-bottom:5px; padding:0;">
+						<div class="col s12 mize" style="margin-bottom:0.4rem; padding:0;">
 							<div id="taglist"></div>
 							<div id="preview" class="mize"></div>
 							<span class=" sml mize"
@@ -404,7 +404,7 @@
 								style="margin:0"
 							/>
 							<div id="sch-box">
-								@@postat@@<br /><span class="sml">@@scheduleWarn@@</span><br />
+								@@postat@@<br /><span class="sml">@@scheduleWarn@@</span><a onclick="expPostMode()">Expire mode(beta)</a><br />
 								<input
 									type="datetime-local"
 									id="sch-date"
@@ -417,7 +417,7 @@
 					</div>
 					<!-- 公開範囲 Dropdown Structure -->
 					<ul id="dropdown1" class="dropdown-content">
-						<li style="font-size: 16px; display: block; line-height: 22px; padding: 14px 16px;">
+						<li style="font-size: 1.2rem; display: block; line-height: 1.69rem; padding: 1.1rem 1.23rem;">
 							@@selectVis@@
 						</li>
 						<li>
@@ -767,7 +767,7 @@
 										<span id="his-follow"></span>
 									</span>
 									<span class="cbadge">@@follower@@: <span id="his-follower"></span> </span><br />
-									<span class="cbadge" style="max-width:150px; width:150px; "
+									<span class="cbadge" style="max-width:11.5rem; width:11.5rem; "
 										>Since:
 										<span id="his-since"></span>
 									</span>
@@ -1072,7 +1072,7 @@
 				<br />
 			</div>
 			<div class="modal-footer">
-				<div style="float: left;padding-top:3px;line-height: normal;">
+				<div style="float: left;padding-top:0.23rem;line-height: normal;">
 					<span id="imgprog"></span>% <br />
 					<span id="imgsec"></span>ms <br /><span id="imgbyte"></span>KB
 				</div>
@@ -1120,60 +1120,6 @@
 				>
 			</div>
 		</div>
-		<!--mstdn.jp useragent-->
-		<div
-			id="askjp_jp_ua"
-			class="hide"
-			style="z-index:505;width:100vw;height:100vh; background-color: #530f0f;color:white;padding:20px;overflow-y:scroll;position:absolute;"
-		>
-			<p style="font-size:300%">【緊急】mstdn.jpへのアクセスについて</p>
-			<br />
-			<p style="font-size:200%">問題の概要</p>
-			<p>
-				合同会社分散型ソーシャルネットワーク機構は非公開審査によってユーザーエージェントベースで個々のアプリに対してAPIへのアクセスを許可する方法を取っています。
-			</p>
-			<p>
-				TheDesk開発者はこれに強く反発し、TheDeskのユーザーエージェントをそのアプリからのアクセスであると特定することができない値にすることを決めました。
-			</p>
-			<p>具体的には、"Mastodon client: [起動毎に変わる100文字の英数記号]"と設定しました。</p>
-			<p style="font-size:200%">ユーザーによる対策</p>
-			<p>
-				このバージョンのTheDeskでは任意のユーザーエージェントを適用できます。「設定」内の「環境設定」で設定していただけます。<a
-					href="setting.html"
-					>設定</a
-				>
-			</p>
-			<p style="font-size:150%">1. 「TheDesk」を含む値に設定する</p>
-			<p>
-				「設定」内の「環境設定」、「ユーザーエージェント」に「TheDesk」を含む値を入れてください。大文字小文字に注意してください。
-			</p>
-			<p><b>懸念点</b></p>
-			<p>
-				TheDesk開発者は合同会社分散型ソーシャルネットワーク機構に対しこの件についてメールで問い合わせを行っています(抗議ではありません)。問い合わせの過程でアプリ許可が取り消され、使用不能になる可能性があります。
-			</p>
-			<p><u>ちなみに</u></p>
-			<p>
-				合同会社分散型ソーシャルネットワーク機構はmstdn.jpのお知らせアカウントに対するリプライに書かれたサードパーティクライアントを「審査」の後許可するとトゥートし、複数ユーザーがTheDeskの名前を挙げました。
-				事実、トゥートの翌日までにTheDeskに対してアクセス許可が出されました。しかし、許可を出す際にTheDeskの標準ユーザーエージェントを機構は一切確認せず、「TheDesk」という文字列が入ったユーザーエージェントを一律で許可する設定にしたようです。
-				結果として実際の標準ユーザーエージェントはそれに合致せず、不許可のままとなっていました。前バージョンまでの標準ユーザーエージェントは、パッケージ名の都合上全て小文字の「thedesk」を採用していました。
-			</p>
-			<p style="font-size:150%">2. 「認定済み」クライアントの名前を含む値に設定する</p>
-			<p>
-				「設定」内の「環境設定」、「ユーザーエージェント」に、<a href="https://mstdn.jp/about"
-					>mstdn.jpのトップページ</a
-				>記載のアプリ名を含む値を入れてください。大文字小文字やスペースに注意してください。
-			</p>
-			<p>
-				「Mastodon日本鯖です．」と書かれた以降の一段を全てコピーして記載してもアクセス可能です。<u
-					>これほどまでにユーザーエージェント制限は「抜け道」が多いのです。</u
-				><a href="setting.html">設定</a>
-			</p>
-			<p><b>懸念点</b></p>
-			<p>
-				その記載されたアプリと合同会社分散型ソーシャルネットワーク機構になんの関係があるかは知りませんが、どちらにしろ他のクライアントの名を借りてアクセスの許可をいただくというあまり道徳的によろしくない方法です。
-			</p>
-			<button onclick="$('#askjp_jp_ua').addClass('hide')" class="btn waves-effect">閉じる</button>
-		</div>
 		<!-- Modal Structure Release Note-->
 		<div id="releasenote" class="modal modal-fixed-footer scr">
 			<div class="modal-content">
@@ -1181,28 +1127,16 @@
 				<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-21-0-1_Mayu" class="release-do" style="display:none; ">
+				<div id="release-21-0-4_Mayu" class="release-do" style="display:none; ">
 					<br />
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br />
 					Pixiv
 					FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br />
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note 21.0.1 (Mayu)</h5>
+					<h5>Release Note 21.0.4 (Mayu)</h5>
-					・画像がアップロードできない  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <a onclick="udgEx('popn_ja@popon.pptdn.jp','main')" class="contributor"><img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4">kaias1jp</a><br>
+					<!--上のdivのidも変えてね-->
-・画像のリサイズに失敗する  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <a onclick="udgEx('popn_ja@popon.pptdn.jp','main')" class="contributor"><img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4">kaias1jp</a><br>
+					・起動しないバグ  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・画像をダウンロードした後、ボタンを押しても保存先フォルダが表示されない  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
+・引用可能なインスタンスで、すべてのトゥートがミュートされた引用になってしまうバグ heguro<br>
-・ユーザーマッチングを削除  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-
-					<h5>Release Note 21.0.0 (Mayu)</h5>
-					・フォロリクをストリーミングで受け取ったときにNo status hereになる  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・Apple MusicのNowPlayingでアルバム情報がないときの挙動を改善  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・Last.fm NowPlaying  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・テーマCSSに関するバグ  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・プラットフォームやPWAか否か等で表示を切り替える  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・ユーザータイムラインをカラム化  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <img src="">anonymous user<br>
-・スプラッシュスクリーンを追加  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・アイコンの微調整  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・FTLのRemote only  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
 
 				</div>
 				<div id="release-en" style="display:none">
@@ -1362,7 +1296,7 @@
 									id="noauth-url"
 									type="text"
 									class="validate"
-									style="width:calc( 70% - 40px);"
+									style="width:calc( 70% - 3rem);"
 									placeholder="e.g:mstdn.jp"
 								/>
 							</div>
@@ -1370,7 +1304,7 @@
 						</div>
 						<button
 							class="btn waves-effect blue "
-							style="width:calc( 100% - 10px);"
+							style="width:calc( 100% - 0.7rem);"
 							onclick="addColumn()"
 							data-trans-i="add"
 						>
@@ -1385,11 +1319,11 @@
 							<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 						</div>
 						<div class="input-field">
-							<input id="src" type="text" class="validate" style="width:60%" />
+							<input id="src" type="text" class="validate" style="width:57%" />
 							<label for="src" data-trans="src">@@search@@</label>
 							<button
 								class="btn waves-effect indigo"
-								style="width: 36%;padding: 0;padding-left: 15px;"
+								style="width: 36%;padding: 0;padding-left: 1.15rem;"
 								onclick="src()"
 								data-trans-i="src"
 							>
@@ -1412,12 +1346,12 @@
 								id="dirNoAuth-url"
 								type="text"
 								class="validate"
-								style="width:calc( 70% - 40px);"
+								style="width:calc( 70% - 3rem);"
 								placeholder="e.g:mastodon.social"
 							/>
 							<button
 								class="btn waves-effect indigo"
-								style="width: 120px;padding: 0;padding-left: 15px;"
+								style="width: 9.23rem;padding: 0;padding-left: 1.15rem;"
 								onclick="directory()"
 							>
 								<i class="material-icons left" style="margin:0">search</i>@@show@@
@@ -1604,7 +1538,7 @@
 					</div>
 				</div>
 			</div>
-			<a onclick="about()" class="nex waves-effect pwa">
+			<a id="onClickAbout" class="nex waves-effect pwa">
 				<i class="material-icons" style="font-size: 1rem;">info</i>@@about@@ </a
 			>&nbsp;|&nbsp;
 			<a onclick="bottomReverse()" class="nex waves-effect">
@@ -1638,7 +1572,7 @@
 					>
 						<i
 							class="material-icons"
-							style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;"
+							style="position: relative; top: 0.38rem; font-size: 1.5rem; text-align: center; margin-right: 0.76rem;"
 							>edit</i
 						>@@toot@@
 					</button>
@@ -1676,7 +1610,7 @@
 			</div>
 			<div>
 				<div id="tips-menu">
-					<div class="btnsgroup" style="height:34px">
+					<div class="btnsgroup" style="height:2.61rem">
 						<span class="grouptitle">Tips:</span>
 						<a onclick="tips('ver')" class="nex waves-effect">
 							<i class="material-icons nex" title="@@verTips@@" data-trans-title="ver">info</i>
@@ -1708,7 +1642,7 @@
 							>bubble_chart</i
 						>
 					</a>
-					<div id="tips-text" style="width:300px;"></div>
+					<div id="tips-text" style="width:23rem;"></div>
 				</div>
 			</div>
 		</div>
@@ -1789,6 +1723,7 @@
 		<!--JS-->
 		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
 		<script type="text/javascript" src="../../js/platform/first.js"></script>
+		<script type="text/javascript" src="../../js/common/api.js"></script>
 		<script type="text/javascript" src="../../@@node_base@@/grapheme-splitter/index.js"></script>
 		<script
 			type="text/javascript"

app/view/make/language/af-ZA/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/af-ZA/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",

app/view/make/language/af-ZA/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/af-ZA/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/ar-SA/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/ar-SA/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",

app/view/make/language/ar-SA/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/ar-SA/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/bg-BG/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Влезте като Misskey",
     "misskeylogin": "Прочетете <a href=\"https://thedesk.top/how-to-misskey-login.html\">Документацията</a>, за да влезете в Misskey.",
     "nodata": "Няма данни",
-    "accessTokenSetup": "Използвайте маркера за достъп и вход (щракнете след попълване, но не код, а знак за достъп в поле: Разширено)"
+    "accessTokenSetup": "Използвайте маркера за достъп и вход (щракнете след попълване, но не код, а знак за достъп в поле: Разширено)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/bg-BG/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Скриване на текста зад предупреждение",
     "selfile": "Прикачи..",
     "insertEmoji": "Емотикони",
-    "NPSpotify": "Възпроизвеждане сега (Spotify)",
-    "NPiTunes": "Възпроизвеждане сега (macOS)",
     "schedule": "Планиран тоот",
     "postat": "Публикация в",
     "scheduleWarn": "2.7.0 ~ Минимален интервал от време:5мин. (часовникът на сървъра може да не е точен.)",
@@ -77,6 +75,7 @@
     "toots": "Тоот",
     "follow": "Следвам",
     "follower": "Последователи",
+    "utlColumn": "Show as a column",
     "timeline": "Времева линия",
     "operateOtherAcct": "Свързан-профил",
     "list": "Списък",

app/view/make/language/bg-BG/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Премахване на тази колона",
     "lang_layout_setthis": "Предпочитания за тази колона",
     "lang_layout_mediafil": "Филтриране на медиите",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Автоматичен анализатор на връзки",
     "lang_layout_linkanades": "Автоматичен анализатор на връзки",
     "lang_layout_tts": "Текст към говор ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Следвайте, за да добавите този потребител към списъците.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "NSFW media",
     "lang_parse_html": "Показване на вграденият HTML код",
     "lang_parse_notffilter": "Показване на известията от този потребител",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Повторно публикуване",
     "lang_misskeyparse_renoteqt": "Повторна бележка",
     "lang_misskeyparse_reaction": "Реакция",

app/view/make/language/bg-BG/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/ca-ES/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/ca-ES/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",

app/view/make/language/ca-ES/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/ca-ES/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/cs-CZ/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Přihlásit jako Misskey",
     "misskeylogin": "Pro přihlášení do Misskey si přečtěte <a href=\"https://thedesk.top/how-to-misskey-login.html\">dokumentaci (ja)</a>.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/cs-CZ/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Skrýt text za varováním",
     "selfile": "Přiložit...",
     "insertEmoji": "Emoji",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Plánovaný toot",
     "postat": "Odeslat jak",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Tooty",
     "follow": "Sledovat",
     "follower": "Sledující",
+    "utlColumn": "Show as a column",
     "timeline": "Časová osa",
     "operateOtherAcct": "Cross-account",
     "list": "Seznam",

app/view/make/language/cs-CZ/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Odstranit tento sloupec",
     "lang_layout_setthis": "Nastavení tohoto sloupce",
     "lang_layout_mediafil": "Filtrování médií",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Automatický analyzátor odkazů",
     "lang_layout_linkanades": "Automatický analyzátor odkazů",
     "lang_layout_tts": "Převod textu na řeč ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Doména ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " vám odpověděl/a",
     "lang_parse_faved": " si oblíbil/a váš toot",
     "lang_parse_bted": " boostnul/a váš toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "NSFW media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Znovusdílení",
     "lang_misskeyparse_renoteqt": "Renotování",
     "lang_misskeyparse_reaction": "Reakce",

app/view/make/language/cs-CZ/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/da-DK/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/da-DK/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",

app/view/make/language/da-DK/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/da-DK/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/de-DE/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Als Misskey anmelden",
     "misskeylogin": "Lies die <a href=\"https://thedesk.top/how-to-misskey-login.html\">Doku (japanisch)</a> um dich bei Misskey einzuloggen.",
     "nodata": "Keine Daten",
-    "accessTokenSetup": "Benutze Zugangs-Token zum Anmelden (Klicke nach Ausfüllen nicht den Code, sondern den Access-Token im Kästchen: Erweitert)"
+    "accessTokenSetup": "Benutze Zugangs-Token zum Anmelden (Klicke nach Ausfüllen nicht den Code, sondern den Access-Token im Kästchen: Erweitert)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/de-DE/index.json

@@ -2,7 +2,7 @@
     "draghere": "Zum Hochladen hier her ziehen",
     "close": "Schließen",
     "webSrc": "Suche im Internet",
-    "tsSrc": "Search on tootsearch",
+    "tsSrc": "Bei Tootsearch suchen",
     "showSelectProf": "Ausgewähltes Konto anzeigen",
     "closethisbox": "Diesen Dialog schließen",
     "toot": "Tröt",
@@ -11,8 +11,6 @@
     "cwDes": "Text hinter Warnung verstecken",
     "selfile": "Anhängen...",
     "insertEmoji": "Emojis",
-    "NPSpotify": "Wird gerade gespielt (Spotify)",
-    "NPiTunes": "Wird gerade wiedergegeben(macOS)",
     "schedule": "Geplanter Tröt",
     "postat": "Senden um",
     "scheduleWarn": "2.7.0~ Mindestzeitabstand: von 5min(Uhr auf dem Server ist möglicherweise ungenau.)",
@@ -77,6 +75,7 @@
     "toots": "Tröts",
     "follow": "Folgen",
     "follower": "Abonnenten",
+    "utlColumn": "Show as a column",
     "timeline": "Verlauf",
     "operateOtherAcct": "Cross-Account",
     "list": "Liste",
@@ -179,11 +178,11 @@
     "active": "Kürzlich aktiv",
     "newcomer": "Neu eingetroffen",
     "local_only": "Nur lokal",
-    "menu": "Menu",
+    "menu": "Menü",
     "demoBottomBtns": "Willkommensguide",
     "lookAtBottom": "Schauen Sie sich den unteren Teil des Fensters an. Hier sind einige Tipps darüber.",
     "acctManDesc": "Fügen Sie weitere Konten hinzu und loggen Sie sie aus.",
-    "settingDesc": "Many and many preferences here. You will couldn't check it all!",
+    "settingDesc": "Hier sind sehr, sehr viele Einstellungen. Du könntest gar nicht alles ausprobieren!",
     "nanoDescPlus": "Mini-Fenster-Klient (experimentell)",
     "menuDesc": "All daily TheDesk and Mastodon tuning like <b>add and sort columns</b>, <b>list and filter check</b>."
 }

app/view/make/language/de-DE/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Diese Spalte löschen",
     "lang_layout_setthis": "Einstellungen dieser Spalte",
     "lang_layout_mediafil": "Medien filtern",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Automatische Link-Analyse",
     "lang_layout_linkanades": "Automatische Link-Analyse",
     "lang_layout_tts": "Sprachausgabe ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domäne ",
     "lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " hat dir geantwortet",
     "lang_parse_faved": " favorisierte deinen Tröt",
     "lang_parse_bted": " hat deinen Tröt verstärkt",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "NSFW Medien",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Weiterleiten",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaktion",

app/view/make/language/de-DE/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk speichert Ihre Daten auf dem thedesk.top Server.",
   "connect": "Verbinden",
   "disconnect": "Trennen",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/el-GR/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/el-GR/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",

app/view/make/language/el-GR/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/el-GR/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/en-US/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "crwdns3052:0crwdne3052:0",
     "misskeylogin": "crwdns3054:0crwdne3054:0",
     "nodata": "crwdns3056:0crwdne3056:0",
-    "accessTokenSetup": "crwdns4362:0crwdne4362:0"
+    "accessTokenSetup": "crwdns4362:0crwdne4362:0",
+    "haveExported": "crwdns4500:0crwdne4500:0"
 }

app/view/make/language/en-US/index.json

@@ -11,8 +11,6 @@
     "cwDes": "crwdns3072:0crwdne3072:0",
     "selfile": "crwdns3074:0crwdne3074:0",
     "insertEmoji": "crwdns3076:0crwdne3076:0",
-    "NPSpotify": "crwdns3078:0crwdne3078:0",
-    "NPiTunes": "crwdns3080:0crwdne3080:0",
     "schedule": "crwdns3082:0crwdne3082:0",
     "postat": "crwdns3084:0crwdne3084:0",
     "scheduleWarn": "crwdns3086:0crwdne3086:0",
@@ -77,6 +75,7 @@
     "toots": "crwdns3198:0crwdne3198:0",
     "follow": "crwdns3200:0crwdne3200:0",
     "follower": "crwdns3202:0crwdne3202:0",
+    "utlColumn": "crwdns4492:0crwdne4492:0",
     "timeline": "crwdns3204:0crwdne3204:0",
     "operateOtherAcct": "crwdns3206:0crwdne3206:0",
     "list": "crwdns3208:0crwdne3208:0",

app/view/make/language/en-US/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "crwdns3640:0crwdne3640:0",
     "lang_layout_setthis": "crwdns3642:0crwdne3642:0",
     "lang_layout_mediafil": "crwdns3644:0crwdne3644:0",
+    "lang_layout_remoteOnly": "crwdns4494:0crwdne4494:0",
     "lang_layout_linkana": "crwdns3646:0crwdne3646:0",
     "lang_layout_linkanades": "crwdns3648:0crwdne3648:0",
     "lang_layout_tts": "crwdns3650:0crwdne3650:0",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "crwdns3710:0crwdne3710:0",
     "lang_showontl_listwarn": "crwdns3712:0crwdne3712:0",
     "lang_showontl_verified": "crwdns3714:0crwdne3714:0",
+    "lang_status_requesting": "crwdns4496:0crwdne4496:0",
     "lang_parse_mentioned": "crwdns3716:0crwdne3716:0",
     "lang_parse_faved": "crwdns3718:0crwdne3718:0",
     "lang_parse_bted": "crwdns3720:0crwdne3720:0",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "crwdns3800:0crwdne3800:0",
     "lang_parse_html": "crwdns4388:0crwdne4388:0",
     "lang_parse_notffilter": "crwdns3802:0crwdne3802:0",
+    "lang_parse_hidden": "crwdns4498:0crwdne4498:0",
     "lang_misskeyparse_renote": "crwdns3804:0crwdne3804:0",
     "lang_misskeyparse_renoteqt": "crwdns3806:0crwdne3806:0",
     "lang_misskeyparse_reaction": "crwdns3808:0crwdne3808:0",

app/view/make/language/en-US/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "crwdns4194:0crwdne4194:0",
   "connect": "crwdns4196:0crwdne4196:0",
   "disconnect": "crwdns4198:0crwdne4198:0",
+  "lastFmWarn": "crwdns4490:0crwdne4490:0",
   "templateedit": "crwdns4340:0crwdne4340:0",
   "templateeditwarn": "crwdns4342:0crwdne4342:0",
   "template1": "crwdns4344:0{song}crwdnd4344:0{album}crwdnd4344:0{artist}crwdnd4344:0{url}crwdne4344:0",

app/view/make/language/en/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey":"Login as Misskey",
     "misskeylogin":"Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata":"No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/en/main.json

@@ -166,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -220,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/es-AR/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Iniciar sesión con Misskey",
     "misskeylogin": "Leé <a href=\"https://docs.thedesk.top/\">la documentación (en japonés)</a> para usar Misskey.",
     "nodata": "Sin datos",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/es-AR/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Ocultar texto con advertencia de contenido",
     "selfile": "Adjuntar…",
     "insertEmoji": "Emojis",
-    "NPSpotify": "Ahora suena (Spotify)",
-    "NPiTunes": "Ahora suena (macOS)",
     "schedule": "Toot programado",
     "postat": "Publicar el",
     "scheduleWarn": "2.7.0~ Intervalo mínimo: 5 minutos (el reloj en el servidor podría no ser preciso).",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Seguir",
     "follower": "Seguidor",
+    "utlColumn": "Show as a column",
     "timeline": "Línea temporal",
     "operateOtherAcct": "Cuenta cruzada",
     "list": "Enlistar",

app/view/make/language/es-AR/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Quitar esta columna",
     "lang_layout_setthis": "Configuración de esta columna",
     "lang_layout_mediafil": "Filtro de medio",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Analizador automático de enlace",
     "lang_layout_linkanades": "Analizador automático de enlace",
     "lang_layout_tts": "Texto hablado ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Dominio ",
     "lang_showontl_listwarn": "Seguí a este usuario para agregarlo a las listas.",
     "lang_showontl_verified": "Este sitio web está verificado por su propietario en ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " te respondió",
     "lang_parse_faved": " marcó tu toot como favorito",
     "lang_parse_bted": " retooteó tu toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "medios sensibles",
     "lang_parse_html": "Mostrar HTML insertado",
     "lang_parse_notffilter": "Mostrar notificaciones de este usuario",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Republicar",
     "lang_misskeyparse_renoteqt": "Renovar",
     "lang_misskeyparse_reaction": "Reacción",

app/view/make/language/es-AR/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk guarda tus datos en el servidor thedesk.top.",
   "connect": "Conectar",
   "disconnect": "Desconectar",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Editar plantilla",
   "templateeditwarn": "",
   "template1": "Spotify: {artist}: nombre del artista // {song}: nombre del tema // {album}: nombre del álbum // {url}: dirección web a Spotify",

app/view/make/language/es-ES/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Iniciar sesión como Misskey",
     "misskeylogin": "Leer <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> para iniciar sesión en Misskey.",
     "nodata": "Sin datos",
-    "accessTokenSetup": "Usar el token de acceso para iniciar sesión (haga clic después de completar no el código si no el token de acceso en el casilla: avanzado)"
+    "accessTokenSetup": "Usar el token de acceso para iniciar sesión (haga clic después de completar no el código si no el token de acceso en el casilla: avanzado)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/es-ES/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",

app/view/make/language/es-ES/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/es-ES/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/fi-FI/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/fi-FI/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",

app/view/make/language/fi-FI/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/fi-FI/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/fr-FR/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/fr-FR/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Émojis",
-    "NPSpotify": "Spotify NowPlaying",
-    "NPiTunes": "iTunes NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Pouets",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Fil",
     "operateOtherAcct": "Cross-account",
     "list": "Liste",

app/view/make/language/fr-FR/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Paramètres de cette colonne",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domaine ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " vous a répondu",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Réaction",

app/view/make/language/fr-FR/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",

app/view/make/language/he-IL/acct.json

@@ -20,5 +20,6 @@
     "thisismisskey": "Login as Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
     "nodata": "No data",
-    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)"
+    "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
+    "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/he-IL/index.json

@@ -11,8 +11,6 @@
     "cwDes": "Hide text behind warning",
     "selfile": "Attach..",
     "insertEmoji": "Emojis",
-    "NPSpotify": "NowPlaying(Spotify)",
-    "NPiTunes": "NowPlaying(macOS)",
     "schedule": "Scheduled toot",
     "postat": "Post at",
     "scheduleWarn": "2.7.0~ Minimum time gap:5min(clock on the server may not be accurate.)",
@@ -77,6 +75,7 @@
     "toots": "Toots",
     "follow": "Follow",
     "follower": "Follower",
+    "utlColumn": "Show as a column",
     "timeline": "Timeline",
     "operateOtherAcct": "Cross-account",
     "list": "List",

app/view/make/language/he-IL/main.json

@@ -127,6 +127,7 @@
     "lang_layout_delthis": "Remove this column",
     "lang_layout_setthis": "Preferences of this column",
     "lang_layout_mediafil": "Media filtering",
+    "lang_layout_remoteOnly": "Remote only",
     "lang_layout_linkana": "Auto Link Analyzer",
     "lang_layout_linkanades": "Auto link analyzer",
     "lang_layout_tts": "Text to speech ",
@@ -165,6 +166,7 @@
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",
     "lang_showontl_verified": "This website is verified by owner at ",
+    "lang_status_requesting": "Requesting",
     "lang_parse_mentioned": " replied to you",
     "lang_parse_faved": " favourited your toot",
     "lang_parse_bted": " boosted your toot",
@@ -219,6 +221,7 @@
     "lang_parse_nsfw": "sensitive media",
     "lang_parse_html": "Show embed HTML",
     "lang_parse_notffilter": "Show this user's notifications",
+    "lang_parse_hidden": "Unvisible quoted toot",
     "lang_misskeyparse_renote": "Repost",
     "lang_misskeyparse_renoteqt": "Renote",
     "lang_misskeyparse_reaction": "Reaction",

app/view/make/language/he-IL/setting.json

@@ -167,6 +167,7 @@
   "linkwarn": "TheDesk save your data on thedesk.top server.",
   "connect": "Connect",
   "disconnect": "Disconnect",
+  "lastFmWarn": "User name...(empty to disconnect) You cannot hide your recent play log at last.fm privacy settings.",
   "templateedit": "Edit a template",
   "templateeditwarn": "",
   "template1": "Spotify:{song}:Song name/{album}:Album name/{artist}:Artist name/{url}:URL to Spotify",