Fixed #11

Dyfused · Sep 21, 2022 · aa7cb38 · aa7cb38
1 parent 7919dfb
commit aa7cb38
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/data/src/main/kotlin/explode/dataprovider/provider/IBlowReadOnly.kt b/data/src/main/kotlin/explode/dataprovider/provider/IBlowReadOnly.kt
@@ -51,4 +51,7 @@ interface IBlowReadOnly {
  val MongoSet.tunerize: SetModel
 
  fun MongoSet.tunerize(owner: MongoUser?): SetModel = tunerize
+
+ val MongoSet.displayNoterName: String
+ get() = this.noterDisplayOverride ?: getUser(this.noterId)?.username ?: serverUser.username
 }
diff --git a/data/src/main/kotlin/explode/dataprovider/provider/mongo/MongoProvider.kt b/data/src/main/kotlin/explode/dataprovider/provider/mongo/MongoProvider.kt
@@ -911,7 +911,7 @@ class MongoProvider(private val config: MongoExplodeConfig, val detonate: Detona
  val s = getParentSet()
  return DetailedChartModel(
  _id = id,
- charter = UserWithUserNameModel(s.noterDisplayOverride ?: getUser(s.noterId)?.username ?: "unknown"),
+ charter = UserWithUserNameModel(s.displayNoterName),
  chartName = "${s.musicName}_${difficultyClass}",
  gcPrice = 0,
  music = MusicModel(s.musicName, MusicianModel(s.composerName)),
@@ -926,7 +926,7 @@ class MongoProvider(private val config: MongoExplodeConfig, val detonate: Detona
  _id = id,
  introduction = introduction ?: "",
  coinPrice = price,
- noter = NoterModel(noterDisplayOverride ?: getUser(noterId)?.username ?: "unknown"),
+ noter = NoterModel(displayNoterName),
  musicTitle = musicName,
  composerName = composerName,
  playCount = 0,
@@ -945,7 +945,7 @@ class MongoProvider(private val config: MongoExplodeConfig, val detonate: Detona
  _id = id,
  introduction = introduction ?: "",
  coinPrice = price,
- noter = NoterModel(noterDisplayOverride ?: getUser(noterId)?.username ?: "unknown"),
+ noter = NoterModel(displayNoterName),
  musicTitle = musicName,
  composerName = composerName,
  playCount = 0,

diff --git a/server/src/main/kotlin/explode/backend/bomb/v1/backend/BombHelper.kt b/server/src/main/kotlin/explode/backend/bomb/v1/backend/BombHelper.kt
@@ -39,7 +39,7 @@ fun MongoSet.bombify() =
  put("introduction", introduction)
  put("price", price)
  put("status", status.name)
- put("noter-name", noterDisplayOverride ?: getUser(noterId)?.username ?: "unknown")
+ put("noter-name", displayNoterName)
  putJsonArray("charts") {
  charts.forEach {
  add(it)

diff --git a/server/src/main/kotlin/explode/blow/impl/BlowQueryServiceImpl.kt b/server/src/main/kotlin/explode/blow/impl/BlowQueryServiceImpl.kt
@@ -135,7 +135,7 @@ class BlowQueryServiceImpl(private val p: IBlowAccessor) : BlowQueryService {
  it.id,
  it.status.isRanked,
  it.introduction ?: "",
- getUser(it.noterId)?.username ?: "unknown",
+ it.displayNoterName,
  it.musicName
  )
  }