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

Use auditorium slugs in IRC channel names & fix plumbAll #182

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+21 −10
Open

Use auditorium slugs in IRC channel names & fix plumbAll #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8883e9
Use auditorium slugs in IRC channel names
reivilibre Feb 4, 2023
e4988fc
Fix plumbAll calling plumbOne incorrectly
reivilibre Feb 4, 2023
9cd4a93
Increase wait time for plumb command
Half-Shot Feb 4, 2023
97290d7
Only run PL update if needed
Half-Shot Feb 4, 2023
450630d
Don't log an error on already existing
Half-Shot Feb 4, 2023
72b2747
Add try catch around bridge version
Half-Shot Feb 4, 2023
b4ae9a2
fix PL action
Half-Shot Feb 4, 2023
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
18 changes: 13 additions & 5 deletions src/IRCBridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import {LogService, MatrixClient, MatrixEvent} from "matrix-bot-sdk";
import { LogService, MatrixClient, MatrixEvent } from "matrix-bot-sdk";
import * as irc from "irc-upd";
import { Auditorium } from "./models/Auditorium";
import { InterestRoom } from "./models/InterestRoom";
Expand Down Expand Up @@ -62,7 +62,7 @@ export class IRCBridge {
}

public async deriveChannelName(auditorium: Auditorium) {
const name = await auditorium.getName();
const name = await auditorium.getSlug();
if (!name) {
throw Error('Auditorium name is empty');
}
Expand Down Expand Up @@ -93,9 +93,13 @@ export class IRCBridge {
} else {
this.botRoomId = data.roomId;
}

// This should timeout if the connection is broken
await this.executeCommand("bridgeversion");

try {
// This should timeout if the connection is broken
await this.executeCommand("bridgeversion");
} catch (ex) {
LogService.warn(`IRCBridge`, "Failed to get IRC bridge version, it may be unreachable.");
}

this.ircClient = new irc.Client(this.config.serverName, this.config.botNick, {
port: this.config.port,
Expand Down Expand Up @@ -134,6 +138,10 @@ export class IRCBridge {
await this.ircClient.join(channel);
const result = await this.executeCommand(`plumb ${roomId} ${this.config.serverName} ${channel}`);
const resultText = result.content.body;
if (resultText.match(/Room mapping already exists/)) {
// Already bridged
return;
}
if (resultText !== 'Room plumbed.') {
throw Error(`IRC bridge gave an error: ${resultText}`);
}
Expand Down
13 changes: 8 additions & 5 deletions src/commands/IrcPlumbCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ import { IRCBridge } from "../IRCBridge";
import { logMessage } from "../LogProxy";
import { KickPowerLevel } from "../models/room_kinds";
import { ConferenceMatrixClient } from "../ConferenceMatrixClient";
import { PowerLevelAction } from "matrix-bot-sdk/lib/models/PowerLevelAction";

const PLUMB_WAIT_MS = 1000;
const PLUMB_WAIT_MS = 10000;

export class IrcPlumbCommand implements ICommand {
public readonly prefixes = ["plumb-irc"];
Expand All @@ -34,7 +35,7 @@ export class IrcPlumbCommand implements ICommand {
for (const auditorium of this.conference.storedAuditoriums) {
const channelName = await this.ircBridge.deriveChannelName(auditorium);
try {
await this.plumbOne(this.client, channelName, auditorium.roomId);
await this.plumbOne(this.client, auditorium.roomId, channelName);
// Wait before plumbing the next one so as to not overwhelm the poor bridge.
await new Promise(r => setTimeout(r, PLUMB_WAIT_MS));
} catch (ex) {
Expand All @@ -45,7 +46,7 @@ export class IrcPlumbCommand implements ICommand {
for (const interest of this.conference.storedInterestRooms) {
const channelName = await this.ircBridge.deriveChannelNameSI(interest);
try {
await this.plumbOne(this.client, channelName, interest.roomId);
await this.plumbOne(this.client, interest.roomId, channelName);
// Wait before plumbing the next one so as to not overwhelm the poor bridge.
await new Promise(r => setTimeout(r, PLUMB_WAIT_MS));
} catch (ex) {
Expand All @@ -71,8 +72,10 @@ export class IrcPlumbCommand implements ICommand {
}

try {
// The bridge needs the ability to kick KLINED users.
await client.setUserPowerLevel(this.ircBridge.botUserId, resolvedRoomId, KickPowerLevel);
if (!await client.userHasPowerLevelForAction(this.ircBridge.botUserId, resolvedRoomId, PowerLevelAction.Kick)) {
// The bridge needs the ability to kick KLINED users.
await client.setUserPowerLevel(this.ircBridge.botUserId, resolvedRoomId, KickPowerLevel);
}
} catch (ex) {
LogService.warn("IrcPlumbCommand", ex);
return logMessage(LogLevel.WARN, "IrcPlumbCommand", `Could not plumb channel to room ${resolvedRoomId}: could not set AS power level`, this.client);
Expand Down
Loading