this repo has no description

feat: format both sides

dunkirk.sh 29902a8c b0be7a6e

verified
Changed files
+255 -138
src
+1 -1
package.json
···
"type": "module",
"private": true,
"scripts": {
-
"dev": "bun --hot src/index.ts",
+
"dev": "bun src/index.ts",
"start": "bun src/index.ts",
"ngrok": "ngrok http 3000 --domain casual-renewing-reptile.ngrok-free.app"
},
+156 -137
src/index.ts
···
import * as irc from "irc";
-
import { SlackAPIClient, SlackApp } from "slack-edge";
+
import { SlackApp } from "slack-edge";
import { version } from "../package.json";
import { channelMappings, userMappings } from "./db";
+
import { parseSlackMarkdown, parseIRCFormatting } from "./parser";
+
import type { CachetUser } from "./types";
const missingEnvVars = [];
if (!process.env.SLACK_BOT_TOKEN) missingEnvVars.push("SLACK_BOT_TOKEN");
if (!process.env.SLACK_SIGNING_SECRET)
-
missingEnvVars.push("SLACK_SIGNING_SECRET");
+
missingEnvVars.push("SLACK_SIGNING_SECRET");
if (!process.env.ADMINS) missingEnvVars.push("ADMINS");
if (!process.env.IRC_NICK) missingEnvVars.push("IRC_NICK");
if (missingEnvVars.length > 0) {
-
throw new Error(
-
`Missing required environment variables: ${missingEnvVars.join(", ")}`,
-
);
+
throw new Error(
+
`Missing required environment variables: ${missingEnvVars.join(", ")}`,
+
);
}
const slackApp = new SlackApp({
-
env: {
-
SLACK_BOT_TOKEN: process.env.SLACK_BOT_TOKEN as string,
-
SLACK_SIGNING_SECRET: process.env.SLACK_SIGNING_SECRET as string,
-
SLACK_LOGGING_LEVEL: "INFO",
-
},
-
startLazyListenerAfterAck: true,
+
env: {
+
SLACK_BOT_TOKEN: process.env.SLACK_BOT_TOKEN as string,
+
SLACK_SIGNING_SECRET: process.env.SLACK_SIGNING_SECRET as string,
+
SLACK_LOGGING_LEVEL: "INFO",
+
},
+
startLazyListenerAfterAck: true,
});
const slackClient = slackApp.client;
// Get bot user ID
let botUserId: string | undefined;
-
slackClient.auth.test({
-
token: process.env.SLACK_BOT_TOKEN,
-
}).then((result) => {
-
botUserId = result.user_id;
-
console.log(`Bot user ID: ${botUserId}`);
-
});
+
slackClient.auth
+
.test({
+
token: process.env.SLACK_BOT_TOKEN,
+
})
+
.then((result) => {
+
botUserId = result.user_id;
+
console.log(`Bot user ID: ${botUserId}`);
+
});
// IRC client setup
const ircClient = new irc.Client(
-
"irc.hackclub.com",
-
process.env.IRC_NICK || "slackbridge",
-
{
-
port: 6667,
-
autoRejoin: true,
-
autoConnect: true,
-
channels: [],
-
secure: false,
-
userName: process.env.IRC_NICK,
-
realName: "Slack IRC Bridge",
-
},
+
"irc.hackclub.com",
+
process.env.IRC_NICK || "slackbridge",
+
{
+
port: 6667,
+
autoRejoin: true,
+
autoConnect: true,
+
channels: [],
+
secure: false,
+
userName: process.env.IRC_NICK,
+
realName: "Slack IRC Bridge",
+
},
);
+
// Clean up IRC connection on hot reload or exit
+
process.on("beforeExit", () => {
+
ircClient.disconnect("Reloading", () => {
+
console.log("IRC client disconnected");
+
});
+
});
+
// Join all mapped IRC channels on connect
ircClient.addListener("registered", async () => {
-
console.log("Connected to IRC server");
-
const mappings = channelMappings.getAll();
-
for (const mapping of mappings) {
-
ircClient.join(mapping.irc_channel);
-
}
+
console.log("Connected to IRC server");
+
const mappings = channelMappings.getAll();
+
for (const mapping of mappings) {
+
ircClient.join(mapping.irc_channel);
+
}
});
ircClient.addListener("join", (channel: string, nick: string) => {
-
if (nick === process.env.IRC_NICK) {
-
console.log(`Joined IRC channel: ${channel}`);
-
}
+
if (nick === process.env.IRC_NICK) {
+
console.log(`Joined IRC channel: ${channel}`);
+
}
});
ircClient.addListener(
-
"message",
-
async (nick: string, to: string, text: string) => {
-
if (nick === process.env.IRC_NICK) return;
-
if (nick === "****") return;
+
"message",
+
async (nick: string, to: string, text: string) => {
+
// Ignore messages from our own bot (with or without numbers suffix)
+
const botNickPattern = new RegExp(`^${process.env.IRC_NICK}\\d*$`);
+
if (botNickPattern.test(nick)) return;
+
if (nick === "****") return;
-
// Find Slack channel mapping for this IRC channel
-
const mapping = channelMappings.getByIrcChannel(to);
-
if (!mapping) return;
+
// Find Slack channel mapping for this IRC channel
+
const mapping = channelMappings.getByIrcChannel(to);
+
if (!mapping) return;
-
// Check if this IRC nick is mapped to a Slack user
-
const userMapping = userMappings.getByIrcNick(nick);
+
// Check if this IRC nick is mapped to a Slack user
+
const userMapping = userMappings.getByIrcNick(nick);
-
const displayName = `${nick} <irc>`;
-
let iconUrl: string | undefined;
+
const displayName = `${nick} <irc>`;
+
let iconUrl: string | undefined;
-
if (userMapping) {
-
try {
-
iconUrl = `https://cachet.dunkirk.sh/users/${userMapping.slack_user_id}/r`;
-
} catch (error) {
-
console.error("Error fetching user info:", error);
-
}
-
}
+
if (userMapping) {
+
try {
+
iconUrl = `https://cachet.dunkirk.sh/users/${userMapping.slack_user_id}/r`;
+
} catch (error) {
+
console.error("Error fetching user info:", error);
+
}
+
}
-
try {
-
await slackClient.chat.postMessage({
-
token: process.env.SLACK_BOT_TOKEN,
-
channel: mapping.slack_channel_id,
-
text: text,
-
username: displayName,
-
icon_url: iconUrl,
-
unfurl_links: false,
-
unfurl_media: false,
-
});
-
} catch (error) {
-
console.error("Error posting to Slack:", error);
-
}
-
},
+
try {
+
await slackClient.chat.postMessage({
+
token: process.env.SLACK_BOT_TOKEN,
+
channel: mapping.slack_channel_id,
+
text: parseIRCFormatting(text),
+
username: displayName,
+
icon_url: iconUrl,
+
unfurl_links: false,
+
unfurl_media: false,
+
});
+
console.log(`IRC → Slack: <${nick}> ${text}`);
+
} catch (error) {
+
console.error("Error posting to Slack:", error);
+
}
+
},
);
ircClient.addListener("error", (error: string) => {
-
console.error("IRC error:", error);
+
console.error("IRC error:", error);
});
// Slack event handlers
slackApp.event("message", async ({ payload }) => {
-
if (payload.subtype) return;
-
if (payload.bot_id) return;
-
if (payload.user === botUserId) return;
+
if (payload.subtype) return;
+
if (payload.bot_id) return;
+
if (payload.user === botUserId) return;
-
// Find IRC channel mapping for this Slack channel
-
const mapping = channelMappings.getBySlackChannel(payload.channel);
-
if (!mapping) {
-
console.log(
-
`No IRC channel mapping found for Slack channel ${payload.channel}`,
-
);
-
slackClient.conversations.leave({
-
channel: payload.channel,
-
});
-
return;
-
}
+
// Find IRC channel mapping for this Slack channel
+
const mapping = channelMappings.getBySlackChannel(payload.channel);
+
if (!mapping) {
+
console.log(
+
`No IRC channel mapping found for Slack channel ${payload.channel}`,
+
);
+
slackClient.conversations.leave({
+
channel: payload.channel,
+
});
+
return;
+
}
-
try {
-
const userInfo = await slackClient.users.info({
-
token: process.env.SLACK_BOT_TOKEN,
-
user: payload.user,
-
});
+
try {
+
const userInfo = await slackClient.users.info({
+
token: process.env.SLACK_BOT_TOKEN,
+
user: payload.user,
+
});
-
// Check for user mapping, otherwise use Slack name
-
const userMapping = userMappings.getBySlackUser(payload.user);
-
const username =
-
userMapping?.irc_nick ||
-
userInfo.user?.real_name ||
-
userInfo.user?.name ||
-
"Unknown";
-
-
// Parse Slack mentions and replace with display names
-
let messageText = payload.text;
-
const mentionRegex = /<@(U[A-Z0-9]+)>/g;
-
const mentions = Array.from(messageText.matchAll(mentionRegex));
-
-
for (const match of mentions) {
-
const userId = match[1];
-
try {
-
const response = await fetch(`https://cachet.dunkirk.sh/users/${userId}`);
-
if (response.ok) {
-
const data = await response.json();
-
messageText = messageText.replace(match[0], `@${data.displayName}`);
-
}
-
} catch (error) {
-
console.error(`Error fetching user ${userId} from cachet:`, error);
-
}
-
}
-
-
const message = `<${username}> ${messageText}`;
+
// Check for user mapping, otherwise use Slack name
+
const userMapping = userMappings.getBySlackUser(payload.user);
+
const username =
+
userMapping?.irc_nick ||
+
userInfo.user?.real_name ||
+
userInfo.user?.name ||
+
"Unknown";
-
console.log(`Sending to IRC ${mapping.irc_channel}: ${message}`);
-
ircClient.say(mapping.irc_channel, message);
-
} catch (error) {
-
console.error("Error handling Slack message:", error);
-
}
+
// Parse Slack mentions and replace with display names
+
let messageText = payload.text;
+
const mentionRegex = /<@(U[A-Z0-9]+)>/g;
+
const mentions = Array.from(messageText.matchAll(mentionRegex));
+
+
for (const match of mentions) {
+
const userId = match[1];
+
try {
+
const response = await fetch(
+
`https://cachet.dunkirk.sh/users/${userId}`,
+
);
+
if (response.ok) {
+
const data = await response.json() as CachetUser;
+
messageText = messageText.replace(match[0], `@${data.displayName}`);
+
}
+
} catch (error) {
+
console.error(`Error fetching user ${userId} from cachet:`, error);
+
}
+
}
+
+
// Parse Slack markdown formatting
+
messageText = parseSlackMarkdown(messageText);
+
+
const message = `<${username}> ${messageText}`;
+
+
ircClient.say(mapping.irc_channel, message);
+
console.log(`Slack → IRC: ${message}`);
+
} catch (error) {
+
console.error("Error handling Slack message:", error);
+
}
});
export default {
-
port: process.env.PORT || 3000,
-
async fetch(request: Request) {
-
const url = new URL(request.url);
-
const path = url.pathname;
+
port: process.env.PORT || 3000,
+
async fetch(request: Request) {
+
const url = new URL(request.url);
+
const path = url.pathname;
-
switch (path) {
-
case "/":
-
return new Response(`Hello World from irc-slack-bridge@${version}`);
-
case "/health":
-
return new Response("OK");
-
case "/slack":
-
return slackApp.run(request);
-
default:
-
return new Response("404 Not Found", { status: 404 });
-
}
-
},
+
switch (path) {
+
case "/":
+
return new Response(`Hello World from irc-slack-bridge@${version}`);
+
case "/health":
+
return new Response("OK");
+
case "/slack":
+
return slackApp.run(request);
+
default:
+
return new Response("404 Not Found", { status: 404 });
+
}
+
},
};
console.log(
-
`🚀 Server Started in ${Bun.nanoseconds() / 1000000} milliseconds on version: ${version}!\n\n----------------------------------\n`,
+
`🚀 Server Started in ${Bun.nanoseconds() / 1000000} milliseconds on version: ${version}!\n\n----------------------------------\n`,
);
console.log(
-
`Connecting to IRC: irc.hackclub.com:6667 as ${process.env.IRC_NICK}`,
+
`Connecting to IRC: irc.hackclub.com:6667 as ${process.env.IRC_NICK}`,
);
console.log(`Channel mappings: ${channelMappings.getAll().length}`);
console.log(`User mappings: ${userMappings.getAll().length}`);
+89
src/parser.ts
···
+
/**
+
* Parse Slack mrkdwn formatting and convert to IRC-friendly plain text
+
*/
+
export function parseSlackMarkdown(text: string): string {
+
let parsed = text;
+
+
// Replace channel mentions <#C123ABC|channel-name> or <#C123ABC>
+
parsed = parsed.replace(/<#[A-Z0-9]+\|([^>]+)>/g, "#$1");
+
parsed = parsed.replace(/<#[A-Z0-9]+>/g, "#channel");
+
+
// Replace links <http://example.com|text> or <http://example.com>
+
parsed = parsed.replace(/<(https?:\/\/[^|>]+)\|([^>]+)>/g, "$2 ($1)");
+
parsed = parsed.replace(/<(https?:\/\/[^>]+)>/g, "$1");
+
+
// Replace mailto links <mailto:email|text>
+
parsed = parsed.replace(/<mailto:([^|>]+)\|([^>]+)>/g, "$2 <$1>");
+
parsed = parsed.replace(/<mailto:([^>]+)>/g, "$1");
+
+
// Replace special mentions
+
parsed = parsed.replace(/<!here>/g, "@here");
+
parsed = parsed.replace(/<!channel>/g, "@channel");
+
parsed = parsed.replace(/<!everyone>/g, "@everyone");
+
+
// Replace user group mentions <!subteam^GROUP_ID|handle>
+
parsed = parsed.replace(/<!subteam\^[A-Z0-9]+\|([^>]+)>/g, "@$1");
+
parsed = parsed.replace(/<!subteam\^[A-Z0-9]+>/g, "@group");
+
+
// Date formatting - just use fallback text
+
parsed = parsed.replace(/<!date\^[0-9]+\^[^|]+\|([^>]+)>/g, "$1");
+
+
// Replace Slack bold *text* with IRC bold \x02text\x02
+
parsed = parsed.replace(/\*((?:[^\*]|\\\*)+)\*/g, "\x02$1\x02");
+
+
// Replace Slack italic _text_ with IRC italic \x1Dtext\x1D
+
parsed = parsed.replace(/_((?:[^_]|\\_)+)_/g, "\x1D$1\x1D");
+
+
// Replace Slack strikethrough ~text~ with plain text (IRC doesn't support strikethrough well)
+
parsed = parsed.replace(/~((?:[^~]|\\~)+)~/g, "$1");
+
+
// Replace code blocks ```code``` with plain text
+
parsed = parsed.replace(/```([^`]+)```/g, "$1");
+
+
// Replace inline code `code` with plain text
+
parsed = parsed.replace(/`([^`]+)`/g, "$1");
+
+
// Handle block quotes - prefix with >
+
parsed = parsed.replace(/^>/gm, ">");
+
+
// Unescape HTML entities
+
parsed = parsed.replace(/&amp;/g, "&");
+
parsed = parsed.replace(/&lt;/g, "<");
+
parsed = parsed.replace(/&gt;/g, ">");
+
+
return parsed;
+
}
+
+
/**
+
* Parse IRC formatting codes and convert to Slack mrkdwn
+
*/
+
export function parseIRCFormatting(text: string): string {
+
let parsed = text;
+
+
// IRC color codes - strip them (Slack doesn't support colors in the same way)
+
// \x03 followed by optional color codes
+
parsed = parsed.replace(/\x03(\d{1,2}(,\d{1,2})?)?/g, "");
+
+
// IRC bold \x02text\x02 -> Slack bold *text*
+
parsed = parsed.replace(/\x02([^\x02]*)\x02/g, "*$1*");
+
+
// IRC italic \x1D text\x1D -> Slack italic _text_
+
parsed = parsed.replace(/\x1D([^\x1D]*)\x1D/g, "_$1_");
+
+
// IRC underline \x1F text\x1F -> Slack doesn't have underline, use italic instead
+
parsed = parsed.replace(/\x1F([^\x1F]*)\x1F/g, "_$1_");
+
+
// IRC reverse/inverse \x16 - strip it (Slack doesn't support)
+
parsed = parsed.replace(/\x16/g, "");
+
+
// IRC reset \x0F - strip it
+
parsed = parsed.replace(/\x0F/g, "");
+
+
// Escape special Slack characters that would be interpreted as formatting
+
parsed = parsed.replace(/&/g, "&amp;");
+
parsed = parsed.replace(/</g, "&lt;");
+
parsed = parsed.replace(/>/g, "&gt;");
+
+
return parsed;
+
}
+
+9
src/types.ts
···
+
export interface CachetUser {
+
type: "user";
+
id: string;
+
userId: string;
+
displayName: string;
+
pronouns: string;
+
imageUrl: string;
+
expiration: string;
+
}