Skip to content

Commit ffc25d1

Browse files
TedCraftTedCraft
committed
changes
1 parent 802b6fe commit ffc25d1

File tree

5 files changed

+36
-19
lines changed

5 files changed

+36
-19
lines changed

‎src/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
<div id="app-title">
2929
<h5>
30-
Test
31-
<div class="small text-muted" style="font-size: .9rem;">Test</div>
30+
Система управления ботами дискорд
31+
<div class="small text-muted" style="font-size: .9rem;">Боты - это просто!</div>
3232
</h5>
3333
</div>
3434

‎src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const createWindow = () => {
2626
mainWindow.loadFile(path.join(__dirname, 'index.html'));
2727

2828
// Open the DevTools.
29-
mainWindow.webContents.openDevTools();
29+
//mainWindow.webContents.openDevTools();
3030
require('./events');
3131
require('./load');
3232

‎src/preload.js

+15
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,11 @@ ipcRenderer.on('connectBot', (e, id) => {
324324
const name = document.getElementById(id);
325325
const botName = name.lastChild.textContent;
326326
logs.set(botName, logs.get(botName) + data);
327+
328+
bots.get(botName).kill();
329+
name.removeChild(name.childNodes[1]);
330+
bots.delete(botName);
331+
logs.delete(botName);
327332
});
328333

329334
connect.on('close', (code) => {
@@ -378,6 +383,11 @@ ipcRenderer.on('refreshBot', (e, id) => {
378383
const name = document.getElementById(id);
379384
const botName = name.lastChild.textContent;
380385
logs.set(botName, logs.get(botName) + data);
386+
387+
bots.get(botName).kill();
388+
name.removeChild(name.childNodes[1]);
389+
bots.delete(botName);
390+
logs.delete(botName);
381391
});
382392

383393
connect.on('close', (code) => {
@@ -417,6 +427,11 @@ ipcRenderer.on('connectAll', (e) => {
417427
const name = document.getElementById(tree.childNodes[i].id);
418428
const botName = name.lastChild.textContent;
419429
logs.set(botName, logs.get(botName) + data);
430+
431+
bots.get(botName).kill();
432+
name.removeChild(name.childNodes[1]);
433+
bots.delete(botName);
434+
logs.delete(botName);
420435
});
421436

422437
connect.on('close', (code) => {

‎src/renderer.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ function addToTree(name) {
6969

7070
const events = readdirSync(path.join(__dirname, `/bots/${name}/events/${dir}/`)).filter(files => files.endsWith('.js'));
7171
for (const file of events) {
72-
html += `<div role="treeitem" class="list-group-item" style="padding-left:4.2rem;" aria-level="4" id="${id}-events-${dir}-${file.slice(0, -3)}">
73-
${file}</div>`
72+
html += `<div role="treeitem" class="list-group-item" style="padding-left:4.2rem;" aria-level="4" id="${id}-events-${dir}-${file.slice(0, -3)}">${file}</div>`
7473
};
7574
html += `</div></div>`;
7675
});
@@ -86,8 +85,7 @@ function addToTree(name) {
8685

8786
const commands = readdirSync(path.join(__dirname, `/bots/${name}/commands/${dir}/`)).filter(files => files.endsWith('.js'));
8887
for (const file of commands) {
89-
html += `<div role="treeitem" class="list-group-item" data-bs-toggle="collapse" style="padding-left:4.2rem;" aria-level="4" id="${id}-commands-${dir}-${file.slice(0, -3)}">
90-
${file}</div>`
88+
html += `<div role="treeitem" class="list-group-item" data-bs-toggle="collapse" style="padding-left:4.2rem;" aria-level="4" id="${id}-commands-${dir}-${file.slice(0, -3)}">${file}</div>`
9189
};
9290
html += `</div></div>`;
9391
});

‎src/templates/commands.js

+16-12
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ module.exports = {
108108
const choice = new Array();
109109
const name = row.childNodes[1].firstChild.firstChild.value;
110110
const value = row.childNodes[2].firstChild.firstChild.value;
111-
if(checked) {
111+
if (checked) {
112112
if (name === "") return ipcRenderer.send('error', `Ошибка!`, `Введите имя!`);
113113
if (value === "") return ipcRenderer.send('error', `Ошибка!`, `Введите значение!`);
114114
}
@@ -119,8 +119,8 @@ module.exports = {
119119
content.push(`"Choices": { "checked": ${checked}, "value": [${choicesArr.join(', ')}] }`);
120120
}
121121
else {
122-
if(checked) {
123-
if(accordion.value === "") return ipcRenderer.send('error', `Ошибка!`, `Введите число!`);
122+
if (checked) {
123+
if (accordion.value === "") return ipcRenderer.send('error', `Ошибка!`, `Введите число!`);
124124
}
125125
content.push(`"${accordion.id}": { "checked": ${checked}, "value": "${accordion.value}" }`)
126126
}
@@ -196,7 +196,7 @@ module.exports = {
196196
const choice = new Array();
197197
const name = row.childNodes[1].firstChild.firstChild.value;
198198
const value = row.childNodes[2].firstChild.firstChild.value;
199-
if(checked) {
199+
if (checked) {
200200
if (name === "") return ipcRenderer.send('error', `Ошибка!`, `Введите имя!`);
201201
if (value === "") return ipcRenderer.send('error', `Ошибка!`, `Введите значение!`);
202202
}
@@ -207,8 +207,8 @@ module.exports = {
207207
content.push(`"Choices": { "checked": ${checked}, "value": [${choicesArr.join(', ')}] }`);
208208
}
209209
else {
210-
if(checked) {
211-
if(accordion.value === "") return ipcRenderer.send('error', `Ошибка!`, `Введите число!`);
210+
if (checked) {
211+
if (accordion.value === "") return ipcRenderer.send('error', `Ошибка!`, `Введите число!`);
212212
}
213213
content.push(`"${accordion.id}": { "checked": ${checked}, "value": "${accordion.value}" }`)
214214
}
@@ -270,7 +270,7 @@ module.exports = {
270270
const choice = new Array();
271271
const name = row.childNodes[1].firstChild.firstChild.value;
272272
const value = row.childNodes[2].firstChild.firstChild.value;
273-
if(checked) {
273+
if (checked) {
274274
if (name === "") return ipcRenderer.send('error', `Ошибка!`, `Введите имя!`);
275275
if (value === "") return ipcRenderer.send('error', `Ошибка!`, `Введите значение!`);
276276
}
@@ -292,19 +292,23 @@ module.exports = {
292292
getUser: (idx, groupId) => {
293293
closeModal();
294294
},
295-
295+
296296
setChannelTypes: (json, content) => {
297297
return json.addType("ChannelTypes", `${JSON.stringify(content)}`);
298298
},
299-
299+
300300
setChoices: (json, content) => {
301-
return json.set("Choices", `${JSON.stringify(content).slice(1,-1)}`);
301+
let str = "";
302+
for (let choice of content) {
303+
str += json.addType("Choices", `${JSON.stringify(choice)}`);
304+
}
305+
return str;
302306
},
303-
307+
304308
setMaxValue: (json, content) => {
305309
return json.set("MaxValue", `${content}`);
306310
},
307-
311+
308312
setMinValue: (json, content) => {
309313
return json.set("MinValue", `${content}`);
310314
},

0 commit comments

Comments
 (0)