disqualify by taken date

.gitignore

@@ -11,6 +11,7 @@
 
 ## Directory-based project format:
 .idea/
+null/
 
 ## File-based project format:
 *.ipr

.scalafmt.conf

@@ -1,2 +1,3 @@
 version = 3.8.3
-runner.dialect = scala213
+runner.dialect = scala213
+maxColumn = 100

scalawiki-core/src/main/resources/application.conf

@@ -1,4 +1,9 @@
 akka.http.parsing {
   max-content-length = 16m
   max-to-strict-bytes = 16m
+}
+
+akka.default-dispatcher {
+  type = Dispatcher
+  executor = "thread-pool-executor"
 }

scalawiki-core/src/main/scala/org/scalawiki/MwBot.scala

@@ -25,6 +25,8 @@ trait ActionBot {
       limit: Option[Long] = None
   ): Future[Iterable[Page]]
 
+  def log: LoggingAdapter
+
 }
 
 trait MwBot extends ActionBot {
@@ -70,8 +72,6 @@ trait MwBot extends ActionBot {
 
   def system: ActorSystem
 
-  def log: LoggingAdapter
-
   def mediaWikiVersion: MediaWikiVersion
 }
 

scalawiki-core/src/main/scala/org/scalawiki/dto/Image.scala

@@ -8,19 +8,25 @@ import org.scalawiki.dto.markup.Gallery
 import org.scalawiki.wikitext.TemplateParser
 import org.sweble.wikitext.engine.nodes.EngPage
 
+import scala.util.Try
+
 case class ImageMetadata(data: Map[String, String]) {
 
   def camera: Option[String] = data.get("Model")
 
   def date: Option[ZonedDateTime] =
     data
-      .get("DateTime")
-      .map(s => LocalDateTime.parse(s, ImageMetadata.df).atZone(ZoneOffset.UTC))
+      .get("DateTimeOriginal")
+      .flatMap { s =>
+        val parsed = Try(LocalDateTime.parse(s, ImageMetadata.df).atZone(ZoneOffset.UTC))
+//        parsed.failed.foreach(println)
+        parsed.toOption
+      }
 }
 
 object ImageMetadata {
-  val pattern = "yyyy:MM:dd HH:mm:ss"
-  val df = DateTimeFormatter.ofPattern(pattern)
+  private val pattern = "yyyy:MM:dd HH:mm:ss"
+  private val df = DateTimeFormatter.ofPattern(pattern)
 }
 
 case class Image(
@@ -38,7 +44,8 @@ case class Image(
     pageId: Option[Long] = None,
     metadata: Option[ImageMetadata] = None,
     categories: Set[String] = Set.empty,
-    specialNominations: Set[String] = Set.empty
+    specialNominations: Set[String] = Set.empty,
+    mime: Option[String] = None
 ) extends Ordered[Image] {
 
   def compare(that: Image): Int = title.compareTo(that.title)
@@ -82,7 +89,7 @@ object Image {
   def fromPageRevision(
       page: Page,
       monumentIdTemplate: Option[String],
-      specialNominationTemplates: Seq[String] = Nil
+      specialNominationTemplates: Set[String] = Set.empty
   ): Option[Image] = {
     page.revisions.headOption.map { revision =>
       val content = revision.content.getOrElse("")
@@ -92,12 +99,8 @@ object Image {
           .collectTemplates(parsedPage, template)
           .flatMap(_.getParamOpt("1"))
       }
-      val specialNominations = specialNominationTemplates.flatMap { template =>
-        Some(template).filter(_ => {
-          val value = TemplateParser.collectTemplates(parsedPage, template)
-          value.nonEmpty
-        })
-      }
+      val specialNominations =
+        TemplateParser.collectTemplateNames(parsedPage, specialNominationTemplates)
 
       val author = getAuthorFromPage(parsedPage)
 
@@ -115,40 +118,32 @@ object Image {
         monumentIds = ids,
         pageId = page.id,
         categories = categories,
-        specialNominations = specialNominations.toSet
+        specialNominations = specialNominations
       )
     }
   }
 
   def fromPage(
-      page: Page,
       monumentIdTemplate: Option[String],
-      specialNominationTemplates: Seq[String] = Nil
-  ): Option[Image] = {
-    for (
-      fromImage <- Image.fromPageImages(page);
+      specialNominationTemplates: Set[String] = Set.empty
+  )(page: Page): Option[Image] =
+    for {
+      fromImage <- Image.fromPageImages(page)
       fromRev <- Image.fromPageRevision(
         page,
         monumentIdTemplate,
         specialNominationTemplates
       )
+      renamedAuthor = fromRev.author.map(author => AuthorsMap.renames.getOrElse(author, author))
+    } yield fromImage.copy(
+      monumentIds = fromRev.monumentIds,
+      author = renamedAuthor,
+      categories = fromRev.categories,
+      specialNominations = fromRev.specialNominations
     )
-      yield {
-        val renamedAuthor = fromRev.author.map(author =>
-          AuthorsMap.renames.getOrElse(author, author)
-        )
-        fromImage.copy(
-          monumentIds = fromRev.monumentIds,
-          author = renamedAuthor,
-          categories = fromRev.categories,
-          specialNominations = fromRev.specialNominations
-        )
-      }
-  }
 
-  def getAuthorFromPage(content: String): String = {
+  def getAuthorFromPage(content: String): String =
     getAuthorFromPage(TemplateParser.parsePage(content))
-  }
 
   def getAuthorFromPage(parsedPage: EngPage): String = {
     val template = TemplateParser.getTemplate(parsedPage, Some("Information"))
@@ -198,7 +193,8 @@ object Image {
       url: Option[String],
       pageUrl: Option[String],
       pageId: Option[Long],
-      metadata: Option[Map[String, String]] = None
+      metadata: Option[Map[String, String]] = None,
+      mime: Option[String] = None
   ) =
     new Image(
       title = title,
@@ -210,7 +206,8 @@ object Image {
       url = url,
       pageUrl = pageUrl,
       pageId = pageId,
-      metadata = metadata.map(ImageMetadata.apply)
+      metadata = metadata.map(ImageMetadata.apply),
+      mime = mime
     )
 
   def gallery(

scalawiki-core/src/main/scala/org/scalawiki/dto/Page.scala

@@ -20,29 +20,29 @@ case class Page(
 ) /*extends HasId[Page]*/ {
   val history = new History(revisions)
 
-  def titleWithoutNs = title.split("\\:").last
+  def titleWithoutNs: String = title.split("\\:").last
 
-  def withText(text: String) =
+  def withText(text: String): Page =
     copy(revisions = Page.revisionsFromText(Some(text)))
 
   def text: Option[String] = revisions.headOption.flatMap(_.content)
 
-  def isTalkPage = ns.exists(_ % 2 == 1)
+  def isTalkPage: Boolean = ns.exists(_ % 2 == 1)
 
-  def isArticle = ns.contains(Namespace.MAIN)
+  def isArticle: Boolean = ns.contains(Namespace.MAIN)
 
   def withId(id: Long): Page = copy(id = Some(id))
 
   def lastRevisionUser: Option[Contributor] =
     revisions.headOption.flatMap(_.user)
 
-  def appendLists(other: Page) = copy(
+  def appendLists(other: Page): Page = copy(
     revisions = this.revisions ++ other.revisions,
     langLinks = this.langLinks ++ other.langLinks,
     links = this.links ++ other.links
   )
 
-  def withoutContent = copy(revisions = revisions.map(_.withoutContent))
+  def withoutContent: Page = copy(revisions = revisions.map(_.withoutContent))
 
 }
 
@@ -120,11 +120,9 @@ object Page {
       ns: Option[Int],
       title: String,
       editToken: Option[String]
-  ) = {
-    new Page(id, ns, title, Seq.empty, Seq.empty, editToken)
-  }
+  ): Page = new Page(id, ns, title, Nil, Nil, editToken)
 
-  def revisionsFromText(text: Option[String]) =
+  def revisionsFromText(text: Option[String]): Seq[Revision] =
     text.fold(Seq.empty[Revision])(content => Revision.many(content))
 
   def groupById(pages: Seq[Page]): Map[Long, Seq[Page]] =

scalawiki-core/src/main/scala/org/scalawiki/dto/cmd/query/prop/ImageInfo.scala

@@ -166,6 +166,7 @@ package iiprop {
       Size,
       Dimensions,
       Sha1,
+      Mime,
       ThumbMime,
       MediaType,
       Metadata,

scalawiki-core/src/main/scala/org/scalawiki/dto/filter/PageFilter.scala

@@ -4,14 +4,16 @@ import org.scalawiki.dto.Page
 
 object PageFilter {
 
-  def titles(titles: Set[String]) = (p: Page) => titles.contains(p.title)
+  type PageFilter = Page => Boolean
 
-  def ids(ids: Set[Long]) = (p: Page) => p.id.exists(ids.contains)
+  def titles(titles: Set[String]): PageFilter = (p: Page) => titles.contains(p.title)
 
-  def ns(namespaces: Set[Int]) = (p: Page) => p.ns.exists(namespaces.contains)
+  def ids(ids: Set[Long]): PageFilter = (p: Page) => p.id.exists(ids.contains)
 
-  val all = (p: Page) => true
+  def ns(namespaces: Set[Int]): PageFilter = (p: Page) => p.ns.exists(namespaces.contains)
 
-  val none = (p: Page) => false
+  val all: PageFilter = _ => true
+
+  val none: PageFilter = _ => false
 
 }

scalawiki-core/src/main/scala/org/scalawiki/dto/history/History.scala

@@ -7,7 +7,7 @@ import org.scalawiki.dto.filter.RevisionFilter
 
 class History(val revisions: Seq[Revision]) {
 
-  def hasPageCreation = revisions.headOption.exists(_.isNewPage)
+  def hasPageCreation: Boolean = revisions.headOption.exists(_.isNewPage)
 
   def users(revisionFilter: RevisionFilter): Set[String] = {
     val filtered = revisionFilter.apply(revisions)
@@ -45,10 +45,10 @@ class History(val revisions: Seq[Revision]) {
 
   def updated: Option[ZonedDateTime] = revisions.headOption.flatMap(_.timestamp)
 
-  def createdAfter(from: Option[ZonedDateTime]) =
+  def createdAfter(from: Option[ZonedDateTime]): Boolean =
     created.exists(rev => from.forall(rev.isAfter))
 
-  def editedIn(revisionFilter: RevisionFilter) =
+  def editedIn(revisionFilter: RevisionFilter): Boolean =
     revisionFilter.apply(revisions).nonEmpty
 
 }

scalawiki-core/src/main/scala/org/scalawiki/dto/markup/SwTemplate.scala

@@ -12,7 +12,7 @@ case class SwTemplate(wtNode: WtTemplate) extends SwNode {
     wtNode.getArgs.asScala.collect { case arg: WtTemplateArgument => arg }
   val template = getTemplate
 
-  def getTemplate = {
+  def getTemplate: Template = {
     val argsMap = args.zipWithIndex.map { case (arg, index) =>
       val name =
         if (arg.hasName)
@@ -25,13 +25,13 @@ case class SwTemplate(wtNode: WtTemplate) extends SwNode {
       name -> value
     }.toMap
 
-    new Template(name, argsMap)
+    Template(name, argsMap)
   }
 
   def getArg(name: String): Option[WtTemplateArgument] =
     args.find(p => p.getName.isResolved && p.getName.getAsString.trim == name)
 
-  def setTemplateParam(name: String, value: String) = {
+  def setTemplateParam(name: String, value: String): Unit = {
     getArg(name).foreach { arg =>
       val orig = getText(arg.getValue)
 

scalawiki-core/src/main/scala/org/scalawiki/dto/markup/Table.scala

@@ -7,7 +7,7 @@ case class Table(
     cssClass: String = "wikitable sortable"
 ) {
 
-  def asWiki = {
+  def asWiki: String = {
     "{|" +
       (if (cssClass.nonEmpty) s" class='$cssClass'" else "") +
       (if (title.nonEmpty) "\n|+ " + title else "") +
@@ -22,7 +22,7 @@ case class Table(
       "\n|}"
   }
 
-  def asHtml = {
+  def asHtml: String = {
     "<table>" +
       (if (cssClass.nonEmpty) s" class='$cssClass'" else "") +
       (if (title.nonEmpty) s"\n<caption> $title </caption>" else "") +