More consistent date columns

app/features/admin/AdminRepository.server.ts

@@ -291,15 +291,15 @@ export async function linkUserAndPlayer({
 export function forcePatron(args: {
 	id: number;
 	patronTier: Tables["User"]["patronTier"];
-	patronSince: Date;
-	patronTill: Date;
+	patronStartedAt: Date;
+	patronExpiresAt: Date;
 }) {
 	return db
 		.updateTable("User")
 		.set({
 			patronTier: args.patronTier,
-			patronSince: dateToDatabaseTimestamp(args.patronSince),
-			patronTill: dateToDatabaseTimestamp(args.patronTill),
+			patronStartedAt: dateToDatabaseTimestamp(args.patronStartedAt),
+			patronExpiresAt: dateToDatabaseTimestamp(args.patronExpiresAt),
 		})
 		.where("User.id", "=", args.id)
 		.execute();

app/features/admin/ExternalStreamRepository.server.ts

@@ -12,7 +12,7 @@ const RETENTION_SECONDS = 24 * 60 * 60;
 export function insert(
 	args: Pick<
 		TablesInsertable["ExternalStream"],
-		"name" | "url" | "avatarImgId" | "startTime"
+		"name" | "url" | "avatarImgId" | "startsAt"
 	>,
 ) {
 	return db.insertInto("ExternalStream").values(args).execute();
@@ -36,12 +36,12 @@ export function all() {
 			"ExternalStream.id",
 			"ExternalStream.name",
 			"ExternalStream.url",
-			"ExternalStream.startTime",
+			"ExternalStream.startsAt",
 			concatUserSubmittedImagePrefix(eb.ref("UserSubmittedImage.url")).as(
 				"avatarUrl",
 			),
 		])
-		.orderBy("ExternalStream.startTime", "asc")
+		.orderBy("ExternalStream.startsAt", "asc")
 		.execute();
 }
 
@@ -58,13 +58,13 @@ export function forSidebar() {
 			"ExternalStream.id",
 			"ExternalStream.name",
 			"ExternalStream.url",
-			"ExternalStream.startTime",
+			"ExternalStream.startsAt",
 			concatUserSubmittedImagePrefix(eb.ref("UserSubmittedImage.url")).as(
 				"avatarUrl",
 			),
 		])
 		.where(
-			"ExternalStream.startTime",
+			"ExternalStream.startsAt",
 			">=",
 			databaseTimestampNow() - SIDEBAR_VISIBLE_SECONDS,
 		)
@@ -75,6 +75,6 @@ export function forSidebar() {
 export function deleteOld() {
 	return db
 		.deleteFrom("ExternalStream")
-		.where("startTime", "<", databaseTimestampNow() - RETENTION_SECONDS)
+		.where("startsAt", "<", databaseTimestampNow() - RETENTION_SECONDS)
 		.executeTakeFirst();
 }

app/features/admin/actions/admin.server.ts

@@ -74,9 +74,9 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 
 			await AdminRepository.forcePatron({
 				id: data.user,
-				patronSince: new Date(),
+				patronStartedAt: new Date(),
 				patronTier: data.patronTier,
-				patronTill: new Date(data.patronTill),
+				patronExpiresAt: new Date(data.patronExpiresAt),
 			});
 
 			message = "Patron status updated";
@@ -207,7 +207,7 @@ export const adminActionSchema = z.union([
 		_action: _action("FORCE_PATRON"),
 		user: z.preprocess(actualNumber, z.number().positive()),
 		patronTier: z.preprocess(actualNumber, z.number()),
-		patronTill: z.string(),
+		patronExpiresAt: z.string(),
 	}),
 	z.object({
 		_action: _action("VIDEO_ADDER"),

app/features/admin/actions/admin.streams.server.ts

@@ -27,7 +27,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 				name: data.name,
 				url: data.url,
 				avatarImgId: data.avatar,
-				startTime: dateToDatabaseTimestamp(data.startTime),
+				startsAt: dateToDatabaseTimestamp(data.startTime),
 			});
 			break;
 		}

app/features/admin/routes/admin.streams.tsx

@@ -68,7 +68,7 @@ function ExternalStreamList() {
 							</Link>
 							<span className="text-xs text-lighter">
 								<LocaleTime
-									date={stream.startTime}
+									date={stream.startsAt}
 									inline
 									options={{
 										month: "numeric",

app/features/admin/routes/admin.test.ts

@@ -35,7 +35,7 @@ const voteArgs = ({
 	authorId,
 	month,
 	tier: 1,
-	validAfter: dateToDatabaseTimestamp(new Date("2021-12-11T00:00:00.000Z")),
+	becomesValidAt: dateToDatabaseTimestamp(new Date("2021-12-11T00:00:00.000Z")),
 	year,
 });
 

app/features/admin/routes/admin.tsx

@@ -370,7 +370,7 @@ function ForcePatron() {
 
 				<div className="flex-same-size">
 					<label>Patron till</label>
-					<input name="patronTill" type="date" />
+					<input name="patronExpiresAt" type="date" />
 				</div>
 			</div>
 			<div className="stack horizontal md">