-
Notifications
You must be signed in to change notification settings - Fork 160
Fix issue 156 gamification #198
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.
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
Open
DeveloperAmrit
wants to merge
2
commits into
AOSSIE-Org:main
Choose a base branch
from
DeveloperAmrit:fix-156-gamification
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+109
−37
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| import React, { useEffect, useState, useRef } from "react"; | ||
| import { useUser } from "@/hooks/useUser"; | ||
| import { | ||
| createGamificationWebSocket, | ||
| GamificationEvent, | ||
| fetchGamificationLeaderboard, | ||
| } from "@/services/gamificationService"; | ||
| import BadgeUnlocked from "@/components/BadgeUnlocked"; | ||
|
|
||
| const GamificationOverlay: React.FC = () => { | ||
| const { user } = useUser(); | ||
| const [badgeUnlocked, setBadgeUnlocked] = useState<{ | ||
| badgeName: string; | ||
| isOpen: boolean; | ||
| }>({ | ||
| badgeName: "", | ||
| isOpen: false, | ||
| }); | ||
| const wsRef = useRef<WebSocket | null>(null); | ||
| const previousRankRef = useRef<number | null>(null); | ||
|
|
||
| useEffect(() => { | ||
| const token = localStorage.getItem("token"); | ||
| if (!token || !user) return; | ||
|
|
||
| // Initial rank check | ||
| fetchGamificationLeaderboard(token).then((data) => { | ||
| const myEntry = data.debaters.find(d => d.id === user.id); | ||
| if (myEntry) { | ||
| previousRankRef.current = myEntry.rank; | ||
| } | ||
| }).catch(console.error); | ||
|
|
||
| if (wsRef.current) { | ||
| wsRef.current.close(); | ||
| } | ||
|
|
||
| const ws = createGamificationWebSocket( | ||
| token, | ||
| async (event: GamificationEvent) => { | ||
| if (event.userId !== user.id) return; | ||
|
|
||
| if (event.type === "badge_awarded" && event.badgeName) { | ||
| setBadgeUnlocked({ | ||
| badgeName: event.badgeName, | ||
| isOpen: true, | ||
| }); | ||
| } else if (event.type === "score_updated") { | ||
| // Check for rank change | ||
| try { | ||
| const data = await fetchGamificationLeaderboard(token); | ||
| const myEntry = data.debaters.find(d => d.id === user.id); | ||
| if (myEntry) { | ||
| const newRank = myEntry.rank; | ||
| const oldRank = previousRankRef.current; | ||
|
|
||
| // Celebrate if entering top 10 | ||
| if (newRank <= 10 && oldRank !== null && oldRank > 10) { | ||
| setBadgeUnlocked({ | ||
| badgeName: "Top10", | ||
| isOpen: true, | ||
| }); | ||
| } | ||
| previousRankRef.current = newRank; | ||
| } | ||
| } catch (e) { | ||
| console.error("Failed to check rank", e); | ||
| } | ||
| } | ||
| } | ||
| ); | ||
|
|
||
| wsRef.current = ws; | ||
|
|
||
| return () => { | ||
| if (wsRef.current) { | ||
| wsRef.current.close(); | ||
| } | ||
| }; | ||
| }, [user]); | ||
|
|
||
| return ( | ||
| <BadgeUnlocked | ||
| badgeName={badgeUnlocked.badgeName} | ||
| isOpen={badgeUnlocked.isOpen} | ||
| onClose={() => setBadgeUnlocked({ ...badgeUnlocked, isOpen: false })} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export default GamificationOverlay; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Race condition may cause missed top 10 celebration.
The initial leaderboard fetch is asynchronous and runs concurrently with WebSocket setup. If a
score_updatedevent arrives before this fetch completes,previousRankRef.currentwill still benull, causing the check at line 58 (oldRank !== null) to fail. This means the user won't see the top 10 celebration on their first ranking update.Consider awaiting the initial rank fetch before establishing the WebSocket, or initializing
previousRankRefto a safe default (e.g.,Infinity) so the comparison works correctly:Suggested approach
And update the check accordingly:
🤖 Prompt for AI Agents