Compare commits
7 Commits
ebc482dc87
...
v0.1.6.11
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
576b486caf | ||
|
|
d8f69631b5 | ||
|
|
dbcdaf9278 | ||
|
|
2e93d09236 | ||
|
|
a1fe62f132 | ||
|
|
e49c6acc99 | ||
|
|
96cc9db7d6 |
@@ -61,10 +61,23 @@ Message: "${message}"`;
|
|||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
let rewrittenMessage = data.choices?.[0]?.message?.content?.trim() || message;
|
let rewrittenMessage = data.choices?.[0]?.message?.content?.trim() || message;
|
||||||
|
|
||||||
// Only add suffix if message was actually changed
|
// Remove any explanatory comments in parentheses that the AI might add
|
||||||
|
// e.g., "(This message is a friendly, positive comment expressing appreciation. No rewriting is necessary.)"
|
||||||
|
rewrittenMessage = rewrittenMessage.replace(/\s*\([^)]*\)\s*/g, '').trim();
|
||||||
|
|
||||||
|
// Compare with original message (case-insensitive and ignoring extra whitespace)
|
||||||
const originalTrimmed = message.trim();
|
const originalTrimmed = message.trim();
|
||||||
if (rewrittenMessage !== originalTrimmed) {
|
const rewrittenTrimmed = rewrittenMessage.trim();
|
||||||
rewrittenMessage += " (autocorrected by Polite-Bot)";
|
|
||||||
|
// Check if message was actually changed (normalize for comparison)
|
||||||
|
const wasChanged = rewrittenTrimmed.toLowerCase() !== originalTrimmed.toLowerCase() &&
|
||||||
|
rewrittenTrimmed !== originalTrimmed;
|
||||||
|
|
||||||
|
if (wasChanged) {
|
||||||
|
rewrittenMessage = rewrittenTrimmed + " (autocorrected by Polite-Bot)";
|
||||||
|
} else {
|
||||||
|
// Return original message if not changed
|
||||||
|
rewrittenMessage = originalTrimmed;
|
||||||
}
|
}
|
||||||
|
|
||||||
return NextResponse.json({ rewrittenMessage });
|
return NextResponse.json({ rewrittenMessage });
|
||||||
|
|||||||
@@ -49,8 +49,8 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
const t = useTranslations('Game');
|
const t = useTranslations('Game');
|
||||||
const locale = useLocale();
|
const locale = useLocale();
|
||||||
const { gameState, statistics, addGuess, giveUp, addReplay, addYearBonus, skipYearBonus } = useGameState(genre, maxAttempts, isSpecial);
|
const { gameState, statistics, addGuess, giveUp, addReplay, addYearBonus, skipYearBonus } = useGameState(genre, maxAttempts, isSpecial);
|
||||||
const [hasWon, setHasWon] = useState(false);
|
const [hasWon, setHasWon] = useState(gameState?.isSolved ?? false);
|
||||||
const [hasLost, setHasLost] = useState(false);
|
const [hasLost, setHasLost] = useState(gameState?.isFailed ?? false);
|
||||||
const [shareText, setShareText] = useState(`🔗 ${t('share')}`);
|
const [shareText, setShareText] = useState(`🔗 ${t('share')}`);
|
||||||
const [lastAction, setLastAction] = useState<'GUESS' | 'SKIP' | null>(null);
|
const [lastAction, setLastAction] = useState<'GUESS' | 'SKIP' | null>(null);
|
||||||
const [isProcessingGuess, setIsProcessingGuess] = useState(false);
|
const [isProcessingGuess, setIsProcessingGuess] = useState(false);
|
||||||
@@ -67,6 +67,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
const [commentError, setCommentError] = useState<string | null>(null);
|
const [commentError, setCommentError] = useState<string | null>(null);
|
||||||
const [commentCollapsed, setCommentCollapsed] = useState(true);
|
const [commentCollapsed, setCommentCollapsed] = useState(true);
|
||||||
const [rewrittenMessage, setRewrittenMessage] = useState<string | null>(null);
|
const [rewrittenMessage, setRewrittenMessage] = useState<string | null>(null);
|
||||||
|
const [commentAIConsent, setCommentAIConsent] = useState(false);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const updateCountdown = () => {
|
const updateCountdown = () => {
|
||||||
@@ -87,12 +88,12 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (gameState && dailyPuzzle) {
|
if (gameState) {
|
||||||
setHasWon(gameState.isSolved);
|
setHasWon(gameState.isSolved);
|
||||||
setHasLost(gameState.isFailed);
|
setHasLost(gameState.isFailed);
|
||||||
|
|
||||||
// Show year modal if won but year not guessed yet and release year is available
|
// Show year modal if won but year not guessed yet and release year is available
|
||||||
if (gameState.isSolved && !gameState.yearGuessed && dailyPuzzle.releaseYear) {
|
if (gameState.isSolved && !gameState.yearGuessed && dailyPuzzle?.releaseYear) {
|
||||||
setShowYearModal(true);
|
setShowYearModal(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -317,7 +318,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleCommentSubmit = async () => {
|
const handleCommentSubmit = async () => {
|
||||||
if (!commentText.trim() || commentSending || commentSent || !dailyPuzzle) {
|
if (!commentText.trim() || commentSending || commentSent || !dailyPuzzle || !commentAIConsent) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -343,8 +344,10 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
const rewriteData = await rewriteResponse.json();
|
const rewriteData = await rewriteResponse.json();
|
||||||
if (rewriteData.rewrittenMessage) {
|
if (rewriteData.rewrittenMessage) {
|
||||||
finalMessage = rewriteData.rewrittenMessage;
|
finalMessage = rewriteData.rewrittenMessage;
|
||||||
// If message was changed significantly (simple check), show it
|
// Only show rewritten message if it was actually changed
|
||||||
if (finalMessage !== commentText.trim()) {
|
// The API adds "(autocorrected by Polite-Bot)" suffix only if message was changed
|
||||||
|
const wasChanged = finalMessage.includes('(autocorrected by Polite-Bot)');
|
||||||
|
if (wasChanged) {
|
||||||
setRewrittenMessage(finalMessage);
|
setRewrittenMessage(finalMessage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -416,11 +419,22 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
const bonusStar = (hasWon && gameState.yearGuessed && dailyPuzzle.releaseYear && gameState.scoreBreakdown.some(item => item.reason === 'Bonus: Correct Year')) ? '⭐' : '';
|
const bonusStar = (hasWon && gameState.yearGuessed && dailyPuzzle.releaseYear && gameState.scoreBreakdown.some(item => item.reason === 'Bonus: Correct Year')) ? '⭐' : '';
|
||||||
const genreText = genre ? `${isSpecial ? t('special') : t('genre')}: ${genre}\n` : '';
|
const genreText = genre ? `${isSpecial ? t('special') : t('genre')}: ${genre}\n` : '';
|
||||||
|
|
||||||
|
// Use current domain from window.location to support both hoerdle.de and hördle.de
|
||||||
|
const rawHost = typeof window !== 'undefined' ? window.location.hostname : config.domain;
|
||||||
|
const protocol = typeof window !== 'undefined' ? window.location.protocol : 'https:';
|
||||||
|
|
||||||
|
// For users on hördle.de, use Punycode domain (xn--hrdle-jua.de) in share message
|
||||||
|
// to avoid rendering issues with Unicode domains
|
||||||
|
let currentHost = rawHost;
|
||||||
|
if (rawHost === 'hördle.de' || rawHost === 'xn--hrdle-jua.de') {
|
||||||
|
currentHost = 'xn--hrdle-jua.de';
|
||||||
|
}
|
||||||
|
|
||||||
|
// OLD CODE (commented out - may be needed again in the future):
|
||||||
// Use current domain from window.location to support both hoerdle.de and hördle.de,
|
// Use current domain from window.location to support both hoerdle.de and hördle.de,
|
||||||
// but always share the pretty Unicode-Domain "hördle.de" instead of the Punycode variant.
|
// but always share the pretty Unicode-Domain "hördle.de" instead of the Punycode variant.
|
||||||
const rawHost = typeof window !== 'undefined' ? window.location.hostname : config.domain;
|
// const currentHost = rawHost === 'xn--hrdle-jua.de' ? 'hördle.de' : rawHost;
|
||||||
const currentHost = rawHost === 'xn--hrdle-jua.de' ? 'hördle.de' : rawHost;
|
|
||||||
const protocol = typeof window !== 'undefined' ? window.location.protocol : 'https:';
|
|
||||||
let shareUrl = `${protocol}//${currentHost}`;
|
let shareUrl = `${protocol}//${currentHost}`;
|
||||||
// Add locale prefix if not default (en)
|
// Add locale prefix if not default (en)
|
||||||
if (locale !== 'en') {
|
if (locale !== 'en') {
|
||||||
@@ -676,14 +690,26 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
<div style={{ marginBottom: '0.75rem' }}>
|
||||||
|
<label style={{ display: 'flex', alignItems: 'flex-start', gap: '0.5rem', fontSize: '0.85rem', color: 'var(--foreground)', cursor: 'pointer' }}>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={commentAIConsent}
|
||||||
|
onChange={(e) => setCommentAIConsent(e.target.checked)}
|
||||||
|
disabled={commentSending || commentSent}
|
||||||
|
style={{ marginTop: '0.2rem', cursor: (commentSending || commentSent) ? 'not-allowed' : 'pointer' }}
|
||||||
|
/>
|
||||||
|
<span>{t('commentAIConsent')}</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
<button
|
<button
|
||||||
onClick={handleCommentSubmit}
|
onClick={handleCommentSubmit}
|
||||||
disabled={!commentText.trim() || commentSending || commentSent}
|
disabled={!commentText.trim() || commentSending || commentSent || !commentAIConsent}
|
||||||
className="btn-primary"
|
className="btn-primary"
|
||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '100%',
|
||||||
opacity: (!commentText.trim() || commentSending || commentSent) ? 0.5 : 1,
|
opacity: (!commentText.trim() || commentSending || commentSent || !commentAIConsent) ? 0.5 : 1,
|
||||||
cursor: (!commentText.trim() || commentSending || commentSent) ? 'not-allowed' : 'pointer'
|
cursor: (!commentText.trim() || commentSending || commentSent || !commentAIConsent) ? 'not-allowed' : 'pointer'
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{commentSending ? t('sending') : t('sendComment')}
|
{commentSending ? t('sending') : t('sendComment')}
|
||||||
@@ -695,14 +721,20 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
|
|
||||||
{commentSent && (
|
{commentSent && (
|
||||||
<div style={{ marginTop: '1.5rem', padding: '1rem', background: 'rgba(16, 185, 129, 0.1)', borderRadius: '0.5rem', border: '1px solid rgba(16, 185, 129, 0.3)' }}>
|
<div style={{ marginTop: '1.5rem', padding: '1rem', background: 'rgba(16, 185, 129, 0.1)', borderRadius: '0.5rem', border: '1px solid rgba(16, 185, 129, 0.3)' }}>
|
||||||
<p style={{ fontSize: '0.9rem', color: 'var(--success)', textAlign: 'center', marginBottom: rewrittenMessage ? '0.5rem' : 0 }}>
|
{rewrittenMessage ? (
|
||||||
{t('commentSent')}
|
<>
|
||||||
</p>
|
<p style={{ fontSize: '0.9rem', color: 'var(--success)', textAlign: 'center', marginBottom: '0.5rem' }}>
|
||||||
{rewrittenMessage && (
|
{t('commentSent')}
|
||||||
<div style={{ fontSize: '0.85rem', color: 'var(--muted-foreground)', textAlign: 'center' }}>
|
</p>
|
||||||
<p style={{ marginBottom: '0.25rem' }}>{t('commentRewritten')}</p>
|
<div style={{ fontSize: '0.85rem', color: 'var(--muted-foreground)', textAlign: 'center' }}>
|
||||||
<p style={{ fontStyle: 'italic' }}>"{rewrittenMessage}"</p>
|
<p style={{ marginBottom: '0.25rem' }}>{t('commentRewritten')}</p>
|
||||||
</div>
|
<p style={{ fontStyle: 'italic' }}>"{rewrittenMessage}"</p>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<p style={{ fontSize: '0.9rem', color: 'var(--success)', textAlign: 'center', marginBottom: 0 }}>
|
||||||
|
{t('commentThankYou')}
|
||||||
|
</p>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -61,7 +61,9 @@
|
|||||||
"sendCommentCollapsed": "Nachricht an Kurator senden",
|
"sendCommentCollapsed": "Nachricht an Kurator senden",
|
||||||
"commentPlaceholder": "Schreibe eine Nachricht an die Kuratoren dieses Genres... Bitte bleibe freundlich und höflich.",
|
"commentPlaceholder": "Schreibe eine Nachricht an die Kuratoren dieses Genres... Bitte bleibe freundlich und höflich.",
|
||||||
"commentHelp": "Teile deine Gedanken zum Rätsel mit den Kuratoren. Deine Nachricht wird ihnen angezeigt.",
|
"commentHelp": "Teile deine Gedanken zum Rätsel mit den Kuratoren. Deine Nachricht wird ihnen angezeigt.",
|
||||||
|
"commentAIConsent": "Ich bin damit einverstanden, dass diese Nachricht von einer KI verarbeitet wird, um unfreundliche Nachrichten zu filtern.",
|
||||||
"commentSent": "✓ Nachricht gesendet! Vielen Dank für dein Feedback.",
|
"commentSent": "✓ Nachricht gesendet! Vielen Dank für dein Feedback.",
|
||||||
|
"commentThankYou": "Vielen Dank für dein Feedback!",
|
||||||
"commentRewritten": "Deine Nachricht wurde automatisch freundlicher formuliert:",
|
"commentRewritten": "Deine Nachricht wurde automatisch freundlicher formuliert:",
|
||||||
"commentError": "Fehler beim Senden der Nachricht",
|
"commentError": "Fehler beim Senden der Nachricht",
|
||||||
"commentRateLimited": "Du hast bereits eine Nachricht für dieses Rätsel gesendet.",
|
"commentRateLimited": "Du hast bereits eine Nachricht für dieses Rätsel gesendet.",
|
||||||
|
|||||||
@@ -61,7 +61,9 @@
|
|||||||
"sendCommentCollapsed": "Send message to curator",
|
"sendCommentCollapsed": "Send message to curator",
|
||||||
"commentPlaceholder": "Write a message to the curators of this genre... Please remain friendly and polite.",
|
"commentPlaceholder": "Write a message to the curators of this genre... Please remain friendly and polite.",
|
||||||
"commentHelp": "Share your thoughts on the puzzle with the curators. Your message will be shown to them.",
|
"commentHelp": "Share your thoughts on the puzzle with the curators. Your message will be shown to them.",
|
||||||
|
"commentAIConsent": "I agree that this message will be processed by an AI to filter unfriendly messages.",
|
||||||
"commentSent": "✓ Message sent! Thank you for your feedback.",
|
"commentSent": "✓ Message sent! Thank you for your feedback.",
|
||||||
|
"commentThankYou": "Thank you for your feedback!",
|
||||||
"commentRewritten": "Your message was automatically rephrased to be more friendly:",
|
"commentRewritten": "Your message was automatically rephrased to be more friendly:",
|
||||||
"commentError": "Error sending message",
|
"commentError": "Error sending message",
|
||||||
"commentRateLimited": "You have already sent a message for this puzzle.",
|
"commentRateLimited": "You have already sent a message for this puzzle.",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hoerdle",
|
"name": "hoerdle",
|
||||||
"version": "0.1.6.8",
|
"version": "0.1.6.11",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
@@ -88,10 +88,13 @@ docker compose build
|
|||||||
echo "🔄 Restarting with new image (minimal downtime)..."
|
echo "🔄 Restarting with new image (minimal downtime)..."
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
|
|
||||||
# Clean up old images
|
# Clean up old images and build cache
|
||||||
echo "🧹 Cleaning up old images..."
|
echo "🧹 Cleaning up old images..."
|
||||||
docker image prune -f
|
docker image prune -f
|
||||||
|
|
||||||
|
echo "🧹 Cleaning up build cache..."
|
||||||
|
docker builder prune -f
|
||||||
|
|
||||||
echo "✅ Deployment complete!"
|
echo "✅ Deployment complete!"
|
||||||
echo ""
|
echo ""
|
||||||
echo "📊 Showing logs (Ctrl+C to exit)..."
|
echo "📊 Showing logs (Ctrl+C to exit)..."
|
||||||
|
|||||||
Reference in New Issue
Block a user