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

build.sbt

@@ -54,10 +54,10 @@ lazy val core = Project("scalawiki-core", file("scalawiki-core"))
   .settings(commonSettings: _*)
   .settings(libraryDependencies ++= {
     Seq(
-      Library.Akka.actor,
-      Library.Akka.stream,
-      Library.Akka.http,
-      Library.Akka.httpCaching,
+      Library.Pekko.actor,
+      Library.Pekko.stream,
+      Library.Pekko.http,
+      Library.Pekko.httpCaching,
       Library.Play.json(isScala213.value),
       "com.typesafe" % "config" % TypesafeConfigV,
       "com.iheart" %% "ficus" % FicusV,
@@ -125,9 +125,9 @@ lazy val `http-extensions` = (project in file("http-extensions"))
   .settings(commonSettings: _*)
   .settings(
     libraryDependencies ++= Seq(
-      Library.Akka.actor,
-      Library.Akka.stream,
-      Library.Akka.http,
+      Library.Pekko.actor,
+      Library.Pekko.stream,
+      Library.Pekko.http,
       "org.scalacheck" %% "scalacheck" % ScalaCheckV % Test
     )
   )

http-extensions/src/main/scala/net/spraycookies/CookieHandling.scala

@@ -1,8 +1,8 @@
 package net.spraycookies
 
-import akka.http.scaladsl.client.RequestBuilding
-import akka.http.scaladsl.model.headers.{Cookie, `Set-Cookie`}
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
+import org.apache.pekko.http.scaladsl.client.RequestBuilding
+import org.apache.pekko.http.scaladsl.model.headers.{Cookie, `Set-Cookie`}
+import org.apache.pekko.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
 
 import scala.concurrent.{ExecutionContext, Future}
 

http-extensions/src/main/scala/net/spraycookies/CookieJar.scala

@@ -1,7 +1,7 @@
 package net.spraycookies
 
-import akka.http.scaladsl.model.{DateTime, Uri}
-import akka.http.scaladsl.model.headers.HttpCookie
+import org.apache.pekko.http.scaladsl.model.{DateTime, Uri}
+import org.apache.pekko.http.scaladsl.model.headers.HttpCookie
 import net.spraycookies.tldlist.EffectiveTldList
 
 import scala.annotation.tailrec

http-extensions/src/test/scala/net/spraycookies/CookieJarSpecification.scala

@@ -1,14 +1,14 @@
 package net.spraycookies
 
-import akka.http.scaladsl.model.headers.HttpCookie
+import org.apache.pekko.http.scaladsl.model.headers.HttpCookie
 import org.scalacheck.Properties
 import org.scalacheck.Prop.forAll
 import org.scalacheck.Gen
 
 object CookieJarSpecification extends Properties("CookieHandling") {
 
-  import akka.http.scaladsl.model.headers.{Cookie, `Set-Cookie`}
-  import akka.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
+  import org.apache.pekko.http.scaladsl.model.headers.{Cookie, `Set-Cookie`}
+  import org.apache.pekko.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
   import net.spraycookies.tldlist.EffectiveTldList
   import scala.concurrent._
   import scala.concurrent.duration._

project/Dependencies.scala

@@ -37,7 +37,7 @@ object Dependencies {
   )
 
   val overrides = Seq(
-    Library.Akka.actor,
+    Library.Pekko.actor,
     "org.reactivestreams" % "reactive-streams" % ReactiveStreamsV,
     "org.scala-lang.modules" %% "scala-xml" % ScalaXmlV,
     "org.scala-lang.modules" %% "scala-parser-combinators" % ScalaParserCombinatorsV,
@@ -63,14 +63,14 @@ object Dependencies {
 
   object Library {
 
-    object Akka {
-      val AkkaV = "2.6.20"
-      val AkkaHttpV = "10.1.15"
+    object Pekko {
+      val PekkoV = "1.0.3"
+      val PekkoHttpV = "1.0.1"
 
-      val actor = "com.typesafe.akka" %% "akka-actor" % AkkaV
-      val stream = "com.typesafe.akka" %% "akka-stream" % AkkaV
-      val http = "com.typesafe.akka" %% "akka-http" % AkkaHttpV
-      val httpCaching = "com.typesafe.akka" %% "akka-http-caching" % AkkaHttpV
+      val actor = "org.apache.pekko" %% "pekko-actor" % PekkoV
+      val stream = "org.apache.pekko" %% "pekko-stream" % PekkoV
+      val http = "org.apache.pekko" %% "pekko-http" % PekkoHttpV
+      val httpCaching = "org.apache.pekko" %% "pekko-http-caching" % PekkoHttpV
     }
 
     object Play {

scalawiki-bots/src/main/scala/org/scalawiki/bots/stat/CatScan.scala

@@ -1,20 +1,18 @@
 package org.scalawiki.bots.stat
 
-import java.util.Collections
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicInteger
-
-import akka.actor.ActorSystem
-import akka.http.caching.LfuCache
-import akka.http.caching.javadsl.CachingSettings
-import akka.http.caching.scaladsl.Cache
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.http.caching.LfuCache
+import org.apache.pekko.http.caching.scaladsl.Cache
 import org.scalawiki.MwBot
-import org.scalawiki.dto.{Namespace, Page}
 import org.scalawiki.dto.cmd.Action
 import org.scalawiki.dto.cmd.query.list._
 import org.scalawiki.dto.cmd.query.prop._
 import org.scalawiki.dto.cmd.query.{Generator, Query}
+import org.scalawiki.dto.{Namespace, Page}
 
+import java.util.Collections
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicInteger
 import scala.collection.JavaConverters._
 import scala.collection.SortedSet
 import scala.concurrent.ExecutionContext.Implicits.global

scalawiki-bots/src/main/scala/org/scalawiki/bots/stat/zachte/UkWikiStat.scala

@@ -1,6 +1,6 @@
 package org.scalawiki.bots.stat.zachte
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import org.jsoup.Jsoup
 import org.scalawiki.MwBot
 import org.scalawiki.http.HttpClient

scalawiki-core/src/it/scala/org/scalawiki/BaseIntegrationSpec.scala

@@ -1,7 +1,7 @@
 package org.scalawiki
 
-import akka.actor.ActorSystem
-import org.scalawiki.http.HttpClientAkka
+import org.apache.pekko.actor.ActorSystem
+import org.scalawiki.http.HttpClientPekko
 import org.specs2.mutable.Specification
 
 import scala.concurrent.{Await, Future}
@@ -14,7 +14,7 @@ class BaseIntegrationSpec extends Specification {
   val commons = "commons.wikimedia.org"
 
   val system: ActorSystem = ActorSystem()
-  val http = new HttpClientAkka(system)
+  val http = new HttpClientPekko(system)
 
   def getUkWikiBot: MwBot = MwBot.fromHost(ukWiki)
 

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

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

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

@@ -1,10 +1,10 @@
 package org.scalawiki
 
-import akka.actor.ActorSystem
-import akka.event.LoggingAdapter
-import akka.http.caching.LfuCache
-import akka.http.scaladsl.model.Uri.Query
-import akka.http.scaladsl.model._
+import org.apache.pekko.actor.ActorSystem
+import org.apache.pekko.event.LoggingAdapter
+import org.apache.pekko.http.caching.LfuCache
+import org.apache.pekko.http.scaladsl.model.Uri.Query
+import org.apache.pekko.http.scaladsl.model._
 import org.jsoup.Jsoup
 import org.scalawiki.dto.cmd.Action
 import org.scalawiki.dto.{LoginResponse, MwException, Page, Site}
@@ -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
 }
 
@@ -309,7 +309,7 @@ class MwBotImpl(
 
 object MwBot {
 
-  import akka.http.caching.scaladsl.Cache
+  import org.apache.pekko.http.caching.scaladsl.Cache
 
   import scala.concurrent.ExecutionContext.Implicits.global
   import scala.concurrent._

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(