From 402b78c84cfd3b3ea3a2d0bd51d26b0d5785ff80 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Mon, 10 Feb 2020 15:01:46 -0600
Subject: [PATCH] rewrite user lang forum cache key

---
 modules/forum/src/main/Recent.scala | 4 +++-
 modules/user/src/main/User.scala    | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/forum/src/main/Recent.scala b/modules/forum/src/main/Recent.scala
index 66d6fa6789..d507c5c871 100644
--- a/modules/forum/src/main/Recent.scala
+++ b/modules/forum/src/main/Recent.scala
@@ -27,9 +27,11 @@ final class Recent(
 
   def invalidate(): Unit = cache.invalidateAll
 
+  private val defaultLang = "en"
+
   private def userCacheKey(user: Option[User], getTeams: GetTeamIds): Fu[String] =
     (user.map(_.id) ?? getTeams).map { teamIds =>
-      user.fold("en")(_.langs.mkString(",")) :: {
+      user.fold(defaultLang)(u => (defaultLang :: u.lang.filter(defaultLang !=).toList).mkString(",")) :: {
         categIds ::: teamIds.view.map(teamSlug).toList
       } mkString ";"
     }
diff --git a/modules/user/src/main/User.scala b/modules/user/src/main/User.scala
index aaa87f6d19..2c352f3d2d 100644
--- a/modules/user/src/main/User.scala
+++ b/modules/user/src/main/User.scala
@@ -41,8 +41,6 @@ case class User(
 
   def realNameOrUsername = profileOrDefault.nonEmptyRealName | username
 
-  def langs = ("en" :: lang.toList).distinct.sorted
-
   def compare(other: User) = id compareTo other.id
 
   def disabled = !enabled