TheDesk Usamin (18.7.1)

Update readline-sync requirement from 1.4.9 to 1.4.10 in /app

app/css/master.css

@@ -10,9 +10,6 @@ body {
   background-color: var(--bg);
   color: var(--color);
 }
-body {
-  border: thin solid gray;
-}
 .btn {
   margin: 5px;
   text-transform: none;
@@ -307,6 +304,9 @@ blockquote:before,
 .tabs {
   background-color: var(--subcolor);
 }
+.collapsible-header:focus {
+  background-color: var(--subcolor);
+}
 .modal-footer {
   background-color: var(--modalfooter) !important;
 }

app/css/themes.css

@@ -15,6 +15,8 @@
   --postbox: white;
   --modalfooter: #fafafa;
   --accentbtn: #009688;
+  --selected: #c0c0c0;
+  --selectedWithShare: #b2babd;
 }
 #imagemodal {
   background: url("../img/pixel.white.svg");
@@ -36,6 +38,8 @@
   --postbox: #424242;
   --modalfooter: #212121;
   --accentbtn: #3f51b5;
+  --selected: #3f3f3f;
+  --selectedWithShare: #003a30;
 }
 .blacktheme #imagemodal {
   background: url("../img/pixel.svg");
@@ -57,6 +61,8 @@
   --postbox: #1a237e;
   --modalfooter: #031833;
   --accentbtn: #00acc1;
+  --selected: #214f8a;
+  --selectedWithShare: #003a30;
 }
 .indigotheme #imagemodal {
   background: url("../img/pixel.svg");
@@ -78,6 +84,8 @@
   --postbox: #4e342e;
   --modalfooter: #261411;
   --accentbtn: #827717;
+  --selected: #6d352b;
+  --selectedWithShare: #003a30;
 }
 .browntheme #imagemodal {
   background: url("../img/pixel.svg");
@@ -99,6 +107,8 @@
   --postbox: #a5d6a7;
   --modalfooter: #81c784;
   --accentbtn: #33691e;
+  --selected: #78c17a;
+  --selectedWithShare: #caa266;
 }
 .greentheme #imagemodal {
   background: url("../img/pixel.white.svg");
@@ -120,6 +130,8 @@
   --postbox: #dff1ff;
   --modalfooter: #2196f3;
   --accentbtn: #2f7bb7;
+  --selected: #9dcade;
+  --selectedWithShare: #c1dac4;
 }
 .bluetheme #imagemodal {
   background: url("../img/pixel.white.svg");

app/css/tl.css

@@ -96,6 +96,7 @@
 }
 iframe {
   max-width: 100%;
+  max-height: 300px;
 }
 @media screen and (max-width: 600px) {
   .mobile #timeline-container {
@@ -157,6 +158,7 @@ iframe {
   height: 100%;
   border: thin solid gray;
   overflow: hidden;
+  border-top: none;
 }
 .box .pin,
 #his-data .pin {
@@ -425,6 +427,9 @@ p:not(:last-child) {
 
 .area-notice_name {
   grid-area: notice_name;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .area-notice_acct {
@@ -581,6 +586,7 @@ p:not(:last-child) {
   display: block;
   margin-right: 1px;
   float: left;
+  overflow: hidden;
 }
 .nsfw-media {
   position: absolute;
@@ -594,6 +600,12 @@ p:not(:last-child) {
   width: 100%;
   height: 100%;
 }
+.shared.selectedToot{
+  background-color: var(--selectedWithShare);
+}
+.selectedToot{
+  background-color: var(--selected);
+}
 audio{
   height: 2rem;
 }

app/js/common/keyshortcut.js

@@ -1,3 +1,5 @@
+selectedColumn = 0
+selectedToot = 0
 $(function ($) {
 	//キーボードショートカット
 	$(window).keydown(function (e) {
@@ -118,7 +120,7 @@ $(function ($) {
 				}
 			}
 			//Ctrl+Sift+P:プロフ
-			if ((event.ctrlKey) && event.shiftKey) {
+			if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 				if (e.keyCode === 80) {
 					profShow()
 					return false;
@@ -132,30 +134,82 @@ $(function ($) {
 					return false;
 				}
 			}
+			//矢印:選択
+			if (e.code == "ArrowLeft") {
+				//left
+				if ($("#imagemodal").hasClass("open")) {
+					imgCont('next');
+					return false;
+				}
+				if (selectedColumn > 0) {
+					selectedColumn--
+				}
+				tootSelector(selectedColumn, selectedToot)
+				return false;
+			} else if (e.code == "ArrowUp") {
+				//up
+				if ($("#imagemodal").hasClass("open")) {
+					return false;
+				}
+				if (selectedToot > 0) {
+					selectedToot--
+				}
+				tootSelector(selectedColumn, selectedToot)
+				return false;
+			} else if (e.code == "ArrowRight") {
+				//right
+				if ($("#imagemodal").hasClass("open")) {
+					imgCont('prev');
+					return false;
+				}
+				if (selectedColumn < $(".tl-box").length - 1) {
+					selectedColumn++
+				}
+				tootSelector(selectedColumn, selectedToot)
+				return false;
+			} else if (e.code == "ArrowDown") {
+				//down
+				if ($("#imagemodal").hasClass("open")) {
+					return false;
+				}
+				selectedToot++
+				tootSelector(selectedColumn, selectedToot)
+				return false;
+			}
+			//Ctrl+U:0,0選択
+			if (event.ctrlKey || event.metaKey) {
+				if (e.keyCode === 85) {
+					selectedToot = 0
+					selectedColumn = 0
+					tootSelector(0, 0)
+					return false;
+				}
+			}
+			//選択時
+			if (e.keyCode == 70) {
+				var id = $(".selectedToot").attr('unique-id')
+				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')
+				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')
+				var acct_id = $('#timeline_' + selectedColumn).attr("data-acct")
+				var ats_cm = $('.selectedToot .rep-btn').attr("data-men")
+				var mode = $('.selectedToot .rep-btn').attr("data-visen")
+				re(id, ats_cm, acct_id, mode)
+				return false;
+			}
 		}
 		//textareaフォーカス時
 		if (hasFocus2 && wv) {
 			if (event.metaKey || event.ctrlKey) {
-				//Ctrl+B:太字
-				if (e.keyCode === 66) {
-					tagsel('b');
-					return false;
-				}
-				//Ctrl+I:斜字
-				if (e.keyCode === 73) {
-					tagsel('i');
-					return false;
-				}
-				//Ctrl+U:下線
-				if (e.keyCode === 85) {
-					tagsel('u');
-					return false;
-				}
-				//Ctrl+S:取り消し線
-				if (e.keyCode === 83) {
-					tagsel('s');
-					return false;
-				}
 				//C+S+(No):ワンクリ
 				if ((event.metaKey || event.ctrlKey) && event.shiftKey) {
 					if (e.keyCode >= 49 && e.keyCode <= 51) {
@@ -166,22 +220,28 @@ $(function ($) {
 				}
 			}
 		}
-		//イメージビューワー切り替え
-		if (e.keyCode === 37 && wv) {
-			if ($("#imagemodal").hasClass("open")) {
-				imgCont('prev');
-				return false;
-			}
-		}
-		if (e.keyCode === 39 && wv) {
-			if ($("#imagemodal").hasClass("open")) {
-				imgCont('next');
-				return false;
-			}
-		}
 	});
 	//クリアボタン
 	$("#clear").click(function () {
 		clear();
 	});
 });
+//選択する
+function tootSelector(column, toot) {
+	$('.cvo').removeClass("selectedToot")
+	$('#timeline_' + column + ' .cvo').eq(toot).addClass("selectedToot")
+	var scr = $('.tl-box[tlid=' + column + ']').scrollTop()
+	var elem = $('.selectedToot').offset().top
+	var top = elem - $('.tl-box').height() + scr
+	if (top > 0) {
+		top = top + $('.selectedToot').height()
+		if (top > scr) {
+			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: top })
+		}
+	} else if (elem < 0) {
+		var to = scr + elem - $('.selectedToot').height()
+		if (to < scr) {
+			$('.tl-box[tlid=' + column + ']').animate({ scrollTop: to })
+		}
+	}
+}

app/js/lang/lang.en.js

@@ -47,6 +47,7 @@ var lang = {
     //post/img.js
     "lang_postimg_previewdis": "cannot preview",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
+    "lang_postimg_failupload": "Failed",
     "lang_postimg_delete": "Delete this image.",
     //post/post.js
     "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?",

app/js/lang/lang.ja.js

@@ -47,6 +47,7 @@ var lang = {
     //post/img.js
     "lang_postimg_previewdis": "プレビューできません。",
     "lang_postimg_aftupload": "アップロード後はアカウントを切り替えられません。",
+    "lang_postimg_failupload": "アップロードに失敗しました。",
     "lang_postimg_delete": "この画像を削除します",
     //post/post.js
     "lang_post_tagTL": "デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。",

app/js/login/login.js

@@ -40,7 +40,7 @@ function ck() {
 		if (obj[0].domain) {
 			$("#tl").show();
 			ticker();
-			multiSelector();
+			multiSelector(false);
 			verck(ver);
 			$("#something-wrong img").attr("src", "../../img/thinkingdesk.png")
 		}
@@ -403,7 +403,7 @@ function ckdb(acct_id) {
 }
 
 //アカウントを選択…を実装
-function multiSelector() {
+function multiSelector(parseC) {
 	var multi = localStorage.getItem("multi");
 	if (!multi) {
 		var obj = [];
@@ -490,8 +490,10 @@ function multiSelector() {
 		$("#add-acct-sel").append('<option value="noauth">' + lang.lang_login_noauth + '</option><option value="webview">Twitter</option>');
 	}
 	$('select').formSelect();
+	if(!parseC){
 		parseColumn(true);
 	}
+}
 
 //バージョンエンコ
 function enc(ver) {

app/js/platform/end.js

@@ -10,16 +10,20 @@ $(document).on('click', 'a', e => {
 	if (url) {
 		urls = url.match(/https?:\/\/(.+)/);
 		//トゥートのURLぽかったら
-		toot = url.match(/https:\/\/([a-zA-Z0-9.-]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/);
+		toot = url.match(/https:\/\/([^+_]+)\/@([a-zA-Z0-9_]+)\/([0-9]+)/);
+		if(!toot){
+			//Pleroma対策
+			toot = url.match(/https:\/\/([^+_]+)\/users\/([a-zA-Z0-9_]+)\/statuses\/([0-9]+)/);
+		}
 		//タグのURLぽかったら
 		var tags = [];
 		tags = url.match(
-			/https:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
+			/https:\/\/([^+_]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#]+)/
 		);
 		//メンションっぽかったら
 		var ats = [];
 		ats = url.match(
-			/https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
+			/https:\/\/([^+_]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/
 		);
 		if (toot) {
 			if (toot[1]) {

app/js/platform/first.js

@@ -170,4 +170,29 @@ $.mb_substr = function (str, begin, end) {
 	}
 	return ret;
 };
+//ソートするやつ
+function object_array_sort(data, key, order, fn) {
+	var num_a = -1;
+	var num_b = 1;
+	if (order === 'asc') {
+		num_a = 1;
+		num_b = -1;
+	}
+	data = data.sort(function (a, b) {
+		var x = a[key];
+		var y = b[key];
+		if (x > y) return num_a;
+		if (x < y) return num_b;
+		return 0;
+	});
+	var arrObj = {};
+	for (var i = 0; i < data.length; i++) {
+		arrObj[data[i]['family']] = data[i];
+	}
+	data = [];
+	for (var key in arrObj) {
+		data.push(arrObj[key]);
+	}
+	fn(data);
+}
 localStorage.removeItem("errors");

app/js/platform/preload.js

@@ -160,7 +160,6 @@ ipc.on('memory', function (event, arg) {
 })
 //update.html
 ipc.on('prog', function (event, arg) {
-    console.log(arg)
     postMessage(["updateProg", arg], "*")
 })
 ipc.on('mess', function (event, arg) {

app/js/platform/punycode.js

@@ -0,0 +1,533 @@
+/*! https://mths.be/punycode v1.4.1 by @mathias */
+;(function(root) {
+
+	/** Detect free variables */
+	var freeExports = typeof exports == 'object' && exports &&
+		!exports.nodeType && exports;
+	var freeModule = typeof module == 'object' && module &&
+		!module.nodeType && module;
+	var freeGlobal = typeof global == 'object' && global;
+	if (
+		freeGlobal.global === freeGlobal ||
+		freeGlobal.window === freeGlobal ||
+		freeGlobal.self === freeGlobal
+	) {
+		root = freeGlobal;
+	}
+
+	/**
+	 * The `punycode` object.
+	 * @name punycode
+	 * @type Object
+	 */
+	var punycode,
+
+	/** Highest positive signed 32-bit float value */
+	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
+
+	/** Bootstring parameters */
+	base = 36,
+	tMin = 1,
+	tMax = 26,
+	skew = 38,
+	damp = 700,
+	initialBias = 72,
+	initialN = 128, // 0x80
+	delimiter = '-', // '\x2D'
+
+	/** Regular expressions */
+	regexPunycode = /^xn--/,
+	regexNonASCII = /[^\x20-\x7E]/, // unprintable ASCII chars + non-ASCII chars
+	regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
+
+	/** Error messages */
+	errors = {
+		'overflow': 'Overflow: input needs wider integers to process',
+		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+		'invalid-input': 'Invalid input'
+	},
+
+	/** Convenience shortcuts */
+	baseMinusTMin = base - tMin,
+	floor = Math.floor,
+	stringFromCharCode = String.fromCharCode,
+
+	/** Temporary variable */
+	key;
+
+	/*--------------------------------------------------------------------------*/
+
+	/**
+	 * A generic error utility function.
+	 * @private
+	 * @param {String} type The error type.
+	 * @returns {Error} Throws a `RangeError` with the applicable error message.
+	 */
+	function error(type) {
+		throw new RangeError(errors[type]);
+	}
+
+	/**
+	 * A generic `Array#map` utility function.
+	 * @private
+	 * @param {Array} array The array to iterate over.
+	 * @param {Function} callback The function that gets called for every array
+	 * item.
+	 * @returns {Array} A new array of values returned by the callback function.
+	 */
+	function map(array, fn) {
+		var length = array.length;
+		var result = [];
+		while (length--) {
+			result[length] = fn(array[length]);
+		}
+		return result;
+	}
+
+	/**
+	 * A simple `Array#map`-like wrapper to work with domain name strings or email
+	 * addresses.
+	 * @private
+	 * @param {String} domain The domain name or email address.
+	 * @param {Function} callback The function that gets called for every
+	 * character.
+	 * @returns {Array} A new string of characters returned by the callback
+	 * function.
+	 */
+	function mapDomain(string, fn) {
+		var parts = string.split('@');
+		var result = '';
+		if (parts.length > 1) {
+			// In email addresses, only the domain name should be punycoded. Leave
+			// the local part (i.e. everything up to `@`) intact.
+			result = parts[0] + '@';
+			string = parts[1];
+		}
+		// Avoid `split(regex)` for IE8 compatibility. See #17.
+		string = string.replace(regexSeparators, '\x2E');
+		var labels = string.split('.');
+		var encoded = map(labels, fn).join('.');
+		return result + encoded;
+	}
+
+	/**
+	 * Creates an array containing the numeric code points of each Unicode
+	 * character in the string. While JavaScript uses UCS-2 internally,
+	 * this function will convert a pair of surrogate halves (each of which
+	 * UCS-2 exposes as separate characters) into a single code point,
+	 * matching UTF-16.
+	 * @see `punycode.ucs2.encode`
+	 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+	 * @memberOf punycode.ucs2
+	 * @name decode
+	 * @param {String} string The Unicode input string (UCS-2).
+	 * @returns {Array} The new array of code points.
+	 */
+	function ucs2decode(string) {
+		var output = [],
+		    counter = 0,
+		    length = string.length,
+		    value,
+		    extra;
+		while (counter < length) {
+			value = string.charCodeAt(counter++);
+			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
+				// high surrogate, and there is a next character
+				extra = string.charCodeAt(counter++);
+				if ((extra & 0xFC00) == 0xDC00) { // low surrogate
+					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
+				} else {
+					// unmatched surrogate; only append this code unit, in case the next
+					// code unit is the high surrogate of a surrogate pair
+					output.push(value);
+					counter--;
+				}
+			} else {
+				output.push(value);
+			}
+		}
+		return output;
+	}
+
+	/**
+	 * Creates a string based on an array of numeric code points.
+	 * @see `punycode.ucs2.decode`
+	 * @memberOf punycode.ucs2
+	 * @name encode
+	 * @param {Array} codePoints The array of numeric code points.
+	 * @returns {String} The new Unicode string (UCS-2).
+	 */
+	function ucs2encode(array) {
+		return map(array, function(value) {
+			var output = '';
+			if (value > 0xFFFF) {
+				value -= 0x10000;
+				output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);
+				value = 0xDC00 | value & 0x3FF;
+			}
+			output += stringFromCharCode(value);
+			return output;
+		}).join('');
+	}
+
+	/**
+	 * Converts a basic code point into a digit/integer.
+	 * @see `digitToBasic()`
+	 * @private
+	 * @param {Number} codePoint The basic numeric code point value.
+	 * @returns {Number} The numeric value of a basic code point (for use in
+	 * representing integers) in the range `0` to `base - 1`, or `base` if
+	 * the code point does not represent a value.
+	 */
+	function basicToDigit(codePoint) {
+		if (codePoint - 48 < 10) {
+			return codePoint - 22;
+		}
+		if (codePoint - 65 < 26) {
+			return codePoint - 65;
+		}
+		if (codePoint - 97 < 26) {
+			return codePoint - 97;
+		}
+		return base;
+	}
+
+	/**
+	 * Converts a digit/integer into a basic code point.
+	 * @see `basicToDigit()`
+	 * @private
+	 * @param {Number} digit The numeric value of a basic code point.
+	 * @returns {Number} The basic code point whose value (when used for
+	 * representing integers) is `digit`, which needs to be in the range
+	 * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
+	 * used; else, the lowercase form is used. The behavior is undefined
+	 * if `flag` is non-zero and `digit` has no uppercase form.
+	 */
+	function digitToBasic(digit, flag) {
+		//  0..25 map to ASCII a..z or A..Z
+		// 26..35 map to ASCII 0..9
+		return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+	}
+
+	/**
+	 * Bias adaptation function as per section 3.4 of RFC 3492.
+	 * https://tools.ietf.org/html/rfc3492#section-3.4
+	 * @private
+	 */
+	function adapt(delta, numPoints, firstTime) {
+		var k = 0;
+		delta = firstTime ? floor(delta / damp) : delta >> 1;
+		delta += floor(delta / numPoints);
+		for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
+			delta = floor(delta / baseMinusTMin);
+		}
+		return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+	}
+
+	/**
+	 * Converts a Punycode string of ASCII-only symbols to a string of Unicode
+	 * symbols.
+	 * @memberOf punycode
+	 * @param {String} input The Punycode string of ASCII-only symbols.
+	 * @returns {String} The resulting string of Unicode symbols.
+	 */
+	function decode(input) {
+		// Don't use UCS-2
+		var output = [],
+		    inputLength = input.length,
+		    out,
+		    i = 0,
+		    n = initialN,
+		    bias = initialBias,
+		    basic,
+		    j,
+		    index,
+		    oldi,
+		    w,
+		    k,
+		    digit,
+		    t,
+		    /** Cached calculation results */
+		    baseMinusT;
+
+		// Handle the basic code points: let `basic` be the number of input code
+		// points before the last delimiter, or `0` if there is none, then copy
+		// the first basic code points to the output.
+
+		basic = input.lastIndexOf(delimiter);
+		if (basic < 0) {
+			basic = 0;
+		}
+
+		for (j = 0; j < basic; ++j) {
+			// if it's not a basic code point
+			if (input.charCodeAt(j) >= 0x80) {
+				error('not-basic');
+			}
+			output.push(input.charCodeAt(j));
+		}
+
+		// Main decoding loop: start just after the last delimiter if any basic code
+		// points were copied; start at the beginning otherwise.
+
+		for (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
+
+			// `index` is the index of the next character to be consumed.
+			// Decode a generalized variable-length integer into `delta`,
+			// which gets added to `i`. The overflow checking is easier
+			// if we increase `i` as we go, then subtract off its starting
+			// value at the end to obtain `delta`.
+			for (oldi = i, w = 1, k = base; /* no condition */; k += base) {
+
+				if (index >= inputLength) {
+					error('invalid-input');
+				}
+
+				digit = basicToDigit(input.charCodeAt(index++));
+
+				if (digit >= base || digit > floor((maxInt - i) / w)) {
+					error('overflow');
+				}
+
+				i += digit * w;
+				t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+
+				if (digit < t) {
+					break;
+				}
+
+				baseMinusT = base - t;
+				if (w > floor(maxInt / baseMinusT)) {
+					error('overflow');
+				}
+
+				w *= baseMinusT;
+
+			}
+
+			out = output.length + 1;
+			bias = adapt(i - oldi, out, oldi == 0);
+
+			// `i` was supposed to wrap around from `out` to `0`,
+			// incrementing `n` each time, so we'll fix that now:
+			if (floor(i / out) > maxInt - n) {
+				error('overflow');
+			}
+
+			n += floor(i / out);
+			i %= out;
+
+			// Insert `n` at position `i` of the output
+			output.splice(i++, 0, n);
+
+		}
+
+		return ucs2encode(output);
+	}
+
+	/**
+	 * Converts a string of Unicode symbols (e.g. a domain name label) to a
+	 * Punycode string of ASCII-only symbols.
+	 * @memberOf punycode
+	 * @param {String} input The string of Unicode symbols.
+	 * @returns {String} The resulting Punycode string of ASCII-only symbols.
+	 */
+	function encode(input) {
+		var n,
+		    delta,
+		    handledCPCount,
+		    basicLength,
+		    bias,
+		    j,
+		    m,
+		    q,
+		    k,
+		    t,
+		    currentValue,
+		    output = [],
+		    /** `inputLength` will hold the number of code points in `input`. */
+		    inputLength,
+		    /** Cached calculation results */
+		    handledCPCountPlusOne,
+		    baseMinusT,
+		    qMinusT;
+
+		// Convert the input in UCS-2 to Unicode
+		input = ucs2decode(input);
+
+		// Cache the length
+		inputLength = input.length;
+
+		// Initialize the state
+		n = initialN;
+		delta = 0;
+		bias = initialBias;
+
+		// Handle the basic code points
+		for (j = 0; j < inputLength; ++j) {
+			currentValue = input[j];
+			if (currentValue < 0x80) {
+				output.push(stringFromCharCode(currentValue));
+			}
+		}
+
+		handledCPCount = basicLength = output.length;
+
+		// `handledCPCount` is the number of code points that have been handled;
+		// `basicLength` is the number of basic code points.
+
+		// Finish the basic string - if it is not empty - with a delimiter
+		if (basicLength) {
+			output.push(delimiter);
+		}
+
+		// Main encoding loop:
+		while (handledCPCount < inputLength) {
+
+			// All non-basic code points < n have been handled already. Find the next
+			// larger one:
+			for (m = maxInt, j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+				if (currentValue >= n && currentValue < m) {
+					m = currentValue;
+				}
+			}
+
+			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
+			// but guard against overflow
+			handledCPCountPlusOne = handledCPCount + 1;
+			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
+				error('overflow');
+			}
+
+			delta += (m - n) * handledCPCountPlusOne;
+			n = m;
+
+			for (j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+
+				if (currentValue < n && ++delta > maxInt) {
+					error('overflow');
+				}
+
+				if (currentValue == n) {
+					// Represent delta as a generalized variable-length integer
+					for (q = delta, k = base; /* no condition */; k += base) {
+						t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+						if (q < t) {
+							break;
+						}
+						qMinusT = q - t;
+						baseMinusT = base - t;
+						output.push(
+							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
+						);
+						q = floor(qMinusT / baseMinusT);
+					}
+
+					output.push(stringFromCharCode(digitToBasic(q, 0)));
+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
+					delta = 0;
+					++handledCPCount;
+				}
+			}
+
+			++delta;
+			++n;
+
+		}
+		return output.join('');
+	}
+
+	/**
+	 * Converts a Punycode string representing a domain name or an email address
+	 * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
+	 * it doesn't matter if you call it on a string that has already been
+	 * converted to Unicode.
+	 * @memberOf punycode
+	 * @param {String} input The Punycoded domain name or email address to
+	 * convert to Unicode.
+	 * @returns {String} The Unicode representation of the given Punycode
+	 * string.
+	 */
+	function toUnicode(input) {
+		return mapDomain(input, function(string) {
+			return regexPunycode.test(string)
+				? decode(string.slice(4).toLowerCase())
+				: string;
+		});
+	}
+
+	/**
+	 * Converts a Unicode string representing a domain name or an email address to
+	 * Punycode. Only the non-ASCII parts of the domain name will be converted,
+	 * i.e. it doesn't matter if you call it with a domain that's already in
+	 * ASCII.
+	 * @memberOf punycode
+	 * @param {String} input The domain name or email address to convert, as a
+	 * Unicode string.
+	 * @returns {String} The Punycode representation of the given domain name or
+	 * email address.
+	 */
+	function toASCII(input) {
+		return mapDomain(input, function(string) {
+			return regexNonASCII.test(string)
+				? 'xn--' + encode(string)
+				: string;
+		});
+	}
+
+	/*--------------------------------------------------------------------------*/
+
+	/** Define the public API */
+	punycode = {
+		/**
+		 * A string representing the current Punycode.js version number.
+		 * @memberOf punycode
+		 * @type String
+		 */
+		'version': '1.4.1',
+		/**
+		 * An object of methods to convert from JavaScript's internal character
+		 * representation (UCS-2) to Unicode code points, and back.
+		 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+		 * @memberOf punycode
+		 * @type Object
+		 */
+		'ucs2': {
+			'decode': ucs2decode,
+			'encode': ucs2encode
+		},
+		'decode': decode,
+		'encode': encode,
+		'toASCII': toASCII,
+		'toUnicode': toUnicode
+	};
+
+	/** Expose `punycode` */
+	// Some AMD build optimizers, like r.js, check for specific condition patterns
+	// like the following:
+	if (
+		typeof define == 'function' &&
+		typeof define.amd == 'object' &&
+		define.amd
+	) {
+		define('punycode', function() {
+			return punycode;
+		});
+	} else if (freeExports && freeModule) {
+		if (module.exports == freeExports) {
+			// in Node.js, io.js, or RingoJS v0.8.0+
+			freeModule.exports = punycode;
+		} else {
+			// in Narwhal or RingoJS v0.7.0-
+			for (key in punycode) {
+				punycode.hasOwnProperty(key) && (freeExports[key] = punycode[key]);
+			}
+		}
+	} else {
+		// in Rhino or a web browser
+		root.punycode = punycode;
+	}
+
+}(this));

app/js/post/img.js

@@ -120,6 +120,16 @@ function media(b64, type, no) {
 	httpreq.onreadystatechange = function () {
 		if (httpreq.readyState === 4) {
 			var json = httpreq.response;
+			if (!json.id) {
+				todc();
+				$("#imgup").text("");
+				$(".toot-btn-group").prop("disabled", false);
+				$("#post-acct-sel").prop("disabled", false);
+				$('select').formSelect();
+				$("#imgsel").show();
+				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
+				return false
+			}
 			var img = localStorage.getItem("img");
 			if (json.type.indexOf("image") != -1) {
 				var html = '<img src="' + json[previewer] + '" class="preview-img pointer" data-media="' + json["id"] + '" onclick="deleteImage(\'' + json["id"] + '\')" title="' + lang.lang_postimg_delete + '">';

app/js/post/post.js

@@ -29,7 +29,6 @@ function post(mode, postvis) {
 	}
 	if (domain != "kirishima.cloud") {
 		if (mode != "pass" && !$("#cw").hasClass("cw-avail") && (str.length > cw_sent || (str.split("\n").length - 1) > cw_ltres)) {
-			console.log("out")
 			var plus = str.replace(/\n/g, "").slice(0, 10) + "...";
 			Swal.fire({
 				title: lang.lang_post_cwtitle,
@@ -43,7 +42,6 @@ function post(mode, postvis) {
 				showCloseButton: true,
 				focusConfirm: false,
 			}).then((result) => {
-				console.log(result)
 				if (result.dismiss == "cancel") {
 					//btn3:sonomama
 					post("pass")

app/js/post/suggest.js

@@ -66,7 +66,7 @@ input.addEventListener("focus", function () {
 			}
 			var domain = localStorage.getItem("domain_" + acct_id);
 			var at = localStorage.getItem("acct_" + acct_id + "_at");
-			suggest = "https://" + domain + "/api/v1/search?q=" + q
+			suggest = "https://" + domain + "/api/v2/search?q=" + q
 			if (suggest != oldSuggest) {
 				console.log("Try to get suggest at " + suggest)
 				fetch(suggest, {
@@ -81,18 +81,43 @@ input.addEventListener("focus", function () {
 					todo(error);
 					console.error(error);
 				}).then(function (json) {
+					console.log(["Search", json]);
+					//ハッシュタグ
 					if (json.hashtags[0] && tag) {
 						if (tag[1]) {
-							var tags = "";
+							var tags = [];
 							Object.keys(json.hashtags).forEach(function (key4) {
 								var tag = json.hashtags[key4];
-								if (tag != q) {
+								var his = tag.history;
-									tags = tags + '<a onclick="tagInsert(\'#' + tag + '\',\'#' + q +
+								var uses = his[0].uses * 1 + his[1].uses * 1 + his[2].uses * 1 + his[3].uses * 1 + his[4].uses * 1 + his[5].uses * 1 + his[6].uses * 1;
-										'\')" class="pointer">#' + tag + '</a><br>';
+								tagHTML = '<br><a onclick="tagInsert(\'#' + escapeHTML(tag.name) + '\',\'#' + q + '\')" class="pointer">#' +
+									escapeHTML(tag.name) + '</a>&nbsp;' + uses + 'toot(s)'
+								var item = {
+									"uses": uses,
+									"html": tagHTML
+								}
+								tags.push(item)
+							});
+							var num_a = -1;
+							var num_b = 1;
+							tags = tags.sort(function (a, b) {
+								var x = a["uses"];
+								var y = b["uses"];
+								if (x > y) return num_a;
+								if (x < y) return num_b;
+								return 0;
+							});
+							var ins = ""
+							var nev = false
+							Object.keys(tags).forEach(function (key7) {
+								ins = ins + tags[key7].html
+								if (key7 <= 0 && !nev) {
+									ins = ins + '<br>'
+									nev = true
 								}
 							});
+							$("#suggest").html(ins);
 							$("#right-side").show()
-							$("#suggest").html("Tags:<br>" + tags);
 							$("#poll").addClass("hide")
 							$("#emoji").addClass("hide")
 						}

app/js/tl/card.js

@@ -155,7 +155,7 @@ function additionalIndv(tlid, acct_id, id) {
 			});
 		} else {
 			var id = $("[toot-id=" + id + "] .toot a").parents('.cvo').attr("toot-id");
-			var start = "https://" + domain + "/api/v1/statuses/" + id + "/card";
+			var start = "https://" + domain + "/api/v1/statuses/" + id;
 			fetch(start, {
 				method: 'GET',
 				headers: {
@@ -169,6 +169,7 @@ function additionalIndv(tlid, acct_id, id) {
 				todo(error);
 				console.error(error);
 			}).then(function (json) {
+				json = json.card;
 				//このリンク鳥やんけ、ってとき
 				if (json.provider_name == "Twitter") {
 					if (json.image) {

app/js/tl/datails.js

@@ -82,7 +82,7 @@ function details(id, acct_id, tlid, mode) {
 		} else {
 			$("#tootmodal").attr("data-user", scn);
 		}
-		context(id, acct_id);
+		getContext(id, acct_id);
 		var dom = null;
 		if (!local) {
 			dom = scn.replace(/.+@/g, '');
@@ -99,8 +99,10 @@ function details(id, acct_id, tlid, mode) {
 		if ($("#toot-this div").hasClass("cvo")) {
 			$("#toot-this").removeClass("cvo");
 		} else {
+			if(!$("#toot-this .cvo").hasClass("cvo")){
 				$("#toot-this").addClass("cvo");
 			}
+		}
 		if (!$("#activator").hasClass("active")) {
 			$('#det-col').collapsible('open', 4);
 		}
@@ -125,14 +127,7 @@ function replyTL(id, acct_id) {
 			})
 		}
 	} else {
-		var start = "https://" + domain + "/api/v1/statuses/" + id;
+		return false
-		var i = {
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
-		}
 	}
 	fetch(start, i).then(function (response) {
 		return response.json();
@@ -155,27 +150,13 @@ function replyTL(id, acct_id) {
 			if (json[rep]) {
 				replyTL(json[rep][0], acct_id);
 			}
-		} else {
-			var templete = parse([json], '', acct_id, "", "", mute);
-			if (templete != "") {
-				$("#toot-reply .no-data").hide();
-			}
-			$("#toot-reply").prepend(templete);
-			$("#toot-reply .hide").html(lang.lang_details_filtered);
-			$("#toot-reply .by_filter").css("display", "block");
-			$("#toot-reply .by_filter").removeClass("hide");
-			jQuery("time.timeago").timeago();
-			var rep = "in_reply_to_id";
-			if (json[rep]) {
-				replyTL(json[rep], acct_id);
-			}
 		}
 
 	});
 }
 
 //コンテクストってなんですか
-function context(id, acct_id) {
+function getContext(id, acct_id) {
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	if (localStorage.getItem("mode_" + domain) == "misskey") {
@@ -228,6 +209,14 @@ function context(id, acct_id) {
 			$("#toot-after .hide").html(lang.lang_details_filtered);
 			$("#toot-after .by_filter").css("display", "block");
 			$("#toot-after .by_filter").removeClass("hide");
+			var templete = parse(json.ancestors, '', acct_id, "", "", mute);
+			if (templete != "") {
+				$("#toot-reply .no-data").hide();
+			}
+			$("#toot-reply").prepend(templete);
+			$("#toot-reply .hide").html(lang.lang_details_filtered);
+			$("#toot-reply .by_filter").css("display", "block");
+			$("#toot-reply .by_filter").removeClass("hide");
 			jQuery("time.timeago").timeago();
 		}
 

app/js/tl/misskeyparse.js

@@ -832,10 +832,10 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="action ' + disp["re"] + ' ' + noauth + '"><a onclick="misskeyreply(\'' + toot.id +
 			'\',\'' + acct_id + '\',' +
 			acct_id + ',\'' + visen +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat rep-btn" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["rt"] + ' ' + noauth + '"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_renote + '"><i class="text-darken-3 fas fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat bt-btn" style="padding:0" title="' + lang.lang_misskeyparse_renote + '"><i class="text-darken-3 fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["qt"] + ' ' + noauth + '"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
 			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_misskeyparse_renoteqt + '"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
@@ -979,7 +979,7 @@ function goGoogle(id) {
 }
 var misskeyws = []
 var misskeywsstate = []
-function connectMisskey(acct_id) {
+function connectMisskey(acct_id, re) {
 	var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_" + acct_id + "_at");
 	var start = "wss://" + domain +
@@ -1001,7 +1001,6 @@ function connectMisskey(acct_id) {
 		var mute = [];
 		if (data.body.id.indexOf("notf:") !== -1) {
 			var obj = JSON.parse(mess.data).body;
-			console.log(obj);
 			var popup = localStorage.getItem("popup");
 			if (!popup) {
 				popup = 0;
@@ -1063,13 +1062,17 @@ function connectMisskey(acct_id) {
 		console.error("Error closing " + tlid);
 		console.error(error);
 		misskeywsstate[wsid] = false
-		connectMisskey(acct_id)
+		if(!re){
+			connectMisskey(acct_id, true)
+		}
 		return false;
 	};
 	misskeyws[wsid].onclose = function () {
 		console.warn("Closing " + tlid);
 		misskeywsstate[wsid] = false
-		connectMisskey(acct_id)
+		if(!re){
+			connectMisskey(acct_id, true)
+		}
 		return false;
 	};
 

app/js/tl/parse.js

@@ -481,8 +481,25 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 		}
 		var urls = $.strip_tags(content).replace(/\n/g, " ").match(
-			/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
+			/https?:\/\/([^+_]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
 		);
+		urlsck = content.match(/(https?):\/\/([^<>]*?)\/([^"]*)/g)
+		if (urlsck) {
+			for (var urlct = 0; urlct < urlsck.length; urlct++) {
+				var urlindv = urlsck[urlct]
+				urlCont = urlindv.match(/(https?):\/\/([^a-zA-Z0-9.-]*?)\.(.+?)\/([^"]*)/)
+				if (urlCont) {
+					urlindv = urlindv.replace(/[.*+?^=!:${}()|[\]\/\\]/g, "\\$&")
+					var encoded = encodeURI(urlCont[4])
+					var punycoded = "xn--" + punycode.encode(urlCont[2])
+					var eUrl = urlCont[1] + "://" + punycoded + "." + urlCont[3] + "/" + encoded
+					var regExp = new RegExp('href="' + urlindv + '"', "g")
+					content = content.replace(regExp, 'href="' + eUrl + '"')
+				}
+
+			}
+		}
+
 		if (urls) {
 			var analyze = '<a onclick="additionalIndv(\'' + tlid + '\',' + acct_id +
 				',\'' + id + '\')" class="add-show pointer">' + lang.lang_parse_url + '</a><br>';
@@ -525,60 +542,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				'"><i class="far fa-calendar-times"></i>' +
 				ended + '</span></div>';
 		}
-		if (toot.emojis) {
+		
-			var emojick = toot.emojis[0];
-		} else {
-			var emojick = false;
-		}
-		//絵文字があれば
-		if (emojick) {
-			Object.keys(toot.emojis).forEach(function (key5) {
-				var emoji = toot.emojis[key5];
-				var shortcode = emoji.shortcode;
-				var emoji_url = '<img draggable="false" src="' + emoji.url +
-					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
-				var regExp = new RegExp(":" + shortcode + ":", "g");
-				content = content.replace(regExp, emoji_url);
-				spoil = spoil.replace(regExp, emoji_url);
-				poll = poll.replace(regExp, emoji_url);
-			});
-		}
-		//ニコフレ絵文字
-		if (toot.profile_emojis) {
-			var nicoemojick = toot.profile_emojis[0];
-		} else {
-			var nicoemojick = false;
-		}
-		//絵文字があれば(nico)
-		if (nicoemojick) {
-			Object.keys(toot.profile_emojis).forEach(function (keynico) {
-				var emoji = toot.profile_emojis[keynico];
-				var shortcode = emoji.shortcode;
-				var emoji_url = '<img draggable="false" src="' + emoji.url +
-					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
-				var regExp = new RegExp(":" + shortcode + ":", "g");
-				content = content.replace(regExp, emoji_url);
-				spoil = spoil.replace(regExp, emoji_url);
-				poll = poll.replace(regExp, emoji_url);
-			});
-		}
-		//デフォ絵文字
-		content = twemoji.parse(content);
-		if (dis_name) {
-			dis_name = twemoji.parse(dis_name);
-		}
-		if (spoil) {
-			spoil = twemoji.parse(spoil);
-		}
-		if (noticetext) {
-			noticetext = twemoji.parse(noticetext);
-		}
-		if (notice) {
-			notice = twemoji.parse(notice);
-		}
-		if (poll) {
-			poll = twemoji.parse(poll);
-		}
 		var mediack = toot.media_attachments[0];
 		//メディアがあれば
 		var media_ids = "";
@@ -594,8 +558,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				if (toot.sensitive && nsfw) {
 					var sense = "sensitive"
 					var blur = media.blurhash
-					if (blur) {
 					nsfwmes = '<div class="nsfw-media">' + lang.lang_parse_nsfw + '</div>'
+					if (blur) {
 						purl = parseBlur(blur)
 						var sense = ""
 					}
@@ -608,7 +572,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						acct_id + ')" id="' + id + '-image-' + key2 + '" data-url="' + url +
 						'" data-type="video" class="img-parsed"><video src="' +
 						purl + '" class="' + sense +
-						' toot-img pointer" style="max-width:100%;"></a></span>';
+						' toot-img pointer" style="max-width:100%;" loop="true"></a></span>';
 				} else {
 					if (media.type == "unknown") {
 						viewer = viewer + '<a href="' + media.remote_url + '" title="' + media.remote_url + '">[' + lang.lang_parse_unknown + ']</a> '
@@ -736,7 +700,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		if (wordmuteList) {
 			Object.keys(wordmuteList).forEach(function (key8) {
 				var worde = wordmuteList[key8];
-				console.log(worde)
 				if (worde) {
 					if (worde.tag) {
 						var wordList = worde.tag;
@@ -761,9 +724,63 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 			});
 		}
+		if (toot.emojis) {
+			var emojick = toot.emojis[0];
+		} else {
+			var emojick = false;
+		}
+		//絵文字があれば
+		if (emojick) {
+			Object.keys(toot.emojis).forEach(function (key5) {
+				var emoji = toot.emojis[key5];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
+					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+				poll = poll.replace(regExp, emoji_url);
+			});
+		}
+		//ニコフレ絵文字
+		if (toot.profile_emojis) {
+			var nicoemojick = toot.profile_emojis[0];
+		} else {
+			var nicoemojick = false;
+		}
+		//絵文字があれば(nico)
+		if (nicoemojick) {
+			Object.keys(toot.profile_emojis).forEach(function (keynico) {
+				var emoji = toot.profile_emojis[keynico];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
+					'" class="emoji-img" data-emoji="' + shortcode + '" alt=" :' + shortcode + ': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+				poll = poll.replace(regExp, emoji_url);
+			});
+		}
+		//デフォ絵文字
+		content = twemoji.parse(content);
+		if (dis_name) {
+			dis_name = twemoji.parse(dis_name);
+		}
+		if (spoil) {
+			spoil = twemoji.parse(spoil);
+		}
+		if (noticetext) {
+			noticetext = twemoji.parse(noticetext);
+		}
+		if (notice) {
+			notice = twemoji.parse(notice);
+		}
+		if (poll) {
+			poll = twemoji.parse(poll);
+		}
 		//日本語じゃない
 		if (toot.language != lang.language && toot.language) {
-			var trans = '<div class="action pin"><a onclick="trans(\'' + toot.language + '\',\'' + lang.language + '\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_trans + '"><i class="material-icons">g_translate</i></a></div>';
+			var trans = '<div class="action pin"><a onclick="trans(\'' + toot.language + '\',\'' + lang.language + '\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_trans + '"><i class="material-icons">g_translate</i></a></div>';
 		} else {
 			var trans = "";
 		}
@@ -847,11 +864,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'<div class="action ' + disp["re"] + ' ' + noauth + '"><a onclick="re(\'' + toot.id +
 			'\',\'' + to_mention + '\',' +
 			acct_id + ',\'' + visen +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i><span class="rep_ct">' + replyct +
+			'\')" class="waves-effect waves-dark btn-flat actct rep-btn" data-men="' + to_mention + '" data-visen="' + visen + '" style="padding:0" title="' + lang.lang_parse_replyto + '"><i class="fas fa-share"></i><span class="rep_ct">' + replyct +
 			'</a></span></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["rt"] + ' ' + noauth + '"><a onclick="rt(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_bt + '"><i class="fas fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat actct bt-btn" style="padding:0" title="' + lang.lang_parse_bt + '"><i class="fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count +
 			'</span></a></div>' +
 			'<div class="action ' + can_rt + ' ' + disp["qt"] + ' ' + noauth + ' ' + qtClass + '"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
@@ -859,18 +876,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_quote + '"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action ' + disp["fav"] + ' ' + noauth + '"><a onclick="fav(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_fav + '"><i class="fas text-darken-3 fa-star' +
+			'\')" class="waves-effect waves-dark btn-flat actct fav-btn" style="padding:0" title="' + lang.lang_parse_fav + '"><i class="fas text-darken-3 fa-star' +
 			if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count +
 			'</a></span></div>' +
 			'<div class="' + if_mine + ' action ' + disp["del"] + ' ' + noauth + '"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_del + '"><i class="fas fa-trash"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_del + '"><i class="fas fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin ' + disp["pin"] + ' ' + noauth + '"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_pin + '"><i class="fas fa-map-pin pin_' + toot.id + ' ' + if_pin + '"></i></a></div>'
+			')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_pin + '"><i class="fas fa-map-pin pin_' + toot.id + ' ' + if_pin + '"></i></a></div>'
 			+ '<div class="' + if_mine + ' action ' + disp["red"] + ' ' + noauth + '"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="' + lang.lang_parse_redraft + '"><i class="material-icons">redo</i></a></div>' + trans +
+			')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="' + lang.lang_parse_redraft + '"><i class="material-icons">redo</i></a></div>' + trans +
 			'</div><div class="area-side ' + mouseover + '"><span class="cbadge viabadge waves-effect ' + viashow + ' ' + mine_via + '" style="max-width:60px;" onclick="client(\'' + $.strip_tags(via) + '\')" title="via ' + $.strip_tags(via) + '">' +
 			via +
 			'</span>' + '<div class="action ' + if_mine + ' ' + noauth + '"><a onclick="toggleAction(\'' + toot.id + '\',\'' + tlid + '\',\'' + acct_id + '\')" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div>' +
@@ -897,6 +914,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	var datetype = localStorage.getItem("datetype");
 	Object.keys(obj).forEach(function (key) {
 		var toot = obj[key];
+		if (toot) {
 			console.log(["Parsing", toot])
 			if (!toot.username) {
 				var raw = toot;
@@ -1010,6 +1028,8 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				'</div>' +
 				'</div>' +
 				'</div>';
+		}
+
 
 	});
 	return templete;
@@ -1030,7 +1050,6 @@ function client(name) {
 			showCloseButton: true,
 			focusConfirm: false,
 		}).then((result) => {
-			console.log(result)
 			if (result.dismiss == "cancel") {
 				//Emp
 				var cli = localStorage.getItem("client_emp");

app/js/tl/src.js

@@ -177,12 +177,12 @@ function graphDraw(tag, acct_id) {
 	var zero = 50 - (his[0].uses / max * 50);
 	if (max === 0) {
 		tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
-			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
+			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toot(s)&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
 			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
 	} else {
 		tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">' +
 			'<g><path d="M0,' + six + ' L10,' + five + ' 20,' + four + ' 30,' + three + ' 40,' + two + ' 50,' + one + ' 60,' + zero + '" style="stroke: #9e9e9e; stroke-width: 1;fill: none;"></path></g>' +
-			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
+			'</svg><span style="font-size:200%">' + his[0].uses + '</span>toot&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
 			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;' + his[0].accounts + lang.lang_src_people;
 	}
 

app/js/ui/layout.js

@@ -55,7 +55,7 @@ function parseColumn(dontclose) {
 			var domain = localStorage.getItem("domain_" + key);
 			if (localStorage.getItem("mode_" + domain) == "misskey") {
 				localStorage.removeItem("misskey_wss_" + key)
-				connectMisskey(key)
+				connectMisskey(key, false)
 			}
 		});
 	}

app/js/ui/post-box.js

@@ -70,7 +70,6 @@ if (location.search) {
 	var mode = m[1];
 	var codex = m[2];
 	if (mode == "share") {
-		console.log(codex);
 		$('textarea').focus();
 		$("#textarea").val(decodeURI(codex));
 		show();
@@ -84,15 +83,20 @@ $('#posttgl').click(function (e) {
 	} else {
 		hide();
 	}
+	$('.cvo').removeClass("selectedToot")
+	selectedColumn = 0
+	selectedToot = 0
 });
 
 $("#timeline-container,#group").click(function (e) {
-
 	if (localStorage.getItem("box") != "absolute") {
 		if ($('#post-box').hasClass("appear") && !localStorage.getItem("nohide")) {
 			hide();
 		}
 	}
+	$('.cvo').removeClass("selectedToot")
+	selectedColumn = 0
+	selectedToot = 0
 	localStorage.removeItem("nohide")
 });
 $('#textarea,#cw-text').focusout(function (e) {
@@ -101,4 +105,7 @@ $('#textarea,#cw-text').focusout(function (e) {
 		localStorage.removeItem("nohide")
 	}
 	//setTimeout(remove, 100);
+	$('.cvo').removeClass("selectedToot")
+	selectedColumn = 0
+	selectedToot = 0
 });

app/js/userdata/showOnTL.js

@@ -193,6 +193,9 @@ function udg(user, acct_id) {
 			$("#his-emp-btn").hide();
 			$(".only-my-data").show();
 			$(".only-his-data").hide();
+			if(localStorage.getItem("main")==acct_id){
+				$("#his-main-acct").hide();
+			}
 		} else {
 			relations(user, acct_id);
 			$(".only-my-data").hide();
@@ -293,6 +296,9 @@ function misskeyUdg(user, acct_id) {
 			$("#his-emp-btn").hide();
 			$(".only-my-data").show();
 			$(".only-his-data").hide();
+			if(localStorage.getItem("main")==acct_id){
+				$("#his-main-acct").hide();
+			}
 		} else {
 			if (json.isFollowing) {
 				//自分がフォローしている
@@ -351,7 +357,6 @@ function relations(user, acct_id) {
 		console.error(error);
 	}).then(function (json) {
 		var json = json[0];
-		console.log(json);
 		if (json.following) {
 			//自分がフォローしている
 			$("#his-data").addClass("following");
@@ -409,6 +414,12 @@ function profbrws() {
 	var url = $("#his-openin").attr("data-href")
 	postMessage(["openUrl", url], "*")
 }
+function setMain() {
+	var acct_id = $("#his-data").attr("use-acct")
+	localStorage.setItem("main", acct_id);
+	multiSelector(true)
+	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
+}
 //オールリセット
 function hisclose() {
 	$('#his-data').modal('close');
@@ -464,6 +475,7 @@ function reset() {
 	$("#his-openin").attr("data-href", "");
 	$("#his-float-timeline").show();
 	$("#his-float-blocked").hide();
+	$("#his-main-acct").show();
 	$("#his-proof-prof").html("")
 }
 $('#my-data-nav .tab').on('click', function () {

app/main.js

@@ -18,6 +18,27 @@ const app = electron.app;
 const BrowserWindow = electron.BrowserWindow;
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow;
+if (process.argv.indexOf("--dev") === -1) {
+	var packaged = true;
+} else {
+	var packaged = false;
+	console.log(
+		"||\\\\\\ \n"+
+		"||||  \\\\\\\\ \n"+
+		"||||     \\\\\\\\ \n"+
+		"|||| Am I a \\\\\\\\ \n"+
+		"|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n"+
+		"||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n"+
+		"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n"+
+		"|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/\__ \\   < \n"+
+		"||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n"+
+		"||||          /////         \n"+
+		"||||       /////\n"+
+		"||||     /////\n"+
+		"||||//////"
+	)
+	console.log("Welcome!")
+}
 var info_path = join(app.getPath("userData"), "window-size.json");
 var max_info_path = join(app.getPath("userData"), "max-window-size.json");
 var lang_path = join(app.getPath("userData"), "language");
@@ -25,9 +46,9 @@ var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
 try {
 	fs.readFileSync(ha_path, 'utf8');
 	app.disableHardwareAcceleration()
-	console.log("disabled: HA");
+	if(!packaged) console.log("disabled: Hardware Acceleration");
 } catch{
-	console.log("enabled: HA");
+	if(!packaged) console.log("enabled: Hardware Acceleration");
 }
 var window_size;
 try {
@@ -74,7 +95,6 @@ app.on('activate', function () {
 
 function createWindow() {
 	if (isFile(lang_path)) {
-		console.log("exist");
 		var lang = fs.readFileSync(lang_path, 'utf8');
 	} else {
 		var langs = app.getLocale();
@@ -88,8 +108,8 @@ function createWindow() {
 			fs.writeFileSync(lang_path, lang);
 		});
 	}
-	console.log(app.getLocale());
+	if(!packaged) console.log("your lang:" + app.getLocale());
-	console.log("launch:" + lang);
+	if(!packaged) console.log("launch:" + lang);
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform = process.platform;
 	var bit = process.arch;
@@ -173,11 +193,6 @@ function createWindow() {
 
 	var platform = process.platform;
 	var bit = process.arch;
-	if (process.argv.indexOf("--dev") === -1) {
-		packaged = true;
-	} else {
-		packaged = false;
-	}
 	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
 	//CSS
 	css.css(mainWindow);

app/main/css.js

@@ -53,9 +53,13 @@ function css(mainWindow) {
 			if (json.base == "light") {
 				var drag = "rgba(255, 255, 255, 0.8)";
 				var beforehover = "#757575";
+				var selected = "#3f3f3f"
+				var selectedWithShare = "#b2babd"
 			} else {
 				var drag = "rgba(0, 0, 0, 0.8)";
 				var beforehover = "#9e9e9e";
+				var selected = "#c0c0c0"
+				var selectedWithShare = "#003a30"
 			}
 			if (json.props) {
 				if (json.props.TheDeskAccent) {
@@ -75,7 +79,7 @@ function css(mainWindow) {
 				secondary +
 				";--active:" + primary + ";--postbox:" + primary + ";--modalfooter:" +
 				primary +
-				";--accentbtn:" + primary + "}.customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
+				";--accentbtn:" + primary + ";--selected:" + selected + ";--selectedWithShare:" + selectedWithShare + "}.customtheme #imagemodal{background: url(\"../img/pixel.svg\");}";
 			e.sender.webContents.send('theme-css-response', css);
 		} catch (e) {
 			var css = "";

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.6.6",
+  "version": "18.7.1",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
@@ -65,9 +65,9 @@
     "font-manager": "^0.3.0"
   },
   "devDependencies": {
-    "electron": "^5.0.4",
+    "electron": "^6.0.0",
-    "electron-builder": "^20.44.4",
+    "electron-builder": "^21.1.5",
-    "readline-sync": "1.4.9"
+    "readline-sync": "1.4.10"
   },
   "build": {
     "productName": "TheDesk",
@@ -116,8 +116,8 @@
       ]
     },
     "electronDownload": {
-      "version": "5.0.1"
+      "version": "5.0.4"
     },
-    "electronVersion": "5.0.1"
+    "electronVersion": "5.0.4"
   }
 }

app/view/en/index.html

@@ -36,8 +36,9 @@
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
+	<script type="text/javascript" src="../../js/platform/punycode.js"></script>
 	<script>
-		var ver = "Usamin (18.6.6)";
+		var ver = "Usamin (18.7.1)";
 		//betaを入れるとバージョンチェックしない
 		//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 		//var ver="beta";
@@ -465,7 +466,9 @@
 						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
 							id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
 						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
-							onclick="profbrws()">Open in browser</a><br>
+							onclick="profbrws()">Open in browser</a>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data" id="his-main-acct"
+							onclick="setMain()" style="width: calc(100% - 10px)">Set it an main account</a><br>
 					</div><br>
 					<div id="his-matching-list">
 						Get people resembling this user.<br>
@@ -664,7 +667,7 @@
 	<!-- Modal Structure Video-->
 	<div id="videomodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-			<video src="" id="video" style="max-width:100%; max-height:100%;" controls>
+			<video src="" id="video" style="max-width:100%; max-height:100%;" controls loop="true" autoplay="true">
 		</div>
 		<div class="modal-footer">
 			<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
@@ -677,19 +680,21 @@
 			<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-Usamin_18-6-6" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-7-1" class="release-do" style="display:none; ">
 				<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note Usamin (18.6.6)</h5>
+				<h5>Release Note Usamin (18.7.1)</h5>
-				・設定に関するバグを修正<br>
+				・Electron 6.0.0。<br>
-				・ブーストのボタンの色を青に変更<br>
+				・画像ビューアーを開いているときに画像を矢印キーで切り替えられないバグを修正。<br>
-				・テーマごとに「トゥート」ボタンの色が変わる<br>
+				・コンテキストを上手く取得できないバグを修正。<br>
-				・新テーマ(Blue:渚の花嫁)を追加<br>
+				・タグサジェストがパワーアップ。<br>
-				・トゥート下のアクションボタンのスペースなどを変更<br>
+				・動画が自動再生(モーダル表示時)、ループ(モーダル, Pleroma, MisskeyのTL上)する<br>
-				・翻訳したときに結果を全て表示するよう変更<br>
+				・絵文字(カスタム絵文字/Twemoji)をミュートワードに追加できるように。<br>
-				・knzk.meとbesr-friends.chatをサポートインスタンスから削除
+				・絵文字が入ったURLに関する不具合を修正。<br>
+				・blurhash非対応インスタンスでのNSFW画像のblurを改修。<br>
+				・Pleroma等でアカウント情報が無い時があるため、それに関して修正。<br>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>

app/view/en/setting.html

@@ -58,7 +58,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">Notification test</a><br></template>
@@ -212,7 +212,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -259,7 +259,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -303,7 +303,6 @@
 				<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
 				Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
 				<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">Save</button><br><br>
-
 			</div>
 		</li>
 		<li>
@@ -439,6 +438,7 @@
 	<li>Ctrl+Enter+Shift:Post(secondary toot)</li>
 	<li>Alt+Enter:Secondary Toot Button</li>
 	<li>Ctrl+E:Make all notifications read</li>
+	<li>Ctrl+U:Select the top & left(No.1 column) toot</li>
 	<li>Esc:Hide toot box</li>
 	<li>F5:Super Reload</li>
 	<li>Ctrl+Shift+C:Clear toot box</li>
@@ -457,6 +457,10 @@
 		<li>Ctrl+R:
 			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
 		</li><br>
+	When a toot is selected: 
+	<li>F:Favourite this toot</li>
+	<li>B:Boost this toot</li>
+	<li>R:Reply to this toot</li>
 	</div>
 	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
 		onclick="if(confirm('Delete all data. You cannot undo. Continue?')){ localStorage.clear(); location.href='index.html'; }"><i

app/view/ja/index.html

@@ -36,8 +36,9 @@
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
+	<script type="text/javascript" src="../../js/platform/punycode.js"></script>
 	<script>
-		var ver = "Usamin (18.6.6)";
+		var ver = "Usamin (18.7.1)";
 		//betaを入れるとバージョンチェックしない
 		//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 		//var ver="beta";
@@ -465,7 +466,9 @@
 						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
 							id="his-end-btn" onclick="pinUser()">紹介する</a><br>
 						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
-							onclick="profbrws()">ブラウザで開く</a><br>
+							onclick="profbrws()">ブラウザで開く</a>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data" id="his-main-acct"
+							onclick="setMain()" style="width: calc(100% - 10px)">メインアカウントに設定</a><br>
 					</div><br>
 					<div id="his-matching-list">
 						似ているユーザーを取得できます。<br>
@@ -664,7 +667,7 @@
 	<!-- Modal Structure Video-->
 	<div id="videomodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-			<video src="" id="video" style="max-width:100%; max-height:100%;" controls>
+			<video src="" id="video" style="max-width:100%; max-height:100%;" controls loop="true" autoplay="true">
 		</div>
 		<div class="modal-footer">
 			<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
@@ -677,19 +680,21 @@
 			<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-Usamin_18-6-6" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-7-1" class="release-do" style="display:none; ">
 				<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note Usamin (18.6.6)</h5>
+				<h5>Release Note Usamin (18.7.1)</h5>
-				・設定に関するバグを修正<br>
+				・Electron 6.0.0。<br>
-				・ブーストのボタンの色を青に変更<br>
+				・画像ビューアーを開いているときに画像を矢印キーで切り替えられないバグを修正。<br>
-				・テーマごとに「トゥート」ボタンの色が変わる<br>
+				・コンテキストを上手く取得できないバグを修正。<br>
-				・新テーマ(Blue:渚の花嫁)を追加<br>
+				・タグサジェストがパワーアップ。<br>
-				・トゥート下のアクションボタンのスペースなどを変更<br>
+				・動画が自動再生(モーダル表示時)、ループ(モーダル, Pleroma, MisskeyのTL上)する<br>
-				・翻訳したときに結果を全て表示するよう変更<br>
+				・絵文字(カスタム絵文字/Twemoji)をミュートワードに追加できるように。<br>
-				・knzk.meとbesr-friends.chatをサポートインスタンスから削除
+				・絵文字が入ったURLに関する不具合を修正。<br>
+				・blurhash非対応インスタンスでのNSFW画像のblurを改修。<br>
+				・Pleroma等でアカウント情報が無い時があるため、それに関して修正。<br>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>

app/view/ja/setting.html

@@ -58,7 +58,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">通知テスト</a><br></template>
@@ -212,7 +212,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -259,7 +259,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -303,7 +303,6 @@
 				<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
 				Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
 				<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
-
 			</div>
 		</li>
 		<li>
@@ -439,6 +438,7 @@
 	<li>Ctrl+Enter+Shift:投稿(セカンダリートゥート)</li>
 	<li>Alt+Enter:セカンダリートゥートボタン</li>
 	<li>Ctrl+E:全ての通知を既読にする</li>
+	<li>Ctrl+U:一番上の一番左のトゥートを選択</li>
 	<li>Esc:投稿パネルを消す</li>
 	<li>F5:スーパーリロード</li>
 	<li>Ctrl+Shift+C:入力内容を消す</li>
@@ -457,6 +457,10 @@
 		<li>Ctrl+R:
 			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
 		</li><br>
+	選択時
+	<li>F:お気に入り登録</li>
+	<li>B:ブースト</li>
+	<li>R:返信</li>
 	</div>
 	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
 		onclick="if(confirm('全てのデータを削除します。この操作は取り消せません。')){ localStorage.clear(); location.href='index.html'; }"><i

app/view/make/index.sample.html

@@ -36,6 +36,7 @@
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
+	<script type="text/javascript" src="../../js/platform/punycode.js"></script>
 	<script>
 		var ver = "@@versionLetter@@";
 		//betaを入れるとバージョンチェックしない
@@ -465,7 +466,9 @@
 						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
 							id="his-end-btn" onclick="pinUser()">@@endorse@@</a><br>
 						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
-							onclick="profbrws()">@@openinbrowser@@</a><br>
+							onclick="profbrws()">@@openinbrowser@@</a>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data" id="his-main-acct"
+							onclick="setMain()" style="width: calc(100% - 10px)">@@mainacct@@</a><br>
 					</div><br>
 					<div id="his-matching-list">
 						@@likeUserDes@@<br>
@@ -664,7 +667,7 @@
 	<!-- Modal Structure Video-->
 	<div id="videomodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-			<video src="" id="video" style="max-width:100%; max-height:100%;" controls>
+			<video src="" id="video" style="max-width:100%; max-height:100%;" controls loop="true" autoplay="true">
 		</div>
 		<div class="modal-footer">
 			<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">@@close@@</a>
@@ -677,19 +680,21 @@
 			<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-Usamin_18-6-6" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-7-1" class="release-do" style="display:none; ">
 				<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note Usamin (18.6.6)</h5>
+				<h5>Release Note Usamin (18.7.1)</h5>
-				・設定に関するバグを修正<br>
+				・Electron 6.0.0。<br>
-				・ブーストのボタンの色を青に変更<br>
+				・画像ビューアーを開いているときに画像を矢印キーで切り替えられないバグを修正。<br>
-				・テーマごとに「トゥート」ボタンの色が変わる<br>
+				・コンテキストを上手く取得できないバグを修正。<br>
-				・新テーマ(Blue:渚の花嫁)を追加<br>
+				・タグサジェストがパワーアップ。<br>
-				・トゥート下のアクションボタンのスペースなどを変更<br>
+				・動画が自動再生(モーダル表示時)、ループ(モーダル, Pleroma, MisskeyのTL上)する<br>
-				・翻訳したときに結果を全て表示するよう変更<br>
+				・絵文字(カスタム絵文字/Twemoji)をミュートワードに追加できるように。<br>
-				・knzk.meとbesr-friends.chatをサポートインスタンスから削除
+				・絵文字が入ったURLに関する不具合を修正。<br>
+				・blurhash非対応インスタンスでのNSFW画像のblurを改修。<br>
+				・Pleroma等でアカウント情報が無い時があるため、それに関して修正。<br>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>

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

@@ -88,6 +88,7 @@
     "likeHimOrHer":"Resembling",
     "endorse":"Feature on profile",
     "openinbrowser":"Open in browser",
+    "mainacct":"Set it an main account",
     "frc":"Suggest",
     "more":"More",
     "revoverJP":" to ",

app/view/make/language/index.ja.json

@@ -89,6 +89,7 @@
     "more":"もっと",
     "endorse":"紹介する",
     "openinbrowser":"ブラウザで開く",
+    "mainacct":"メインアカウントに設定",
     "revoverJP":"する",
     "warnUseOtherAcct":"(解除はできません。)",
     "revoverJPde":"で",

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

@@ -175,6 +175,11 @@
   "keyshowprof": "Show profile of selecting",
   "keyrow": "Show next or previous image",
   "keyzoom": "Mousewheel:Zoom a image",
+  "whenSelected": "When a toot is selected: ",
+  "fav": "Favourite this toot",
+  "bt": "Boost this toot",
+  "reply": "Reply to this toot",
+  "keyselecttop": "Select the top & left(No.1 column) toot",
   "reset": "Reset(Danger)",
   "resetconfirm": "Delete all data. You cannot undo. Continue?",
   "about": "About TheDesk",

app/view/make/language/setting.ja.json

@@ -175,6 +175,11 @@
   "keyshowprof": "現在選択中のプロフィール",
   "keyrow": "イメージビューワー起動時に画像切り替え",
   "keyzoom": "マウスホイール:イメージビューワー時に拡大縮小",
+  "whenSelected": "選択時",
+  "fav": "お気に入り登録",
+  "bt": "ブースト",
+  "reply": "返信",
+  "keyselecttop":"一番上の一番左のトゥートを選択",
   "reset": "初期化",
   "resetconfirm": "全てのデータを削除します。この操作は取り消せません。",
   "about": "このソフトについて",

app/view/make/make.js

@@ -2,7 +2,7 @@ const fs = require("fs")
 const readlineSync = require('readline-sync');
 let ver = readlineSync.question('version string (empty: default string)? ');
 if (!ver) {
-    ver = "Usamin (18.6.6)"
+    ver = "Usamin (18.7.1)"
 }
 console.log("Constructing view files " + ver + ": make sure to update package.json")
 const langs = ["ja", "en", "ps"]

app/view/make/setting.sample.html

@@ -58,7 +58,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">@@nntest@@</a><br></template>
@@ -212,7 +212,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -259,7 +259,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -303,7 +303,6 @@
 				<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">@@set@@</button><br><br>
 				Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
 				<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">@@set@@</button><br><br>
-
 			</div>
 		</li>
 		<li>
@@ -439,6 +438,7 @@
 	<li>Ctrl+Enter+Shift:@@keysecpost@@</li>
 	<li>Alt+Enter:@@secondary@@</li>
 	<li>Ctrl+E:@@keyunread@@</li>
+	<li>Ctrl+U:@@keyselecttop@@</li>
 	<li>Esc:@@keyesc@@</li>
 	<li>F5:@@keyf5@@</li>
 	<li>Ctrl+Shift+C:@@keyclear@@</li>
@@ -457,6 +457,10 @@
 		<li>Ctrl+R:
 			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
 		</li><br>
+	@@whenSelected@@
+	<li>F:@@fav@@</li>
+	<li>B:@@bt@@</li>
+	<li>R:@@reply@@</li>
 	</div>
 	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
 		onclick="if(confirm('@@resetconfirm@@')){ localStorage.clear(); location.href='index.html'; }"><i

app/view/ps/index.html

@@ -36,8 +36,9 @@
 	<script type="text/javascript" src="../../js/common/modal.js"></script>
 	<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 	<script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
+	<script type="text/javascript" src="../../js/platform/punycode.js"></script>
 	<script>
-		var ver = "Usamin (18.6.6)";
+		var ver = "Usamin (18.7.1)";
 		//betaを入れるとバージョンチェックしない
 		//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 		//var ver="beta";
@@ -465,7 +466,9 @@
 						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data"
 							id="his-end-btn" onclick="pinUser()">crwdns454:0crwdne454:0</a><br>
 						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-openin"
-							onclick="profbrws()">crwdns455:0crwdne455:0</a><br>
+							onclick="profbrws()">crwdns455:0crwdne455:0</a>
+						<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-my-data" id="his-main-acct"
+							onclick="setMain()" style="width: calc(100% - 10px)">@@mainacct@@</a><br>
 					</div><br>
 					<div id="his-matching-list">
 						crwdns469:0crwdne469:0<br>
@@ -664,7 +667,7 @@
 	<!-- Modal Structure Video-->
 	<div id="videomodal" class="modal modal-fixed-footer">
 		<div class="modal-content">
-			<video src="" id="video" style="max-width:100%; max-height:100%;" controls>
+			<video src="" id="video" style="max-width:100%; max-height:100%;" controls loop="true" autoplay="true">
 		</div>
 		<div class="modal-footer">
 			<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">crwdns385:0crwdne385:0</a>
@@ -677,19 +680,21 @@
 			<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-Usamin_18-6-6" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-7-1" class="release-do" style="display:none; ">
 				<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note Usamin (18.6.6)</h5>
+				<h5>Release Note Usamin (18.7.1)</h5>
-				・設定に関するバグを修正<br>
+				・Electron 6.0.0。<br>
-				・ブーストのボタンの色を青に変更<br>
+				・画像ビューアーを開いているときに画像を矢印キーで切り替えられないバグを修正。<br>
-				・テーマごとに「トゥート」ボタンの色が変わる<br>
+				・コンテキストを上手く取得できないバグを修正。<br>
-				・新テーマ(Blue:渚の花嫁)を追加<br>
+				・タグサジェストがパワーアップ。<br>
-				・トゥート下のアクションボタンのスペースなどを変更<br>
+				・動画が自動再生(モーダル表示時)、ループ(モーダル, Pleroma, MisskeyのTL上)する<br>
-				・翻訳したときに結果を全て表示するよう変更<br>
+				・絵文字(カスタム絵文字/Twemoji)をミュートワードに追加できるように。<br>
-				・knzk.meとbesr-friends.chatをサポートインスタンスから削除
+				・絵文字が入ったURLに関する不具合を修正。<br>
+				・blurhash非対応インスタンスでのNSFW画像のblurを改修。<br>
+				・Pleroma等でアカウント情報が無い時があるため、それに関して修正。<br>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>

app/view/ps/setting.html

@@ -58,7 +58,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">crwdns540:0crwdne540:0</a><br></template>
@@ -212,7 +212,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -259,7 +259,7 @@
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
 						<template v-if="item.text.desc">
-							<template v-html="item.text.desc"></template><br>
+							<span v-html="item.text.desc"></span><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -303,7 +303,6 @@
 				<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
 				Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
 				<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">crwdns525:0crwdne525:0</button><br><br>
-
 			</div>
 		</li>
 		<li>
@@ -439,6 +438,7 @@
 	<li>Ctrl+Enter+Shift:crwdns1924:0crwdne1924:0</li>
 	<li>Alt+Enter:crwdns1916:0crwdne1916:0</li>
 	<li>Ctrl+E:crwdns652:0crwdne652:0</li>
+	<li>Ctrl+U:@@keyselecttop@@</li>
 	<li>Esc:crwdns653:0crwdne653:0</li>
 	<li>F5:crwdns654:0crwdne654:0</li>
 	<li>Ctrl+Shift+C:crwdns655:0crwdne655:0</li>
@@ -457,6 +457,10 @@
 		<li>Ctrl+R:
 			<a href="https://astarte.thedesk.top">アスタルテ暇人ランキング</a>を開く
 		</li><br>
+	@@whenSelected@@
+	<li>F:@@fav@@</li>
+	<li>B:@@bt@@</li>
+	<li>R:@@reply@@</li>
 	</div>
 	<button class="btn waves-effect red" style="width:100%; max-width:500px;"
 		onclick="if(confirm('crwdns661:0crwdne661:0')){ localStorage.clear(); location.href='index.html'; }"><i