explorers use the same endpoint

lichess-org · Oct 26, 2021 · 98e8b6b · 98e8b6b
1 parent 72563d8
commit 98e8b6b
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 11 deletions.
diff --git a/app/Env.scala b/app/Env.scala
@@ -94,7 +94,6 @@ final class Env(
 ) {
 
  val explorerEndpoint = config.get[String]("explorer.endpoint")
- val explorer3Endpoint = config.get[String]("explorer.endpoint3")
  val tablebaseEndpoint = config.get[String]("explorer.tablebase.endpoint")
 
  val appVersionDate = config.getOptional[String]("app.version.date")

diff --git a/app/templating/AssetHelper.scala b/app/templating/AssetHelper.scala
@@ -84,8 +84,7 @@ trait AssetHelper { self: I18nHelper with SecurityHelper =>
  }
  ContentSecurityPolicy(
  defaultSrc = List("'self'", assets),
- connectSrc =
- "'self'" :: assets :: sockets ::: env.explorerEndpoint :: env.tablebaseEndpoint :: env.explorer3Endpoint :: Nil,
+ connectSrc = "'self'" :: assets :: sockets ::: env.explorerEndpoint :: env.tablebaseEndpoint :: Nil,
  styleSrc = List("'self'", "'unsafe-inline'", assets),
  frameSrc = List("'self'", assets, "https://www.youtube.com", "https://player.twitch.tv"),
  workerSrc = List("'self'", assets),

diff --git a/app/templating/Environment.scala b/app/templating/Environment.scala
@@ -40,7 +40,6 @@ object Environment
  def apiVersion = lila.api.Mobile.Api.currentVersion
 
  def explorerEndpoint = env.explorerEndpoint
- def explorer3Endpoint = env.explorer3Endpoint
  def tablebaseEndpoint = env.tablebaseEndpoint
 
  def isChatPanicEnabled = env.chat.panic.enabled

diff --git a/app/views/board/bits.scala b/app/views/board/bits.scala
@@ -44,7 +44,6 @@ object bits {
 
  def explorerConfig(implicit ctx: Context) = Json.obj(
  "endpoint" -> explorerEndpoint,
- "endpoint3" -> explorer3Endpoint,
  "tablebaseEndpoint" -> tablebaseEndpoint,
  "showRatings" -> ctx.pref.showRatings
  )

diff --git a/conf/base.conf b/conf/base.conf
@@ -324,7 +324,6 @@ streamer {
 }
 explorer {
  endpoint = "https://explorer.lichess.ovh"
- endpoint3 = "https://explorer.lichess.ovh"
  internal_endpoint = "https://explorer.lichess.ovh"
  tablebase = {
  endpoint = "https://tablebase.lichess.ovh"

diff --git a/ui/analyse/src/explorer/explorerCtrl.ts b/ui/analyse/src/explorer/explorerCtrl.ts
@@ -77,7 +77,6 @@ export default class ExplorerCtrl {
 
  private baseXhrOpening = () => ({
  endpoint: this.opts.endpoint,
- endpoint3: this.opts.endpoint3,
  config: this.config.data,
  });
 

diff --git a/ui/analyse/src/explorer/explorerXhr.ts b/ui/analyse/src/explorer/explorerXhr.ts
@@ -6,7 +6,6 @@ import { sync } from 'common/sync';
 
 interface OpeningXhrOpts {
  endpoint: string;
- endpoint3: string;
  db: ExplorerDb;
  rootFen: Fen;
  play: string[];
@@ -21,8 +20,10 @@ export async function opening(
  processData: (data: ExplorerData) => void
 ): Promise<CancellableStream> {
  const conf = opts.config;
- const endpoint = opts.db == 'player' ? opts.endpoint3 : opts.endpoint;
- const url = new URL(opts.db === 'lichess' ? '/lichess' : opts.db == 'player' ? '/personal' : '/master', endpoint);
+ const url = new URL(
+ opts.db === 'lichess' ? '/lichess' : opts.db == 'player' ? '/personal' : '/master',
+ opts.endpoint
+ );
  const params = url.searchParams;
  params.set('fen', opts.rootFen);
  params.set('play', opts.play.join(','));

diff --git a/ui/analyse/src/explorer/interfaces.ts b/ui/analyse/src/explorer/interfaces.ts
@@ -14,7 +14,6 @@ export interface PlayerOpts {
 
 export interface ExplorerOpts {
  endpoint: string;
- endpoint3: string;
  tablebaseEndpoint: string;
  showRatings: boolean;
 }