diff --git a/app/about.html b/app/about.html index 1d5ccca2..6c253416 100644 --- a/app/about.html +++ b/app/about.html @@ -99,8 +99,6 @@ a,button{ var electron = require("electron"); var remote=electron.remote; const shell=electron.shell; - //JSON.parse(fs.readFileSync(info_path, 'utf8')); - console.log(process.versions); $("#node").text(process.version); $("#chrome").text(process.versions.chrome); $("#electron").text(process.versions.electron); diff --git a/app/adobe.html b/app/adobe.html index a606a499..0414375b 100644 --- a/app/adobe.html +++ b/app/adobe.html @@ -190,7 +190,6 @@ function launchEditor(id, src) { } function editPhoto() { - //console.log(this); var id = this.getAttribute("id"); var src = this.getAttribute("src"); launchEditor(id, src); diff --git a/app/css/master.css b/app/css/master.css index e4ece881..9f2d773a 100644 --- a/app/css/master.css +++ b/app/css/master.css @@ -392,7 +392,13 @@ blockquote:before, .quote:before { padding:4px; } #something-wrong{ - width:100%; height:100%; position:absolute; display:flex; justify-content: center; align-items:center + flex-direction: column; + width:100%; + height:100%; + position:absolute; + display:flex; + justify-content: center; + align-items:center; } /*スクロールバー*/ diff --git a/app/img/thinkingdesk.png b/app/img/thinkingdesk.png new file mode 100644 index 00000000..909f10bb Binary files /dev/null and b/app/img/thinkingdesk.png differ diff --git a/app/js/common/version.js b/app/js/common/version.js index be0c5d9f..6186bb99 100644 --- a/app/js/common/version.js +++ b/app/js/common/version.js @@ -1,9 +1,9 @@ //バージョンチェッカー function verck(ver) { - console.log("Welcome") + console.log("%c Welcome😊", "color: red;font-size:200%;") if(localStorage.getItem("ver")!=ver){ localStorage.setItem("ver", ver); - console.log("Thank you for your update"); + console.log("%c Thank you for your update🎉", "color: red;font-size:200%;"); $(document).ready(function(){ $('#releasenote').modal('open'); verp=ver.replace( '(', ''); @@ -13,7 +13,7 @@ function verck(ver) { verp=verp.replace( ']', ''); verp=verp.replace( ')', ''); verp=verp.replace( ' ', '_'); - console.log(verp); + console.log("%c "+verp, "color: red;font-size:200%;"); if(lang.language=="ja"){ $("#release-"+verp).show(); }else{ @@ -106,7 +106,7 @@ function verck(ver) { todo(error); console.error(error); }).then(function(mess) { - console.log(mess); + console.table(mess); if (mess) { var electron = require("electron"); var remote=electron.remote; @@ -128,7 +128,7 @@ function verck(ver) { var ipc = electron.ipcRenderer; ipc.send('update', "true"); }else{ - console.log(lang.lang_version_skipver); + console.warn(lang.lang_version_skipver); todo(lang.lang_version_skipver); } }else{ @@ -141,9 +141,7 @@ function verck(ver) { if(!localStorage.getItem("last-notice-id")){ localStorage.setItem("last-notice-id",0) } - console.log(localStorage.getItem("last-notice-id")) var start = "https://thedesk.top/notice?since_id="+localStorage.getItem("last-notice-id"); - console.log(start); fetch(start, { method: 'GET' }).then(function(response) { @@ -152,7 +150,6 @@ function verck(ver) { todo(error); console.error(error); }).then(function(mess) { - console.log(mess.length); if(mess.length<1){ return false; }else{ @@ -202,13 +199,11 @@ var infostreaming=false; function infowebsocket(){ infows = new WebSocket("wss://thedesk.top/ws/"); infows.onopen = function(mess) { - console.log(tlid + ":Connect Streaming Info:"); - console.log(mess); + console.log([tlid,":Connect Streaming Info:",mess]); infostreaming=true; } infows.onmessage = function(mess) { - console.log(":Receive Streaming:"); - console.log(JSON.parse(mess.data)); + console.log([tlid,":Receive Streaming:",JSON.parse(mess.data)]); var obj=JSON.parse(mess.data); if(obj.type!="counter"){ localStorage.setItem("last-notice-id",obj.id) @@ -258,7 +253,22 @@ function infowebsocket(){ } setInterval(function(){ if(!infostreaming){ - console.log("try to connect") + console.log("try to connect to base-streaming") infowebsocket(); } -}, 10000); \ No newline at end of file +}, 10000); +function openRN(){ + $('#releasenote').modal('open'); + if(lang.language=="ja"){ + verp=ver.replace( '(', ''); + verp=verp.replace( '.', '-'); + verp=verp.replace( '.', '-'); + verp=verp.replace( '[', '-'); + verp=verp.replace( ']', ''); + verp=verp.replace( ')', ''); + verp=verp.replace( ' ', '_'); + $("#release-"+verp).show(); + }else{ + $("#release-en").show(); + } +} \ No newline at end of file diff --git a/app/js/emoji/default-emoji.js b/app/js/emoji/default-emoji.js index 3ec3019a..24dd5810 100644 --- a/app/js/emoji/default-emoji.js +++ b/app/js/emoji/default-emoji.js @@ -42,7 +42,6 @@ function defaultEmoji(target){ }); $("#emoji-list").html(emojis); $("#now-emoji").text(lang.lang_defaultemojis_text.replace("{{cat}}" ,defaultemojiname[target])); - console.log(target); $(".emoji-control").addClass("hide"); } function customEmoji(){ @@ -60,7 +59,6 @@ function defEmoji(target){ }else{ emoji=twemoji.convert.fromCodePoint(hex[0]); } - console.log(emoji) var now = $("#textarea").val(); var selin = localStorage.getItem("cursor"); var now = $("#textarea").val(); @@ -71,7 +69,6 @@ function defEmoji(target){ }else{ newt = emoji+now; } - console.log(emoji); $("#textarea").val(newt); $("#textarea").focus(); var selin = $("#textarea").prop('selectionStart'); @@ -82,7 +79,6 @@ function defEmoji(target){ } function faicon(){ var json=faicons; - console.log(json); var emojis=""; Object.keys(json).forEach(function(key) { var emoji = json[key]; diff --git a/app/js/login/login.js b/app/js/login/login.js index e3cef8b4..40b66a8d 100644 --- a/app/js/login/login.js +++ b/app/js/login/login.js @@ -40,6 +40,7 @@ if (obj[0].domain) { ticker(); multiSelector(); verck(ver); + $("#something-wrong img").attr("src","../../img/thinkingdesk.png") } } } @@ -68,7 +69,6 @@ function login(url) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); var auth = "https://" + url + "/oauth/authorize?client_id=" + json[ "client_id"] + "&client_secret=" + json["client_secret"] + "&response_type=code&redirect_uri="+red+"&scope=read+write+follow"; @@ -162,7 +162,6 @@ function getdata() { todo(error); console.error(error); }).then(function(json) { - console.log(json); if (json.error) { console.error("Error:" + json.error); Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error, @@ -184,7 +183,6 @@ function getdata() { vis: json["source"]["privacy"] }]; var json = JSON.stringify(obj); - console.log(obj); localStorage.setItem("multi", json); localStorage.setItem("name_" + acct_id, json["display_name"]); localStorage.setItem("user_" + acct_id, json["acct"]); @@ -212,7 +210,6 @@ function getdataAdv(domain, at) { todo(error); console.error(error); }).then(function(json) { - console.log(json); if (json.error) { console.error("Error:" + json.error); Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error, @@ -246,7 +243,6 @@ function getdataAdv(domain, at) { localStorage.setItem("user_" + target, json["acct"]); localStorage.setItem("user-id_" + target, json["id"]); localStorage.setItem("prof_" + target, avatar); - console.log(obj); var json = JSON.stringify(obj); localStorage.setItem("multi", json); location.href="index.html"; @@ -261,7 +257,6 @@ function refresh(target,loadskip) { } var start = "https://" + obj[target].domain + "/api/v1/accounts/verify_credentials"; - console.log(start); fetch(start, { method: 'GET', headers: { @@ -274,7 +269,6 @@ function refresh(target,loadskip) { todo(error); console.error(error); }).then(function(json) { - console.log(json); if (json.error) { console.error("Error:" + json.error); Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error, @@ -298,8 +292,6 @@ function refresh(target,loadskip) { localStorage.setItem("name_" + target, json["display_name"]); localStorage.setItem("user_" + target, json["acct"]); localStorage.setItem("user-id_" + target, json["id"]); - console.log("user-id_" + target+":"+json["id"]) - console.log(localStorage.getItem("user-id_"+target)); localStorage.setItem("prof_" + target, avatar); localStorage.setItem("follow_" + target, json["following_count"]); obj[target] = ref; @@ -359,7 +351,6 @@ function ckdb(acct_id) { localStorage.removeItem("bb_" + acct_id); } if(json[domain + "_home"]){ - console.log("unique name:"+json[domain + "_home"]); localStorage.setItem("home_" + acct_id, json[domain + "_home"]); } if(json[domain + "_local"]){ @@ -396,8 +387,8 @@ function ckdb(acct_id) { }).catch(function(error) { console.error(error); }).then(function(json) { - console.log(json); if (json.error) { + console.error(json.error); return; } if(json){ @@ -461,12 +452,10 @@ function multiSelector() { } var profimg = acct.prof; localStorage.setItem("prof_" + key, profimg); - console.log(profimg); if(!profimg){ profimg="../../img/missing.svg"; } $("#acct-sel-prof").attr("src",profimg); - console.log(domain); if(domain){ var cc="("+domain+")"; }else{ diff --git a/app/js/login/manager.js b/app/js/login/manager.js index 9c476257..ebccc598 100644 --- a/app/js/login/manager.js +++ b/app/js/login/manager.js @@ -32,7 +32,7 @@ function load() { } } - console.log(obj); + console.table(obj); var templete; Object.keys(obj).forEach(function(key) { var acct = obj[key]; @@ -99,7 +99,6 @@ function data(domain) { todo(error); console.error(error); }).then(function(json) { - console.log(json); if (!json.error) { $("#ins-name").text(json.name); $("#ins-upd").text(date(json.checked_at, 'full')); @@ -110,6 +109,8 @@ function data(domain) { $("#ins-per").text(json.uptime * 100); $("#ins-user").text(json.users); $("#ins-ver").text(json.version); + }else{ + console.error(json.error); } }); var start = "https://" + domain +"/api/v1/instance"; @@ -124,7 +125,6 @@ function data(domain) { todo(error); console.error(error); }).then(function(json) { - console.log(json); if (!json.error) { $("#ins-title").text(json.title); $("#ins-desc").html(json.description); @@ -135,6 +135,8 @@ function data(domain) { $("#ins-prof").attr('src', json.thumbnail); $("#ins-admin").text(escapeHTML(json.contact_account.display_name)+"("+json.contact_account.acct+")"); $("#ins-admin").attr("href","index.html?mode=user&code="+json.contact_account.username+"@"+domain); + }else{ + console.error(json.error); } }); } @@ -150,7 +152,6 @@ function multiDel(target) { //公開範囲(差分のみ) if(key>=target){ var oldvis=localStorage.getItem("vis-memory-"+key); - console.log(oldvis); if(oldvis){ localStorage.setItem("vis-memory-"+nk,oldvis); } @@ -175,7 +176,6 @@ function multiDel(target) { }); //とりあえず消す obj.splice(target, 1); - console.log(obj); var json = JSON.stringify(obj); localStorage.setItem("multi", json); load(); @@ -216,7 +216,6 @@ function multiDel2(target) { 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); @@ -287,7 +286,6 @@ function login(url) { }else{ var red = 'thedesk://manager'; } - console.log(red); localStorage.setItem("redirect", red); var start = "https://" + url + "/api/v1/apps"; var httpreq = new XMLHttpRequest(); @@ -303,7 +301,6 @@ function login(url) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); localStorage.setItem("msky","false"); var auth = "https://" + url + "/oauth/authorize?client_id=" + json[ "client_id"] + "&client_secret=" + json["client_secret"] + @@ -389,7 +386,6 @@ function misskeyLogin(url) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); misskeyAuth(url, json.secret) } } @@ -411,7 +407,6 @@ function misskeyAuth(url, mkc){ httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); const { shell } = require('electron'); @@ -445,7 +440,6 @@ function code(code) { } var url = localStorage.getItem("domain_tmp"); localStorage.removeItem("domain_tmp"); - console.log(localStorage.getItem("msky")); if(localStorage.getItem("msky")=="true"){ var start = "https://"+url+"/api/auth/session/userkey"; var httpreq = new XMLHttpRequest(); @@ -460,7 +454,6 @@ function code(code) { if (httpreq.readyState === 4) { var json = httpreq.response; var i = sha256(json.accessToken + localStorage.getItem("mkc")); - console.log(json); var avatar=json["user"]["avatarUrl"]; var priv="public"; var add = { @@ -482,7 +475,6 @@ function code(code) { localStorage.setItem("user_" + target, json["user"]["username"]); localStorage.setItem("user-id_" + target, json["user"]["id"]); localStorage.setItem("prof_" + target, avatar); - console.log(obj); var json = JSON.stringify(obj); localStorage.setItem("multi", json); if($("body").hasClass("first")){ @@ -511,7 +503,6 @@ function code(code) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); if (json["access_token"]) { $("#auth").hide(); $("#add").show(); @@ -537,7 +528,6 @@ function getdata(domain, at) { todo(error); console.error(error); }).then(function(json) { - console.log(json); if (json.error) { console.error("Error:" + json.error); Materialize.toast(lang.lang_fatalerroroccured+"Error:" + escapeHTML(json.error), @@ -572,7 +562,6 @@ function getdata(domain, at) { localStorage.setItem("user_" + target, json["acct"]); localStorage.setItem("user-id_" + target, json["id"]); localStorage.setItem("prof_" + target, avatar); - console.log(obj); var json = JSON.stringify(obj); localStorage.setItem("multi", json); if($("body").hasClass("first")){ @@ -592,7 +581,6 @@ function refresh(target) { } var start = "https://" + obj[target].domain + "/api/v1/accounts/verify_credentials"; - console.log(start); fetch(start, { method: 'GET', headers: { @@ -605,7 +593,6 @@ function refresh(target) { todo(error); console.error(error); }).then(function(json) { - console.log(json); if (json.error) { console.error("Error:" + json.error); Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error, @@ -629,8 +616,6 @@ function refresh(target) { localStorage.setItem("name_" + target, json["display_name"]); localStorage.setItem("user_" + target, json["acct"]); localStorage.setItem("user-id_" + target, json["id"]); - console.log("user-id_" + target+":"+json["id"]) - console.log(localStorage.getItem("user-id_"+target)); localStorage.setItem("prof_" + target, avatar); obj[target] = ref; var json = JSON.stringify(obj); @@ -652,7 +637,6 @@ function misskeyRefresh(obj,target,url){ httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); return; var avatar=json["user"]["avatarURL"]; var priv="public"; @@ -673,7 +657,6 @@ function misskeyRefresh(obj,target,url){ localStorage.setItem("user_" + target, json["user"]["username"]); localStorage.setItem("user-id_" + target, json["user"]["id"]); localStorage.setItem("prof_" + target, avatar); - console.log(obj); var json = JSON.stringify(obj); localStorage.setItem("multi", json); load(); @@ -694,7 +677,6 @@ function multisel() { var templete; var last = localStorage.getItem("main"); var sel; - console.log(obj.length) if(obj.length<1){ $("#src-acct-sel").html(''); $("#add-acct-sel").html(''); @@ -808,9 +790,7 @@ input.addEventListener("focus", function() { todo(error); console.error(error); }).then(function(json) { - console.log(json); - if (!json.error) { - + if (!json.error) { var urls = "Suggest:"; Object.keys(json.instances).forEach(function(key) { var url = json.instances[key]; @@ -818,6 +798,8 @@ input.addEventListener("focus", function() { '\')" class="pointer">' +escapeHTML(url.name) + ' '; }); $("#ins-suggest").html(urls); + }else{ + console.error(json.error); } }); } diff --git a/app/js/platform/end.js b/app/js/platform/end.js index 7bb937c1..4e047ba2 100644 --- a/app/js/platform/end.js +++ b/app/js/platform/end.js @@ -21,7 +21,6 @@ ats = url.match( /https:\/\/([-a-zA-Z0-9.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\&=+\$,%#@]+)/ ); - console.log(toot); if(toot){ if(toot[1]){ var acct_id=$a.parent().attr("data-acct"); @@ -42,7 +41,6 @@ tl('tag',decodeURI(tags[2]),acct_id,'add') } }else if(ats){ - console.log(ats); if(ats[2]){ //Quesdon判定 if(!~ats[2].indexOf("@")){ @@ -81,39 +79,6 @@ }); //よく使うライブラリ - /*マルチバイト用切り出し*/ - $.isSurrogatePear = function(upper, lower) { - return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <= 0xDFFF; - }; - $.mb_strlen = function(str) { - var ret = 0; - for (var i = 0; i < str.length; i++, ret++) { - var upper = str.charCodeAt(i); - var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0; - if ($.isSurrogatePear(upper, lower)) { - i++; - } - } - return ret; - }; - $.mb_substr = function(str, begin, end) { - var ret = ''; - for (var i = 0, len = 0; i < str.length; i++, len++) { - var upper = str.charCodeAt(i); - var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0; - var s = ''; - if ($.isSurrogatePear(upper, lower)) { - i++; - s = String.fromCharCode(upper, lower); - } else { - s = String.fromCharCode(upper); - } - if (begin <= len && len < end) { - ret += s; - } - } - return ret; - }; //コピー function execCopy(string){ @@ -132,7 +97,7 @@ function nano(){ function progshow(e) { if (e.lengthComputable) { var percent = e.loaded / e.total; - console.log(percent * 100); + console.log("Progress: "+percent * 100); $("#imgsel").hide(); if(percent<1){ $("#imgup").text(Math.floor(percent*100)+"%"); @@ -187,7 +152,7 @@ function playSound() { context = new AudioContext(); context.createBufferSource().start(0); context.decodeAudioData(request.response, function (buf) { - console.log(source) + console.log("Playing:"+source) source.buffer = buf; source.loop = false; }); @@ -196,6 +161,5 @@ function playSound() { source.connect(volumeControl); volumeControl.connect(context.destination); volumeControl.gain.value=0.8 - console.log(volumeControl) source.start(0); } \ No newline at end of file diff --git a/app/js/platform/first.js b/app/js/platform/first.js index 4f1525d4..9b5c2749 100644 --- a/app/js/platform/first.js +++ b/app/js/platform/first.js @@ -164,4 +164,37 @@ function rgbToHex(color) } console.error(color+':第1引数はRGB形式で入力'); -} \ No newline at end of file +} + /*マルチバイト用切り出し*/ + $.isSurrogatePear = function(upper, lower) { + return 0xD800 <= upper && upper <= 0xDBFF && 0xDC00 <= lower && lower <= 0xDFFF; + }; + $.mb_strlen = function(str) { + var ret = 0; + for (var i = 0; i < str.length; i++, ret++) { + var upper = str.charCodeAt(i); + var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0; + if ($.isSurrogatePear(upper, lower)) { + i++; + } + } + return ret; + }; + $.mb_substr = function(str, begin, end) { + var ret = ''; + for (var i = 0, len = 0; i < str.length; i++, len++) { + var upper = str.charCodeAt(i); + var lower = str.length > (i + 1) ? str.charCodeAt(i + 1) : 0; + var s = ''; + if ($.isSurrogatePear(upper, lower)) { + i++; + s = String.fromCharCode(upper, lower); + } else { + s = String.fromCharCode(upper); + } + if (begin <= len && len < end) { + ret += s; + } + } + return ret; + }; \ No newline at end of file diff --git a/app/js/platform/nano.js b/app/js/platform/nano.js index e960e293..efc0e7df 100644 --- a/app/js/platform/nano.js +++ b/app/js/platform/nano.js @@ -14,7 +14,6 @@ function tl(data) { $("#notice_nano").text(cap(type, data) + " TL(" + localStorage.getItem( "user_" + acct_id) + "@" + domain + ")"); var start = "https://" + domain + "/api/v1/timelines/" + com(type, data); - console.log(start); fetch(start, { method: 'GET', headers: { @@ -46,17 +45,12 @@ var websocket=[]; var start = "wss://" + domain + "/api/v1/streaming/?stream=hashtag&tag=" + data +"&access_token=" + at; } - console.log(start); var wsid = websocket.length; websocket[wsid] = new WebSocket(start); websocket[wsid].onopen = function(mess) { - console.log(tlid + ":Connect Streaming API:" + type); - console.log(mess); $("#notice_icon_" + tlid).removeClass("red-text"); } websocket[wsid].onmessage = function(mess) { - console.log(tlid + ":Receive Streaming API:"); - console.log(websocket[wsid]); var typeA = JSON.parse(mess.data).event; if (typeA == "delete") { var obj = JSON.parse(mess.data).payload; @@ -64,12 +58,11 @@ var websocket=[]; $("[toot-id=" + JSON.parse(mess.data).payload + "]").remove(); } else if (typeA == "update") { var obj = JSON.parse(JSON.parse(mess.data).payload); - console.log(obj); var templete = parse([obj], '', acct_id, tlid); $("#timeline_nano").html(templete); } websocket[wsid].onclose = function(mess) { - console.log("Close Streaming API:" + type); + console.error("Close Streaming API:" + type); } } websocket[wsid].onerror = function(error) { diff --git a/app/js/post/emoji.js b/app/js/post/emoji.js index 19038798..0b4e4609 100644 --- a/app/js/post/emoji.js +++ b/app/js/post/emoji.js @@ -179,7 +179,6 @@ function emojiInsert(code, del) { } else { var brank = " "; } - console.log(selin); var now = $("#textarea").val(); if (selin > 0) { var before = now.substr(0, selin); diff --git a/app/js/post/img.js b/app/js/post/img.js index cc3c45b9..f602874f 100644 --- a/app/js/post/img.js +++ b/app/js/post/img.js @@ -36,7 +36,7 @@ $("#drag").on('dragleave', function(e) { //複数アップ function pimg(files) { - console.log(files); + console.table(files); for (i = 0; i < files.length; i++) { var dot=files[i].path.match(/\.(.+)$/)[1]; if(dot=="bmp" || dot=="BMP"){ @@ -95,7 +95,6 @@ function media(b64, type, no) { localStorage.setItem("image","busy"); todo("Image Upload..."); var media = toBlob(b64, type); - console.log(media); var fd = new FormData(); fd.append('file', media); var acct_id = $("#post-acct-sel").val(); @@ -128,7 +127,6 @@ function media(b64, type, no) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); var img = localStorage.getItem("img"); if (json.type.indexOf("image")!=-1) { var html = ''; @@ -182,14 +180,13 @@ function toBlob(base64, type) { //画像を貼り付けたら… var element = document.querySelector("#textarea"); element.addEventListener("paste", function(e){ - console.log(e) if (!e.clipboardData || !e.clipboardData.items) { return true; } // DataTransferItemList に画像が含まれいない場合は終了する var imageItems = [...e.clipboardData.items].filter(i => i.type.startsWith('image')); if (imageItems.length == 0) { - console.log("not image") + console.warn("it is not image") return true; } @@ -223,7 +220,6 @@ ipc.on('adobeagree', function (event, arg) { localStorage.setItem("adobeagree",arg); }); function deleteImage(key){ - console.log(key); if(!confirm(lang.lang_postimg_delete)){ return false; } diff --git a/app/js/post/misskeystatus.js b/app/js/post/misskeystatus.js index f03ce09b..fb670b4d 100644 --- a/app/js/post/misskeystatus.js +++ b/app/js/post/misskeystatus.js @@ -17,7 +17,7 @@ function renote(id, acct_id, remote) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); + console.log(["Success: renote",json]); $("[toot-id=" + id + "]").addClass("rted"); $(".rt_"+id).toggleClass("teal-text"); } @@ -63,7 +63,7 @@ function reactiontoggle(id,acct_id,tlid){ httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); + console.log(["Success: reaction",json]); if(json.reactions){ var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding","rip"]; for(var i=0;i'); } }); @@ -307,7 +306,7 @@ function pin(id, acct_id) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); + console.log(["Success: pinned",json]); if ($("[toot-id=" + id + "]").hasClass("pined")) { $("[toot-id=" + id + "]").removeClass("pined"); $(".pin_" + id).removeClass("blue-text"); @@ -333,7 +332,7 @@ function request(id, flag, acct_id) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); + console.log(["Success: request","type:"+flag,json]); showReq(); } } @@ -356,7 +355,7 @@ function domainblock(add, flag, acct_id) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); + console.log(["Success: domain block",json]); showDom(); } } @@ -371,7 +370,6 @@ function empUser(){ var usr = localStorage.getItem("user_emp"); var obj = JSON.parse(usr); var id=$("#his-acct").attr("fullname"); - console.log(id); if(!obj){ var obj=[]; obj.push(id); @@ -413,7 +411,6 @@ function pinUser(){ httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); if ($("#his-end-btn").hasClass("endorsed")) { $("#his-end-btn").removeClass("endorsed") $("#his-end-btn").text(lang.lang_status_endorse) diff --git a/app/js/post/suggest.js b/app/js/post/suggest.js index ba5a9188..4e837b67 100644 --- a/app/js/post/suggest.js +++ b/app/js/post/suggest.js @@ -68,7 +68,7 @@ input.addEventListener("focus", function() { var at = localStorage.getItem("acct_"+ acct_id + "_at"); suggest = "https://" + domain + "/api/v1/search?q=" + q if (suggest != oldSuggest) { - console.log(suggest) + console.log("Try to get suggest at "+suggest) fetch(suggest, { method: 'GET', headers: { @@ -152,7 +152,7 @@ function tagInsert(code, del) { function cgNPs(q){ suggest = "https://cg.toot.app/api/v1/search/light?q=" + q if (suggest != oldSuggest) { - console.log(suggest) + console.log("Try to get suggest at "+suggest) fetch(suggest, { method: 'GET', headers: { @@ -164,7 +164,6 @@ function cgNPs(q){ todo(error); console.error(error); }).then(function(json) { - console.log(json); if (json[0]) { var tags = ""; Object.keys(json).forEach(function(key4) { diff --git a/app/js/tl/card.js b/app/js/tl/card.js index 1b638c14..dfe32800 100644 --- a/app/js/tl/card.js +++ b/app/js/tl/card.js @@ -170,9 +170,7 @@ function additionalIndv(tlid, acct_id, id) { todo(error); console.error(error); }).then(function(json) { - console.log(json); //このリンク鳥やんけ、ってとき - console.log(json.provider_name); if (json.provider_name=="Twitter"){ if(json.image){ var twiImg='
'; @@ -243,7 +241,6 @@ function mov(id,tlid,type){ }else{ var tlide="[tlid="+tlid+"]"; } - console.log(tlid) var mouseover=localStorage.getItem("mouseover"); if(!mouseover){ mouseover=""; diff --git a/app/js/tl/datails.js b/app/js/tl/datails.js index 8c305119..11ac64bc 100644 --- a/app/js/tl/datails.js +++ b/app/js/tl/datails.js @@ -40,7 +40,7 @@ function details(id, acct_id, tlid, mode) { todo(error); console.error(error); }).then(function(json) { - console.log(json); + console.log(["Toot data:",json]); if(!$("#timeline_"+tlid+" #pub_" + id).length){ var html = parse([json], '', acct_id); $("#toot-this").html(html); @@ -208,7 +208,6 @@ function context(id, acct_id) { }).then(function(json) { if(localStorage.getItem("mode_" + domain)=="misskey"){ json.reverse(); - console.log(json); var templete = misskeyParse(json, '', acct_id,"","",[]); $("#toot-reply").html(templete); $("#toot-reply .hide").html(lang.lang_details_filtered); @@ -482,7 +481,7 @@ function staCopy(id){ html = html.replace(//, "\n"); html = html.replace(/

/, "\n"); html = html.replace(/<\/p>/, "\n"); - console.log(html); + console.log("Copy it:\n"+html); html = html.replace(//g, "$1"); html=$.strip_tags(html); if(execCopy(html)){ @@ -505,7 +504,7 @@ function trans(tar,to){ } $("#toot-this .additional").text("Loading...(Powered by Google Translate)"); var exec='https://script.google.com/macros/s/AKfycbxhwW5tjjop9Irg-y1zr_WsXlCKEzwWG6KuoOt_vVRDfEbRv0c/exec?format=json&text='+encodeURIComponent(html)+'&source='+tar+'&target='+to - console.log(exec); + console.log("Try to translate from "+tar+" to "+to+" at "+exec); fetch(exec, { method: 'GET', }).then(function(response) { diff --git a/app/js/tl/dm.js b/app/js/tl/dm.js index 657b0d3a..92bf4fe0 100644 --- a/app/js/tl/dm.js +++ b/app/js/tl/dm.js @@ -57,7 +57,6 @@ function dmmore(tlid){ } //DMオブジェクトパーサー(トゥート) function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) { - console.log(obj); var templete = ''; if(obj[0]){ localStorage.setItem("lastunix_"+ tlid,date(obj[0].created_at, 'unix')); diff --git a/app/js/tl/filter.js b/app/js/tl/filter.js index e1030a08..319ddde6 100644 --- a/app/js/tl/filter.js +++ b/app/js/tl/filter.js @@ -114,7 +114,6 @@ function filter(){ var domain = localStorage.getItem("domain_" + acct_id); var at = localStorage.getItem("acct_"+ acct_id + "_at"); var start = "https://" + domain + "/api/v1/filters" - console.log(start) fetch(start, { method: 'GET', headers: { @@ -127,7 +126,6 @@ function filter(){ todo(error); console.error(error); }).then(function(json) { - console.log(json); if (json) { var filters = ""; Object.keys(json).forEach(function(key) { @@ -167,7 +165,6 @@ function makeNewFilter(){ if($("#conv_filter:checked").val()){ cont.push("thread"); } - console.log(cont); if(!cont.length){ $("#filtered-words").html('Error:'+lang.lang_filter_errordegree); } @@ -235,7 +232,6 @@ function filterEdit(id,acct_id){ var domain = localStorage.getItem("domain_" + acct_id); var at = localStorage.getItem("acct_"+ acct_id + "_at"); var start = "https://" + domain + "/api/v1/filters/"+id - console.log(start) fetch(start, { method: 'GET', headers: { @@ -248,7 +244,6 @@ function filterEdit(id,acct_id){ todo(error); console.error(error); }).then(function(json) { - console.log(json); if (json) { var now = new Date() ; now = now.getTime() ; @@ -297,7 +292,6 @@ function getFilter(acct_id){ var at = localStorage.getItem("acct_"+ acct_id + "_at"); if(localStorage.getItem("mode_" + domain)!="misskey"){ var start = "https://" + domain + "/api/v1/filters" - console.log(start) fetch(start, { method: 'GET', headers: { @@ -341,7 +335,6 @@ function filterUpdate(acct_id){ var domain = localStorage.getItem("domain_" + acct_id); var at = localStorage.getItem("acct_"+ acct_id + "_at"); var start = "https://" + domain + "/api/v1/filters" - console.log(start) fetch(start, { method: 'GET', headers: { diff --git a/app/js/tl/list.js b/app/js/tl/list.js index 109dee45..6e5eb977 100644 --- a/app/js/tl/list.js +++ b/app/js/tl/list.js @@ -40,7 +40,6 @@ function list(){ }); }else{ var start = "https://" + domain + "/api/v1/lists" - console.log(start) fetch(start, { method: 'GET', headers: { @@ -75,7 +74,6 @@ function makeNewList(){ var at = localStorage.getItem("acct_"+ acct_id + "_at"); if(localStorage.getItem("mode_" + domain)!="misskey"){ var start = "https://" + domain + "/api/v1/lists" - console.log(start) var httpreq = new XMLHttpRequest(); httpreq.open('POST', start, true); httpreq.setRequestHeader('Content-Type', 'application/json'); @@ -93,7 +91,6 @@ function makeNewList(){ } }else{ var start = "https://" + domain + "/api/users/lists/create" - console.log(start) var httpreq = new XMLHttpRequest(); httpreq.open('POST', start, true); httpreq.setRequestHeader('Content-Type', 'application/json'); @@ -119,7 +116,6 @@ function listUser(id,acct_id){ var domain = localStorage.getItem("domain_" + acct_id); var at = localStorage.getItem("acct_"+ acct_id + "_at"); var start = "https://" + domain + "/api/v1/lists/"+id+"/accounts" - console.log(start) fetch(start, { method: 'GET', headers: { @@ -149,7 +145,6 @@ function hisList(user,acct_id){ var at = localStorage.getItem("acct_"+ acct_id + "_at"); if(localStorage.getItem("mode_" + domain)!="misskey"){ var start = "https://" + domain + "/api/v1/lists" - console.log(start) fetch(start, { method: 'GET', headers: { @@ -175,7 +170,6 @@ function hisList(user,acct_id){ } }); var start = "https://" + domain + "/api/v1/accounts/"+user+"/lists" - console.log(start) fetch(start, { method: 'GET', headers: { @@ -245,7 +239,6 @@ function listAdd(id,user,acct_id){ account_ids: [user] } } - console.log(start) var httpreq = new XMLHttpRequest(); httpreq.open('POST', start, true); httpreq.setRequestHeader('Content-Type', 'application/json'); @@ -277,7 +270,6 @@ function listRemove(id,user,acct_id){ account_ids: [user] } } - console.log(start) var httpreq = new XMLHttpRequest(); httpreq.open(method, start, true); httpreq.setRequestHeader('Content-Type', 'application/json'); diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js index 3a8c7040..e5fcc35c 100644 --- a/app/js/tl/misskeyparse.js +++ b/app/js/tl/misskeyparse.js @@ -857,7 +857,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) { //オブジェクトパーサー(ユーザーデータ) function misskeyUserparse(obj, auth, acct_id, tlid, popup) { - console.log(obj) + console.log(["Parse them ",obj]) if (popup > 0 || popup == -1) { } else { @@ -984,15 +984,14 @@ function connectMisskey(acct_id) { localStorage.setItem("misskey_wss_" + acct_id, wsid); misskeyws[wsid] = new WebSocket(start); misskeyws[wsid].onopen = function (mess) { - console.log(tlid + ":Connect Streaming API:"+domain); - console.log(mess); + console.table({"tlid":tlid,"type":"Connect Streaming API","domain":domain,"message":[mess]}) misskeywsstate[wsid]=true //$("#notice_icon_" + tlid).removeClass("red-text"); var send='{"type":"connect","body":{"channel":"main","id":"notf:'+acct_id+'"}}' misskeyws[wsid].send(send) } misskeyws[wsid].onmessage = function (mess) { - console.log(acct_id + ":Receive Streaming API:"); + console.log([domain + ":Receive Streaming API:",data]); var data=JSON.parse(mess.data) var obj=data.body.body @@ -1010,7 +1009,7 @@ function connectMisskey(acct_id) { templete = misskeyUserparse([obj.body], 'notf', acct_id, 'notf', popup); } if(JSON.parse(mess.data).body.type=="reaction"){ - console.log("refresh") + console.log("reaction refresh") reactRefresh(acct_id,obj.body.note.id) } if(!$("div[data-notfIndv=" + acct_id +"_"+obj.body.id+"]").length){ @@ -1048,7 +1047,6 @@ function connectMisskey(acct_id) { jQuery("time.timeago").timeago(); }else if (data.type == "noteUpdated") { if(data.body.type=="reacted"){ - console.log(data.body.id) reactRefresh(acct_id,data.body.id) }else if(data.body.type=="deleted"){ $("#pub_"+data.body.id).hide(); @@ -1058,15 +1056,14 @@ function connectMisskey(acct_id) { } } misskeyws[wsid].onerror = function (error) { - console.error("Error closing"); + console.error("Error closing "+tlid); console.error(error); misskeywsstate[wsid]=false connectMisskey(acct_id) return false; }; misskeyws[wsid].onclose = function () { - console.log("Closing"); - console.log(tlid); + console.warn("Closing "+tlid); misskeywsstate[wsid]=false connectMisskey(acct_id) return false; diff --git a/app/js/tl/mix.js b/app/js/tl/mix.js index 7b2ea0e0..63126a0e 100644 --- a/app/js/tl/mix.js +++ b/app/js/tl/mix.js @@ -1,6 +1,5 @@ //Integrated TL function mixtl(acct_id, tlid, type,delc,voice) { - console.log(delc); localStorage.removeItem("morelock") localStorage.setItem("now", type); todo("Integrated TL Loading...(Local)"); @@ -94,21 +93,18 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { websocketLocal[wslid] = new WebSocket(startLocal); websocketHome[wshid].onopen = function(mess) { localStorage.setItem("wssH_" + tlid, wshid); - console.log(tlid + ":Connect Streaming API(Integrated:Home)"); - console.log(mess); + console.table({"tlid":tlid,"type":"Connect Streaming API(Integrated:Home)","domain":domain,"message":mess}) $("#notice_icon_" + tlid).removeClass("red-text"); } websocketLocal[wslid].onopen = function(mess) { localStorage.setItem("wssL_" + tlid, wslid); - console.log(tlid + ":Connect Streaming API(Integrated:Local)"); - console.log(mess); + console.table({"tlid":tlid,"type":"Connect Streaming API(Integrated:Local)","domain":domain,"message":mess}) $("#notice_icon_" + tlid).removeClass("red-text"); } websocketLocal[wslid].onmessage = function(mess) { - console.log("Receive Streaming API:(Integrated:Local)"); + console.log(["Receive Streaming API:(Integrated:Local)",obj]); var obj = JSON.parse(JSON.parse(mess.data).payload); - console.log(obj); var type = JSON.parse(mess.data).event; if (type == "delete") { if(delc=="true"){ @@ -145,10 +141,8 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { } } websocketHome[wshid].onmessage = function(mess) { - console.log("Receive Streaming API:(Integrated:Home)"); - + console.log(["Receive Streaming API:(Integrated:Home)",obj]); var obj = JSON.parse(JSON.parse(mess.data).payload); - console.log(obj); var type = JSON.parse(mess.data).event; if (type == "delete") { if(del>10){ @@ -211,7 +205,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { } }; websocketLocal[wslid].onclose = function() { - console.log('WebSocketLocal Closing:' + tlid); + console.warn('WebSocketLocal Closing:' + tlid); if(mode=="error"){ $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Closed'); @@ -224,8 +218,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { } }; websocketHome[wshid].onerror = function(error) { - console.error('WebSocketHome Error') - console.error(error); + console.error(['WebSocketHome Error',error]) if(mode=="error"){ $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Error ' + error); @@ -238,7 +231,7 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) { } }; websocketHome[wshid].onclose = function() { - console.log('WebSocketHome Closing:' + tlid); + console.warn('WebSocketHome Closing:' + tlid); if(mode=="error"){ $("#notice_icon_" + tlid).addClass("red-text"); todo('WebSocket Closed'); diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js index 0808ac90..55ee6390 100644 --- a/app/js/tl/notification.js +++ b/app/js/tl/notification.js @@ -147,7 +147,7 @@ function notfCommon(acct_id, tlid, sys) { } } fetch(start, i).then(function(response) { - console.log(response.headers.get('link')); + console.log("header to get param:"+response.headers.get('link')); return response.json(); }).catch(function(error) { todo(error); @@ -218,25 +218,20 @@ function notfWS(misskey,acct_id,tlid,domain,at){ var start = wss + "/api/v1/streaming/?stream=user&access_token=" + at; - console.log(start); var wsid = websocketNotf.length; websocketNotf[acct_id] = new WebSocket(start); - console.log(websocketNotf); websocketNotf[acct_id].onopen = function(mess) { - console.log("Connect Streaming API(Notf):"); - console.log(mess); + console.table({"acct_id":acct_id,"type":"Connect Streaming API(Notf)","domain":domain,"message":[mess]}) $("i[data-notf=" + acct_id +"]").removeClass("red-text"); } websocketNotf[acct_id].onmessage = function(mess) { - console.log("Receive Streaming API(Notf):"+acct_id); + console.log(["Receive Streaming API(Notf):"+acct_id+"("+domain+")",JSON.parse(JSON.parse(mess.data).payload)]); var popup = localStorage.getItem("popup"); if (!popup) { popup = 0; } - console.log(domain) var obj = JSON.parse(JSON.parse(mess.data).payload); - console.log(obj); var type = JSON.parse(mess.data).event; if (type == "notification") { var templete=""; @@ -264,8 +259,7 @@ function notfWS(misskey,acct_id,tlid,domain,at){ } //一定のスクロールで発火 function notfmore(tlid) { - console.log(moreloading); - console.log("kicked"); + console.log({"status":"kicked","status":moreloading}); var multi = localStorage.getItem("column"); var obj = JSON.parse(multi); var acct_id = obj[tlid].domain; @@ -308,7 +302,7 @@ function notfmore(tlid) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); + console.log(["More notifications on "+tlid,json]); var max_id = httpreq.getResponseHeader("link").match(/[?&]{1}max_id=([0-9]+)/)[1]; if(json[0]){ var templete=""; @@ -392,12 +386,10 @@ function notfCanceler(acct){ $(".notf-icon_" + acct).removeClass("red-text"); } function allNotfRead(){ - console.log(localStorage.getItem("notf-fav_2")); var multi = localStorage.getItem("multi"); if (multi) { var obj = JSON.parse(multi); Object.keys(obj).forEach(function(key) { - console.log(key); notfCanceler(key) }); } diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index b72cec21..3e481e07 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -3,7 +3,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) { var templete = ''; if(obj[0]){ if(tlid===1){ - console.log("testalive:"+"lastunix_"+ tlid+":"+date(obj[0].created_at, 'unix')) + } localStorage.setItem("lastunix_"+ tlid,date(obj[0].created_at, 'unix')); } @@ -886,7 +886,7 @@ function userparse(obj, auth, acct_id, tlid, popup) { var datetype = localStorage.getItem("datetype"); Object.keys(obj).forEach(function(key) { var toot = obj[key]; - console.log(toot) + console.log(["Parsing",toot]) if(!toot.username){ var raw=toot; toot=toot.account; diff --git a/app/js/tl/poll.js b/app/js/tl/poll.js index 8803a10c..041e06fe 100644 --- a/app/js/tl/poll.js +++ b/app/js/tl/poll.js @@ -25,13 +25,12 @@ function pollCalc(){ var days=$("#days_poll").val(); var hrs=$("#hours_poll").val(); var mins=$("#mins_poll").val(); - console.log(days*86400+hrs*3600+mins*60) + console.log("Poll calc:"+days*86400+hrs*3600+mins*60) return days*86400+hrs*3600+mins*60; } //Vote function voteSelMastodon(acct_id,id,to,mul){ - console.log('.vote_'+acct_id+'_'+id+'_'+to); if($('.vote_'+acct_id+'_'+id+'_'+to).hasClass("sel")){ $('.vote_'+acct_id+'_'+id+'_'+to).css("background-color","transparent") $('.vote_'+acct_id+'_'+id+'_'+to).removeClass("sel"); @@ -95,7 +94,7 @@ function voteMastodonrefresh(acct_id,id){ httpreqd.onreadystatechange = function() { if (httpreqd.readyState == 4) { var json = httpreqd.response; - console.log(json); + console.log(["Refresh vote",json]); if(!json){ return false; } diff --git a/app/js/tl/speech.js b/app/js/tl/speech.js index 87f9df11..d057c473 100644 --- a/app/js/tl/speech.js +++ b/app/js/tl/speech.js @@ -33,7 +33,6 @@ $repeat = setInterval(function() { var obj = JSON.parse(voice); if(obj[0]){ $synthes.text = obj[0]; - console.log($synthes); speechSynthesis.speak($synthes); obj.splice(0, 1); var json = JSON.stringify(obj); diff --git a/app/js/tl/src.js b/app/js/tl/src.js index f788afe7..0cf98a60 100644 --- a/app/js/tl/src.js +++ b/app/js/tl/src.js @@ -31,7 +31,7 @@ function src(mode) { }else{ var start = "https://" + domain + "/api/v1/search?q=" + q } - console.log(start) + console.log("Try to search at "+start) fetch(start, { method: 'GET', headers: { @@ -44,7 +44,7 @@ function src(mode) { src("v1") return false; }).then(function(json) { - console.log(json); + console.log(["Search",json]); //ハッシュタグ if (json.hashtags[0]) { var tags = ""; @@ -83,14 +83,13 @@ function tsAdd(q){ var obj = JSON.parse(multi); localStorage.setItem("card_" + obj.length,"true"); obj.push(add); - console.log(obj); var json = JSON.stringify(obj); localStorage.setItem("column", json); parseColumn(); } function tootsearch(tlid,q){ var start = "https://tootsearch.chotto.moe/api/v1/search?from=0&sort=created_at%3Adesc&q=" + q - console.log(start) + console.log("Toot srrach at "+start) $("#notice_" + tlid).text("tootsearch("+q+")"); $("#notice_icon_" + tlid).text("search"); fetch(start, { @@ -106,13 +105,10 @@ function tootsearch(tlid,q){ }).then(function(raw) { var templete=""; var json=raw.hits.hits; - console.log(json); var max_id = raw["hits"].length; for(var i=0;i scrt) { - console.log("kicked"); + console.log("kicked more loading:"+tlid); moreload('', tlid); } }); @@ -44,7 +44,6 @@ function goColumn(key){ $("#sort-box").addClass("hide"); $("#sort-box").removeClass("show"); if($('[tlid='+key+']').length){ - console.log($('[tlid='+key+']').offset().left); $("#timeline-container").animate({scrollLeft:$("#timeline-container").scrollLeft()+$('[tlid='+key+']').offset().left}); } } \ No newline at end of file diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js index 7ee30782..d3bbe8d3 100644 --- a/app/js/ui/settings.js +++ b/app/js/ui/settings.js @@ -141,7 +141,6 @@ function climute(){ return; } var templete; - console.log(obj) Object.keys(obj).forEach(function(key) { var cli = obj[key]; var list = key * 1 + 1; @@ -233,7 +232,6 @@ function exportSettings(){ properties: ['openFile', 'createDirectory'], defaultPath: "export.thedeskconfigv2" }, (savedFiles) => { - console.log(savedFiles); if(!savedFiles){ return false; } @@ -294,7 +292,6 @@ function exportSettings(){ var tagarr = localStorage.getItem("tag"); var favtag = JSON.parse(tagarr); exp.favoriteTags=favtag; - console.log(exp); ipc.send('export', [savedFiles,JSON.stringify(exp)]); alert("Done.") //cards @@ -316,7 +313,6 @@ function importSettings(){ {name: 'TheDesk Config', extensions: ['thedeskconfig','thedeskconfigv2']}, ] }, (fileNames) => { - console.log(fileNames); if(!fileNames){ return false; } @@ -363,7 +359,6 @@ function importSettings(){ //Version 1 localStorage.setItem("theme",obj.theme); if(obj.width){ - console.log(obj.width) localStorage.setItem("width",obj.width); } if(obj.font){ @@ -552,7 +547,6 @@ function deleteIt(){ function ctLoad(){ ipc.send('theme-json-list', ""); ipc.on('theme-json-list-response', function (event, args) { - console.log(args); var templete=""; Object.keys(args).forEach(function(key) { var theme = args[key]; @@ -596,7 +590,6 @@ function custom(){ $("#delTheme").removeClass("disabled") ipc.send('theme-json-request', id); ipc.on('theme-json-response', function (event, args) { - console.log(args); $("#custom_name").val(args.name); $("#custom_desc").val(args.desc); $("#"+args.base).prop("checked", true); @@ -633,7 +626,6 @@ function customImp(){ } } function hardwareAcceleration(had){ - console.log("ha"); ipc.send('ha', had); } diff --git a/app/js/ui/sort.js b/app/js/ui/sort.js index 0d350657..204d50c8 100644 --- a/app/js/ui/sort.js +++ b/app/js/ui/sort.js @@ -61,7 +61,7 @@ function Scap(type, data) { }else if (type == "tootsearch") { return "tootsearch(" + data + ")" }else{ - console.log(type); + console.error("unknown timeline type: "+type); } } diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js index b40c46b5..43d0a8d1 100644 --- a/app/js/ui/spotify.js +++ b/app/js/ui/spotify.js @@ -79,7 +79,7 @@ function nowplaying(mode){ todo(error); console.error(error); }).then(function(json) { - console.log(json); + console.table(json); if(json.length<1){ return false; } @@ -133,7 +133,7 @@ function nowplaying(mode){ console.error(arg); return; } - console.log(arg); + console.table(arg); var content=localStorage.getItem("np-temp"); if(!content || content=="" || content=="null"){ var content="#NowPlaying {song} / {album} / {artist}\n{url}"; diff --git a/app/js/ui/tips.js b/app/js/ui/tips.js index e7871c7e..6c253b15 100644 --- a/app/js/ui/tips.js +++ b/app/js/ui/tips.js @@ -66,7 +66,6 @@ function trendTagonTip(){ var domain="imastodon.net" var at = localStorage.getItem("acct_"+ acct_id + "_at"); var start = "https://" + domain + "/api/v1/trend_tags" - console.log(start) fetch(start, { method: 'GET', headers: { @@ -109,7 +108,6 @@ function spotifytips(){ todo(error); console.error(error); }).then(function(json) { - console.log(json); var ms=json.progress_ms; var last=1000-ms%1000; var item=json.item; diff --git a/app/js/userdata/his-data.js b/app/js/userdata/his-data.js index e846d314..ade42f22 100644 --- a/app/js/userdata/his-data.js +++ b/app/js/userdata/his-data.js @@ -538,9 +538,8 @@ function showFrl(more, acct_id) { $("#his-follow-recom-contents").html(lang.lang_details_nodata+"("+lang.lang_hisdata_frcreq+")
"); console.error(error); }).then(function(json) { - console.log(json); if(!json[0]){ - console.log("No data"); + console.warn("No suggestions(recommend) data"); templete=lang.lang_details_nodata+"("+lang.lang_hisdata_frcwarn+")
"; }else{ var templete = userparse(json,'',acct_id); @@ -608,7 +607,6 @@ function showMat() { var acct_id=$("#his-data").attr("use-acct"); full=full.split("@"); var start = "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-filtered-api.cgi?"+full[1]+"+" + full[0]; - console.log(start); fetch(start, { method: 'GET', headers: { @@ -621,7 +619,6 @@ function showMat() { todo(error); console.error(error); }).then(function(json) { - console.log(json); var templete=""; Object.keys(json).forEach(function(key) { var user = json[key]; diff --git a/app/js/userdata/prof-edit.js b/app/js/userdata/prof-edit.js index 3b6d7bdf..cc8cbab0 100644 --- a/app/js/userdata/prof-edit.js +++ b/app/js/userdata/prof-edit.js @@ -30,7 +30,7 @@ function imgChange(imgfile, target) { var acct_id = $('#his-data').attr("use-acct"); todo("アップロードしています") if (!imgfile.files.length) { - console.log("No Img"); + console.warn("No Image to upload"); return; } var file = imgfile.files[0]; @@ -52,7 +52,6 @@ function imgChange(imgfile, target) { httpreq.onreadystatechange = function() { if (httpreq.readyState === 4) { var json = httpreq.response; - console.log(json); $('#his-data').modal('close'); todc(); localStorage.removeItem("image"); diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js index f639d41e..f1e21884 100644 --- a/app/js/userdata/showOnTL.js +++ b/app/js/userdata/showOnTL.js @@ -19,7 +19,7 @@ function udgEx(user,acct_id){ if(acct_id=="main"){ acct_id = localStorage.getItem("main"); } - console.log(user); + console.log("Get user data of "+user); var domain = localStorage.getItem("domain_" + acct_id); if(localStorage.getItem("mode_" + domain)=="misskey"){ return false; } var at = localStorage.getItem("acct_"+ acct_id + "_at"); @@ -36,7 +36,6 @@ function udgEx(user,acct_id){ todo(error); console.error(error); }).then(function(json) { - console.log(json); if(json.accounts){ var id=json.accounts[0].id; udg(id,acct_id); @@ -52,7 +51,6 @@ function udg(user, acct_id) { reset(); if (!user) { user = localStorage.getItem("user-id_"+acct_id); - console.log(user); } todo("User Data Loading..."); var domain = localStorage.getItem("domain_" + acct_id); @@ -62,7 +60,6 @@ function udg(user, acct_id) { } var at = localStorage.getItem("acct_"+ acct_id + "_at"); var start = "https://" + domain + "/api/v1/accounts/" + user; - console.log(start); fetch(start, { method: 'GET', headers: { @@ -75,7 +72,6 @@ function udg(user, acct_id) { todo(error); console.error(error); }).then(function(json) { - console.log(json); //一つ前のユーザーデータ if (!localStorage.getItem("history")){ $("#his-history-btn").prop("disabled",true); @@ -128,7 +124,6 @@ function udg(user, acct_id) { //var tags = '#$1'; //var mens = '@$1'; //note=note.replace(/#(\S+)/gi, tags) - console.log(note) //note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens) $("#his-name").html(dis_name); $("#his-acct").text(json.acct); @@ -215,7 +210,6 @@ function misskeyUdg(user, acct_id) { reset(); if (!user) { user = localStorage.getItem("user-id_"+acct_id); - console.log(user); } todo("User Data Loading..."); var domain = localStorage.getItem("domain_" + acct_id); @@ -225,7 +219,6 @@ function misskeyUdg(user, acct_id) { } var at = localStorage.getItem("acct_"+ acct_id + "_at"); var start = "https://" + domain + "/api/users/show"; - console.log(user); fetch(start, { method: 'POST', headers: { @@ -241,7 +234,6 @@ function misskeyUdg(user, acct_id) { todo(error); console.error(error); }).then(function(json) { - console.log(json); //一つ前のユーザーデータ if (!localStorage.getItem("history")){ $("#his-history-btn").prop("disabled",true); @@ -340,7 +332,6 @@ function historyShow(){ function profShow(){ var acct_id = $("#post-acct-sel").val(); var user = localStorage.getItem("user-id_"+acct_id); - console.log("user-id_"+acct_id+":"+user); udg(user, acct_id) hide(); } diff --git a/app/view/en/index.html b/app/view/en/index.html index 2a71a329..7453bc75 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -665,6 +665,10 @@ ・フォローリクエストの許可/拒否ができるように。
・起動時に通知のストリーミングにつながらない不具合を修正

+

ThinkingDeskラベル
+
+ 手作りマットラベル。貼ってはがせる。300円なのでポイントの余りでどうぞ。
+ メルカリへ。
+
Internal error: please clear all data(at setting page) All data will be deleted.
diff --git a/app/view/en/update.html b/app/view/en/update.html index d3708a7b..482f9b1f 100644 --- a/app/view/en/update.html +++ b/app/view/en/update.html @@ -113,6 +113,7 @@ function skipper(){ } var electron = require("electron"); var ipc = electron.ipcRenderer; +const shell=electron.shell; verck(); function update(sel){ $("#box").toggleClass("show"); @@ -158,7 +159,7 @@ function update(sel){ } }else if(sel=="mac"){ var url=json["mac"]; - var file="TheDesk-darwin-x64.zip"; + shell.openExternal(url); } ipc.send('download-btn', [url,file]); }); diff --git a/app/view/ja/index.html b/app/view/ja/index.html index 59361ca6..8b6b3f2b 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -665,6 +665,10 @@ ・フォローリクエストの許可/拒否ができるように。
・起動時に通知のストリーミングにつながらない不具合を修正

+
ThinkingDeskラベル
+
+ 手作りマットラベル。貼ってはがせる。300円なのでポイントの余りでどうぞ。
+ メルカリへ。
+
内部エラーです。再読込して治らない場合は初期化(全データ削除)をしてください。(事前に設定をエクスポートしておくことをおすすめします。)
diff --git a/app/view/ja/update.html b/app/view/ja/update.html index d2b54f88..47e9122a 100644 --- a/app/view/ja/update.html +++ b/app/view/ja/update.html @@ -113,6 +113,7 @@ function skipper(){ } var electron = require("electron"); var ipc = electron.ipcRenderer; +const shell=electron.shell; verck(); function update(sel){ $("#box").toggleClass("show"); @@ -158,7 +159,7 @@ function update(sel){ } }else if(sel=="mac"){ var url=json["mac"]; - var file="TheDesk-darwin-x64.zip"; + shell.openExternal(url); } ipc.send('download-btn', [url,file]); }); diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index daa0ecf7..b2af3161 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -665,6 +665,10 @@ ・フォローリクエストの許可/拒否ができるように。
・起動時に通知のストリーミングにつながらない不具合を修正

+
ThinkingDeskラベル
+
+ 手作りマットラベル。貼ってはがせる。300円なのでポイントの余りでどうぞ。
+ メルカリへ。
+
@@helloTheDesk@@
diff --git a/app/view/make/update.sample.html b/app/view/make/update.sample.html index 499e53ee..32eed10f 100644 --- a/app/view/make/update.sample.html +++ b/app/view/make/update.sample.html @@ -113,6 +113,7 @@ function skipper(){ } var electron = require("electron"); var ipc = electron.ipcRenderer; +const shell=electron.shell; verck(); function update(sel){ $("#box").toggleClass("show"); @@ -158,7 +159,7 @@ function update(sel){ } }else if(sel=="mac"){ var url=json["mac"]; - var file="TheDesk-darwin-x64.zip"; + shell.openExternal(url); } ipc.send('download-btn', [url,file]); }); diff --git a/app/view/ps/index.html b/app/view/ps/index.html index 3273919f..19a28d0c 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -665,6 +665,10 @@ ・フォローリクエストの許可/拒否ができるように。
・起動時に通知のストリーミングにつながらない不具合を修正

+
ThinkingDeskラベル
+
+ 手作りマットラベル。貼ってはがせる。300円なのでポイントの余りでどうぞ。
+ メルカリへ。
+
crwdns511:0crwdne511:0
diff --git a/app/view/ps/update.html b/app/view/ps/update.html index 2f45976f..b0460e8b 100644 --- a/app/view/ps/update.html +++ b/app/view/ps/update.html @@ -113,6 +113,7 @@ function skipper(){ } var electron = require("electron"); var ipc = electron.ipcRenderer; +const shell=electron.shell; verck(); function update(sel){ $("#box").toggleClass("show"); @@ -158,7 +159,7 @@ function update(sel){ } }else if(sel=="mac"){ var url=json["mac"]; - var file="TheDesk-darwin-x64.zip"; + shell.openExternal(url); } ipc.send('download-btn', [url,file]); });