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

Remove: node on details/misskeyparse.js #86

Browse Source
This commit is contained in:
Cutls 2019-06-15 01:20:12 +09:00
parent 3c276b329b
commit 772a5438aa
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/platform/preload.js
View File

@ -15,6 +15,8 @@ onmessage = function (e) {
ipc.send('bmp-image', e.data[1]); ipc.send('bmp-image', e.data[1]);
} else if (e.data[0] == "dialogCW") { } else if (e.data[0] == "dialogCW") {
ipc.send("dialogCW", e.data[1]) ipc.send("dialogCW", e.data[1])
} else if (e.data[0] == "nativeNotf") {
ipc.send('native-notf', e.data[1]);
} }
} }
//version.js //version.js

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

@ -519,11 +519,7 @@ function trans(tar, to) {
//ブラウザで開く //ブラウザで開く
function brws() { function brws() {
var url = $("#tootmodal").attr("data-url"); var url = $("#tootmodal").attr("data-url");
const { postMessage(["openUrl", url], "*")
shell
} = require('electron');
shell.openExternal(url);
} }
//外部からトゥート開く //外部からトゥート開く
function detEx(url, acct_id) { function detEx(url, acct_id) {
@ -546,11 +542,7 @@ function detEx(url, acct_id) {
console.error(error); console.error(error);
}).then(function (json) { }).then(function (json) {
if (!json.statuses) { if (!json.statuses) {
const { postMessage(["openUrl", url], "*")
shell
} = require('electron');
shell.openExternal(url);
} else { } else {
var id = json.statuses[0].id; var id = json.statuses[0].id;
$(".loadp").text($(".loadp").attr("href")); $(".loadp").text($(".loadp").attr("href"));

24
app/js/tl/misskeyparse.js
View File

@ -257,9 +257,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
M.toast({ html: "[" + domain + "]" + escapeHTMLtemp(toot.user.name) + what, displayLength: popup * 1000 }) M.toast({ html: "[" + domain + "]" + escapeHTMLtemp(toot.user.name) + what, displayLength: popup * 1000 })
} }
if (native == "yes") { if (native == "yes") {
var electron = require("electron"); var os = localStorage.getItem("platform");
var ipc = electron.ipcRenderer;
var os = electron.remote.process.platform;
var options = { var options = {
body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text), body: toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
icon: toot.user.avatarUrl icon: toot.user.avatarUrl
@ -267,14 +265,15 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
if (os == "darwin") { if (os == "darwin") {
var n = new Notification('TheDesk:' + domain, options); var n = new Notification('TheDesk:' + domain, options);
} else { } else {
ipc.send('native-notf', [ var nativeNotfOpt=[
'TheDesk:' + domain, 'TheDesk:' + domain,
toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text), toot.user.name + "(" + toot.user.username + ")" + what + "\n\n" + $.strip_tagstemp(toot.note.text),
toot.user.avatarUrl, toot.user.avatarUrl,
"toot", "toot",
acct_id, acct_id,
toot.note.id toot.note.id
]); ]
postMessage(["nativeNotf", nativeNotfOpt], "*")
} }
} }
if (localStorage.getItem("hasNotfC_" + acct_id) != "true") { if (localStorage.getItem("hasNotfC_" + acct_id) != "true") {
@ -902,9 +901,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
native = "yes"; native = "yes";
} }
if (native == "yes") { if (native == "yes") {
var electron = require("electron"); var os = localStorage.getItem("platform");
var ipc = electron.ipcRenderer;
var os = electron.remote.process.platform;
var options = { var options = {
body: toot.display_name + "(" + toot.acct + ")" + ftxt, body: toot.display_name + "(" + toot.acct + ")" + ftxt,
icon: toot.avatar icon: toot.avatar
@ -913,14 +910,15 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
if (os == "darwin") { if (os == "darwin") {
var n = new Notification('TheDesk:' + domain, options); var n = new Notification('TheDesk:' + domain, options);
} else { } else {
ipc.send('native-notf', [ var nativeNotfOpt=[
'TheDesk:' + domain, 'TheDesk:' + domain,
toot.display_name + "(" + toot.acct + ")" + ftxt, toot.display_name + "(" + toot.acct + ")" + ftxt,
toot.avatar, toot.avatar,
"userdata", "userdata",
acct_id, acct_id,
toot.id toot.id
]); ]
postMessage(["nativeNotf", nativeNotfOpt], "*")
} }
} }
} }
@ -967,11 +965,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
function goGoogle(id) { function goGoogle(id) {
var val = $("#srcbox_" + id).val(); var val = $("#srcbox_" + id).val();
var url = "https://google.com/search?q=" + val; var url = "https://google.com/search?q=" + val;
const { postMessage(["openUrl", url], "*")
shell
} = require('electron');
shell.openExternal(url);
} }
var misskeyws = [] var misskeyws = []
var misskeywsstate = [] var misskeywsstate = []