Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change bouncer cap to a vendor cap #26

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change bouncer cap to a vendor cap #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b3eb1a
Change `bouncer` cap name to `kiwiirc.com/bouncer`, as it's not yet a…
DanielOaks Jul 8, 2019
40f7500
Add unknown_subcommand response to BOUNCER
DanielOaks Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/worker/connectionincoming.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class ConnectionIncoming {

// If the client supports BOUNCER commands, it will request a buffer list
// itself and then request messages as needed
if (!this.state.caps.includes('bouncer')) {
if (!this.state.caps.includes('kiwiirc.com/bouncer')) {
await this.dumpChannels();
} else {
// Get the latest NAMEs replies for our joined channels
Expand Down
22 changes: 20 additions & 2 deletions src/worker/extensions/bouncer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ module.exports.init = async function init(hooks, app) {
}

upstream.forEachClient(client => {
if (client.state.caps.includes('BOUNCER')) {
if (client.state.caps.includes('kiwiirc.com/bouncer')) {
client.writeMsg('BOUNCER', 'state', network.name, state);
}
});
};

hooks.on('available_caps', event => {
event.caps.push('bouncer');
event.caps.push('kiwiirc.com/bouncer');
});

hooks.on('connection_open', event => {
Expand Down Expand Up @@ -60,7 +60,10 @@ async function handleBouncerCommand(event) {
let subCmd = mParamU(msg, 0, '');
let encodeTags = require('irc-framework/src/messagetags').encode;

let handled = false;

if (subCmd === 'CONNECT') {
handled = true;
let netName = mParam(msg, 1, '');
if (!netName) {
con.writeMsg('BOUNCER', 'connect', '*', 'ERR_INVALIDARGS');
Expand All @@ -83,6 +86,7 @@ async function handleBouncerCommand(event) {
}

if (subCmd === 'DISCONNECT') {
handled = true;
let netName = mParam(msg, 1, '');
if (!netName) {
con.writeMsg('BOUNCER', 'disconnect', '*', 'ERR_INVALIDARGS');
Expand All @@ -108,6 +112,7 @@ async function handleBouncerCommand(event) {
}

if (subCmd === 'LISTNETWORKS') {
handled = true;
let nets = await con.userDb.getUserNetworks(con.state.authUserId);
nets.forEach((net) => {
let parts = [];
Expand All @@ -133,6 +138,7 @@ async function handleBouncerCommand(event) {
}

if (subCmd === 'LISTBUFFERS') {
handled = true;
let netName = mParam(msg, 1, '');
if (!netName) {
con.writeMsg('BOUNCER', 'listbuffers', '*', 'ERR_INVALIDARGS');
Expand Down Expand Up @@ -172,6 +178,7 @@ async function handleBouncerCommand(event) {
}

if (subCmd === 'DELBUFFER') {
handled = true;
let netName = mParam(msg, 1, '');
let bufferName = mParam(msg, 2, '');
if (!netName || !bufferName) {
Expand Down Expand Up @@ -210,6 +217,7 @@ async function handleBouncerCommand(event) {
}

if (subCmd === 'CHANGEBUFFER') {
handled = true;
let netName = mParam(msg, 1, '');
let bufferName = mParam(msg, 2, '');
if (!netName || !bufferName) {
Expand Down Expand Up @@ -247,6 +255,7 @@ async function handleBouncerCommand(event) {
}

if (subCmd === 'ADDNETWORK') {
handled = true;
let tags = messageTags.decode(mParam(msg, 1));
if (!tags || !tags.network || !tags.network.match(/^[a-z0-9_]+$/i)) {
con.writeMsg('BOUNCER', 'addnetwork', '*', 'ERR_NEEDSNAME');
Expand Down Expand Up @@ -289,6 +298,7 @@ async function handleBouncerCommand(event) {
}

if (subCmd === 'CHANGENETWORK') {
handled = true;
let netName = mParam(msg, 1);
let tags = messageTags.decode(mParam(msg, 2));
if (!netName || !tags) {
Expand Down Expand Up @@ -373,6 +383,7 @@ async function handleBouncerCommand(event) {
}

if (subCmd === 'DELNETWORK') {
handled = true;
let netName = mParam(msg, 1);

// Make sure the network exists
Expand All @@ -393,4 +404,11 @@ async function handleBouncerCommand(event) {
await con.db.db('user_networks').where('id', network.id).delete();
con.writeMsg('BOUNCER', 'delnetwork', netName, 'RPL_OK');
}

if (!handled) {
if (subCmd == '' || subCmd[0] == ':') {
subCmd = '*';
}
con.writeMsg('FAIL', 'BOUNCER', 'unknown_subcommand', subCmd, 'Unknown subcommand');
}
};