Zergling_man/thedesk
Zergling_man/thedesk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TheDesk Akane (16.1.3)

Browse Source
This commit is contained in:
cutls 2018-09-17 20:55:00 +09:00
parent 1b96b42356
commit f87ece1535
29 changed files with 252 additions and 1470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/css/post.css
View File

@ -69,7 +69,15 @@
overflow-y:scroll;
max-height:100px;
}
#toot-btn-field{
display:flex;
}
#toot-post-btn{
width:calc(100% - 10px); padding:0; margin-top:10px;
}
#toot-sec-btn{
width:30px; padding:0; margin-top:10px;
}
/*mini*/

21
app/css/tl.css
View File

@ -425,4 +425,25 @@ p:not(:last-child){
margin-top: 3px;
padding: 1px;
border-radius: 3px;
}
.fa-2x>.emoji-img {
width: 36px!important;
height: 36px!important
}
.fa-3x>.emoji-img {
width: 54px!important;
height: 54px!important
}
.fa-4x>.emoji-img {
width: 72px!important;
height: 72px!important
}
.fa-5x>.emoji-img {
width: 90px!important;
height: 90px!important
}
#lists-user{
overflow-y: scroll;
overflow-x: hidden;
max-height: 200px;
}

1
app/css/userdata.css
View File

@ -19,6 +19,7 @@
}
#his-float-data{
width: 400px;
height: 100%;
}
#his-float-timeline{
width: calc(100% - 400px);

18
app/js/common/keyshortcut.js
View File

@ -12,6 +12,16 @@ $(function($) {
}else{
var wv=true;
}
//Ctrl+Shift+Enter:Lgen
if (event.metaKey || event.ctrlKey && wv) {
if (event.shiftKey) {
if (e.keyCode === 13) {
post('local');
return false;
}
}
}
//Ctrl+Enter:投稿
if (event.metaKey || event.ctrlKey && wv) {
if (e.keyCode === 13) {
@ -19,13 +29,7 @@ $(function($) {
return false;
}
}
//Shift+Enter:Markdown
if (event.shiftKey) {
if (e.keyCode === 13) {
brInsert("　\n");
return false;
}
}
//Shift+Space:Markdownゼロ幅スペース
if (event.shiftKey) {
if (e.keyCode === 32) {

4
app/js/lang/setting.lang.js
View File

@ -118,6 +118,10 @@ var lang_setting_main={
"ja":"起動時・投稿時のアカウントを{{set}}に設定しました。",
"en":"Default account:{{set}}"
}
var lang_setting_sec={
"ja":"セカンダリートゥートボタン:{{set}}",
"en":"Secondary toot button:{{set}}"
}
var lang_setting_ksref={
"ja":"キーボードショートカットが更新されました。",
"en":"Keyboard shortcuts are refreshed."

8
app/js/login/login.js
View File

@ -399,8 +399,12 @@ function ckdb(acct_id) {
return;
}
if(json){
localStorage.setItem("letters_" + acct_id, json["max_toot_chars"]);
//localStorage.setItem("statuses_" + acct_id, json["statuses"]);
if(json["max_toot_chars"]){
localStorage.setItem("letters_" + acct_id, json["max_toot_chars"]);
}
if(json["urls"]["streaming_api"]){
localStorage.setItem("streaming_" + acct_id, json["urls"]["streaming_api"]);
}
}
});

4
app/js/login/manager.js
View File

@ -269,7 +269,8 @@ function support() {
function login(url) {
var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi);
if($('#misskey:checked').val()=="on"){
if($('#misskey:checked').val()=="on" || url=="misskey.xyz"){
$("#misskey").prop("checked", true);
misskeyLogin(url);
return;
}
@ -369,6 +370,7 @@ function misskeyLogin(url) {
$("#auth").show();
$("#code").val(token);
$("#add").hide();
$("#misskey").prop("checked", false);
localStorage.setItem("domain_tmp",url);
shell.openExternal(json.url);
var electron = require("electron");

18
app/js/post/post.js
View File

@ -1,6 +1,15 @@
/*投稿系*/
//投稿
function post(mode) {
function sec(){
var mode=localStorage.getItem("sec");
var acct_id = $("#post-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id);
if(~domain.indexOf("kirishima.cloud")>=0 && mode=="local"){
mode="unlisted";
}
post(null,mode);
}
function post(mode,postvis) {
if($("#toot-post-btn").prop("disabled")){
return
}
@ -85,7 +94,12 @@ function post(mode) {
} else {
var nsfw = "false";
}
var vis = $("#vis").text();
if(postvis){
var vis = postvis;
}else{
var vis = $("#vis").text();
}
if(vis!="inherit" && vis!="local"){
toot.visibility=vis;
}else if(vis=="local"){

9
app/js/tl/mix.js
View File

@ -80,10 +80,15 @@ function mixtl(acct_id, tlid, type,delc,voice) {
function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_"+ acct_id + "_at");
var startHome = "wss://" + domain +
if(localStorage.getItem("streaming_" + acct_id)){
var wss=localStorage.getItem("streaming_" + acct_id)
}else{
var wss="wss://"+domain
}
var startHome = wss
"/api/v1/streaming/?stream=user&access_token=" + at;
var startLocal = "wss://" + domain +
var startLocal = wss
"/api/v1/streaming/?stream=public:local&access_token=" + at;
var wshid = websocketHome.length;
var wslid = websocketLocal.length;

7
app/js/tl/notification.js
View File

@ -95,7 +95,12 @@ function notf(acct_id, tlid, sys) {
todc();
});
if(!misskey){
var start = "wss://" + domain + "/api/v1/streaming/?stream=user&access_token=" +
if(localStorage.getItem("streaming_" + acct_id)){
var wss=localStorage.getItem("streaming_" + acct_id)
}else{
var wss="wss://"+domain
}
var start = wss + "/api/v1/streaming/?stream=user&access_token=" +
at;
}else{
var start = "wss://" + domain + "/?i=" +

7
app/js/tl/speech.js
View File

@ -12,8 +12,8 @@ $voise = null;
$synthes.rate=localStorage.getItem("voice_speed");
$synthes.pitch=localStorage.getItem("voice_pitch");
$synthes.volume=localStorage.getItem("voice_vol");
function say(msg){
msg=voiceParse(msg);
function say(msgr){
msg=voiceParse(msgr);
var voice=localStorage.getItem("voicebank");
var obj = JSON.parse(voice);
if(!obj){
@ -43,10 +43,11 @@ $repeat = setInterval(function() {
}
}, 300);
function voiceParse(msg){
msg = $.strip_tags(msg);
msg = msg.replace(/#/g, "");
msg = msg.replace(/'/g, "");
msg = msg.replace(/"/g, "");
msg = msg.replace(/https?:\/\/[a-zA-Z0-9./-@_=?&]+/g, "");
msg = msg.replace(/https?:\/\/[a-zA-Z0-9./-@_=?%&-]+/g, "");
return msg;
}
function voiceToggle(tlid) {

23
app/js/tl/tl.js
View File

@ -179,20 +179,25 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
}
}else{
var misskey=false;
if(localStorage.getItem("streaming_" + acct_id)){
var wss=localStorage.getItem("streaming_" + acct_id)
}else{
var wss="wss://"+domain
}
if (type == "home") {
var start = "wss://" + domain +
var start = wss +
"/api/v1/streaming/?stream=user&access_token=" + at;
} else if (type == "pub") {
var start = "wss://" + domain +
var start = wss +
"/api/v1/streaming/?stream=public&access_token=" + at;
} else if (type == "pub-media") {
var start = "wss://" + domain +
var start = wss +
"/api/v1/streaming/?stream=public:media&access_token=" + at;
} else if (type == "local") {
var start = "wss://" + domain +
var start = wss +
"/api/v1/streaming/?stream=public:local&access_token=" + at;
} else if (type == "local-media") {
var start = "wss://" + domain +
var start = wss +
"/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=" + at;
} else if (type == "tag") {
if(type=="tag"){
@ -201,16 +206,16 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
data=data+"&local=true";
}
}
var start = "wss://" + domain +
var start = wss +
"/api/v1/streaming/?stream=hashtag&tag=" + data +"&access_token=" + at;
} else if (type == "noauth") {
var start = "wss://" + acct_id +
var start = wss +
"/api/v1/streaming/?stream=public:local";
} else if (type=="list"){
var start = "wss://" + domain +
var start = wss +
"/api/v1/streaming/?stream=list&list=" + data +"&access_token=" + at;
} else if (type=="dm"){
var start = "wss://" + domain +
var start = wss +
"/api/v1/streaming/?stream=direct&access_token=" + at;
}
}

26
app/js/ui/layout.js
View File

@ -179,6 +179,9 @@ function parseColumn() {
$("#bottom").removeClass("reverse");
$(".leftside").removeClass("reverse");
}
if(localStorage.getItem("sec") && localStorage.getItem("sec")!="nothing"){
secvis(localStorage.getItem("sec"));
}
favTag();
var cw = localStorage.getItem("always-cw");
if (cw == "yes") {
@ -193,6 +196,29 @@ function parseColumn() {
}
}
}
//セカンダリートゥートボタン
function secvis(set){
if(set=="public"){
$("#toot-sec-icon").text("public");
$("#toot-sec-btn").addClass("purple");
}else if(set=="unlisted"){
$("#toot-sec-icon").text("lock_open");
$("#toot-sec-btn").addClass("blue");
}else if(set=="private"){
$("#toot-sec-icon").text("lock");
$("#toot-sec-btn").addClass("orange");
}else if(set=="direct"){
$("#toot-sec-icon").text("mail");
$("#toot-sec-btn").addClass("red");
}else if(set=="limited"){
$("#toot-sec-icon").text("group");
$("#toot-sec-btn").addClass("teal");
}else if(set=="local"){
$("#toot-sec-icon").text("visibility");
$("#toot-sec-btn").addClass("light-blue");
}
$("#toot-sec-btn").removeClass("hide");
}
//カラム追加
function addColumn() {
var acct = $("#add-acct-sel").val();

13
app/js/ui/settings.js
View File

@ -192,6 +192,13 @@ function settings() {
Materialize.toast(lang_setting_main[lang].replace("{{set}}" ,maint), 3000);
}
localStorage.setItem("mainuse", maind);
var secd = $("[name=sec]:checked").val();
var sect = $("[for=sec-"+secd+"]").text();
if (secd != localStorage.getItem("sec")) {
Materialize.toast(lang_setting_sec[lang].replace("{{set}}" ,sect), 3000);
}
localStorage.setItem("sec", secd);
}
//読み込み時の設定ロード
@ -384,6 +391,12 @@ function load() {
var maint = "remain";
}
$("#mn_" + maint).prop("checked", true);
var sect = localStorage.getItem("sec");
if (!sect) {
var sect = "nothing";
}
$("#sec-" + sect).prop("checked", true);
}
//最初に読む
load();

2
app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "thedesk",
"version": "16.1.2",
"version": "16.1.3",
"description": "TheDesk is a Mastodon client for PC.",
"main": "main.js",
"scripts": {

1
app/view/en/acct.html
View File

@ -88,6 +88,7 @@ Mastodon version:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
<script type="text/javascript" src="../../js/ui/theme.js"></script>
<script type="text/javascript" src="../../js/platform/end.js"></script>
<script type="text/javascript" src="../../js/common/sha256.js"></script>
<script type="text/javascript" src="../../js/login/tkn.js"></script>
<script type="text/javascript" src="../../js/login/instance.js"></script>
<script type="text/javascript" src="../../js/login/manager.js"></script>
<script type="text/javascript" src="../../js/tl/date.js"></script>

32
app/view/en/index.html
View File

@ -26,7 +26,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script>
var ver="Akane (16.1.2)";
var ver="Akane (16.1.3)";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";
@ -170,7 +170,8 @@ var lang="en";
<!--END hidden area-->
</div>
<div id="toot-btn-field">
<button class="btn waves-effect indigo unmize" style="width:calc(100% - 10px); padding:0; margin-top:10px;" onclick="post()" id="toot-post-btn">Toot</button>
<button class="btn waves-effect indigo unmize" onclick="post()" id="toot-post-btn">Toot</button>
<button class="btn waves-effect indigo darken-3 unmize hide" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="Secondary Toot">lock_open</i></button>
</div>
</div>
<!--絵文字ピッカー-->
@ -307,7 +308,7 @@ var lang="en";
<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">Take a screenshot</a>
<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">Copy URL of this toot</a>
<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">Embed</a>
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Use other account</a>
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
</div>
<!-- Modal Structure Userdata -->
@ -526,21 +527,19 @@ var lang="en";
<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-Akane_16-0-11" style="display:none">
<div id="release-Akane_16-1-3" style="display:none">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。
<h5>Release Note Akane (16.0.11)</h5>
16.0.11<br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Akane (16.1.3)</h5>
16.1.3<br>
<ul>
<li>様々なバグを修正</li>
</ul>
16.0.10<br>
<ul>
<li>自動CWに関する不具合</li>
<li>アップデートに関する不具合</li>
<li>MisskeyのURLコピーに関する不具合</li>
<li>セカンダリートゥートボタン</li>
<li>読み上げや絵文字に関するバグの修正</li>
<li>公式ヘルプサイト:<a href="https://docs.thedesk.top">TheDesk Docs</a></li>
</ul>
いつの間にかリアルタイムユーザー数が100を超えていました。皆様のご愛顧に感謝申し上げます。<br>
</div>
<br><br>
<h3>Support TheDesk!</h3>
@ -739,7 +738,10 @@ var lang="en";
</a>
<a onclick="window.open('https://astarte.thedesk.top');" class="setting nex waves-effect" target="_blank" id="ranking-btn" style="display:none;">
<i class="material-icons nex" title="アスタルテランキング">timeline</i>
</a>
</a>
<a href="https://docs.thedesk.top" class="setting nex waves-effect" target="_blank">
<i class="material-icons nex" title="Help">help_outline</i>
</a>
</div>
</div>
</div>

14
app/view/en/setting.html
View File

@ -238,6 +238,20 @@
<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_main" value="main" />
<label for="mn_main">Main account</label>
</label>
<h5>Secondary Toot Button</h5>
Toot with other visibility setting<br>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-nothing" value="nothing" />
<label for="sec-nothing">Hidden</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-public" value="public" />
<label for="sec-public">Public</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-unlisted" value="unlisted" />
<label for="sec-unlisted">Unlisted</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-private" value="private" />
<label for="sec-private">Private</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-direct" value="direct" />
<label for="sec-direct">Direct</label>
<input class="with-gap hide kirishima" onchange="settings()" name="sec" type="radio" id="sec-local" value="local" />
<label for="sec-local">Local Only</label><span class="hide kirishima">非対応インスタンスでは「未収載」になります。</span>
<br>
</div>
</li>

1
app/view/ja/acct.html
View File

@ -88,6 +88,7 @@ Mastodonバージョン:<span id="ins-ver"></span>@<span id="ins-upd"></span><br
<script type="text/javascript" src="../../js/ui/theme.js"></script>
<script type="text/javascript" src="../../js/platform/end.js"></script>
<script type="text/javascript" src="../../js/common/sha256.js"></script>
<script type="text/javascript" src="../../js/login/tkn.js"></script>
<script type="text/javascript" src="../../js/login/instance.js"></script>
<script type="text/javascript" src="../../js/login/manager.js"></script>
<script type="text/javascript" src="../../js/tl/date.js"></script>

32
app/view/ja/index.html
View File

@ -26,7 +26,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script>
var ver="Akane (16.1.2)";
var ver="Akane (16.1.3)";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";
@ -170,7 +170,8 @@ var lang="ja";
<!--END hidden area-->
</div>
<div id="toot-btn-field">
<button class="btn waves-effect indigo unmize" style="width:calc(100% - 10px); padding:0; margin-top:10px;" onclick="post()" id="toot-post-btn">トゥート</button>
<button class="btn waves-effect indigo unmize" onclick="post()" id="toot-post-btn">トゥート</button>
<button class="btn waves-effect indigo darken-3 unmize hide" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="セカンダリートゥート">lock_open</i></button>
</div>
</div>
<!--絵文字ピッカー-->
@ -307,7 +308,7 @@ var lang="ja";
<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">スクリーンショット</a>
<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">URLをコピー</a>
<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">埋め込む</a>
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">他のアカウントを使用</a>
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
</div>
</div>
<!-- Modal Structure Userdata -->
@ -526,21 +527,19 @@ var lang="ja";
<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-Akane_16-0-11" style="display:none">
<div id="release-Akane_16-1-3" style="display:none">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。
<h5>Release Note Akane (16.0.11)</h5>
16.0.11<br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Akane (16.1.3)</h5>
16.1.3<br>
<ul>
<li>様々なバグを修正</li>
</ul>
16.0.10<br>
<ul>
<li>自動CWに関する不具合</li>
<li>アップデートに関する不具合</li>
<li>MisskeyのURLコピーに関する不具合</li>
<li>セカンダリートゥートボタン</li>
<li>読み上げや絵文字に関するバグの修正</li>
<li>公式ヘルプサイト:<a href="https://docs.thedesk.top">TheDesk Docs</a></li>
</ul>
いつの間にかリアルタイムユーザー数が100を超えていました。皆様のご愛顧に感謝申し上げます。<br>
</div>
<br><br>
<h3>ご支援ください。</h3>
@ -739,7 +738,10 @@ var lang="ja";
</a>
<a onclick="window.open('https://astarte.thedesk.top');" class="setting nex waves-effect" target="_blank" id="ranking-btn" style="display:none;">
<i class="material-icons nex" title="アスタルテランキング">timeline</i>
</a>
</a>
<a href="https://docs.thedesk.top" class="setting nex waves-effect" target="_blank">
<i class="material-icons nex" title="ヘルプ">help_outline</i>
</a>
</div>
</div>
</div>

14
app/view/ja/setting.html
View File

@ -238,6 +238,20 @@
<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_main" value="main" />
<label for="mn_main">メインアカウント</label>
</label>
<h5>セカンダリートゥートボタン</h5>
公開範囲の変更とトゥートを一発でできます。<br>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-nothing" value="nothing" />
<label for="sec-nothing">表示しない</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-public" value="public" />
<label for="sec-public">公開(Public)</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-unlisted" value="unlisted" />
<label for="sec-unlisted">未収載(Unlisted)</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-private" value="private" />
<label for="sec-private">非公開(Private)</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-direct" value="direct" />
<label for="sec-direct">ダイレクト(Direct)</label>
<input class="with-gap hide kirishima" onchange="settings()" name="sec" type="radio" id="sec-local" value="local" />
<label for="sec-local">ローカル限定</label><span class="hide kirishima">非対応インスタンスでは「未収載」になります。</span>
<br>
</div>
</li>

1
app/view/make/acct.sample.html
View File

@ -88,6 +88,7 @@ Administered by:<a id="ins-admin"></a><br>
<script type="text/javascript" src="../../js/ui/theme.js"></script>
<script type="text/javascript" src="../../js/platform/end.js"></script>
<script type="text/javascript" src="../../js/common/sha256.js"></script>
<script type="text/javascript" src="../../js/login/tkn.js"></script>
<script type="text/javascript" src="../../js/login/instance.js"></script>
<script type="text/javascript" src="../../js/login/manager.js"></script>
<script type="text/javascript" src="../../js/tl/date.js"></script>

32
app/view/make/index.sample.html
View File

@ -26,7 +26,7 @@
<script type="text/javascript" src="../../js/common/modal.js"></script>
<script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
<script>
var ver="Akane (16.1.2)";
var ver="Akane (16.1.3)";
//betaを入れるとバージョンチェックしない
//GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
//var ver="beta";
@ -170,7 +170,8 @@ var lang="{{lang}}";
<!--END hidden area-->
</div>
<div id="toot-btn-field">
<button class="btn waves-effect indigo unmize" style="width:calc(100% - 10px); padding:0; margin-top:10px;" onclick="post()" id="toot-post-btn">{{toot}}</button>
<button class="btn waves-effect indigo unmize" onclick="post()" id="toot-post-btn">{{toot}}</button>
<button class="btn waves-effect indigo darken-3 unmize hide" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="{{sectoot}}">lock_open</i></button>
</div>
</div>
<!--絵文字ピッカー-->
@ -307,7 +308,7 @@ var lang="{{lang}}";
<a href="#!" class="waves-effect waves-green btn-flat" onclick="shot()">{{screenshot}}</a>
<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy()">{{copyURL}}</a>
<a href="#!" class="waves-effect waves-green btn-flat" onclick="cbCopy('emb')">{{embed}}</a>
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">{{useOtherAcct1}}</a>
<a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">{{close}}</a>
</div>
</div>
<!-- Modal Structure Userdata -->
@ -526,21 +527,19 @@ var lang="{{lang}}";
<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-Akane_16-0-11" style="display:none">
<div id="release-Akane_16-1-3" style="display:none">
<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。
<h5>Release Note Akane (16.0.11)</h5>
16.0.11<br>
Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。<br>
困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
<h5>Release Note Akane (16.1.3)</h5>
16.1.3<br>
<ul>
<li>様々なバグを修正</li>
</ul>
16.0.10<br>
<ul>
<li>自動CWに関する不具合</li>
<li>アップデートに関する不具合</li>
<li>MisskeyのURLコピーに関する不具合</li>
<li>セカンダリートゥートボタン</li>
<li>読み上げや絵文字に関するバグの修正</li>
<li>公式ヘルプサイト:<a href="https://docs.thedesk.top">TheDesk Docs</a></li>
</ul>
いつの間にかリアルタイムユーザー数が100を超えていました。皆様のご愛顧に感謝申し上げます。<br>
</div>
<br><br>
<h3>{{supportme}}</h3>
@ -739,7 +738,10 @@ var lang="{{lang}}";
</a>
<a onclick="window.open('https://astarte.thedesk.top');" class="setting nex waves-effect" target="_blank" id="ranking-btn" style="display:none;">
<i class="material-icons nex" title="アスタルテランキング">timeline</i>
</a>
</a>
<a href="https://docs.thedesk.top" class="setting nex waves-effect" target="_blank">
<i class="material-icons nex" title="{{help}}">help_outline</i>
</a>
</div>
</div>
</div>

4
app/view/make/language/index.en.json
View File

@ -23,6 +23,7 @@
"unlistedJP":"",
"privateJP":"",
"localJP":"Local only",
"sectoot":"Secondary Toot",
"directJP":"",
"emojiWarn":"",
"emojiInsertWarn":"Some emojis are not able to be inserted.",
@ -138,5 +139,6 @@
"verTips":"Version",
"clockTips":"Clock",
"ramTips":"RAM status",
"changeTips":"Change Tips"
"changeTips":"Change Tips",
"help":"Help"
}

4
app/view/make/language/index.ja.json
View File

@ -24,6 +24,7 @@
"privateJP":"非公開",
"localJP":"ローカル限定",
"directJP":"ダイレクト",
"sectoot":"セカンダリートゥート",
"emojiWarn":"インスタンスによって実装が異なります。",
"emojiInsertWarn":"一部絵文字は入力できません。",
"refreshEmoji":"絵文字更新",
@ -138,5 +139,6 @@
"verTips":"バージョン",
"clockTips":"時計",
"ramTips":"システムメモリ容量",
"changeTips":"Tips変更"
"changeTips":"Tips変更",
"help":"ヘルプ"
}

4
app/view/make/language/setting.en.json
View File

@ -86,6 +86,10 @@
"mainwarn":"Main account can be set on Account Manager.",
"lastacct":"Account you used recently",
"usemainacct":"Main account",
"secondary":"Secondary Toot Button",
"secwarn":"Toot with other visibility setting",
"nothing":"Hidden",
"localonly":"Local Only",
"keysc":"Keyboard shortcut Preferences",
"iks":"Easy inserter",
"okswarn":"You can insert any letters and emojis with only 3 keys",

4
app/view/make/language/setting.ja.json
View File

@ -86,6 +86,10 @@
"mainwarn":"メインアカウントはアカウント設定で指定できます。投稿以外のアカウント選択にも影響します。",
"lastacct":"最後に使用したアカウント",
"usemainacct":"メインアカウント",
"secondary":"セカンダリートゥートボタン",
"secwarn":"公開範囲の変更とトゥートを一発でできます。",
"nothing":"表示しない",
"localonly":"ローカル限定",
"keysc":"キーボードショートカットの設定",
"iks":"簡単文字入力",
"okswarn":"絵文字やタグ、&gt;BTなどを登録しておくとすぐに入力できます。",

14
app/view/make/setting.sample.html
View File

@ -238,6 +238,20 @@
<input class="with-gap" onchange="settings()" name="main" type="radio" id="mn_main" value="main" />
<label for="mn_main">{{usemainacct}}</label>
</label>
<h5>{{secondary}}</h5>
{{secwarn}}<br>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-nothing" value="nothing" />
<label for="sec-nothing">{{nothing}}</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-public" value="public" />
<label for="sec-public">{{public}}</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-unlisted" value="unlisted" />
<label for="sec-unlisted">{{unlisted}}</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-private" value="private" />
<label for="sec-private">{{private}}</label>
<input class="with-gap" onchange="settings()" name="sec" type="radio" id="sec-direct" value="direct" />
<label for="sec-direct">{{direct}}</label>
<input class="with-gap hide kirishima" onchange="settings()" name="sec" type="radio" id="sec-local" value="local" />
<label for="sec-local">{{localonly}}</label><span class="hide kirishima">非対応インスタンスでは「未収載」になります。</span>
<br>
</div>
</li>

1394
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff