From 35d471df9954663397c92447ecb8bc87e30fea50 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Wed, 17 May 2023 02:06:45 +0200 Subject: [PATCH] fix: clean up unused things --- src/discord2telegram/helpers.ts | 19 +++++++++---------- src/discord2telegram/md2html.ts | 16 +++------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/discord2telegram/helpers.ts b/src/discord2telegram/helpers.ts index 6fa7f182..bf70cde0 100644 --- a/src/discord2telegram/helpers.ts +++ b/src/discord2telegram/helpers.ts @@ -35,9 +35,9 @@ export const escapeHTMLSpecialChars = R.compose( * * @returns Filtered string */ -export function removeCustomEmojis(input: string){ - const regex = /\<[^;]*\>\s?/gi; - return input.split(regex).join(''); +export function removeCustomEmojis(input: string) { + const regex = /<[^;]*>\s?/gi; + return input.split(regex).join(""); } /** @@ -48,8 +48,8 @@ export function removeCustomEmojis(input: string){ * * @returns Filtered string */ -export function replaceCustomEmojis(input: string, replacement: string){ - const regex = /\<[^;]*\>/g; +export function replaceCustomEmojis(input: string, replacement: string) { + const regex = /<[^;]*>/g; return input.replace(regex, replacement); } @@ -61,8 +61,8 @@ export function replaceCustomEmojis(input: string, replacement: string){ * * @returns Processed string */ -export function replaceAtWith(input: string, replacement: string ){ - const regex = /\@/g; +export function replaceAtWith(input: string, replacement: string) { + const regex = /@/g; return input.replace(regex, replacement); } @@ -73,8 +73,7 @@ export function replaceAtWith(input: string, replacement: string ){ * * @returns Processed string */ -export function replaceExcessiveSpaces(input: string){ +export function replaceExcessiveSpaces(input: string) { const regex = /[^\S\n]{2,}/g; - return input.replace(regex, ' '); + return input.replace(regex, ""); } - diff --git a/src/discord2telegram/md2html.ts b/src/discord2telegram/md2html.ts index 6fd40323..4d621ea6 100644 --- a/src/discord2telegram/md2html.ts +++ b/src/discord2telegram/md2html.ts @@ -1,12 +1,6 @@ import simpleMarkdown, { SingleASTNode } from "simple-markdown"; import { TelegramSettings } from "../settings/TelegramSettings"; -import { - escapeHTMLSpecialChars, - customEmojiFilter, - replaceAtWithHash, - replaceExcessiveSpaces, - removeNewlineSpaces -} from "./helpers"; +import { escapeHTMLSpecialChars, removeCustomEmojis, replaceAtWith, replaceExcessiveSpaces } from "./helpers"; import R from "ramda"; /*********** @@ -130,19 +124,15 @@ export function md2html(text: string, settings: TelegramSettings) { function htmlCleanup(input: string, settings: TelegramSettings) { if (settings.useCustomEmojiFilter) { - input = customEmojiFilter(input); + input = removeCustomEmojis(input); } if (settings.replaceAtWithHash) { - input = replaceAtWithHash(input); + input = replaceAtWith(input, "#"); } if (settings.replaceExcessiveSpaces) { input = replaceExcessiveSpaces(input); } - - if (settings.removeNewlineSpaces) { - input = removeNewlineSpaces(input); - } return input; }