Skip to content

Update start/goal page placeholder out of sync #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
l0f3n merged 1 commit into from
Feb 16, 2025
Merged

Update start/goal page placeholder out of sync #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 36 additions & 13 deletions wikiweaver-web/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ let data = reef.signal({
countdownStart: 0,
countdownInput: "",
startPage: "",
startPagePlaceholder: "Gingerbread",
startPagePlaceholder: "",
startPageSuggestions: [],
goalPage: "",
goalPagePlaceholder: "League of Legends",
goalPagePlaceholder: "",
goalPageSuggestions: [],
players: {},
});
Expand Down Expand Up @@ -368,15 +368,15 @@ document.addEventListener("reef:signal", async (event) => {
ResetCountdownTimer();
ResetStartAndGoalPages();
CreateNicerExample();
await UpdatePagePlaceholderEveryFewSeconds(10);
await UpdatePagePlaceholderEveryFewSeconds(5);
break;

case LobbyState.RESET:
await UpdatePagePlaceholderEveryFewSeconds(10);
await UpdatePagePlaceholderEveryFewSeconds(5);
break;

case LobbyState.IDLE:
await UpdatePagePlaceholderEveryFewSeconds(10);
await UpdatePagePlaceholderEveryFewSeconds(5);
break;

case LobbyState.RACING:
Expand Down Expand Up @@ -656,26 +656,49 @@ function IsNumber(time) {
// ===== PAGE PLACEHOLDER =====

var PagePlaceholderTimer;
var ShouldUpdateStartPage;
var PagePlaceholderLock;

function ResetPagePlaceholderTimer() {
ShouldUpdateStartPage = true;
clearInterval(PagePlaceholderTimer);
}

async function UpdatePagePlaceholderEveryFewSeconds(n) {
await SetPagePlaceholderToRandomArticles();
// I dont really like this, but whatever.
if (PagePlaceholderLock) return;
PagePlaceholderLock = true;

ResetPagePlaceholderTimer();

if (!data.startPagePlaceholder)
await UpdateStartPagePlaceholder();

if (!data.goalPagePlaceholder)
UpdateGoalPagePlaceholder();

PagePlaceholderTimer = setInterval(
SetPagePlaceholderToRandomArticles,
n * 1_000
);
async () => {
if (ShouldUpdateStartPage)
await UpdateStartPagePlaceholder();
else
UpdateGoalPagePlaceholder();

ShouldUpdateStartPage = !ShouldUpdateStartPage;
},
n * 1_000);

PagePlaceholderLock = false;
}

async function SetPagePlaceholderToRandomArticles() {
async function UpdateStartPagePlaceholder() {
let [startPage] = await GetRandomWikipediaArticles(1);
document.getElementById("start-page-input").placeholder = startPage;
goalPage = goalarticles[Math.floor(Math.random() * goalarticles.length)];
document.getElementById("goal-page-input").placeholder = goalPage;
data.startPagePlaceholder = startPage;
}

function UpdateGoalPagePlaceholder() {
let goalPage = goalarticles[Math.floor(Math.random() * goalarticles.length)];
data.goalPagePlaceholder = goalPage;
}

document.addEventListener("DOMContentLoaded", async () => {
Expand Down
6 changes: 3 additions & 3 deletions wikiweaver-web/js/networking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ async function JoinLobby() {
});

globalThis.socket.addEventListener("close", (event) => {
if (PingTimer) clearInterval(PingTimer);
if (CountdownTimer) clearInterval(CountdownTimer);
if (PagePlaceholderTimer) clearInterval(PagePlaceholderTimer);
clearInterval(PingTimer);
clearInterval(CountdownTimer);
ResetPagePlaceholderTimer();

data.connectionStatus = ConnectionStatus.DISCONNECTED;
});
Expand Down