Revert "Add student birthday tracking with celebration banners and admin notification; v1.1.31"
This reverts commit c0a79b9ed0.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { mkdir, stat, unlink, writeFile } from 'node:fs/promises'
|
||||
import path from 'node:path'
|
||||
import { inferImageExtensionFromDataUrl, normalizeAssetBaseName, isBirthdayThisWeek } from '../helpers.js'
|
||||
import { inferImageExtensionFromDataUrl, normalizeAssetBaseName } from '../helpers.js'
|
||||
import { requireAdminAuth } from '../auth.js'
|
||||
import { UPLOADS_DIR } from '../config.js'
|
||||
import { state } from '../state.js'
|
||||
@@ -132,11 +132,6 @@ export function register(app) {
|
||||
noteCount,
|
||||
subscribeNewsletter: user.subscribeNewsletter !== false,
|
||||
studyRemindersEnabled: user.studyRemindersEnabled === true,
|
||||
birthdayMonth: user.birthdayMonth ?? null,
|
||||
birthdayDay: user.birthdayDay ?? null,
|
||||
birthdayAlternateMonth: user.birthdayAlternateMonth ?? null,
|
||||
birthdayAlternateDay: user.birthdayAlternateDay ?? null,
|
||||
isBirthdayWeek: isBirthdayThisWeek(user),
|
||||
}
|
||||
}))
|
||||
|
||||
@@ -147,7 +142,7 @@ export function register(app) {
|
||||
const user = state.studyUsers.find(u => u.id === req.params.id)
|
||||
if (!user) { res.status(404).json({ message: 'User not found.' }); return }
|
||||
|
||||
const { displayName, newPassword, addEnrollment, removeEnrollment, birthdayMonth, birthdayDay, birthdayAlternateMonth, birthdayAlternateDay } = req.body ?? {}
|
||||
const { displayName, newPassword, addEnrollment, removeEnrollment } = req.body ?? {}
|
||||
|
||||
if (typeof displayName === 'string') {
|
||||
user.displayName = displayName.trim().slice(0, 80)
|
||||
@@ -177,28 +172,6 @@ export function register(app) {
|
||||
user.enrolledStudySlugs = (user.enrolledStudySlugs ?? []).filter(s => s !== slug)
|
||||
}
|
||||
|
||||
if (birthdayMonth !== undefined) {
|
||||
const m = parseInt(birthdayMonth, 10)
|
||||
user.birthdayMonth = (Number.isInteger(m) && m >= 1 && m <= 12) ? m : null
|
||||
}
|
||||
if (birthdayDay !== undefined) {
|
||||
const d = parseInt(birthdayDay, 10)
|
||||
user.birthdayDay = (Number.isInteger(d) && d >= 1 && d <= 31) ? d : null
|
||||
}
|
||||
if (birthdayAlternateMonth !== undefined) {
|
||||
const m = parseInt(birthdayAlternateMonth, 10)
|
||||
user.birthdayAlternateMonth = (Number.isInteger(m) && m >= 1 && m <= 12) ? m : null
|
||||
if (!user.birthdayAlternateMonth) user.birthdayAlternateDay = null
|
||||
}
|
||||
if (birthdayAlternateDay !== undefined) {
|
||||
const d = parseInt(birthdayAlternateDay, 10)
|
||||
user.birthdayAlternateDay = (Number.isInteger(d) && d >= 1 && d <= 31) ? d : null
|
||||
}
|
||||
// Clear the sent-year so a changed birthday can trigger a new notification
|
||||
if (birthdayMonth !== undefined || birthdayDay !== undefined || birthdayAlternateMonth !== undefined || birthdayAlternateDay !== undefined) {
|
||||
user.birthdayEmailSentYear = null
|
||||
}
|
||||
|
||||
user.updatedAt = new Date().toISOString()
|
||||
queueStudyUsersWrite()
|
||||
res.json({ ok: true, displayName: user.displayName, enrolledStudySlugs: user.enrolledStudySlugs })
|
||||
|
||||
Reference in New Issue
Block a user