reinstate flags as "Country or region"

and migrate non-regional flags such as _lichess or _esperanto
into their corresponding flairs

Author: ornicar

app/views/account/profile.scala

@@ -26,6 +26,11 @@ object profile:
         postForm(cls := "form3", action := routes.Account.profileApply)(
           div(cls := "form-group")(trans.allInformationIsPublicAndOptional()),
           form3.split(
+            ctx.kid.no option
+              form3
+                .group(form("bio"), trans.biography(), half = true, help = trans.biographyDescription().some):
+                  f => form3.textarea(f)(rows := 5)
+            ,
             form3.group(form("flair"), "Flair", half = true): f =>
               details(cls := "form-control emoji-details")(
                 summary(cls := "button button-metal button-no-upper")(
@@ -35,11 +40,12 @@ object profile:
                 form3.hidden(f),
                 div(cls := "emoji-picker")
               ),
+          ),
+          form3.split(
+            form3.group(form("flag"), trans.countryRegion(), half = true): f =>
+              form3.select(f, lila.user.Flags.allPairs, default = "".some),
             form3.group(form("location"), trans.location(), half = true)(form3.input(_))
           ),
-          ctx.kid.no option
-            form3.group(form("bio"), trans.biography(), help = trans.biographyDescription().some): f =>
-              form3.textarea(f)(rows := 5),
           form3.split(
             form3.group(form("firstName"), trans.firstName(), half = true)(form3.input(_)),
             form3.group(form("lastName"), trans.lastName(), half = true)(form3.input(_))

app/views/coach/widget.scala

@@ -37,18 +37,16 @@ object widget:
             tr(
               th(location()),
               td(
-                profile.nonEmptyLocation.map { l =>
-                  span(cls := "location")(l)
-                },
-                profile.countryInfo.map { c =>
+                profile.nonEmptyLocation.map: l =>
+                  span(cls := "location")(l),
+                profile.flagInfo.map: c =>
                   frag(
-                    span(cls := "country")(
-                      img(cls := "flag", src := assetUrl(s"images/flags/${c.code}.png")),
+                    span(cls := "flag")(
+                      img(src := assetUrl(s"images/flags/${c.code}.png")),
                       " ",
                       c.name
                     )
                   )
-                }
               )
             ),
             tr(cls := "languages")(

app/views/user/mini.scala

@@ -20,7 +20,11 @@ object mini:
     frag(
       div(cls := "upt__info")(
         div(cls := "upt__info__top")(
-          div(cls := "left")(userLink(u, withPowerTip = false, withFlair = true)),
+          div(cls := "left")(
+            userLink(u, withPowerTip = false, withFlair = true),
+            u.profileOrDefault.flagInfo map: c =>
+              span(cls := "upt__info__top__flag", attrData("flag") := c.code)(c.shortName)
+          ),
           ping map bits.signalBars
         ),
         if u.lame && !ctx.is(u) && !isGranted(_.UserModView)
@@ -31,7 +35,7 @@ object mini:
       ),
       ctx.userId.map: myId =>
         frag(
-          (myId != u.id && u.enabled.yes) option div(cls := "upt__actions btn-rack")(
+          (myId.isnt(u.id) && u.enabled.yes) option div(cls := "upt__actions btn-rack")(
             a(
               dataIcon := licon.AnalogTv,
               cls      := "btn-rack__btn",
@@ -54,7 +58,7 @@ object mini:
             ),
             views.html.relation.mini(u.id, blocked, followable, rel)
           ),
-          crosstable.flatMap(_.nonEmpty) map { cross =>
+          crosstable.flatMap(_.nonEmpty) map: cross =>
             a(
               cls   := "upt__score",
               href  := s"${routes.User.games(u.username, "me")}#games",
@@ -64,7 +68,6 @@ object mini:
                 val opponent = ~cross.showOpponentScore(myId)
                 s"""<strong>${cross.showScore(myId)}</strong> - <strong>$opponent</strong>"""
               )
-          }
         ),
       isGranted(_.UserModView) option div(cls := "upt__mod")(
         span(

app/views/user/show/header.scala

@@ -168,13 +168,12 @@ object header:
                   profile.nonEmptyLocation.ifTrue(ctx.kid.no && !hideTroll).map { l =>
                     span(cls := "location")(l)
                   },
-                  profile.countryInfo.map { c =>
-                    span(cls := "country")(
-                      img(cls := "flag", src := assetUrl(s"images/flags/${c.code}.png")),
+                  profile.flagInfo.map: c =>
+                    span(cls := "flag")(
+                      img(src := assetUrl(s"images/flags/${c.code}.png")),
                       " ",
                       c.name
-                    )
-                  },
+                    ),
                   p(cls := "thin")(trans.memberSince(), " ", showDate(u.createdAt)),
                   u.seenAt.map { seen =>
                     p(cls := "thin")(trans.lastSeenActive(momentFromNow(seen)))
@@ -191,35 +190,31 @@ object header:
                     br,
                     a(href := s"${routes.User.opponents}?u=${u.username}")(trans.favoriteOpponents())
                   ),
-                  u.playTime.map { playTime =>
+                  u.playTime.map: playTime =>
                     frag(
                       p(trans.tpTimeSpentPlaying(showDuration(playTime.totalDuration))),
                       playTime.nonEmptyTvDuration.map { tvDuration =>
                         p(trans.tpTimeSpentOnTV(showDuration(tvDuration)))
                       }
-                    )
-                  },
+                    ),
                   !hideTroll option div(cls := "social_links col2")(
                     profile.actualLinks.nonEmpty option strong(trans.socialMediaLinks()),
-                    profile.actualLinks.map { link =>
+                    profile.actualLinks.map: link =>
                       a(href := link.url, targetBlank, noFollow)(link.site.name)
-                    }
                   ),
                   div(cls := "teams col2")(
                     info.teamIds.nonEmpty option strong(trans.team.teams()),
-                    info.teamIds.sorted(stringOrdering).map { t =>
+                    info.teamIds.sorted(stringOrdering) map: t =>
                       teamLink(t, withIcon = false)
-                    }
                   )
                 )
               ),
               info.insightVisible option
-                a(cls := "insight", href := routes.Insight.index(u.username), dataIcon := licon.Target)(
+                a(cls := "insight", href := routes.Insight.index(u.username), dataIcon := licon.Target):
                   span(
                     strong("Chess Insights"),
                     em("Analytics from ", if ctx.is(u) then "your" else s"${u.username}'s", " games")
                   )
-                )
             )
           )
       ,
@@ -274,11 +269,9 @@ object header:
         p(cls := "note__text")(richText(note.text, expandImg = false)),
         (note.mod && isGranted(_.Admin)) option postForm(
           action := routes.User.setDoxNote(note._id, !note.dox)
-        )(
-          submitButton(
-            cls := "button-empty confirm button text"
-          )("Toggle Dox")
-        ),
+        ):
+          submitButton(cls := "button-empty confirm button text")("Toggle Dox")
+        ,
         p(cls := "note__meta")(
           userIdLink(note.from.some),
           br,

bin/download-lifat

@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-commit=5b684ed8c7de938268200717b22ba48120715b40
+commit=3e7c037e05bf0b5d61e5c2bd95b1f5205c480685
 
 lifat_dir="${LIFAT_DIR:-lifat}"
 mkdir -p "$lifat_dir"
@@ -14,7 +14,7 @@ if [ ! -d "$lifat_commit_dir" ]; then
 	git remote add origin https://github.com/lichess-org/lifat
 	git fetch --depth 1 origin "$commit"
 	git checkout --detach "$commit"
-	git log -n 1 --pretty="oneline" > "commit.txt"
+	git log -n 1 --pretty="oneline" >"commit.txt"
 	cd -
 fi
 

bin/mongodb/user-flag-to-flair.js

@@ -0,0 +1,12 @@
+map = [
+  ['_lichess', 'activity.lichess'],
+  ['_pirate', 'flags.pirate-flag'],
+  ['_rainbow', 'flags.rainbow-flag'],
+  ['_transgender', 'flags.transgender-flag'],
+  ['_esperanto', 'symbols.esperanto'],
+];
+
+db.user4.find({ 'profile.country': { $in: map.map(e => e[0]) } }, { 'profile.country': 1 }).forEach(user => {
+  flair = map.find(e => e[0] == user.profile.country)[1];
+  db.user4.updateOne({ _id: user._id }, { $unset: { 'profile.country': 1 }, $set: { flair: flair } });
+});

modules/i18n/src/main/I18nKeys.scala

@@ -377,7 +377,7 @@ object I18nKeys:
   val `firstName` = I18nKey("firstName")
   val `lastName` = I18nKey("lastName")
   val `biography` = I18nKey("biography")
-  val `flag` = I18nKey("flag")
+  val `countryRegion` = I18nKey("countryRegion")
   val `thankYou` = I18nKey("thankYou")
   val `socialMediaLinks` = I18nKey("socialMediaLinks")
   val `oneUrlPerLine` = I18nKey("oneUrlPerLine")

modules/user/src/main/Flags.scala

@@ -283,14 +283,9 @@ object Flags:
     C("_adygea", "Adygea"),
     C("_belarus-wrw", "Belarus White-red-white"),
     C("_east-turkestan", "East Turkestan"),
-    C("_esperanto", "Esperanto"),
-    C("_lichess", "Lichess"),
-    C("_pirate", "Pirate"),
-    C("_rainbow", "Rainbow"),
     C("_russia-wbw", "Russia White-blue-white"),
     C("_united-nations", "United Nations"),
-    C("_earth", "Earth"),
-    C("_transgender", "Transgender")
+    C("_earth", "Earth")
   )
 
   val allPairs = all.map: c =>

modules/user/src/main/Profile.scala

@@ -1,7 +1,9 @@
 package lila.user
 
+import reactivemongo.api.bson.Macros.Annotations.Key
+
 case class Profile(
-    country: Option[String] = None,
+    @Key("country") flag: Option[String] = None,
     location: Option[String] = None,
     bio: Option[String] = None,
     firstName: Option[String] = None,
@@ -20,7 +22,7 @@ case class Profile(
       case Nil   => none
       case names => (names mkString " ").some
 
-  def countryInfo = country flatMap Flags.info
+  def flagInfo = flag flatMap Flags.info
 
   def nonEmptyLocation = ne(location)
 
@@ -29,7 +31,7 @@ case class Profile(
   def isEmpty = completionPercent == 0
 
   def completionPercent: Int =
-    100 * List(country, bio, firstName, lastName).count(_.isDefined) / 4
+    100 * List(flag, bio, firstName, lastName).count(_.isDefined) / 4
 
   def actualLinks: List[Link] = links so Links.make
 

translation/source/site.xml

@@ -507,7 +507,7 @@ computer analysis, game chat and shareable URL.</string>
   <string name="firstName">First name</string>
   <string name="lastName">Surname</string>
   <string name="biography">Biography</string>
-  <string name="flag" comment="flag&#10;Appears when you edit your profile. Lets a player add a country/flag (not all flags are for countries) to their profile">Flag</string>
+  <string name="countryRegion" comment="flag&#10;Appears when you edit your profile. Lets a player add a country/flag (not all flags are for countries) to their profile">Country or region</string>
   <string name="thankYou">Thank you!</string>
   <string name="socialMediaLinks">Social media links</string>
   <string name="oneUrlPerLine">One URL per line.</string>