Skip to content

Commit 89ed06f

Browse files
Refactor code
1 parent 7df65a8 commit 89ed06f

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/main/scala/io/lambdaworks/detection/UrlDetector.scala

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,16 @@ final class UrlDetector private (
8787
private def allowedUrl(url: AbsoluteUrl): Boolean =
8888
allowedWithoutWww.forall(containsHost(_, url)) && deniedWithoutWww.forall(!containsHost(_, url))
8989

90-
private def cleanUrlForBracketMatch(originalText: String, urlStr: String): String = {
90+
private def cleanUrlForBracketMatch(content: String, url: String): String = {
9191
def isAllowedUrlChar(c: Char): Boolean =
9292
c.isLetterOrDigit || AllowedSpecialChars.contains(c)
9393

94-
Option(originalText.indexOf(urlStr)).filter(_ >= 0).fold(urlStr) { startIndex =>
95-
val extendedUrl = originalText
96-
.substring(startIndex)
97-
.takeWhile(isAllowedUrlChar)
94+
Option(content.indexOf(url)).filter(_ >= 0).fold(url) { from =>
95+
val extendedUrl = content.substring(from).takeWhile(isAllowedUrlChar)
9896

9997
EmptyParensRegex
10098
.findFirstMatchIn(extendedUrl)
101-
.map(m => extendedUrl.substring(0, m.start))
102-
.getOrElse(extendedUrl)
99+
.fold(extendedUrl)(m => extendedUrl.substring(0, m.start))
103100
}
104101
}
105102

@@ -152,7 +149,7 @@ object UrlDetector {
152149
'-', '.', '_', '~', ':', '/', '?', '#', '[', ']', '@', '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=', '%'
153150
)
154151

155-
private final val EmptyParensRegex: Regex = """\(\)[^()]*""".r
152+
private final val EmptyParensRegex: Regex = "\\(\\)[^()]*".r
156153
private final val SanitizeRegex: Regex = "[,!-.`/]+$".r
157154

158155
implicit private[detection] val orderingHost: Ordering[Host] = orderHost.toOrdering

0 commit comments

Comments
 (0)