deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

fix user links

Browse source
This commit is contained in:
Thibault Duplessis 2017-09-18 10:44:07 -05:00
parent 365b12bfaa
commit 43e215deef
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/user/src/main/Links.scala
View file

@ -4,16 +4,12 @@ object Links {
def make(text: String): List[Link] = text.lines.toList.map(_.trim) flatMap toLink
private val UrlRegex = """^(?:http[s]?:\/\/)?(.+)/.+""".r
private val UrlRegex = """^(?:http[s]?:\/\/)?([^/]+)/?.*$""".r
private def toLink(line: String): Option[Link] = line match {
case UrlRegex(domain) => Link(
site = Link.Site.allKnown find { site =>
site.domains.contains(domain)
} getOrElse Link.Site.Other(domain),
url =
if (line startsWith "http") line
else s"https://$line"
site = Link.Site.allKnown find (_ matches domain) getOrElse Link.Site.Other(domain),
url = if (line startsWith "http") line else s"https://$line"
).some
case _ => none
}
@ -23,7 +19,13 @@ case class Link(site: Link.Site, url: String)
object Link {
sealed abstract class Site(val name: String, val domains: List[String])
sealed abstract class Site(val name: String, val domains: List[String]) {
def matches(domain: String) = domains.exists { d =>
domain endsWith d
}
}
object Site {
case object Twitter extends Site("Twitter", List("twitter.com"))
case object Facebook extends Site("Facebook", List("facebook.com"))