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

Added IRC string formatting to HTML conversion #1

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

Added IRC string formatting to HTML conversion #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f669372
Added IRC string formatting to HTML conversion
stormtrek Jun 25, 2016
5f6caff
Update index.js
stormtrek Jun 25, 2016
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
12 changes: 10 additions & 2 deletions src/tg/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ var logger = require('winston');

var myUser = {};

function irc_to_html_format(text) {
text = text.replace(/\x02(.*?)\x02/g, '<b>$1</b>');
text = text.replace(/\x02(.*)/g, '<b>$1</b>');
text = text.replace(/\x1D(.*?)\x1D/g, '<i>$1</i>');
text = text.replace(/\x1D(.*)/g, '<i>$1</i>');
return text;
}

var init = function(msgCallback) {
// start HTTP server for media files if configured to do so
if (config.showMedia) {
Expand Down Expand Up @@ -64,11 +72,11 @@ var init = function(msgCallback) {
}

if (message.user) {
message.text = '<' + message.user + '> ' + message.text;
message.text = '<' + message.user + '> ' + irc_to_html_format(message.text);
Copy link

@melamity melamity Jun 25, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Surely if you're sending HTML tags in a message you'd want to escape where it shows the username of the person who talked? It might be mistaken as a tag.

Copy link

@omnidan omnidan Jun 25, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<username> will be interpreted as an XML tag and probably will end up being removed by telegram, same goes for user input that contains these characters. We need to escape all occurences of < and > first.

}

logger.verbose('>> relaying to TG:', message.text);
tg.sendMessage(message.channel.tgChatId, message.text);
tg.sendMessage(message.channel.tgChatId, message.text, parse_mode=telegram.ParseMode.HTML);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This syntax does not exist in JavaScript

}
};
};
Expand Down