remove support for hiding lobby hooks
This commit is contained in:
parent
f5f6c146b6
commit
64ef380ece
|
@ -8,7 +8,6 @@ import play.twirl.api.Html
|
|||
trait AssetHelper { self: I18nHelper =>
|
||||
|
||||
def assetVersion = lila.api.Env.current.assetVersion.get
|
||||
def disableHooks = lila.lobby.Env.current.disableHooks.get
|
||||
|
||||
def isProd: Boolean
|
||||
|
||||
|
|
|
@ -59,7 +59,6 @@ lichess = lichess || {};
|
|||
lichess.lobby = {
|
||||
perfIcons: @nonPuzzlePerfTypeNameIcons,
|
||||
data: @Html(J.stringify(data)),
|
||||
noHooks: @disableHooks,
|
||||
playban: @playban.fold(Html("null")){ pb =>
|
||||
@Html(J.stringify(J.obj("minutes" -> pb.mins, "remainingSeconds" -> (pb.remainingSeconds + 3))))
|
||||
},
|
||||
|
|
|
@ -53,8 +53,7 @@ final class Env(
|
|||
blocking = blocking,
|
||||
playban = playban,
|
||||
poolApi = poolApi,
|
||||
onStart = onStart,
|
||||
hideHooks = () => disableHooks.get)
|
||||
onStart = onStart)
|
||||
}
|
||||
|
||||
lazy val socketHandler = new SocketHandler(
|
||||
|
@ -64,22 +63,6 @@ final class Env(
|
|||
poolApi = poolApi,
|
||||
blocking = blocking)
|
||||
|
||||
object disableHooks {
|
||||
import reactivemongo.bson._
|
||||
import lila.db.dsl._
|
||||
import scala.concurrent.duration._
|
||||
private val coll = db("flag")
|
||||
private val cache = lila.memo.MixedCache.single[Boolean](
|
||||
name = "lobby.no_hooks",
|
||||
f = coll.primitiveOne[BSONBoolean]($id("noHooks"), "value").map {
|
||||
_.fold(false)(_.value)
|
||||
},
|
||||
timeToLive = 10.seconds,
|
||||
default = false,
|
||||
logger = lila.log("disableHooks"))
|
||||
def get = cache get true
|
||||
}
|
||||
|
||||
private val abortListener = new AbortListener(seekApi = seekApi)
|
||||
|
||||
system.lilaBus.subscribe(system.actorOf(Props(new Actor {
|
||||
|
|
|
@ -19,8 +19,7 @@ private[lobby] final class Lobby(
|
|||
blocking: String => Fu[Set[String]],
|
||||
playban: String => Fu[Option[lila.playban.TempBan]],
|
||||
poolApi: lila.pool.PoolApi,
|
||||
onStart: String => Unit,
|
||||
hideHooks: () => Boolean) extends Actor {
|
||||
onStart: String => Unit) extends Actor {
|
||||
|
||||
def receive = {
|
||||
|
||||
|
@ -43,7 +42,7 @@ private[lobby] final class Lobby(
|
|||
|
||||
case SaveHook(msg) =>
|
||||
HookRepo save msg.hook
|
||||
if (!hideHooks()) socket ! msg
|
||||
socket ! msg
|
||||
|
||||
case SaveSeek(msg) => (seekApi insert msg.seek) >>- {
|
||||
socket ! msg
|
||||
|
@ -120,10 +119,10 @@ private[lobby] final class Lobby(
|
|||
case RemoveHooks(hooks) => hooks foreach remove
|
||||
|
||||
case Resync =>
|
||||
if (!hideHooks()) socket ! HookIds(HookRepo.vector.map(_.id))
|
||||
socket ! HookIds(HookRepo.vector.map(_.id))
|
||||
|
||||
case Lobby.SendNbHooks =>
|
||||
if (hideHooks()) socket ! NbHooks(HookRepo.size)
|
||||
socket ! NbHooks(HookRepo.size)
|
||||
|
||||
case msg@HookSub(member, true) =>
|
||||
socket ! AllHooksFor(
|
||||
|
@ -165,7 +164,7 @@ private[lobby] final class Lobby(
|
|||
|
||||
private def remove(hook: Hook) = {
|
||||
HookRepo remove hook
|
||||
if (!hideHooks()) socket ! RemoveHook(hook.id)
|
||||
socket ! RemoveHook(hook.id)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ module.exports = function(env) {
|
|||
this.currentGame = env.currentGame;
|
||||
this.perfIcons = env.perfIcons;
|
||||
|
||||
this.noHooks = env.noHooks;
|
||||
this.nbHooks = env.nbHooks;
|
||||
|
||||
hookRepo.initAll(this);
|
||||
|
|
|
@ -6,12 +6,6 @@ var filter = require('../../filter');
|
|||
var filterView = require('./filter');
|
||||
|
||||
module.exports = function(ctrl) {
|
||||
if (ctrl.noHooks) return m('div.no_hooks', [
|
||||
m('strong', 'The seeks view is currently unavailable.'),
|
||||
m('div', 'But it still does auto-pairing. Just create a game.'),
|
||||
m('div', 'Sorry for the inconvenience.'),
|
||||
ctrl.nbHooks ? m('strong.nb', ctrl.nbHooks + ' active seeks now') : null
|
||||
]);
|
||||
var filterBody, body, nbFiltered, modeToggle;
|
||||
if (ctrl.vm.filterOpen) filterBody = filterView.render(ctrl);
|
||||
switch (ctrl.vm.mode) {
|
||||
|
|
Loading…
Reference in a new issue