Add stripBattletags option

CHANGELOG.md

@@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Support Shifting Blade
 - Show Quests above hero portrait
 - Add Download XML from settings (#210, @dzannotti)
+- Add option to strip battletags from player names
 
 ### Changed
 - Tweak art for legendary minions in hand

ts/Launcher.tsx

@@ -240,6 +240,14 @@ export default class Launcher {
 		this.opts.scrubber.rewind();
 	}
 
+	public stripBattletags(strip?: boolean): Launcher {
+		if (typeof strip === "undefined") {
+			strip = true;
+		}
+		this.opts.stripBattletags = strip;
+		return this;
+	}
+
 	public get turn(): number {
 		return this.opts.scrubber.getCurrentTurn();
 	}

ts/components/GameWidget.tsx

@@ -8,7 +8,7 @@ import {
 	KeybindingProps,
 	LocaleProps,
 	MulliganOracle,
-	StreamScrubber,
+	StreamScrubber, StripBattletagsProps,
 } from "../interfaces";
 import Scrubber from "./Scrubber";
 import EventLog from "./EventLog";
@@ -22,7 +22,7 @@ import screenfull from "screenfull";
 import GameStateSink from "../state/GameStateSink";
 import { CardData } from "hearthstonejson-client";
 
-export interface GameWidgetProps extends AssetDirectoryProps, CardArtDirectory, EventHandlerProps, LocaleProps, KeybindingProps, React.ClassAttributes<GameWidget> {
+export interface GameWidgetProps extends AssetDirectoryProps, CardArtDirectory, EventHandlerProps, LocaleProps, KeybindingProps, StripBattletagsProps, React.ClassAttributes<GameWidget> {
 	sink: GameStateSink;
 	startupTime: number;
 	interaction?: InteractiveBackend;
@@ -293,6 +293,7 @@ export default class GameWidget extends React.Component<GameWidgetProps, GameWid
 			hideCards={!this.state.isRevealingCards}
 			playerNames={this.props.playerNames || null}
 			loadingError={this.props.loadingError}
+			stripBattletags={this.props.stripBattletags}
 		/>;
 		let log = <EventLog
 			key="log"

ts/components/GameWrapper.tsx

@@ -7,7 +7,7 @@ import {
 	CardOracleProps,
 	AssetDirectoryProps,
 	CardArtDirectory,
-	MulliganOracleProps
+	MulliganOracleProps, StripBattletagsProps,
 } from "../interfaces";
 import GameState from "../state/GameState";
 import TwoPlayerGame from "./game/TwoPlayerGame";
@@ -19,7 +19,7 @@ import LoadingScreen from "./LoadingScreen";
 import * as bowser from "bowser";
 import {cookie} from "cookie_js";
 
-interface GameWrapperProps extends CardDataProps, CardOracleProps, MulliganOracleProps, AssetDirectoryProps, CardArtDirectory, HideCardsProps, React.ClassAttributes<GameWrapper> {
+interface GameWrapperProps extends CardDataProps, CardOracleProps, MulliganOracleProps, AssetDirectoryProps, CardArtDirectory, HideCardsProps, StripBattletagsProps, React.ClassAttributes<GameWrapper> {
 	state: GameState;
 	interaction?: InteractiveBackend;
 	swapPlayers?: boolean;
@@ -153,13 +153,23 @@ export default class GameWrapper extends React.Component<GameWrapperProps, GameW
 					assetDirectory={this.props.assetDirectory}
 					cardArtDirectory={this.props.cardArtDirectory}
 					hideCards={this.props.hideCards}
+					stripBattletags={this.props.stripBattletags}
 				/>;
 			default:
 				return <div>Unsupported player count ({playerCount}).</div>
 		}
 	}
 
 	private renderLoadingScreen(players?: string[]) {
+		if (Array.isArray(players) && this.props.stripBattletags) {
+			players = players.map((playerName) => {
+				const match = /^(.*)#\d+$/.exec(playerName.trim());
+				if (match) {
+					return match[1];
+				}
+				return playerName;
+			});
+		}
 		return <LoadingScreen players={players} />;
 	}
 

ts/components/game/Player.tsx

@@ -24,12 +24,12 @@ import {
 	CardArtDirectory,
 	GameStateDescriptorStackProps,
 	HideCardsProps,
-	MulliganOracleProps
+	MulliganOracleProps, StripBattletagsProps,
 } from "../../interfaces";
 import GameStateDescriptor from "../../state/GameStateDescriptor";
 
 interface PlayerProps extends OptionCallbackProps, CardDataProps, CardOracleProps, MulliganOracleProps, AssetDirectoryProps,
-	CardArtDirectory,GameStateDescriptorStackProps, HideCardsProps, React.ClassAttributes<Player> {
+	CardArtDirectory,GameStateDescriptorStackProps, HideCardsProps, StripBattletagsProps, React.ClassAttributes<Player> {
 	player: PlayerEntity;
 	entities: Immutable.Map<number, Immutable.Map<number, Entity>>;
 	options: Immutable.Map<number, Immutable.Map<number, Option>>;
@@ -265,8 +265,16 @@ export default class Player extends React.Component<PlayerProps> {
 			/>;
 		}
 
-		let name = this.props.player.name ?
-			<div className="name" title={this.props.player.name}>{this.props.player.name}</div> : null;
+		let name = null;
+		if (this.props.player.name) {
+			let playerName = this.props.player.name.trim();
+			if (this.props.stripBattletags) {
+				const match = /^(.*)#\d+$/.exec(playerName);
+				playerName = match ? match[1] : playerName;
+			}
+			name = <div className="name" title={playerName}>{playerName}</div>;
+		}
+
 		let rank = <Rank
 			rank={this.props.player.rank }
 			legendRank={this.props.player.legendRank }

ts/components/game/TwoPlayerGame.tsx

@@ -2,8 +2,15 @@ import * as React from "react";
 import * as Immutable from "immutable";
 
 import {
-	EntityProps, OptionCallbackProps, CardDataProps, CardOracleProps, AssetDirectoryProps,
-	GameStateDescriptorStackProps, HideCardsProps, MulliganOracleProps
+	EntityProps,
+	OptionCallbackProps,
+	CardDataProps,
+	CardOracleProps,
+	AssetDirectoryProps,
+	GameStateDescriptorStackProps,
+	HideCardsProps,
+	MulliganOracleProps,
+	StripBattletagsProps,
 } from "../../interfaces";
 import Entity from "../../Entity";
 import Player from "./Player";
@@ -15,7 +22,7 @@ import Choice from "../../Choice";
 import Choices from "../../Choices";
 
 interface TwoPlayerGameProps extends EntityProps, CardDataProps, CardOracleProps, MulliganOracleProps, OptionCallbackProps,
-	AssetDirectoryProps, GameStateDescriptorStackProps, HideCardsProps, React.ClassAttributes<TwoPlayerGame> {
+	AssetDirectoryProps, GameStateDescriptorStackProps, HideCardsProps, StripBattletagsProps, React.ClassAttributes<TwoPlayerGame> {
 	player1: PlayerEntity;
 	player2: PlayerEntity;
 	entities: Immutable.Map<number, Immutable.Map<number, Immutable.Map<number, Entity>>>;
@@ -50,6 +57,7 @@ export default class TwoPlayerGame extends React.Component<TwoPlayerGameProps> {
 					assetDirectory={this.props.assetDirectory}
 					cardArtDirectory={this.props.cardArtDirectory}
 					hideCards={this.props.hideCards}
+					stripBattletags={this.props.stripBattletags}
 					/>
 				{this.props.optionCallback && <EndTurnButton option={this.props.endTurnOption}
 					optionCallback={this.props.optionCallback} onlyOption={options.count() === 0}
@@ -67,6 +75,7 @@ export default class TwoPlayerGame extends React.Component<TwoPlayerGameProps> {
 					descriptors={this.props.descriptors}
 					assetDirectory={this.props.assetDirectory}
 					cardArtDirectory={this.props.cardArtDirectory}
+					stripBattletags={this.props.stripBattletags}
 					/>
 			</div>
 		);

ts/interfaces.d.ts

@@ -133,6 +133,10 @@ export interface KeybindingProps {
 	enableKeybindings?: boolean;
 }
 
+export interface StripBattletagsProps {
+	stripBattletags?: boolean;
+}
+
 export interface StreamScrubberInhibitor {
 	isInhibiting: () => boolean;
 }