From 2a5b546401ffc2fa445b1c57ad826300a1cb7b42 Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Tue, 5 Dec 2023 11:24:09 -0700 Subject: [PATCH] codePreviews+fedimbed: allow unembedded spoilers to be spoilers --- src/modules/codePreviews.js | 6 +++--- src/modules/fedimbed.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/codePreviews.js b/src/modules/codePreviews.js index dd2c40d..d775926 100644 --- a/src/modules/codePreviews.js +++ b/src/modules/codePreviews.js @@ -3,11 +3,11 @@ const {MessageFlags} = require("@projectdysnomia/dysnomia").Constants; const events = require("../lib/events.js"); const {hasFlag} = require("../lib/guildSettings.js"); const REGEX_GITHUB = - /(?:\s|^)(\|\|\s*)?https?:\/\/(www\.)?github\.com\/[a-z0-9-]+\/[a-z0-9-]+\/blob\/([a-z0-9-_.#/]*)(\s+\|\|)?/gi; + /(?:\s|^)(\|\|\s*)?https?:\/\/(www\.)?github\.com\/[a-z0-9-]+\/[a-z0-9-]+\/blob\/([a-z0-9-_.#/]*)(\s*\|\|)?/gi; const REGEX_GITLAB = - /(?:\s|^)(\|\|\s*)?https?:\/\/.+?\/[a-z0-9-]+\/[a-z0-9-]+\/-\/blob\/([a-z0-9-_.#/]*)(\s+\|\|)?/gi; + /(?:\s|^)(\|\|\s*)?https?:\/\/.+?\/[a-z0-9-]+\/[a-z0-9-]+\/-\/blob\/([a-z0-9-_.#/]*)(\s*\|\|)?/gi; const REGEX_GITEA = - /(?:\s|^)(\|\|\s*)?https?:\/\/.+?\/[a-z0-9-]+\/[a-z0-9-]+\/src\/branch\/([a-z0-9-_.#/]*)(\s+\|\|)?/gi; + /(?:\s|^)(\|\|\s*)?https?:\/\/.+?\/[a-z0-9-]+\/[a-z0-9-]+\/src\/branch\/([a-z0-9-_.#/]*)(\s*\|\|)?/gi; const REGEX_SPOILER = /(?:\s|^)\|\|([\s\S]+?)\|\|/; function unindent(str) { diff --git a/src/modules/fedimbed.js b/src/modules/fedimbed.js index 8cbe627..e693ea2 100644 --- a/src/modules/fedimbed.js +++ b/src/modules/fedimbed.js @@ -12,7 +12,7 @@ const FRIENDLY_USERAGENT = "HiddenPhox/fedimbed (https://gitdab.com/Cynosphere/HiddenPhox)"; const URLS_REGEX = - /(?:\s|^)(\|\|\s*)?(https?:\/\/[^\s<]+[^<.,:;"'\]\s])(\s+\|\|)?/g; + /(?:\s|^)(\|\|\s*)?(https?:\/\/[^\s<]+[^<.,:;"'\]\s])(\s*\|\|)?/g; const SPOILER_REGEX = /(?:\s|^)\|\|([\s\S]+?)\|\|/; const PATH_REGEX = {