diff --git a/app/views/ublog/post.scala b/app/views/ublog/post.scala index 9826d65ead..0625b9d1f2 100644 --- a/app/views/ublog/post.scala +++ b/app/views/ublog/post.scala @@ -98,10 +98,7 @@ object post { imageUrlOf(post) match { case Some(url) => baseImg(src := url) case _ => - baseImg( - heightA := height, - src := assetUrl("images/placeholder.png") - ) + baseImg(src := assetUrl("images/placeholder-500.png")) } def imageUrlOf(post: UblogPost, height: Int = defaultImageHeight) = post.image map { i => diff --git a/modules/memo/src/main/Picfit.scala b/modules/memo/src/main/Picfit.scala index 41f102a5c4..d1a878fa6d 100644 --- a/modules/memo/src/main/Picfit.scala +++ b/modules/memo/src/main/Picfit.scala @@ -20,7 +20,6 @@ case class PicfitImage( // unique: a new image will delete the previous ones with same rel rel: String, name: String, - contentType: Option[String], size: Int, // in bytes createdAt: DateTime ) { @@ -57,8 +56,7 @@ final class PicfitApi(coll: Coll, ws: StandaloneWSClient, config: PicfitConfig)( _id = PicfitImage.Id(s"${lila.common.ThreadLocalRandom nextString 10}.$extension"), user = userId, rel = rel, - name = sanitizeName(uploaded.filename), - contentType = uploaded.contentType, + name = uploaded.filename, size = uploaded.fileSize.toInt, createdAt = DateTime.now ) @@ -74,11 +72,6 @@ final class PicfitApi(coll: Coll, ws: StandaloneWSClient, config: PicfitConfig)( .flatMap { _.result[PicfitImage] ?? picfitServer.delete } .void - private def sanitizeName(name: String) = { - // the char `^` breaks play, even URL encoded - java.net.URLEncoder.encode(name, "UTF-8").replaceIf('%', "") - } - private object picfitServer { def store(image: PicfitImage, from: Uploaded): Funit = { diff --git a/public/images/placeholder-500.png b/public/images/placeholder-500.png new file mode 100644 index 0000000000..072887ab23 Binary files /dev/null and b/public/images/placeholder-500.png differ diff --git a/ui/site/css/ublog/_card.scss b/ui/site/css/ublog/_card.scss index 83c4892ff6..23f6a32be6 100644 --- a/ui/site/css/ublog/_card.scss +++ b/ui/site/css/ublog/_card.scss @@ -34,6 +34,7 @@ background-image: img-url('placeholder-margin.png'); background-size: cover; background-position: center; + height: 200px; } }