justin/step-tracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix leaderboard: remove mutualApproved cross-check, handle removal server-side

Browse Source
This commit is contained in:
Sterling Archer
2026-06-18 23:48:14 -07:00
parent 0010212d35
commit fe5fe3121b
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+5 -17
View File
@@ -676,7 +676,6 @@ let friendSteps = {};
let lbVisibleCount = 10; let lbVisibleCount = 10;
let friendsVisibleCount = 10; let friendsVisibleCount = 10;
let currentFriendUid = null; let currentFriendUid = null;
let mutualApproved = {};
let unsubscribers = []; let unsubscribers = [];
const TAB_LABELS = { day: 'Today', week: 'This Week', month: 'This Month', year: 'This Year', alltime: 'All Time' }; const TAB_LABELS = { day: 'Today', week: 'This Week', month: 'This Month', year: 'This Year', alltime: 'All Time' };
@@ -861,9 +860,9 @@ window.finishOnboarding = async function() {
} }
// DASHBOARD // DASHBOARD
function teardown() { unsubscribers.forEach(fn => fn()); unsubscribers = []; mutualApproved = {}; } function teardown() { unsubscribers.forEach(fn => fn()); unsubscribers = []; }
window._debug = { get friendsData() { return friendsData; }, get mutualApproved() { return mutualApproved; }, get friendProfiles() { return friendProfiles; } }; window._debug = { get friendsData() { return friendsData; }, get friendProfiles() { return friendProfiles; } };
function loadDashboard() { function loadDashboard() {
showScreen('dashboard'); showScreen('dashboard');
@@ -963,7 +962,7 @@ function loadFriendsRealtime() {
function getMutualFriendUids() { function getMutualFriendUids() {
return Object.entries(friendsData) return Object.entries(friendsData)
.filter(([uid, data]) => data.approved === true && data.enabled === true && mutualApproved[uid] === true) .filter(([uid, data]) => data.approved === true && data.enabled === true)
.map(([uid]) => uid); .map(([uid]) => uid);
} }
@@ -974,7 +973,6 @@ function getPendingFriendUids() {
} }
async function loadFriendProfilesAndSteps(uids) { async function loadFriendProfilesAndSteps(uids) {
console.log('loadFriendProfilesAndSteps uids:', uids);
for (const uid of uids) { for (const uid of uids) {
if (!friendProfiles[uid]) { if (!friendProfiles[uid]) {
const pSnap = await getDoc(doc(db, 'profiles', uid)); const pSnap = await getDoc(doc(db, 'profiles', uid));
@@ -984,18 +982,7 @@ async function loadFriendProfilesAndSteps(uids) {
const sSnap = await getDoc(doc(db, 'steps', uid)); const sSnap = await getDoc(doc(db, 'steps', uid));
friendSteps[uid] = sSnap.exists() ? sSnap.data().stepsByDate || {} : {}; friendSteps[uid] = sSnap.exists() ? sSnap.data().stepsByDate || {} : {};
} }
try {
const theirRef = doc(db, 'friends', uid, 'list', currentUser.uid);
const theirSnap = await getDoc(theirRef);
console.log('their entry exists:', theirSnap.exists(), 'data:', JSON.stringify(theirSnap.data()));
mutualApproved[uid] = theirSnap.exists() && theirSnap.data().approved === true && theirSnap.data().enabled !== false;
} catch(e) {
console.error('mutualApproved check failed for', uid, e);
mutualApproved[uid] = false;
}
console.log('mutualApproved[uid]:', uid, mutualApproved[uid]);
} }
console.log('final mutualApproved:', JSON.stringify(mutualApproved));
} }
// LEADERBOARD // LEADERBOARD
@@ -1152,7 +1139,8 @@ window.bulkRemoveFriends = async function() {
} }
async function doRemoveFriend(friendUid) { async function doRemoveFriend(friendUid) {
await updateDoc(doc(db, 'friends', currentUser.uid, 'list', friendUid), { enabled: false }); const idToken = await currentUser.getIdToken();
await fetch(`${window.STEPMATES_CONFIG.friendRequestUrl}?action=remove&fromUid=${currentUser.uid}&toUid=${friendUid}&idToken=${idToken}`);
delete friendProfiles[friendUid]; delete friendProfiles[friendUid];
delete friendSteps[friendUid]; delete friendSteps[friendUid];
} }