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

TheDesk Mio (15.8.0)

Browse Source
This commit is contained in:
cutls 2018-07-07 02:51:48 +09:00
parent 5c39443d92
commit ea4e17920c
42 changed files with 476 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
LATEST.md
View File

@ -1,29 +1,19 @@
## For Astarte(kirishima.cloud), My Primary Instance ## For Astarte(kirishima.cloud), My Primary Instance
TheDesk :thedesk: Mio (ver.7) TheDesk :thedesk: Mio (ver.8)
・公開範囲情報の記録がインスタンスごとに(これにより一度記録がリセットされます。) ・Glance TLの不具合解消
・インスタンスのユーザー設定に従った公開範囲指定(アカウント設定より情報更新をしてください。) ・フォントが変更可能に
・インスタンスカラーを設定できるように(アカウント設定から) ・同一インスタンスで複数垢ログインに対応
・スクリーンショット(魚拓)機能の高速化 ・カラーテーマの追加
・Integrated TLのバグ修正
・キーボードショートカットのバグ修正
・コピペのバグ改善(ただし、ワンクリックコピーで複数の絵文字があるトゥートをコピーするとバグが発生します)
・CWのバグ改善
・[b]DTP鯖(dtp-mstdn.jp)( #dtp )とtheboss.tech( #theboss_tech )をサポート[/b]タグ付きトゥート時、デフォルトタグがないとき確認ダイアログが表示されます。
ほか ほか
https://thedesk.top https://thedesk.top
:github: https://github.com/cutls/TheDesk #Desk #DeskUpdate :github: https://github.com/cutls/TheDesk #Desk #DeskUpdate
## For Other Instances ## For Other Instances
PCクライアントTheDesk Mio (ver.7) PCクライアントTheDesk Mio (ver.8)
・公開範囲情報の記録がインスタンスごとに(これにより一度記録がリセットされます。) ・Glance TLの不具合解消
・インスタンスのユーザー設定に従った公開範囲指定(アカウント設定より情報更新をしてください。) ・フォントが変更可能に
・インスタンスカラーを設定できるように(アカウント設定から) ・同一インスタンスで複数垢ログインに対応
・スクリーンショット(魚拓)機能の高速化 ・カラーテーマの追加
・Integrated TLのバグ修正
・キーボードショートカットのバグ修正
・コピペのバグ改善(ただし、ワンクリックコピーで複数の絵文字があるトゥートをコピーするとバグが発生します)
・CWのバグ改善
・DTP鯖(dtp-mstdn.jp)( #dtp )とtheboss.tech( #theboss_tech )をサポート。タグ付きトゥート時、デフォルトタグがないとき確認ダイアログが表示されます。
https://thedesk.top https://thedesk.top

1
app/about.html
View File

@ -5,6 +5,7 @@
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="./css/materialize.css" type="text/css" rel="stylesheet"> <link href="./css/materialize.css" type="text/css" rel="stylesheet">
<link href='./css/font-awesome.css' rel='stylesheet' type='text/css'> <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
<link href="./css/themes.css" type="text/css" rel="stylesheet">
<link href="./css/master.css" type="text/css" rel="stylesheet"> <link href="./css/master.css" type="text/css" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
<meta charset="utf-8"> <meta charset="utf-8">

2
app/acct.html
View File

@ -4,8 +4,8 @@
<title>Account Manager - TheDesk</title> <title>Account Manager - TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="./css/materialize.css" type="text/css" rel="stylesheet"> <link href="./css/materialize.css" type="text/css" rel="stylesheet">
<link href="./css/themes.css" type="text/css" rel="stylesheet">
<link href="./css/master.css" type="text/css" rel="stylesheet"> <link href="./css/master.css" type="text/css" rel="stylesheet">
<link href="./css/auth.css" type="text/css" rel="stylesheet">
<link href='./css/font-awesome.css' rel='stylesheet' type='text/css'> <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
<link href='./css/tl.css' rel='stylesheet' type='text/css'> <link href='./css/tl.css' rel='stylesheet' type='text/css'>
<link href='./css/userdata.css' rel='stylesheet' type='text/css'> <link href='./css/userdata.css' rel='stylesheet' type='text/css'>

1
app/adobe.html
View File

@ -4,6 +4,7 @@
<title>Adobe Photo Editor - TheDesk</title> <title>Adobe Photo Editor - TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="./css/materialize.css" type="text/css" rel="stylesheet"> <link href="./css/materialize.css" type="text/css" rel="stylesheet">
<link href="./css/themes.css" type="text/css" rel="stylesheet">
<link href="./css/master.css" type="text/css" rel="stylesheet"> <link href="./css/master.css" type="text/css" rel="stylesheet">
<link href="./css/auth.css" type="text/css" rel="stylesheet"> <link href="./css/auth.css" type="text/css" rel="stylesheet">
<link href='./css/font-awesome.css' rel='stylesheet' type='text/css'> <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>

83
app/css/master.css
View File

@ -1,5 +1,5 @@
/*共通CSS*/ /*共通CSS*/
html,body{overflow:hidden; user-select: none; cursor:default; font-size:13px;height: 100vh;} html,body{overflow:hidden; user-select: none; cursor:default; font-size:13px;height: 100vh; background-color: var(--bg); color: var(--color);}
.btn { .btn {
margin: 5px; margin: 5px;
text-transform: none; text-transform: none;
@ -33,12 +33,12 @@ option {
max-width: 100vw; max-width: 100vw;
max-height: 100vh; max-height: 100vh;
top:0; top:0;
background-color: white; background-color: var(--modal);
position: fixed; position: fixed;
z-index: 9; z-index: 9;
} }
#imagemodal, #videomodal, #tootmodal { #imagemodal, #videomodal, #tootmodal {
background-color: white; background-color: var(--modal);
} }
#imagemodal .modal-content { #imagemodal .modal-content {
overflow: hidden; overflow: hidden;
@ -128,7 +128,8 @@ blockquote:before, .quote:before {
position: fixed; position: fixed;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
background-color: rgba(255, 255, 255, 0.8); background-color: var(--bg);
color: var(--color);
z-index: 99999; z-index: 99999;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -142,7 +143,7 @@ blockquote:before, .quote:before {
#pip{ #pip{
z-index:504; z-index:504;
width:418px; width:418px;
background-color: white; background-color: var(--subcolor);
position:absolute; position:absolute;
} }
.pip-bottom{ .pip-bottom{
@ -163,6 +164,9 @@ blockquote:before, .quote:before {
.big-text{ .big-text{
font-size:1.2rem; font-size:1.2rem;
} }
#releasenote {
background-color: var(--modal);
}
#releasenote li{ #releasenote li{
list-style-type: disc list-style-type: disc
} }
@ -186,70 +190,13 @@ blockquote:before, .quote:before {
opacity: 1; opacity: 1;
} }
} }
.collapsible-header,.tabs{
background-color: var(--subcolor);
}
.modal-footer{
background-color: var(--modalfooter) !important;
}
/*black theme*/
.blacktheme body {
color: white;
background-color: #212121;
}
.blacktheme #drag {
color: white;
background-color: rgba(0, 0, 0, 0.8);
position: fixed;
width: 100vw;
height: 100vh;
z-index: 99999;
justify-content: center;
align-items: center;
}
.blacktheme #imagemodal,.blacktheme #videomodal,.blacktheme #tootmodal,.blacktheme #releasenote {
background-color: black;
}
.blacktheme .collapsible-header,.blacktheme .tabs,.blacktheme #pip {
background-color: #212121;
}
/*indigo theme*/
.indigotheme body {
color: white;
background-color: #031833;
}
.indigotheme #drag {
color: white;
background-color: rgba(0, 0, 0, 0.8);
position: fixed;
width: 100vw;
height: 100vh;
z-index: 99999;
justify-content: center;
align-items: center;
}
.indigotheme #imagemodal,.indigotheme #videomodal,.indigotheme #tootmodal,.indigotheme #releasenote {
background-color: #0d1351;
}
.indigotheme .collapsible-header,.indigotheme .tabs,.indigotheme #pip {
background-color: #0d1351;
}
/*brown theme*/
.browntheme body {
color: white;
background-color: #261411;
}
.browntheme #drag {
color: white;
background-color: rgba(0, 0, 0, 0.8);
position: fixed;
width: 100vw;
height: 100vh;
z-index: 99999;
justify-content: center;
align-items: center;
}
.browntheme #imagemodal,.browntheme #videomodal,.browntheme #tootmodal,.browntheme #releasenote {
background-color: #261411;
}
.browntheme .collapsible-header,.browntheme .tabs,.browntheme #pip {
background-color: #4e342e;
}
/*スクロールバー*/ /*スクロールバー*/
::-webkit-scrollbar { ::-webkit-scrollbar {

25
app/css/post.css
View File

@ -3,7 +3,7 @@
position: fixed; position: fixed;
right: 78px; right: 78px;
bottom: 3px; bottom: 3px;
background-color: white; background-color: var(--postbox);
border: thin solid gray; border: thin solid gray;
z-index: 500; z-index: 500;
width: 300px; width: 300px;
@ -25,8 +25,6 @@
#drag { #drag {
width: 100%; width: 100%;
height: 100px; height: 100px;
background-color: #e0e0e0;
color: black;
} }
#post-btn { #post-btn {
display: none; display: none;
@ -70,27 +68,6 @@
} }
/*black theme*/
.blacktheme #post-box {
background-color: #424242;
}
/*indigo theme*/
.indigotheme #post-box {
background-color: #1a237e ;
}
/*brown theme*/
.browntheme #post-box {
background-color: #4e342e;
}
/*
.blacktheme #drag {
width: 100%;
height: 100px;
background-color: #004d40;
color: white;
padding: 3px;
}
*/
/*mini*/ /*mini*/

80
app/css/themes.css Normal file
View File

@ -0,0 +1,80 @@
:root{
--bg:white;
--drag:rgba(255, 255, 255, 0.8);
--color:black;
--modal:white;
--subcolor:#e0e0e0;
--box:white;
--sidebar:#e0e0e0;
--shared:#cfd8dc;
--notfbox:white;
--emphasized:#81c784;
--his-data:rgba(255, 255, 255, 0.9);
--active:#e6ee9c;
--postbox:white;
--modalfooter:#fafafa;
}
.blacktheme {
--bg:#212121;
--drag:rgba(0, 0, 0, 0.8);
--color:white;
--modal:black;
--subcolor:#212121;
--box:#424242;
--sidebar:#424242;
--shared:#004d40;
--notfbox:#333333;
--emphasized:#4e342e;
--his-data:rgba(0, 0, 0, 0.8);
--active:#757575;
--postbox:#424242;
--modalfooter:#212121;
}
.indigotheme {
--bg:#031833;
--drag:rgba(0, 0, 0, 0.8);
--color:white;
--modal:#0d1351;
--subcolor:#0d1351;
--shared:#004d40;
--box:#0d1351;
--sidebar:#0d1351;
--notfbox:#0d47a1;
--emphasized:#4e342e;
--his-data:rgba(13, 19, 81,0.8);
--active:#757575;
--post-box:#1a237e;
--modalfooter:#031833;
}
.browntheme {
--bg:#261411;
--drag:rgba(0, 0, 0, 0.8);
--color:white;
--modal:#261411;
--subcolor:#4e342e;
--shared:#004d40;
--box:#4e342e;
--sidebar:#4e342e;
--notfbox:#4e342e;
--emphasized:#0d47a1;
--his-data:rgba(62, 39, 35,0.8);
--active:#757575;
--postbox:#4e342e;
--modalfooter:#261411;
}
.greentheme{
--bg:#c8e6c9;
--drag:rgba(255, 255, 255, 0.8);
--color:black;
--modal:#81c784;
--subcolor:#a5d6a7;
--box:#81c784;
--sidebar:#81c784;
--shared:#ffcc80;
--notfbox:#a5d6a7;
--emphasized:#9e9d24;
--his-data:rgba(255, 255, 255, 0.9);
--active:#e6ee9c;
--postbox:#a5d6a7;
--modalfooter:#81c784;
}

68
app/css/tl.css
View File

@ -14,7 +14,7 @@
width:75px; width:75px;
min-width:75px; min-width:75px;
height:100vh; height:100vh;
background-color:#e0e0e0; background-color:var(--sidebar);
display:flex; display:flex;
flex-wrap:wrap; flex-wrap:wrap;
} }
@ -37,7 +37,7 @@
vertical-align:text-bottom; vertical-align:text-bottom;
} }
#sidebar a{ #sidebar a{
color:black; color:var(--color);
} }
#sidebar .big-menu{ #sidebar .big-menu{
text-align:center; text-align:center;
@ -218,7 +218,7 @@ font-size:1rem;
height:calc(0.8em + 8px); height:calc(0.8em + 8px);
} }
.cbadge-hover { .cbadge-hover {
color: #000; color: var(--color);
background-color: transparent; background-color: transparent;
} }
.cbadge-hover:hover { .cbadge-hover:hover {
@ -233,17 +233,17 @@ p:not(:last-child){
margin-bottom: 10px; margin-bottom: 10px;
} }
.shared { .shared {
background-color: #cfd8dc; background-color: var(--shared);
} }
.emphasized { .emphasized {
background-color: #81c784; background-color: var(--emphasized);
} }
.udg { .udg {
cursor: pointer; cursor: pointer;
} }
.notice-box { .notice-box {
top: 0; top: 0;
background-color:white; background-color:var(--notfbox);
position: relative; position: relative;
margin-right: 10px; margin-right: 10px;
width:100%; width:100%;
@ -306,7 +306,7 @@ p:not(:last-child){
.notf-box { .notf-box {
position: fixed; position: fixed;
right: 70px; right: 70px;
background-color: white; background-color: var(--box);
border: thin solid gray; border: thin solid gray;
z-index: 501; z-index: 501;
width: 400px; width: 400px;
@ -329,59 +329,15 @@ p:not(:last-child){
overflow-y: scroll; overflow-y: scroll;
} }
.u-url { .u-url {
color: black; color: var(--color);
cursor: text; cursor: text;
} }
.type-b{ .type-b{
display:none; display:none;
} }
.modal-footer{
/*black theme*/ background-color:var(--box);
.blacktheme .cbadge-hover,.browntheme .cbadge-hover,.indigotheme .cbadge-hover { color: #fff;}
.blacktheme .notf-box,.blacktheme .modal-footer,.blacktheme #sidebar {
background-color: #424242;
} }
.blacktheme .btn-flat,.blacktheme .u-url ,.blacktheme #sidebar a { .btn-flat{
color: white color:var(--color);
}
.blacktheme .shared {
background-color: #004d40;
}
.blacktheme .notice-box {
background-color: #333333;
}
.blacktheme .emphasized {
background-color: #4e342e;
}
/*indigo theme*/
.indigotheme .notf-box,.indigotheme .modal-footer,.indigotheme #sidebar {
background-color: #0d1351;
}
.indigotheme .btn-flat,.indigotheme .u-url ,.indigotheme #sidebar a {
color: white
}
.indigotheme .shared {
background-color: #004d40;
}
.indigotheme .notice-box {
background-color: #0d47a1;
}
.indigotheme .emphasized {
background-color: #4e342e;
}
/*brown theme*/
.browntheme .notf-box,.browntheme .modal-footer,.browntheme #sidebar {
background-color: #4e342e;
}
.browntheme .btn-flat,.browntheme .u-url ,.browntheme #sidebar a {
color: white
}
.browntheme .shared {
background-color: #004d40;
}
.browntheme .notice-box {
background-color: #4e342e;
}
.browntheme .emphasized {
background-color: #0d47a1;
} }

27
app/css/userdata.css
View File

@ -17,7 +17,7 @@
} }
#his-data-show { #his-data-show {
margin: 50px; margin: 50px;
background-color:rgba(255, 255, 255, 0.9); background-color:var(--his-data);
width: calc(100% - 50px); width: calc(100% - 50px);
height: calc(100% - 50px); height: calc(100% - 50px);
margin-bottom: 0; margin-bottom: 0;
@ -31,31 +31,8 @@
width: 10%; width: 10%;
} }
.active-back{ .active-back{
background-color: #e6ee9c; background-color: var(--active);
} }
#his-name .emojione,#his-name .emoji-img{ #his-name .emojione,#his-name .emoji-img{
width: 20px; width: 20px;
} }
/*black theme*/
.blacktheme #his-data-show {
background-color: rgba(0, 0, 0, 0.8);
}
.blacktheme .active-back{
background-color:#757575;
}
/*indigo theme*/
.indigotheme #his-data-show {
background-color: rgba(13, 19, 81,0.8);
}
.indigotheme .active-back{
background-color:#757575;
}
/*brown theme*/
.browntheme #his-data-show {
background-color: rgba(62, 39, 35,0.8);
}
.browntheme .active-back{
background-color:#757575;
}

12
app/index.html
View File

@ -5,6 +5,7 @@
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="./css/materialize.css" type="text/css" rel="stylesheet"> <link href="./css/materialize.css" type="text/css" rel="stylesheet">
<link href='./css/font-awesome.css' rel='stylesheet' type='text/css'> <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
<link href="./css/themes.css" type="text/css" rel="stylesheet">
<link href='./css/tl.css' rel='stylesheet' type='text/css'> <link href='./css/tl.css' rel='stylesheet' type='text/css'>
<link href='./css/userdata.css' rel='stylesheet' type='text/css'> <link href='./css/userdata.css' rel='stylesheet' type='text/css'>
<link href='./css/post.css' rel='stylesheet' type='text/css'> <link href='./css/post.css' rel='stylesheet' type='text/css'>
@ -24,7 +25,7 @@
<script type="text/javascript" src="./js/common/modal.js"></script> <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="./js/ui/jquery-ui.min.js"></script>
<script> <script>
var ver="Mio (15.7.0)"; var ver="Mio (15.8.0)";
//betaを入れるとバージョンチェックしない //betaを入れるとバージョンチェックしない
//var ver="beta"; //var ver="beta";
var acct_id=0; var acct_id=0;
@ -541,9 +542,12 @@ var tlid=0;
<li class="custom-tab col my-data-width only-my-data"> <li class="custom-tab col my-data-width only-my-data">
<a go="#his-request-list">フォローリクエスト</a> <a go="#his-request-list">フォローリクエスト</a>
</li> </li>
<li class="custom-tab col my-data-width"> <li class="custom-tab col my-data-width only-his-data">
<a go="#his-matching-list">似てる</a> <a go="#his-matching-list">似てる</a>
</li> </li>
<li class="custom-tab col my-data-width only-my-data">
<a go="#his-follow-recom-list">おすすめ</a>
</li>
</ul> </ul>
</div> </div>
<div id="his-tl" class="col s12 tab-content"> <div id="his-tl" class="col s12 tab-content">
@ -628,6 +632,10 @@ var tlid=0;
</div> </div>
<button class="btn waves-effect " onclick="showMat()">取得</button> <button class="btn waves-effect " onclick="showMat()">取得</button>
</div> </div>
<div id="his-follow-recom-list" class="col s12 tab-content">
<div id="his-follow-recom-contents" class="cont-series">
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

73
app/js/common/version.js
View File

@ -21,7 +21,14 @@ function verck(ver) {
// 生成する文字列に含める文字セット // 生成する文字列に含める文字セット
var c = "abcdefghijklmnopqrstuvwxyz0123456789"; var c = "abcdefghijklmnopqrstuvwxyz0123456789";
var electron = require("electron");
var remote=electron.remote;
var platform=remote.process.platform;
if(platform=="darwin"){
var newest=mess.desk_mac;
}else{
var newest=mess.desk;
}
var cl = c.length; var cl = c.length;
var r = ""; var r = "";
for(var i=0; i<l; i++){ for(var i=0; i<l; i++){
@ -38,12 +45,72 @@ function verck(ver) {
}).then(function(mess) { }).then(function(mess) {
console.log(mess); console.log(mess);
if (mess) { if (mess) {
if (mess.desk == ver) { if (newest == ver) {
todo("お使いのバージョン" + mess.desk + "は最新です。"); todo("お使いのバージョン" + mess.desk + "は最新です。");
//betaならアプデチェックしない //betaならアプデチェックしない
} else if (ver != "beta") { } else if (ver != "beta") {
localStorage.removeItem("instance") localStorage.removeItem("instance")
var electron = require("electron");
var ipc = electron.ipcRenderer;
ipc.send('update', "true");
}
}
});
}
//バージョンチェッカー
function verck(ver) {
if(localStorage.getItem("ver")!=ver){
localStorage.setItem("ver", ver);
console.log("Thank you for your update");
$(document).ready(function(){
$('#releasenote').modal('open');
verp=ver.replace( '(', '');
verp=verp.replace( '.', '-');
verp=verp.replace( '.', '-');
verp=verp.replace( '[', '-');
verp=verp.replace( ']', '');
verp=verp.replace( ')', '');
verp=verp.replace( ' ', '_');
console.log(verp);
$("#release-"+verp).show();
});
}
var l = 5;
// 生成する文字列に含める文字セット
var c = "abcdefghijklmnopqrstuvwxyz0123456789";
var cl = c.length;
var r = "";
for(var i=0; i<l; i++){
r += c[Math.floor(Math.random()*cl)];
}
var start = "https://thedesk.top/ver.json";
fetch(start, {
method: 'GET'
}).then(function(response) {
return response.json();
}).catch(function(error) {
todo(error);
console.error(error);
}).then(function(mess) {
console.log(mess);
if (mess) {
var electron = require("electron");
var remote=electron.remote;
var platform=remote.process.platform;
if(platform=="darwin"){
var newest=mess.desk_mac;
}else{
var newest=mess.desk;
}
if (newest == ver) {
todo("お使いのバージョン" + mess.desk + "は最新です。");
//betaならアプデチェックしない
} else if (ver != "beta") {
localStorage.removeItem("instance")
var ipc = electron.ipcRenderer; var ipc = electron.ipcRenderer;
ipc.send('update', "true"); ipc.send('update', "true");
} }

1
app/js/login/instance.js
View File

@ -5,6 +5,7 @@ var idata={
"kirishima.cloud_letters":"6229", "kirishima.cloud_letters":"6229",
"kirishima.cloud_bbcode":"enabled", "kirishima.cloud_bbcode":"enabled",
"kirishima.cloud_markdown":"enabled", "kirishima.cloud_markdown":"enabled",
"kirishima.cloud_public":"パブリックタイムライン",
"minohdon.jp":"instance", "minohdon.jp":"instance",
"minohdon.jp_name":"箕面丼", "minohdon.jp_name":"箕面丼",
"minohdon.jp_letters":"500", "minohdon.jp_letters":"500",

39
app/js/login/login.js
View File

@ -12,7 +12,24 @@ function ck() {
localStorage.setItem("main",0) localStorage.setItem("main",0)
} }
var domain = localStorage.getItem("domain_0"); var domain = localStorage.getItem("domain_0");
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_0_at");
var oldat = localStorage.getItem(domain + "_at");
if(oldat){
console.log("Move to New Account Management System")
var multi = localStorage.getItem("multi");
if (!multi) {
var acctlen=1;
} else {
var obj = JSON.parse(multi);
var acctlen=obj.length;
}
for(i=0;acctlen>i;i++){
var domain = localStorage.getItem("domain_"+i);
var oldat = localStorage.getItem(domain + "_at");
var newat = localStorage.setItem("acct_"+ i + "_at",oldat);
localStorage.removeItem(domain + "_at");
}
}
//コード受信 //コード受信
if(location.search){ if(location.search){
var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/); var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/);
@ -27,10 +44,10 @@ function ck() {
if (at) { if (at) {
$("#tl").show(); $("#tl").show();
parseColumn(); parseColumn();
multi(); multiSelector();
} else { } else {
$("#tl").show(); $("#tl").show();
multi(); multiSelector();
} }
} }
ck(); ck();
@ -138,7 +155,7 @@ function code(code,mode) {
function getdata() { function getdata() {
var acct_id = 0; var acct_id = 0;
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/verify_credentials"; var start = "https://" + domain + "/api/v1/accounts/verify_credentials";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -214,6 +231,11 @@ function getdataAdv(domain, at) {
if(avatar=="/avatars/original/missing.png"){ if(avatar=="/avatars/original/missing.png"){
avatar="./img/missing.svg"; avatar="./img/missing.svg";
} }
if(json["source"]["privacy"]){
var priv=json["source"]["privacy"];
}else{
var priv="public";
}
var add = { var add = {
at: at, at: at,
name: json["display_name"], name: json["display_name"],
@ -221,7 +243,7 @@ function getdataAdv(domain, at) {
user: json["acct"], user: json["acct"],
prof: avatar, prof: avatar,
id: json["id"], id: json["id"],
vis: json["source"]["privacy"] vis: priv
}; };
var multi = localStorage.getItem("multi"); var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi); var obj = JSON.parse(multi);
@ -244,10 +266,10 @@ function ckdb(acct_id) {
if(domain=="kirishima.cloud"){ if(domain=="kirishima.cloud"){
localStorage.setItem("kirishima", "true"); localStorage.setItem("kirishima", "true");
$("#ranking-btn").show(); $("#ranking-btn").show();
}else if(domain=="imastodon.nat"){ }else if(domain=="imastodon.net"){
localStorage.setItem("imas", "true"); localStorage.setItem("imas", "true");
} }
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var bbcode = domain + "_bbcode"; var bbcode = domain + "_bbcode";
var letters = domain + "_letters"; var letters = domain + "_letters";
if(localStorage.getItem("instance")){ if(localStorage.getItem("instance")){
@ -291,7 +313,6 @@ function ckdb(acct_id) {
} }
} }
//サポートインスタンス取得 //サポートインスタンス取得
function support() { function support() {
var json=JSON.parse(localStorage.getItem("instance")); var json=JSON.parse(localStorage.getItem("instance"));
@ -307,7 +328,7 @@ function support() {
} }
//アカウントを選択…を実装 //アカウントを選択…を実装
function multi() { function multiSelector() {
var multi = localStorage.getItem("multi"); var multi = localStorage.getItem("multi");
if (!multi) { if (!multi) {
var obj = []; var obj = [];

2
app/js/login/logout.js
View File

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

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

@ -13,7 +13,7 @@ function load() {
var multi = localStorage.getItem("multi"); var multi = localStorage.getItem("multi");
if (!multi) { if (!multi) {
var obj = [{ var obj = [{
at: localStorage.getItem(localStorage.getItem("domain_0") + "_at"), at: localStorage.getItem("acct_0_at"),
name: localStorage.getItem("name_0"), name: localStorage.getItem("name_0"),
domain: localStorage.getItem("domain_0"), domain: localStorage.getItem("domain_0"),
user: localStorage.getItem("user_0"), user: localStorage.getItem("user_0"),
@ -111,15 +111,117 @@ function data(domain) {
//アカウントデータ　消す //アカウントデータ　消す
function multiDel(target) { function multiDel(target) {
var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi);
//削除確認ダイアログ
if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] + "を削除します")) {
Object.keys(obj).forEach(function(key) {
var nk=key-1;
//公開範囲(差分のみ)
if(key>=target){
var oldvis=localStorage.getItem("vis-memory-"+key);
console.log(oldvis);
if(oldvis){
localStorage.setItem("vis-memory-"+nk,oldvis);
}
}
//独自ロケール
localStorage.removeItem("home_" + key);
localStorage.removeItem("local_" + key);
localStorage.removeItem("public_" + key);
localStorage.removeItem("notification_" + key);
//アクセストークンとドメイン、プロフ(差分)
if(key>target){
var olddom=localStorage.getItem("domain_"+key);
localStorage.setItem("domain_"+nk,olddom);
var oldat=localStorage.getItem("acct_"+key+"_at");
localStorage.setItem("acct_"+nk+"_at",oldat);
localStorage.setItem("name_" + nk, localStorage.getItem("name_" + key));
localStorage.setItem("user_" + target, localStorage.getItem("user_" + key));
localStorage.setItem("user-id_" + target, localStorage.getItem("user-id_" + key));
localStorage.setItem("prof_" + target, localStorage.getItem("prof_" + key));
}
});
//とりあえず消す
obj.splice(target, 1);
console.log(obj);
var json = JSON.stringify(obj);
localStorage.setItem("multi", json);
//カラムデータコンフリクト
var col = localStorage.getItem("column");
var oldcols = JSON.parse(col);
var newcols=[];
Object.keys(oldcols).forEach(function(key) {
var nk=key-1;
var oldcol=oldcols[key];
if(target<oldcol.domain){
var newdom=oldcol.domain-1;
}else{
var newdom=oldcol.domain;
}
var type=oldcol.type;
//消した垢のコラムじゃないときコピー
if(target!=oldcol.domain){
var add = {
domain: newdom,
type: type
};
newcols.push(add);
}
});
var json = JSON.stringify(newcols);
localStorage.setItem("column", json);
load();
}
}
function multiDel2(target) {
var multi = localStorage.getItem("multi"); var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi); var obj = JSON.parse(multi);
if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] + "を削除します")) { if (confirm(obj[target]["user"] + "@" + obj[target]["domain"] + "を削除します")) {
obj.splice(target, 1); obj.splice(target, 1);
var json = JSON.stringify(obj); var json = JSON.stringify(obj);
localStorage.setItem("multi", json); localStorage.setItem("multi", json);
Object.keys(obj).forEach(function(key) { Object.keys(obj).forEach(function(key) {
if(key>=target){
var oldvis=localStorage.getItem("vis-memory-"+key);
console.log(oldvis);
if(oldvis){
var nk=key-1;
localStorage.setItem("vis-memory-"+nk,oldvis);
}
}
localStorage.removeItem("home_" + key);
localStorage.removeItem("local_" + key);
localStorage.removeItem("public_" + key);
localStorage.removeItem("notification_" + key);
refresh(key); refresh(key);
}); });
var col = localStorage.getItem("column");
if (!col) {
var obj = [{
domain: 0,
type: 'local'
}];
localStorage.setItem("card_0","true");
var json = JSON.stringify(obj);
localStorage.setItem("column", json);
} else {
var cobj = JSON.parse(col);
}
Object.keys(cobj).forEach(function(key) {
var column = cobj[key];
if(column.domain>target){
var nk=key-1;
column.domain=nk;
cobj[key]=column;
}else if(column.domain==target){
localStorage.removeItem("card_" + tlid);
cobj.splice(key, 1);
}
});
var json = JSON.stringify(column);
localStorage.setItem("column", json);
load(); load();
} }
} }
@ -140,18 +242,6 @@ function support() {
function login(url) { function login(url) {
var multi = localStorage.getItem("multi"); var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi); var obj = JSON.parse(multi);
var ng;
Object.keys(obj).forEach(function(key) {
var acct = obj[key];
if (acct.domain == url) {
Materialize.toast(url + "は登録できません。同一インスタンスには一つのアカウントでしかログインできません。", 5000);
ng = "true";
return;
}
});
if (ng) {
return;
}
if($('#linux:checked').val()=="on"){ if($('#linux:checked').val()=="on"){
var red = "urn:ietf:wg:oauth:2.0:oob" var red = "urn:ietf:wg:oauth:2.0:oob"
}else{ }else{
@ -266,6 +356,11 @@ function getdata(domain, at) {
if(avatar=="/avatars/original/missing.png"){ if(avatar=="/avatars/original/missing.png"){
avatar="./img/missing.svg"; avatar="./img/missing.svg";
} }
if(json["source"]){
var priv=json["source"]["privacy"];
}else{
var priv="public";
}
var add = { var add = {
at: at, at: at,
name: json["display_name"], name: json["display_name"],
@ -273,7 +368,7 @@ function getdata(domain, at) {
user: json["acct"], user: json["acct"],
prof: avatar, prof: avatar,
id: json["id"], id: json["id"],
vis: json["source"]["privacy"] vis: priv
}; };
var multi = localStorage.getItem("multi"); var multi = localStorage.getItem("multi");
var obj = JSON.parse(multi); var obj = JSON.parse(multi);
@ -337,7 +432,6 @@ function refresh(target) {
console.log(localStorage.getItem("user-id_"+target)); console.log(localStorage.getItem("user-id_"+target));
localStorage.setItem("prof_" + target, avatar); localStorage.setItem("prof_" + target, avatar);
obj[target] = ref; obj[target] = ref;
console.log(obj);
var json = JSON.stringify(obj); var json = JSON.stringify(obj);
localStorage.setItem("multi", json); localStorage.setItem("multi", json);

4
app/js/platform/nano.js
View File

@ -10,7 +10,7 @@ function tl(data) {
//デフォルト //デフォルト
var type = "local"; var type = "local";
} }
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
$("#notice_nano").text(cap(type, data) + " TL(" + localStorage.getItem( $("#notice_nano").text(cap(type, data) + " TL(" + localStorage.getItem(
"user_" + acct_id) + "@" + domain + ")"); "user_" + acct_id) + "@" + domain + ")");
var start = "https://" + domain + "/api/v1/timelines/" + com(type, data); var start = "https://" + domain + "/api/v1/timelines/" + com(type, data);
@ -38,7 +38,7 @@ var websocket=[];
function reload(type, cc, acct_id, data) { function reload(type, cc, acct_id, data) {
var tlid=0; var tlid=0;
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (type == "home") { if (type == "home") {
var start = "wss://" + domain + var start = "wss://" + domain +
"/api/v1/streaming/?stream=user&access_token=" + at; "/api/v1/streaming/?stream=user&access_token=" + at;

2
app/js/post/img.js
View File

@ -100,7 +100,7 @@ function media(b64, type, no) {
fd.append('file', media); fd.append('file', media);
var acct_id = $("#post-acct-sel").val(); var acct_id = $("#post-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/media"; var start = "https://" + domain + "/api/v1/media";
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true); httpreq.open('POST', start, true);

2
app/js/post/post.js
View File

@ -28,7 +28,7 @@ function post() {
} }
$("#toot-post-btn").prop("disabled", true); $("#toot-post-btn").prop("disabled", true);
todo("Posting"); todo("Posting");
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses"; var start = "https://" + domain + "/api/v1/statuses";
var reply = $("#reply").val(); var reply = $("#reply").val();
var toot={ var toot={

20
app/js/post/status.js
View File

@ -7,7 +7,7 @@ function fav(id, acct_id, remote) {
var flag = "favourite"; var flag = "favourite";
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id + "/" + flag; var start = "https://" + domain + "/api/v1/statuses/" + id + "/" + flag;
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true); httpreq.open('POST', start, true);
@ -57,7 +57,7 @@ function rt(id, acct_id, remote) {
var flag = "reblog"; var flag = "reblog";
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id + "/" + flag; var start = "https://" + domain + "/api/v1/statuses/" + id + "/" + flag;
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true); httpreq.open('POST', start, true);
@ -113,7 +113,7 @@ function follow(acct_id,remote) {
var remote = $("#his-data").attr("remote"); var remote = $("#his-data").attr("remote");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if(remote=="true" && flag=="follow"){ if(remote=="true" && flag=="follow"){
var start = "https://" + domain + "/api/v1/follows"; var start = "https://" + domain + "/api/v1/follows";
var user=$("#his-acct").text(); var user=$("#his-acct").text();
@ -156,7 +156,7 @@ function block(acct_id) {
var flag = "block"; var flag = "block";
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag; var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true); httpreq.open('POST', start, true);
@ -189,7 +189,7 @@ function mute(acct_id) {
var flag = "mute"; var flag = "mute";
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag; var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true); httpreq.open('POST', start, true);
@ -213,7 +213,7 @@ function mute(acct_id) {
//投稿削除 //投稿削除
function del(id, acct_id) { function del(id, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id; var start = "https://" + domain + "/api/v1/statuses/" + id;
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('DELETE', start, true); httpreq.open('DELETE', start, true);
@ -234,7 +234,7 @@ function pin(id, acct_id) {
var flag = "pin"; var flag = "pin";
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id + "/" + flag; var start = "https://" + domain + "/api/v1/statuses/" + id + "/" + flag;
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('DELETE', start, true); httpreq.open('DELETE', start, true);
@ -260,7 +260,7 @@ function pin(id, acct_id) {
//フォロリク //フォロリク
function request(id, flag, acct_id) { function request(id, flag, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/follow_requests/" + id + "/" + flag; var start = "https://" + domain + "/api/v1/follow_requests/" + id + "/" + flag;
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true); httpreq.open('POST', start, true);
@ -283,7 +283,7 @@ function domainblock(add, flag, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/domain_blocks" var start = "https://" + domain + "/api/v1/domain_blocks"
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('POST', start, true); httpreq.open('POST', start, true);
@ -341,7 +341,7 @@ function staEx(mode){
var url=$("#tootmodal").attr("data-url"); var url=$("#tootmodal").attr("data-url");
var acct_id = $("#status-acct-sel").val(); var acct_id = $("#status-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/search?resolve=true&q="+url var start = "https://" + domain + "/api/v1/search?resolve=true&q="+url
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',

2
app/js/post/suggest.js
View File

@ -42,7 +42,7 @@ input.addEventListener("focus", function() {
return; return;
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
suggest = "https://" + domain + "/api/v1/search?q=" + q suggest = "https://" + domain + "/api/v1/search?q=" + q
if (suggest != oldSuggest) { if (suggest != oldSuggest) {
console.log(suggest) console.log(suggest)

4
app/js/tl/card.js
View File

@ -25,7 +25,7 @@ function additional(acct_id, tlid) {
//トゥートサムネ //トゥートサムネ
$("#timeline_" + tlid + " .toot a:not(.parsed)").each(function(i, elem) { $("#timeline_" + tlid + " .toot a:not(.parsed)").each(function(i, elem) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var card = localStorage.getItem("card_" + tlid); var card = localStorage.getItem("card_" + tlid);
var text = $(this).attr('href'); var text = $(this).attr('href');
var urls = text.match( var urls = text.match(
@ -124,7 +124,7 @@ function additional(acct_id, tlid) {
function additionalIndv(tlid, acct_id, id) { function additionalIndv(tlid, acct_id, id) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var text = $("[toot-id="+id+"] .toot a").attr('href'); var text = $("[toot-id="+id+"] .toot a").attr('href');
var urls = text.match( var urls = text.match(
/https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/ /https?:\/\/([-a-zA-Z0-9@.]+)\/media\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/

16
app/js/tl/datails.js
View File

@ -5,7 +5,7 @@ function details(id, acct_id, tlid) {
$("#toot-this").html(html); $("#toot-this").html(html);
$('#tootmodal').modal('open'); $('#tootmodal').modal('open');
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id; var start = "https://" + domain + "/api/v1/statuses/" + id;
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -56,7 +56,7 @@ function details(id, acct_id, tlid) {
//返信タイムライン //返信タイムライン
function replyTL(id, acct_id) { function replyTL(id, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id; var start = "https://" + domain + "/api/v1/statuses/" + id;
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -82,7 +82,7 @@ function replyTL(id, acct_id) {
//コンテクストってなんですか //コンテクストってなんですか
function context(id, acct_id) { function context(id, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id + "/context"; var start = "https://" + domain + "/api/v1/statuses/" + id + "/context";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -106,7 +106,7 @@ function context(id, acct_id) {
//前のトゥート(Back TL) //前のトゥート(Back TL)
function beforeToot(id, acct_id, domain) { function beforeToot(id, acct_id, domain) {
//var domain = localStorage.getItem("domain_" + acct_id); //var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + var start = "https://" + domain +
"/api/v1/timelines/public?local=true&max_id=" + id; "/api/v1/timelines/public?local=true&max_id=" + id;
fetch(start, { fetch(start, {
@ -128,7 +128,7 @@ function beforeToot(id, acct_id, domain) {
//前のユーザーのトゥート //前のユーザーのトゥート
function userToot(id, acct_id, user) { function userToot(id, acct_id, user) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses?max_id=" + id; var start = "https://" + domain + "/api/v1/accounts/" + user + "/statuses?max_id=" + id;
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -151,7 +151,7 @@ function userToot(id, acct_id, user) {
//ふぁぼ一覧 //ふぁぼ一覧
function faved(id, acct_id) { function faved(id, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id + "/favourited_by"; var start = "https://" + domain + "/api/v1/statuses/" + id + "/favourited_by";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -173,7 +173,7 @@ function faved(id, acct_id) {
//ブースト一覧 //ブースト一覧
function rted(id, acct_id) { function rted(id, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/statuses/" + id + "/reblogged_by"; var start = "https://" + domain + "/api/v1/statuses/" + id + "/reblogged_by";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -307,7 +307,7 @@ function detEx(url,acct_id){
acct_id=localStorage.getItem("main"); acct_id=localStorage.getItem("main");
} }
var domain = localStorage.getItem("domain_"+acct_id); var domain = localStorage.getItem("domain_"+acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/search?resolve=true&q="+url var start = "https://" + domain + "/api/v1/search?resolve=true&q="+url
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',

12
app/js/tl/list.js
View File

@ -15,7 +15,7 @@ function list(){
$("#lists-user").html(""); $("#lists-user").html("");
var acct_id = $("#list-acct-sel").val(); var acct_id = $("#list-acct-sel").val();
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/lists" var start = "https://" + domain + "/api/v1/lists"
console.log(start) console.log(start)
fetch(start, { fetch(start, {
@ -48,7 +48,7 @@ function makeNewList(){
var acct_id = $("#list-acct-sel").val(); var acct_id = $("#list-acct-sel").val();
var text=$("#list-add").val(); var text=$("#list-add").val();
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/lists" var start = "https://" + domain + "/api/v1/lists"
console.log(start) console.log(start)
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
@ -73,7 +73,7 @@ function listShow(id,title,acct_id){
} }
function listUser(id,acct_id){ function listUser(id,acct_id){
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts" var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
console.log(start) console.log(start)
fetch(start, { fetch(start, {
@ -102,7 +102,7 @@ function listUser(id,acct_id){
} }
function hisList(user,acct_id){ function hisList(user,acct_id){
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/lists" var start = "https://" + domain + "/api/v1/lists"
console.log(start) console.log(start)
fetch(start, { fetch(start, {
@ -158,7 +158,7 @@ function hisList(user,acct_id){
} }
function listAdd(id,user,acct_id){ function listAdd(id,user,acct_id){
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts" var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
console.log(start) console.log(start)
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
@ -178,7 +178,7 @@ function listAdd(id,user,acct_id){
} }
function listRemove(id,user,acct_id){ function listRemove(id,user,acct_id){
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts" var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts"
console.log(start) console.log(start)
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();

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

@ -6,7 +6,7 @@ function mixtl(acct_id, tlid, type) {
todo("Integrated TL Loading...(Local)"); todo("Integrated TL Loading...(Local)");
//まずLocal //まずLocal
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/timelines/public?local=true"; var start = "https://" + domain + "/api/v1/timelines/public?local=true";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -74,7 +74,7 @@ function mixtl(acct_id, tlid, type) {
//Streamingに接続 //Streamingに接続
function mixre(acct_id, tlid, TLtype) { function mixre(acct_id, tlid, TLtype) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var startHome = "wss://" + domain + var startHome = "wss://" + domain +
"/api/v1/streaming/?stream=user&access_token=" + at; "/api/v1/streaming/?stream=user&access_token=" + at;
@ -169,7 +169,7 @@ function mixmore(tlid,type) {
var acct_id = obj[tlid].domain; var acct_id = obj[tlid].domain;
todo("Integrated TL MoreLoading...(Local)"); todo("Integrated TL MoreLoading...(Local)");
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id"); var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");

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

@ -7,7 +7,7 @@ function notf(acct_id, tlid, sys) {
native="yes"; native="yes";
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/notifications"; var start = "https://" + domain + "/api/v1/notifications";
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -125,7 +125,7 @@ function notfmore(tlid) {
localStorage.setItem("now", type); localStorage.setItem("now", type);
todo("Notfication TL MoreLoading"); todo("Notfication TL MoreLoading");
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/notifications"+ var start = "https://" + domain + "/api/v1/notifications"+
"max_id=" + sid; "max_id=" + sid;
fetch(start, { fetch(start, {

6
app/js/tl/old-mix.js
View File

@ -5,7 +5,7 @@ function mixtl(acct_id, tlid) {
localStorage.setItem("now", type); localStorage.setItem("now", type);
todo("Integrated TL Loading...(Local)"); todo("Integrated TL Loading...(Local)");
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
//まずLocal //まずLocal
var start = "https://" + domain + "/api/v1/timelines/public?local=true"; var start = "https://" + domain + "/api/v1/timelines/public?local=true";
fetch(start, { fetch(start, {
@ -96,7 +96,7 @@ function mixtl(acct_id, tlid) {
//Streamingに接続 //Streamingに接続
function mixre(acct_id, tlid) { function mixre(acct_id, tlid) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var type = "mix"; var type = "mix";
localStorage.setItem("now", type); localStorage.setItem("now", type);
var startHome = "wss://" + domain + var startHome = "wss://" + domain +
@ -180,7 +180,7 @@ function mixmore(tlid) {
var acct_id = obj[tlid].domain; var acct_id = obj[tlid].domain;
todo("Integrated TL MoreLoading...(Local)"); todo("Integrated TL MoreLoading...(Local)");
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id"); var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
var len = $("#timeline_" + tlid + " .cvo").length var len = $("#timeline_" + tlid + " .cvo").length
var start = "https://" + domain + var start = "https://" + domain +

4
app/js/tl/src.js
View File

@ -23,7 +23,7 @@ function src(mode) {
} }
localStorage.setItem("last-use", acct_id); localStorage.setItem("last-use", acct_id);
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (user == "--now") { if (user == "--now") {
var user = $('#his-data').attr("user-id"); var user = $('#his-data').attr("user-id");
} }
@ -112,7 +112,7 @@ function trend(){
return false; return false;
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (user == "--now") { if (user == "--now") {
var user = $('#his-data').attr("user-id"); var user = $('#his-data').attr("user-id");
} }

2
app/js/tl/tag.js
View File

@ -68,7 +68,7 @@ function favTag(){
function trendTag(){ function trendTag(){
$(".trendtag").remove(); $(".trendtag").remove();
var domain="imastodon.net" var domain="imastodon.net"
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/trend_tags" var start = "https://" + domain + "/api/v1/trend_tags"
console.log(start) console.log(start)
fetch(start, { fetch(start, {

6
app/js/tl/tl.js
View File

@ -55,7 +55,7 @@ function tl(type, data, acct_id, tlid) {
} }
localStorage.setItem("now", type); localStorage.setItem("now", type);
todo(cap(type) + " TL Loading..."); todo(cap(type) + " TL Loading...");
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if(type!="noauth"){ if(type!="noauth"){
var hdr={ var hdr={
'content-type': 'application/json', 'content-type': 'application/json',
@ -105,7 +105,7 @@ function reload(type, cc, acct_id, tlid, data) {
var type = localStorage.getItem("now"); var type = localStorage.getItem("now");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
localStorage.setItem("now", type); localStorage.setItem("now", type);
if (type == "home") { if (type == "home") {
var start = "wss://" + domain + var start = "wss://" + domain +
@ -226,7 +226,7 @@ function moreload(type, tlid) {
localStorage.setItem("now", type); localStorage.setItem("now", type);
todo(cap(type) + " TL MoreLoading"); todo(cap(type) + " TL MoreLoading");
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/timelines/" + com(type,data) + var start = "https://" + domain + "/api/v1/timelines/" + com(type,data) +
"max_id=" + sid; "max_id=" + sid;
fetch(start, { fetch(start, {

8
app/js/ui/img.js
View File

@ -16,14 +16,14 @@ function imgv(id, key, acct_id) {
var total=event.total; var total=event.total;
var now=event.loaded; var now=event.loaded;
var per=now/total*100; var per=now/total*100;
$("#imgprog").text(per); $("#imgprog").text(Math.floor(per));
} }
}, false); }, false);
xhr.addEventListener('loadend', function (event) { xhr.addEventListener('loadend', function (event) {
var total=event.total; var total=event.total;
var now=event.loaded; var now=event.loaded;
var per=now/total*100; var per=now/total*100;
$("#imgprog").text(per); $("#imgprog").text(Math.floor(per));
}, false); }, false);
xhr.send(); xhr.send();
$('#imgmodal').attr('src', murl); $('#imgmodal').attr('src', murl);
@ -136,14 +136,14 @@ function imgCont(type) {
var total=event.total; var total=event.total;
var now=event.loaded; var now=event.loaded;
var per=now/total*100; var per=now/total*100;
$("#imgprog").text(per); $("#imgprog").text(Math.floor(per));
} }
}, false); }, false);
xhr.addEventListener('loadend', function (event) { xhr.addEventListener('loadend', function (event) {
var total=event.total; var total=event.total;
var now=event.loaded; var now=event.loaded;
var per=now/total*100; var per=now/total*100;
$("#imgprog").text(per); $("#imgprog").text(Math.floor(per));
}, false); }, false);
xhr.send(); xhr.send();
$('#imgmodal').attr('src', murl); $('#imgmodal').attr('src', murl);

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

@ -39,12 +39,13 @@ function parseColumn() {
localStorage.setItem("user-id_" + key, acct.id); localStorage.setItem("user-id_" + key, acct.id);
localStorage.setItem("prof_" + key, acct.prof); localStorage.setItem("prof_" + key, acct.prof);
localStorage.setItem("domain_" + key, acct.domain); localStorage.setItem("domain_" + key, acct.domain);
localStorage.setItem(acct.domain + "_at", acct.at); localStorage.setItem("acct_"+ key + "_at", acct.at);
notf(key, 0); notf(key, 0);
ckdb(key); ckdb(key);
}); });
} }
var acctlist=obj; var acctlist=obj;
console.log(obj);
var xed=localStorage.getItem("xed"); var xed=localStorage.getItem("xed");
if(xed){ if(xed){
xpand(); xpand();
@ -93,8 +94,11 @@ function parseColumn() {
icnsert=' style="color: #'+ichex+'" '; icnsert=' style="color: #'+ichex+'" ';
} }
} }
if(acctlist[acct.domain].background!="def"){ console.log(acct.domain);
insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background; if(acctlist[acct.domain]){
if(acctlist[acct.domain].background!="def"){
insert=insert+" border-bottom:medium solid #"+acctlist[acct.domain].background;
}
} }
var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key + var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+ '" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+

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

@ -9,7 +9,7 @@ function settings() {
localStorage.setItem("datetype", dd); localStorage.setItem("datetype", dd);
var cd = $("[name=theme]:checked").val(); var cd = $("[name=theme]:checked").val();
var ct = $("[for="+cd+"]").text(); var ct = $("[for="+cd+"]").html();
if (cd != localStorage.getItem("theme")) { if (cd != localStorage.getItem("theme")) {
Materialize.toast("テーマ設定を" + ct + "に設定しました。", 3000); Materialize.toast("テーマ設定を" + ct + "に設定しました。", 3000);
} }
@ -95,9 +95,11 @@ function settings() {
localStorage.setItem("font", fontd); localStorage.setItem("font", fontd);
themes(); themes();
}else{ }else{
localStorage.removeItem("font"); if(localStorage.getItem("font")){
Materialize.toast("フォントをデフォルトに設定しました。", 3000); localStorage.removeItem("font");
themes(); Materialize.toast("フォントをデフォルトに設定しました。", 3000);
themes();
}
} }
@ -165,7 +167,7 @@ function settings() {
//読み込み時の設定ロード //読み込み時の設定ロード
function load() { function load() {
if(localStorage.getItem("kirishima")){ if(localStorage.getItem("imas")){
$(".imas").removeClass("hide"); $(".imas").removeClass("hide");
} }
var prof = localStorage.getItem("prof"); var prof = localStorage.getItem("prof");

32
app/js/ui/theme.js
View File

@ -7,33 +7,11 @@ function themes(theme) {
localStorage.setItem("theme","black"); localStorage.setItem("theme","black");
} }
} }
if (theme == "black") { $("html").removeClass("indigotheme");
$("html").removeClass("indigotheme"); $("html").removeClass("greentheme");
$("html").removeClass("greentheme"); $("html").removeClass("browntheme");
$("html").removeClass("browntheme"); $("html").removeClass("blacktheme");
$("html").addClass("blacktheme"); $("html").addClass(theme+"theme");
} else if (theme == "indigo") {
$("html").removeClass("blacktheme");
$("html").removeClass("greentheme");
$("html").removeClass("browntheme");
$("html").addClass("indigotheme");
} else if (theme == "green") {
$("html").removeClass("indigotheme");
$("html").removeClass("greentheme");
$("html").removeClass("browntheme");
$("html").removeClass("blacktheme");
$("html").addClass("greentheme");
} else if (theme == "brown") {
$("html").removeClass("indigotheme");
$("html").removeClass("greentheme");
$("html").removeClass("blacktheme");
$("html").addClass("browntheme");
} else{
$("html").removeClass("indigotheme");
$("html").removeClass("greentheme");
$("html").removeClass("browntheme");
$("html").removeClass("blacktheme");
}
var font = localStorage.getItem("font"); var font = localStorage.getItem("font");
if(font){ if(font){
$("html").css("font-family",font); $("html").css("font-family",font);

58
app/js/userdata/his-data.js
View File

@ -5,7 +5,7 @@ function utl(user, more, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (user == "--now") { if (user == "--now") {
var user = $('#his-data').attr("user-id"); var user = $('#his-data').attr("user-id");
} }
@ -49,7 +49,7 @@ function pinutl(before,user, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (user == "--now") { if (user == "--now") {
var user = $('#his-data').attr("user-id"); var user = $('#his-data').attr("user-id");
} }
@ -85,7 +85,7 @@ function flw(user, more, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (user == "--now") { if (user == "--now") {
var user = $('#his-data').attr("user-id"); var user = $('#his-data').attr("user-id");
} }
@ -129,7 +129,7 @@ function fer(user, more, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (user == "--now") { if (user == "--now") {
var user = $('#his-data').attr("user-id"); var user = $('#his-data').attr("user-id");
} }
@ -173,7 +173,7 @@ function showFav(more, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (more) { if (more) {
var sid = $("#his-fav-list .cvo").last().attr("toot-id"); var sid = $("#his-fav-list .cvo").last().attr("toot-id");
var plus = "?max_id=" + sid; var plus = "?max_id=" + sid;
@ -212,7 +212,7 @@ function showMut(more, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (more) { if (more) {
var sid = $("#his-muting-list .cvo").last().attr("user-id"); var sid = $("#his-muting-list .cvo").last().attr("user-id");
var plus = "?max_id=" + sid; var plus = "?max_id=" + sid;
@ -251,7 +251,7 @@ function showBlo(more, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (more) { if (more) {
var sid = $("#his-blocking-list .cvo").last().attr("user-id"); var sid = $("#his-blocking-list .cvo").last().attr("user-id");
var plus = "?max_id=" + sid; var plus = "?max_id=" + sid;
@ -290,7 +290,7 @@ function showReq(more, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (more) { if (more) {
var sid = $("#his-request-list .cvo").last().attr("user-id"); var sid = $("#his-request-list .cvo").last().attr("user-id");
var plus = "?max_id=" + sid; var plus = "?max_id=" + sid;
@ -329,7 +329,7 @@ function showDom(more, acct_id) {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
} }
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (more) { if (more) {
var sid = $("#his-domain-list .cvo").last().attr("user-id"); var sid = $("#his-domain-list .cvo").last().attr("user-id");
var plus = "?max_id=" + sid; var plus = "?max_id=" + sid;
@ -370,8 +370,48 @@ function showDom(more, acct_id) {
}); });
} }
//フォローレコメンデーションリスト
function showFrl(more, acct_id) {
if (!acct_id) {
var acct_id = $('#his-data').attr("use-acct");
}
var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem("acct_"+ acct_id + "_at");
if (more) {
var sid = $("#his-follow-recom-list .cvo").last().attr("user-id");
var plus = "?max_id=" + sid;
} else {
var plus = "";
}
var start = "https://" + domain + "/api/v1/suggestions" + plus
fetch(start, {
method: 'GET',
headers: {
'content-type': 'application/json',
'Authorization': 'Bearer ' + at
},
}).then(function(response) {
return response.json();
}).catch(function(error) {
$("#his-follow-recom-contents").html("データはありません(Mastodon 2.4.3~が必要です)<br>");
console.error(error);
}).then(function(json) {
if(!json[0]){
templete="データはありません(Mastodon 2.4.3~)<br>";
}
var templete = userparse(json,'',acct_id);
if (more) {
$("#his-follow-recom-contents").append(templete);
} else {
$("#his-follow-recom-contents").html(templete);
}
});
}
//ユーザーマッチングリスト //ユーザーマッチングリスト
function showMat() { function showMat() {
$("#his-matching-list-contents").html("30秒から数分かかります"); $("#his-matching-list-contents").html("30秒から数分かかります");
var full=$("#his-acct").attr("fullname"); var full=$("#his-acct").attr("fullname");
var acct_id=$("#his-data").attr("use-acct"); var acct_id=$("#his-data").attr("use-acct");

4
app/js/userdata/prof-edit.js
View File

@ -4,7 +4,7 @@ function profedit() {
var acct_id = $('#his-data').attr("use-acct"); var acct_id = $('#his-data').attr("use-acct");
todo("Updating..."); todo("Updating...");
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/update_credentials"; var start = "https://" + domain + "/api/v1/accounts/update_credentials";
var name = $("#his-name-val").val(); var name = $("#his-name-val").val();
var des = $("#his-des-val").val(); var des = $("#his-des-val").val();
@ -41,7 +41,7 @@ function imgChange(imgfile, target) {
var fd = new FormData(); var fd = new FormData();
fd.append(target, blob); fd.append(target, blob);
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/update_credentials"; var start = "https://" + domain + "/api/v1/accounts/update_credentials";
var httpreq = new XMLHttpRequest(); var httpreq = new XMLHttpRequest();
httpreq.open('PATCH', start, true); httpreq.open('PATCH', start, true);

7
app/js/userdata/showOnTL.js
View File

@ -21,7 +21,7 @@ function udgEx(user,acct_id){
} }
console.log(user); console.log(user);
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/search?resolve=true&q="+user var start = "https://" + domain + "/api/v1/search?resolve=true&q="+user
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',
@ -48,7 +48,7 @@ function udg(user, acct_id) {
} }
todo("User Data Loading..."); todo("User Data Loading...");
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/" + user; var start = "https://" + domain + "/api/v1/accounts/" + user;
console.log(start); console.log(start);
fetch(start, { fetch(start, {
@ -148,6 +148,7 @@ function udg(user, acct_id) {
showMut('', acct_id); showMut('', acct_id);
showDom('', acct_id); showDom('', acct_id);
showReq('', acct_id); showReq('', acct_id);
showFrl('', acct_id);
$("#his-name-val").val(json.display_name); $("#his-name-val").val(json.display_name);
$("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value)); $("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value));
$("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value)); $("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value));
@ -191,7 +192,7 @@ function profShow(){
//FF関係取得 //FF関係取得
function relations(user, acct_id) { function relations(user, acct_id) {
var domain = localStorage.getItem("domain_" + acct_id); var domain = localStorage.getItem("domain_" + acct_id);
var at = localStorage.getItem(domain + "_at"); var at = localStorage.getItem("acct_"+ acct_id + "_at");
var start = "https://" + domain + "/api/v1/accounts/relationships?id=" + user; var start = "https://" + domain + "/api/v1/accounts/relationships?id=" + user;
fetch(start, { fetch(start, {
method: 'GET', method: 'GET',

2
app/main.js
View File

@ -57,7 +57,7 @@ function createWindow() {
var platform=process.platform; var platform=process.platform;
var bit=process.arch; var bit=process.arch;
if(platform=="linux"){ if(platform=="linux"){
var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,icon: __dirname + '/thedesk.ico'} var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,icon: __dirname + '/thedesk.png'}
}else{ }else{
var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true} var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true}
} }

1
app/nano.html
View File

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<link href="./css/themes.css" type="text/css" rel="stylesheet">
<link href="./css/tl.css" type="text/css" rel="stylesheet"> <link href="./css/tl.css" type="text/css" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<title>TheDesk Nano</title> <title>TheDesk Nano</title>

1
app/oss.html
View File

@ -4,6 +4,7 @@
<title>OSS License - TheDesk</title> <title>OSS License - TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="./css/materialize.css" type="text/css" rel="stylesheet"> <link href="./css/materialize.css" type="text/css" rel="stylesheet">
<link href="./css/themes.css" type="text/css" rel="stylesheet">
<link href="./css/master.css" type="text/css" rel="stylesheet"> <link href="./css/master.css" type="text/css" rel="stylesheet">
<link href='./css/font-awesome.css' rel='stylesheet' type='text/css'> <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans|IBM+Plex+Mono" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans|IBM+Plex+Mono" rel="stylesheet">

2
app/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "TheDesk", "name": "TheDesk",
"version": "15.7.0", "version": "15.8.0",
"description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです", "description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

3
app/setting.html
View File

@ -4,6 +4,7 @@
<title>Settings - TheDesk</title> <title>Settings - TheDesk</title>
<meta content="width=device-width,initial-scale=1.0" name="viewport"> <meta content="width=device-width,initial-scale=1.0" name="viewport">
<link href="./css/materialize.css" type="text/css" rel="stylesheet"> <link href="./css/materialize.css" type="text/css" rel="stylesheet">
<link href="./css/themes.css" type="text/css" rel="stylesheet">
<link href="./css/master.css" type="text/css" rel="stylesheet"> <link href="./css/master.css" type="text/css" rel="stylesheet">
<link href='./css/font-awesome.css' rel='stylesheet' type='text/css'> <link href='./css/font-awesome.css' rel='stylesheet' type='text/css'>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300" rel="stylesheet">
@ -29,6 +30,8 @@
<label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label> <label for="indigo">Indigo<span class="imas hide">(エンドレスナイト)</span></label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" /> <input class="with-gap" onchange="settings()" name="theme" type="radio" id="brown" value="brown" />
<label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label> <label for="brown">Brown<span class="imas hide">(ビタースイート・タイム)</span></label>
<input class="with-gap" onchange="settings()" name="theme" type="radio" id="green" value="green" />
<label for="green">Green<span class="imas hide">(ユースフルロマンス)</span></label>
<br> <br>
<h5>新規通知のポップアップお知らせの表示秒数</h5>0に設定すると表示されません <h5>新規通知のポップアップお知らせの表示秒数</h5>0に設定すると表示されません
<br> <br>

2
ver.json
View File

@ -1 +1 @@
{"warn":"これはGCPにアップして下さい！！","warn2":"これはGCPにアップして下さい！！","warn3":"これはGCPにアップして下さい！！","desk":"Mio (15.7.0)","date":"2018-06-17","detail":"機能たくさん。バグ修正多数。アプデ後のアプリ内リリースノートなどで。"} {"warn":"これはGCPにアップして下さい！！","warn2":"これはGCPにアップして下さい！！","warn3":"これはGCPにアップして下さい！！","desk":"Mio (15.8.0)","desk_mac":"Mio (15.7.0)","date":"2018-06-17","detail":"複数アカウント、フォントなど。バグ修正多数。アプデ後のアプリ内リリースノートなどで。"}