button(@click="issueNewChallenge()") {{ st.tr["Send challenge"] }}
input#modalPeople.modal(
type="checkbox"
- @click="resetSocialColor()"
+ @click="toggleSocialColor()"
)
div#peopleWrap(
role="dialog"
v-for="sid in Object.keys(people)"
v-if="!!people[sid].name"
)
- span {{ people[sid].name }}
+ UserBio.user-bio(:uid="people[sid].id" :uname="people[sid].name")
button.player-action(
v-if="isGamer(sid)"
@click="watchGame(sid)"
.row
.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
.button-group
- button#peopleBtn(@click="openModalPeople()")
+ button#peopleBtn(onClick="window.doClick('modalPeople')")
| {{ st.tr["Who's there?"] }}
button(@click="showNewchallengeForm()")
| {{ st.tr["New game"] }}
button.tabbtn#btnClive(@click="setDisplay('c','live',$event)")
| {{ st.tr["Live challenges"] }}
button.tabbtn#btnCcorr(@click="setDisplay('c','corr',$event)")
- | {{ st.tr["Correspondance challenges"] }}
+ | {{ st.tr["Correspondence challenges"] }}
ChallengeList(
v-show="cdisplay=='live'"
:challenges="filterChallenges('live')"
button.tabbtn#btnGlive(@click="setDisplay('g','live',$event)")
| {{ st.tr["Live games"] }}
button.tabbtn#btnGcorr(@click="setDisplay('g','corr',$event)")
- | {{ st.tr["Correspondance games"] }}
+ | {{ st.tr["Correspondence games"] }}
GameList(
v-show="gdisplay=='live'"
:games="filterGames('live')"
- :showBoth="true"
+ :show-both="true"
@show-game="showGame"
)
div(v-show="gdisplay=='corr'")
GameList(
:games="filterGames('corr')"
- :showBoth="true"
+ :show-both="true"
@show-game="showGame"
)
button#loadMoreBtn(
import { getRandString, shuffle, randInt } from "@/utils/alea";
import { getDiagram } from "@/utils/printDiagram";
import Chat from "@/components/Chat.vue";
+import UserBio from "@/components/UserBio.vue";
import GameList from "@/components/GameList.vue";
import ChallengeList from "@/components/ChallengeList.vue";
import { GameStorage } from "@/utils/gameStorage";
name: "my-hall",
components: {
Chat,
+ UserBio,
GameList,
ChallengeList
},
infoMessage: "",
newchallenge: {
fen: "",
- vid: parseInt(localStorage.getItem("vid")) || 0,
+ vid: parseInt(localStorage.getItem("vid"), 10) || 0,
to: "", //name of challenged player (if any)
cadence: localStorage.getItem("cadence") || "",
- randomness: parseInt(localStorage.getItem("challRandomness")) || 2,
+ randomness:
+ // Warning: randomness can be 0, then !!randomness is false
+ (parseInt(localStorage.getItem("challRandomness"),10)+1 || 3) - 1,
// VariantRules object, stored to not interfere with
// diagrams of targetted challenges:
V: null,
connexionString: "",
socketCloseListener: 0,
// Related to (killing of) self multi-connects:
- newConnect: {},
- killed: {}
+ newConnect: {}
};
},
watch: {
);
},
mounted: function() {
- ["peopleWrap", "infoDiv", "newgameDiv"].forEach(eltName => {
+ document.getElementById("peopleWrap")
+ .addEventListener("click", (e) => {
+ processModalClick(e, () => {
+ this.toggleSocialColor("close")
+ });
+ });
+ ["infoDiv", "newgameDiv"].forEach(eltName => {
document.getElementById(eltName)
.addEventListener("click", processModalClick);
});
["random-" + pc.randomness]: true
};
},
- openModalPeople: function() {
- window.doClick("modalPeople");
- document.getElementById("inputChat").focus();
- },
anonymousCount: function() {
let count = 0;
Object.values(this.people).forEach(p => {
},
removePresetChall: function(e, pchall) {
e.stopPropagation();
- const pchallIdx = this.presetChalls.findIndex(pc => pc.index == pchall.index);
+ const pchallIdx =
+ this.presetChalls.findIndex(pc => pc.index == pchall.index);
this.presetChalls.splice(pchallIdx, 1);
localStorage.setItem("presetChalls", JSON.stringify(this.presetChalls));
},
document.getElementById("cadence").focus();
},
send: function(code, obj) {
- if (!!this.conn) {
+ if (!!this.conn && this.conn.readyState == 1) {
this.conn.send(JSON.stringify(Object.assign({ code: code }, obj)));
}
},
filterGames: function(type) {
return this.games.filter(g => g.type == type);
},
+ // o: challenge or game
classifyObject: function(o) {
- // o: challenge or game
+ // Consider imports as live games (TODO)
+ if (!!o.id && !!o.id.toString().match(/^i/)) return "live";
return o.cadence.indexOf("d") === -1 ? "live" : "corr";
},
setDisplay: function(letter, type, e) {
// This is meant to challenge people, thus the next 2 conditions:
this.st.user.id > 0 &&
sid != this.st.user.sid &&
- Object.values(this.people[sid].tmpIds).some(v => v.focus && v.page == "/")
+ Object.values(this.people[sid].tmpIds)
+ .some(v => v.focus && v.page == "/")
);
},
challenge: function(sid) {
}
});
const gid = gids[Math.floor(Math.random() * gids.length)];
- const game = this.games.find(g => g.id == gid);
- if (!!game) this.showGame(game);
- else this.$router.push("/game/" + gid); //game vs. me
+ window.open("/#/game/" + gid, "_blank");
},
showGame: function(g) {
// NOTE: we are an observer, since only games I don't play are shown here
// ==> Moves sent by connected remote player(s) if live game
- this.$router.push("/game/" + g.id);
+ window.open("/#/game/" + g.id, "_blank");
},
- resetSocialColor: function() {
- // TODO: this is called twice, once on opening an once on closing
- document.getElementById("peopleBtn").classList.remove("somethingnew");
+ toggleSocialColor: function(action) {
+ if (!action && document.getElementById("modalPeople").checked)
+ document.getElementById("inputChat").focus();
+ else
+ document.getElementById("peopleBtn").classList.remove("somethingnew");
},
processChat: function(chat) {
this.send("newchat", { data: chat });
const page = data.page || "/";
if (data.code == "connect") {
// Ask challenges only on first connexion:
- if (!this.people[data.from])
+ if (!this.people[data.from[0]])
this.send("askchallenges", { target: data.from[0] });
}
// Ask game only if live:
else if (!page.match(/\/[0-9]+$/))
this.send("askgame", { target: data.from[0], page: page });
- if (!this.people[data.from]) {
+ if (!this.people[data.from[0]]) {
this.$set(
this.people,
data.from[0],
}
}
);
- this.newConnect[data.from] = true; //for self multi-connects tests
+ // For self multi-connects tests:
+ this.newConnect[data.from[0]] = true;
this.send("askidentity", { target: data.from[0], page: page });
} else {
this.people[data.from[0]].tmpIds[data.from[1]] =
}
case "disconnect":
case "gdisconnect": {
- // If the user reloads the page twice very quickly (experienced with Firefox),
- // the first reload won't have time to connect but will trigger a "close" event anyway.
+ // If the user reloads the page twice very quickly
+ // (experienced with Firefox), the first reload won't have time to
+ // connect but will trigger a "close" event anyway.
// ==> Next check is required.
if (!this.people[data.from[0]]) return;
delete this.people[data.from[0]].tmpIds[data.from[1]];
this.$delete(this.people, data.from[0]);
else this.$forceUpdate(); //TODO: shouldn't be required
if (data.code == "disconnect") {
- // Remove the live challenges sent by this player:
- ArrayFun.remove(
- this.challenges,
- c => c.type == "live" && c.from.sid == data.from[0],
- "all"
- );
+ // Remove the live challenges sent by this player, if
+ // he isn't connected on another tab:
+ if (
+ !this.people[data.from[0]] ||
+ Object.values(this.people[data.from[0]].tmpIds)
+ .every(v => v.page != "/")
+ ) {
+ ArrayFun.remove(
+ this.challenges,
+ c => c.type == "live" && c.from.sid == data.from[0],
+ "all"
+ );
+ }
} else {
// Remove the matching live game if now unreachable
const gid = data.page.match(/[a-zA-Z0-9]+$/)[0];
// Corr games are always reachable:
if (!gid.match(/^[0-9]+$/)) {
- // Live games are reachable as long as someone is on the game page
+ // Live games are reachable if someone is on the game page
if (Object.values(this.people).every(p =>
Object.values(p.tmpIds).every(v => v.page != data.page))
) {
}
break;
}
- case "killed":
- // I logged in elsewhere:
- this.conn.removeEventListener("message", this.socketMessageListener);
- this.conn.removeEventListener("close", this.socketCloseListener);
- this.conn = null;
- alert(this.st.tr["New connexion detected: tab now offline"]);
- break;
case "askidentity": {
// Request for identification
const me = {
this.$forceUpdate();
// If I multi-connect, kill current connexion if no mark (I'm older)
if (this.newConnect[user.sid]) {
+ delete this.newConnect[user.sid];
if (
user.id > 0 &&
user.id == this.st.user.id &&
- user.sid != this.st.user.sid &&
- !this.killed[this.st.user.sid]
+ user.sid != this.st.user.sid
) {
- this.send("killme", { sid: this.st.user.sid });
- this.killed[this.st.user.sid] = true;
+ // I logged in elsewhere:
+ this.cleanBeforeDestroy();
+ alert(this.st.tr["New connexion detected: tab now offline"]);
}
- delete this.newConnect[user.sid];
}
break;
}
c.from.sid == this.st.user.sid && c.type == "live"
)
.map(c => {
- // NOTE: in principle, should only send targeted challenge to the target.
- // But we may not know yet the identity of the target (just name),
- // so cannot decide if data.from is the target or not.
+ // NOTE: in principle, should only send targeted challenge to the
+ // target. But we may not know yet the identity of the target
+ // (just name), so can't decide if data.from is the target.
return {
id: c.id,
from: this.st.user.sid,
case "deletechallenge_s": {
// NOTE: the challenge(s) may be already removed
const cref = data.data;
- if (!!cref.cid) ArrayFun.remove(this.challenges, c => c.id == cref.cid);
+ if (!!cref.cid)
+ ArrayFun.remove(this.challenges, c => c.id == cref.cid);
else if (!!cref.sids) {
cref.sids.forEach(s => {
ArrayFun.remove(
// Ignore games where I play (will go in MyGames page),
// and also games that I already received.
if (
- game.players.every(p =>
- p.sid != this.st.user.sid && p.id != this.st.user.id) &&
- this.games.findIndex(g => g.id == game.id) == -1
+ this.games.findIndex(g => g.id == game.id) == -1 &&
+ game.players.every(p => {
+ return (
+ p.sid != this.st.user.sid &&
+ (p.id == 0 || p.id != this.st.user.id)
+ );
+ })
) {
let newGame = game;
newGame.type = this.classifyObject(game);
newGame.score = "*";
this.games.push(newGame);
if (
+ newGame.score == '*' &&
(newGame.type == "live" && this.gdisplay == "corr") ||
(newGame.type == "corr" && this.gdisplay == "live")
) {
this.startNewGame(gameInfo);
else {
this.infoMessage =
- this.st.tr["New correspondance game:"] + " " +
+ this.st.tr["New correspondence game:"] + " " +
"<a href='#/game/" + gameInfo.id + "'>" +
"#/game/" + gameInfo.id + "</a>";
document.getElementById("modalInfo").checked = true;
if (
this.cursor == Number.MAX_SAFE_INTEGER &&
this.games.length == 0 &&
- this.gdisplay == "live"
+ this.gdisplay == "live" &&
+ res.games.some(g => g.score == '*')
) {
// First loading: show indicators
document
.getElementById("btnC" + newChall.type)
.classList.add("somethingnew");
}
+ if (!!chall.to) {
+ notify(
+ "New challenge",
+ // fromValues.name should exist since the player is online, but
+ // let's consider there is some chance that the challenge arrives
+ // right after we connected and before receiving the poll result:
+ { body: "from " + (fromValues.name || "unknown yet...") }
+ );
+ }
}
},
loadNewchallVariant: async function(cb) {
if (!this.newchallenge.vid)
error = this.st.tr["Please select a variant"];
else if (ctype == "corr" && this.st.user.id <= 0)
- error = this.st.tr["Please log in to play correspondance games"];
+ error = this.st.tr["Please log in to play correspondence games"];
else if (!!this.newchallenge.to) {
if (this.newchallenge.to == this.st.user.name)
error = this.st.tr["Self-challenge is forbidden"];
let chall = Object.assign({}, this.newchallenge);
// Add only if not already issued (not counting target or FEN):
if (this.challenges.some(c =>
- (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id) &&
+ (
+ c.from.sid == this.st.user.sid ||
+ (c.from.id > 0 && c.from.id == this.st.user.id)
+ )
+ &&
c.vid == chall.vid &&
c.cadence == chall.cadence &&
c.randomness == chall.randomness
const c = this.challenges[i];
if (
c.type == ctype &&
- (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id)
+ (
+ c.from.sid == this.st.user.sid ||
+ (c.from.id > 0 && c.from.id == this.st.user.id)
+ )
) {
countMyChalls++;
if (c.added < oldestAdded) {
name: this.st.user.name
};
chall.added = Date.now();
- // NOTE: vname and type are redundant (can be deduced from cadence + vid)
+ // NOTE: vname and type are redundant (deduced from cadence + vid)
chall.type = ctype;
chall.vname = this.newchallenge.vname;
this.challenges.push(chall);
// Live challenges have a random ID
finishAddChallenge(null);
} else {
- // Correspondance game: send challenge to server
+ // Correspondence game: send challenge to server
ajax(
"/challenges",
"POST",
name: this.st.user.name
};
this.launchGame(c);
- if (c.type == "live")
+ if (c.type == "live") {
// Remove all live challenges of both players
- this.send("deletechallenge_s", { data: { sids: [c.from.sid, c.seat.sid] } });
+ this.send(
+ "deletechallenge_s",
+ { data: { sids: [c.from.sid, c.seat.sid] } }
+ );
+ }
else
// Corr challenge: just remove the challenge
this.send("deletechallenge_s", { data: { cid: c.id } });
// NOTE: when launching game, the challenge is already being deleted
launchGame: function(c) {
// White player index 0, black player index 1:
- const players =
+ let players =
!!c.mycolor
? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat])
: shuffle([c.from, c.seat]);
+ players.forEach(p => {
+ if (!!p["tmpIds"]) delete p["tmpIds"];
+ });
// These game informations will be shared
let gameInfo = {
id: getRandString(),
() => {
const myIdx = (game.players[0].sid == this.st.user.sid ? 0 : 1);
GameStorage.add(game, (err) => {
- // If an error occurred, game is not added: a tab already
- // added the game. Maybe a focused one, maybe not.
- // We know for sure that it emitted the gong start sound.
- // ==> Do not play it again.
- if (!err && this.st.settings.sound)
- new Audio("/sounds/newgame.flac").play().catch(() => {});
+ // If an error occurred, game is not added: the focused tab
+ // already added the game.
if (!this.focus) {
+ if (this.st.settings.sound)
+ // This will be played several times if several hidden tabs
+ // on Hall... TODO: fix that (how ?!)
+ new Audio("/sounds/newgame.flac").play().catch(() => {});
notify(
"New live game",
{ body: "vs " + game.players[1-myIdx].name || "@nonymous" }
this.$router.push("/game/" + gameInfo.id);
});
},
- this.focus ? 500 + 1000 * Math.random() : 0
+ this.focus ? 0 : 500 + 1000 * Math.random()
);
}
}
<style lang="sass" scoped>
.active
- color: #42a983
+ color: #388e3c
#infoDiv > .card
padding: 15px 0
margin-left: 32px
.somethingnew
- background-color: #c5fefe !important
+ background-color: #90C4EC !important
.tabbtn
background-color: #f9faee
#div2, #div3
margin-top: 0
+.user-bio
+ display: inline
+
tr > td
&.random-0
background-color: #FF5733