reptil1990/Ninjaserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Achivements überarbeitet

Browse Source
This commit is contained in:
Carsten Graf
2025-09-15 20:23:20 +02:00
parent 7cce818932
commit ad6ba66220
6 changed files with 410 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/achievementSystem.js
View File

@@ -33,7 +33,7 @@ class AchievementSystem {
async loadAchievements() {
try {
const result = await pool.query(`
SELECT id, name, description, category, condition_type, condition_value, icon, points
SELECT id, name, description, category, condition_type, condition_value, icon, points, can_be_earned_multiple_times
FROM achievements
WHERE is_active = true
ORDER BY category, condition_type
@@ -384,7 +384,7 @@ class AchievementSystem {
}
/**
* Prüft monatliche Achievements
* Prüft monatliche Achievements (einmal pro Jahr)
*/
async checkMonthlyAchievements(playerId, currentMonth, newAchievements) {
const monthNames = [
@@ -393,6 +393,7 @@ class AchievementSystem {
];
const currentMonthName = monthNames[currentMonth - 1];
const currentYear = new Date().getFullYear();
const achievements = Array.from(this.achievements.values())
.filter(a => a.category === 'monthly' && a.condition_type === currentMonthName);
@@ -400,26 +401,39 @@ class AchievementSystem {
for (const achievement of achievements) {
if (this.isAchievementCompleted(playerId, achievement.id)) continue;
// Prüfe ob Spieler in diesem Monat gespielt hat
// Prüfe ob Spieler in diesem Monat dieses Jahres gespielt hat
const result = await pool.query(`
SELECT EXISTS(
SELECT 1 FROM times t
WHERE t.player_id = $1
AND EXTRACT(MONTH FROM t.created_at AT TIME ZONE 'Europe/Berlin') = $2
AND EXTRACT(YEAR FROM t.created_at AT TIME ZONE 'Europe/Berlin') = $3
) as has_played
`, [playerId, currentMonth]);
`, [playerId, currentMonth, currentYear]);
if (result.rows[0].has_played) {
await this.awardAchievement(playerId, achievement, 1, newAchievements);
// Prüfe ob Achievement bereits in diesem Jahr erreicht wurde
const alreadyEarnedThisYear = await pool.query(`
SELECT COUNT(*) as count
FROM player_achievements pa
WHERE pa.player_id = $1
AND pa.achievement_id = $2
AND EXTRACT(YEAR FROM pa.earned_at AT TIME ZONE 'Europe/Berlin') = $3
`, [playerId, achievement.id, currentYear]);
if (parseInt(alreadyEarnedThisYear.rows[0].count) === 0) {
await this.awardAchievement(playerId, achievement, 1, newAchievements);
}
}
}
}
/**
* Prüft Jahreszeiten-Achievements
* Prüft Jahreszeiten-Achievements (einmal pro Jahr)
*/
async checkSeasonalTimeAchievements(playerId, currentMonth, newAchievements) {
const season = this.getSeason(currentMonth);
const currentYear = new Date().getFullYear();
const achievements = Array.from(this.achievements.values())
.filter(a => a.category === 'seasonal' && a.condition_type === season);
@@ -427,7 +441,7 @@ class AchievementSystem {
for (const achievement of achievements) {
if (this.isAchievementCompleted(playerId, achievement.id)) continue;
// Prüfe ob Spieler in dieser Jahreszeit gespielt hat
// Prüfe ob Spieler in dieser Jahreszeit dieses Jahres gespielt hat
const monthRanges = {
spring: [3, 4, 5],
summer: [6, 7, 8],
@@ -441,11 +455,23 @@ class AchievementSystem {
SELECT 1 FROM times t
WHERE t.player_id = $1
AND EXTRACT(MONTH FROM t.created_at AT TIME ZONE 'Europe/Berlin') = ANY($2)
AND EXTRACT(YEAR FROM t.created_at AT TIME ZONE 'Europe/Berlin') = $3
) as has_played
`, [playerId, months]);
`, [playerId, months, currentYear]);
if (result.rows[0].has_played) {
await this.awardAchievement(playerId, achievement, 1, newAchievements);
// Prüfe ob Achievement bereits in diesem Jahr erreicht wurde
const alreadyEarnedThisYear = await pool.query(`
SELECT COUNT(*) as count
FROM player_achievements pa
WHERE pa.player_id = $1
AND pa.achievement_id = $2
AND EXTRACT(YEAR FROM pa.earned_at AT TIME ZONE 'Europe/Berlin') = $3
`, [playerId, achievement.id, currentYear]);
if (parseInt(alreadyEarnedThisYear.rows[0].count) === 0) {
await this.awardAchievement(playerId, achievement, 1, newAchievements);
}
}
}
}
@@ -617,12 +643,22 @@ class AchievementSystem {
/**
* Prüft ob ein Achievement bereits erreicht wurde
* Jetzt können Achievements mehrmals erreicht werden, daher immer false
* Berücksichtigt ob das Achievement mehrmals erreicht werden kann
*/
isAchievementCompleted(playerId, achievementId) {
// Achievements können jetzt mehrmals erreicht werden
// Daher prüfen wir nicht mehr, ob sie bereits erreicht wurden
return false;
const achievement = this.achievements.get(achievementId);
if (!achievement) return false;
// Wenn das Achievement mehrmals erreicht werden kann, ist es nie "abgeschlossen"
if (achievement.can_be_earned_multiple_times) {
return false;
}
// Für einmalige Achievements prüfen wir, ob sie bereits erreicht wurden
const playerAchievements = this.playerAchievements.get(playerId);
if (!playerAchievements) return false;
return playerAchievements.has(achievementId);
}
/**

1
package.json
View File

@@ -15,7 +15,6 @@
},
"dependencies": {
"@hisma/server-puppeteer": "^0.6.5",
"axios": "^1.11.0",
"bcrypt": "^5.1.1",
"discord-oauth2": "^2.12.1",
"dotenv": "^16.3.1",

1
public/admin-dashboard.html
View File

@@ -190,6 +190,7 @@
<input type="text" id="testFirstname" placeholder="Vorname" style="flex: 1; padding: 0.5rem;">
<input type="text" id="testLastname" placeholder="Nachname" style="flex: 1; padding: 0.5rem;">
<button class="btn" onclick="testNameAgainstBlacklist()">Testen</button>
<button class="btn" onclick="testLevenshteinDetailed()" style="background: #9c27b0; color: white;">Levenshtein Details</button>
</div>
<div id="testResult" style="padding: 0.5rem; border-radius: 3px; display: none;"></div>
</div>

79
public/js/admin-dashboard.js
View File

@@ -987,6 +987,85 @@ async function testNameAgainstBlacklist() {
}
}
// Detailed Levenshtein test function
async function testLevenshteinDetailed() {
const firstname = document.getElementById('testFirstname').value.trim();
const lastname = document.getElementById('testLastname').value.trim();
const resultDiv = document.getElementById('testResult');
if (!firstname || !lastname) {
showBlacklistMessage('Bitte gib Vorname und Nachname ein', 'error');
return;
}
try {
const response = await fetch('/api/v1/admin/blacklist/levenshtein-test', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({ firstname, lastname, threshold: 0.3 })
});
const result = await response.json();
if (result.success) {
const data = result.data;
let html = `
<div style="background: #f3e5f5; color: #4a148c; padding: 1rem; border-radius: 5px; margin-top: 1rem;">
<h4>🔍 Detaillierte Levenshtein-Analyse</h4>
<p><strong>Getesteter Name:</strong> ${data.input.firstname} ${data.input.lastname}</p>
<p><strong>Schwellenwert:</strong> ${data.threshold}</p>
<hr style="margin: 1rem 0;">
`;
// Show results for each category
for (const [category, categoryResult] of Object.entries(data.results)) {
if (categoryResult.hasSimilarTerms && categoryResult.similarTerms.length > 0) {
html += `
<div style="margin-bottom: 1rem; padding: 0.5rem; background: #fff3e0; border-left: 4px solid #ff9800; border-radius: 3px;">
<h5>📁 ${getCategoryDisplayName(category)} (Schwellenwert: ${categoryResult.categoryThreshold})</h5>
`;
categoryResult.similarTerms.forEach(term => {
const similarityPercent = Math.round((1 - term.distance) * 100);
html += `
<div style="margin: 0.5rem 0; padding: 0.5rem; background: white; border-radius: 3px;">
<strong>Begriff:</strong> "${term.term}"<br>
<strong>Levenshtein-Distanz:</strong> ${term.levenshteinDistance}<br>
<strong>Normalisierte Distanz:</strong> ${term.distance.toFixed(4)}<br>
<strong>Ähnlichkeit:</strong> ${similarityPercent}%<br>
<strong>Match-Typ:</strong> ${term.matchType || 'similar'}
</div>
`;
});
html += `</div>`;
}
}
// If no matches found
if (!Object.values(data.results).some(r => r.hasSimilarTerms)) {
html += `
<div style="background: #e8f5e8; color: #2e7d32; padding: 1rem; border-radius: 3px;">
<strong>✅ Keine ähnlichen Begriffe gefunden</strong><br>
Der Name "${data.input.firstname} ${data.input.lastname}" hat keine ähnlichen Begriffe in der Blacklist.
</div>
`;
}
html += `</div>`;
resultDiv.innerHTML = html;
resultDiv.style.display = 'block';
} else {
showBlacklistMessage(result.message || 'Fehler beim Testen', 'error');
}
} catch (error) {
console.error('Error testing Levenshtein:', error);
showBlacklistMessage('Fehler beim Testen der Levenshtein-Distanz', 'error');
}
}
async function addToBlacklist() {
const term = document.getElementById('newTerm').value.trim();
const category = document.getElementById('newCategory').value;

27
routes/api.js
View File

@@ -866,12 +866,21 @@ router.post('/v1/private/create-time', requireApiKey, async (req, res) => {
}
// Zeit mit RFIDUID in die Tabelle einfügen (player_id wird automatisch durch Trigger gesetzt)
// Finde den Spieler mit dieser RFIDUID
const playerResult = await pool.query(
'SELECT id FROM players WHERE rfiduid = $1',
[rfiduid]
);
const player_id = playerResult.rows.length > 0 ? playerResult.rows[0].id : null;
console.log(`🔍 RFIDUID: ${rfiduid}, Player ID: ${player_id}`);
// Zeit mit RFIDUID in die Tabelle einfügen
const result = await pool.query(
`INSERT INTO times (rfiduid, location_id, recorded_time, created_at)
VALUES ($1, $2, $3, $4)
`INSERT INTO times (rfiduid, location_id, recorded_time, player_id, created_at)
VALUES ($1, $2, $3, $4, $5)
RETURNING id, player_id, created_at`,
[rfiduid, location_id, recorded_time, new Date()]
[rfiduid, location_id, recorded_time, player_id, new Date()]
);
// Achievement-Überprüfung nach Zeit-Eingabe (JavaScript)
@@ -905,10 +914,20 @@ router.post('/v1/private/create-time', requireApiKey, async (req, res) => {
const rank = rankResult.rows[0].rank;
// Hole Spielerdaten für WebSocket-Event
const playerResult = await pool.query(
`SELECT firstname, lastname FROM players WHERE id = $1`,
[result.rows[0].player_id]
);
const player = playerResult.rows[0];
const playerName = player ? `${player.firstname} ${player.lastname}` : 'Unbekannter Spieler';
// Sende WebSocket-Event an alle verbundenen Clients
io.emit('newTime', {
id: result.rows[0].id,
player_id: result.rows[0].player_id,
player_name: playerName,
rfiduid: rfiduid,
location_name: location.name,
recorded_time: recorded_time,

258
terode", Normal file
View File

@@ -0,0 +1,258 @@
SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS
Commands marked with * may be preceded by a number, _N.
Notes in parentheses indicate the behavior if _N is given.
A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K.
h H Display this help.
q :q Q :Q ZZ Exit.
---------------------------------------------------------------------------
MMOOVVIINNGG
e ^E j ^N CR * Forward one line (or _N lines).
y ^Y k ^K ^P * Backward one line (or _N lines).
f ^F ^V SPACE * Forward one window (or _N lines).
b ^B ESC-v * Backward one window (or _N lines).
z * Forward one window (and set window to _N).
w * Backward one window (and set window to _N).
ESC-SPACE * Forward one window, but don't stop at end-of-file.
d ^D * Forward one half-window (and set half-window to _N).
u ^U * Backward one half-window (and set half-window to _N).
ESC-) RightArrow * Right one half screen width (or _N positions).
ESC-( LeftArrow * Left one half screen width (or _N positions).
ESC-} ^RightArrow Right to last column displayed.
ESC-{ ^LeftArrow Left to first column.
F Forward forever; like "tail -f".
ESC-F Like F but stop when search pattern is found.
r ^R ^L Repaint screen.
R Repaint screen, discarding buffered input.
---------------------------------------------------
Default "window" is the screen height.
Default "half-window" is half of the screen height.
---------------------------------------------------------------------------
SSEEAARRCCHHIINNGG
/_p_a_t_t_e_r_n * Search forward for (_N-th) matching line.
?_p_a_t_t_e_r_n * Search backward for (_N-th) matching line.
n * Repeat previous search (for _N-th occurrence).
N * Repeat previous search in reverse direction.
ESC-n * Repeat previous search, spanning files.
ESC-N * Repeat previous search, reverse dir. & spanning files.
ESC-u Undo (toggle) search highlighting.
ESC-U Clear search highlighting.
&_p_a_t_t_e_r_n * Display only matching lines.
---------------------------------------------------
A search pattern may begin with one or more of:
^N or ! Search for NON-matching lines.
^E or * Search multiple files (pass thru END OF FILE).
^F or @ Start search at FIRST file (for /) or last file (for ?).
^K Highlight matches, but don't move (KEEP position).
^R Don't use REGULAR EXPRESSIONS.
^W WRAP search if no match found.
---------------------------------------------------------------------------
JJUUMMPPIINNGG
g < ESC-< * Go to first line in file (or line _N).
G > ESC-> * Go to last line in file (or line _N).
p % * Go to beginning of file (or _N percent into file).
t * Go to the (_N-th) next tag.
T * Go to the (_N-th) previous tag.
{ ( [ * Find close bracket } ) ].
} ) ] * Find open bracket { ( [.
ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>.
ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_>.
---------------------------------------------------
Each "find close bracket" command goes forward to the close bracket
matching the (_N-th) open bracket in the top line.
Each "find open bracket" command goes backward to the open bracket
matching the (_N-th) close bracket in the bottom line.
m_<_l_e_t_t_e_r_> Mark the current top line with <letter>.
M_<_l_e_t_t_e_r_> Mark the current bottom line with <letter>.
'_<_l_e_t_t_e_r_> Go to a previously marked position.
'' Go to the previous position.
^X^X Same as '.
ESC-M_<_l_e_t_t_e_r_> Clear a mark.
---------------------------------------------------
A mark is any upper-case or lower-case letter.
Certain marks are predefined:
^ means beginning of the file
$ means end of the file
---------------------------------------------------------------------------
CCHHAANNGGIINNGG FFIILLEESS
:e [_f_i_l_e] Examine a new file.
^X^V Same as :e.
:n * Examine the (_N-th) next file from the command line.
:p * Examine the (_N-th) previous file from the command line.
:x * Examine the first (or _N-th) file from the command line.
:d Delete the current file from the command line list.
= ^G :f Print current file name.
---------------------------------------------------------------------------
MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS
-_<_f_l_a_g_> Toggle a command line option [see OPTIONS below].
--_<_n_a_m_e_> Toggle a command line option, by name.
__<_f_l_a_g_> Display the setting of a command line option.
___<_n_a_m_e_> Display the setting of an option, by name.
+_c_m_d Execute the less cmd each time a new file is examined.
!_c_o_m_m_a_n_d Execute the shell command with $SHELL.
|XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command.
s _f_i_l_e Save input to a file.
v Edit the current file with $VISUAL or $EDITOR.
V Print version number of "less".
---------------------------------------------------------------------------
OOPPTTIIOONNSS
Most options may be changed either on the command line,
or from within less by using the - or -- command.
Options may be given in one of two forms: either a single
character preceded by a -, or a name preceded by --.
-? ........ --help
Display help (from command line).
-a ........ --search-skip-screen
Search skips current screen.
-A ........ --SEARCH-SKIP-SCREEN
Search starts just after target line.
-b [_N] .... --buffers=[_N]
Number of buffers.
-B ........ --auto-buffers
Don't automatically allocate buffers for pipes.
-c ........ --clear-screen
Repaint by clearing rather than scrolling.
-d ........ --dumb
Dumb terminal.
-D xx_c_o_l_o_r . --color=xx_c_o_l_o_r
Set screen colors.
-e -E .... --quit-at-eof --QUIT-AT-EOF
Quit at end of file.
-f ........ --force
Force open non-regular files.
-F ........ --quit-if-one-screen
Quit if entire file fits on first screen.
-g ........ --hilite-search
Highlight only last match for searches.
-G ........ --HILITE-SEARCH
Don't highlight any matches for searches.
-h [_N] .... --max-back-scroll=[_N]
Backward scroll limit.
-i ........ --ignore-case
Ignore case in searches that do not contain uppercase.
-I ........ --IGNORE-CASE
Ignore case in all searches.
-j [_N] .... --jump-target=[_N]
Screen position of target lines.
-J ........ --status-column
Display a status column at left edge of screen.
-k [_f_i_l_e] . --lesskey-file=[_f_i_l_e]
Use a lesskey file.
-K ........ --quit-on-intr
Exit less in response to ctrl-C.
-L ........ --no-lessopen
Ignore the LESSOPEN environment variable.
-m -M .... --long-prompt --LONG-PROMPT
Set prompt style.
-n -N .... --line-numbers --LINE-NUMBERS
Don't use line numbers.
-o [_f_i_l_e] . --log-file=[_f_i_l_e]
Copy to log file (standard input only).
-O [_f_i_l_e] . --LOG-FILE=[_f_i_l_e]
Copy to log file (unconditionally overwrite).
-p [_p_a_t_t_e_r_n] --pattern=[_p_a_t_t_e_r_n]
Start at pattern (from command line).
-P [_p_r_o_m_p_t] --prompt=[_p_r_o_m_p_t]
Define new prompt.
-q -Q .... --quiet --QUIET --silent --SILENT
Quiet the terminal bell.
-r -R .... --raw-control-chars --RAW-CONTROL-CHARS
Output "raw" control characters.
-s ........ --squeeze-blank-lines
Squeeze multiple blank lines.
-S ........ --chop-long-lines
Chop (truncate) long lines rather than wrapping.
-t [_t_a_g] .. --tag=[_t_a_g]
Find a tag.
-T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e]
Use an alternate tags file.
-u -U .... --underline-special --UNDERLINE-SPECIAL
Change handling of backspaces.
-V ........ --version
Display the version number of "less".
-w ........ --hilite-unread
Highlight first new line after forward-screen.
-W ........ --HILITE-UNREAD
Highlight first new line after any forward movement.
-x [_N[,...]] --tabs=[_N[,...]]
Set tab stops.
-X ........ --no-init
Don't use termcap init/deinit strings.
-y [_N] .... --max-forw-scroll=[_N]
Forward scroll limit.
-z [_N] .... --window=[_N]
Set size of window.
-" [_c[_c]] . --quotes=[_c[_c]]
Set shell quote characters.
-~ ........ --tilde
Don't display tildes after end of file.
-# [_N] .... --shift=[_N]
Set horizontal scroll amount (0 = one half screen width).
--file-size
Automatically determine the size of the input file.
--follow-name
The F command changes files if the input file is renamed.
--incsearch
Search file as each pattern character is typed in.
--line-num-width=N
Set the width of the -N line number field to N characters.
--mouse
Enable mouse input.
--no-keypad
Don't send termcap keypad init/deinit strings.
--no-histdups
Remove duplicates from command history.
--rscroll=C
Set the character used to mark truncated lines.
--save-marks
Retain marks across invocations of less.
--status-col-width=N
Set the width of the -J status column to N characters.
--use-backslash
Subsequent options use backslash as escape char.
--use-color
Enables colored text.
--wheel-lines=N
Each click of the mouse wheel moves N lines.
---------------------------------------------------------------------------
LLIINNEE EEDDIITTIINNGG
These keys can be used to edit text being entered
on the "command line" at the bottom of the screen.
RightArrow ..................... ESC-l ... Move cursor right one character.
LeftArrow ...................... ESC-h ... Move cursor left one character.
ctrl-RightArrow ESC-RightArrow ESC-w ... Move cursor right one word.
ctrl-LeftArrow ESC-LeftArrow ESC-b ... Move cursor left one word.
HOME ........................... ESC-0 ... Move cursor to start of line.
END ............................ ESC-$ ... Move cursor to end of line.
BACKSPACE ................................ Delete char to left of cursor.
DELETE ......................... ESC-x ... Delete char under cursor.
ctrl-BACKSPACE ESC-BACKSPACE ........... Delete word to left of cursor.
ctrl-DELETE .... ESC-DELETE .... ESC-X ... Delete word under cursor.
ctrl-U ......... ESC (MS-DOS only) ....... Delete entire line.
UpArrow ........................ ESC-k ... Retrieve previous command line.
DownArrow ...................... ESC-j ... Retrieve next command line.
TAB ...................................... Complete filename & cycle.
SHIFT-TAB ...................... ESC-TAB Complete filename & reverse cycle.
ctrl-L ................................... Complete filename, list all.