paquetes/gamja
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix buffer refs in commands

Browse Source
This commit is contained in:
Simon Ser
2021-03-03 09:58:09 +01:00
parent 72977b30b4
commit ae914d4106
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands.js
+14 -14
View File
@@ -1,4 +1,4 @@
import { SERVER_BUFFER } from "./state.js"; import { SERVER_BUFFER, BufferType } from "./state.js";
function getActiveClient(app) { function getActiveClient(app) {
var buf = app.state.buffers.get(app.state.activeBuffer); var buf = app.state.buffers.get(app.state.activeBuffer);
@@ -20,7 +20,7 @@ export default {
if (window.localStorage) { if (window.localStorage) {
localStorage.removeItem("autoconnect"); localStorage.removeItem("autoconnect");
} }
app.close(SERVER_BUFFER); app.close({ name: SERVER_BUFFER });
}, },
"query": (app, args) => { "query": (app, args) => {
var nick = args[0]; var nick = args[0];
@@ -30,11 +30,11 @@ export default {
app.open(nick); app.open(nick);
}, },
"close": (app, args) => { "close": (app, args) => {
var target = app.state.activeBuffer; var activeBuffer = app.state.buffers.get(app.state.activeBuffer);
if (!target || target == SERVER_BUFFER) { if (!activeBuffer || activeBuffer.type == BufferType.SERVER) {
throw new Error("Not in a user or channel buffer"); throw new Error("Not in a user or channel buffer");
} }
app.close(target); app.close(activeBuffer.id);
}, },
"join": (app, args) => { "join": (app, args) => {
var channel = args[0]; var channel = args[0];
@@ -45,11 +45,11 @@ export default {
}, },
"part": (app, args) => { "part": (app, args) => {
var reason = args.join(" "); var reason = args.join(" ");
var channel = app.state.activeBuffer; var activeBuffer = app.state.buffers.get(app.state.activeBuffer);
if (!channel || !app.isChannel(channel)) { if (!activeBuffer || !app.isChannel(activeBuffer.name)) {
throw new Error("Not in a channel"); throw new Error("Not in a channel");
} }
var params = [channel]; var params = [activeBuffer.name];
if (reason) { if (reason) {
params.push(reason); params.push(reason);
} }
@@ -62,12 +62,12 @@ export default {
}, },
"me": (app, args) => { "me": (app, args) => {
var action = args.join(" "); var action = args.join(" ");
var target = app.state.activeBuffer; var activeBuffer = app.state.buffers.get(app.state.activeBuffer);
if (!target) { if (!activeBuffer) {
throw new Error("Not in a buffer"); throw new Error("Not in a buffer");
} }
var text = `\x01ACTION ${action}\x01`; var text = `\x01ACTION ${action}\x01`;
app.privmsg(target, text); app.privmsg(activeBuffer.name, text);
}, },
"nick": (app, args) => { "nick": (app, args) => {
var newNick = args[0]; var newNick = args[0];
@@ -89,11 +89,11 @@ export default {
throw new Error("Unknown buffer"); throw new Error("Unknown buffer");
}, },
"topic": (app, args) => { "topic": (app, args) => {
var channel = app.state.activeBuffer; var activeBuffer = app.state.buffers.get(app.state.activeBuffer);
if (!channel || !app.isChannel(channel)) { if (!activeBuffer || !app.isChannel(activeBuffer.name)) {
throw new Error("Not in a channel"); throw new Error("Not in a channel");
} }
var params = [channel]; var params = [activeBuffer.name];
if (args.length > 0) { if (args.length > 0) {
params.push(args.join(" ")); params.push(args.join(" "));
} }