Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor site management functions for improved readability and consistency

Bill Yang42937058d008
diff --git a/server/src/api/sites/changeSiteBlockBots.ts b/server/src/api/sites/changeSiteBlockBots.ts
index 6f4de7761..d650ef8ca 100644
--- a/server/src/api/sites/changeSiteBlockBots.ts
+++ b/server/src/api/sites/changeSiteBlockBots.ts
@@ -12,16 +12,10 @@ interface ChangeSiteBlockBotsRequest {
};
}
-export async function changeSiteBlockBots(
- request: FastifyRequest<ChangeSiteBlockBotsRequest>,
- reply: FastifyReply
-) {
+export async function changeSiteBlockBots(request: FastifyRequest<ChangeSiteBlockBotsRequest>, reply: FastifyReply) {
const { siteId, blockBots } = request.body;
- const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
- request,
- String(siteId)
- );
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(siteId));
if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
@@ -41,7 +35,7 @@ export async function changeSiteBlockBots(
.update(sites)
.set({
blockBots: blockBots,
- updatedAt: new Date(),
+ updatedAt: new Date().toISOString(),
})
.where(eq(sites.siteId, siteId));
diff --git a/server/src/api/sites/changeSiteDomain.ts b/server/src/api/sites/changeSiteDomain.ts
index 7fe1f6e80..92d1ba9e2 100644
--- a/server/src/api/sites/changeSiteDomain.ts
+++ b/server/src/api/sites/changeSiteDomain.ts
@@ -13,34 +13,26 @@ export async function changeSiteDomain(
newDomain: string;
};
}>,
- reply: FastifyReply
+ reply: FastifyReply,
) {
const { siteId, newDomain } = request.body;
- const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
- request,
- String(siteId)
- );
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(siteId));
if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
// Validate domain format using regex
- const domainRegex =
- /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
+ const domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
if (!domainRegex.test(newDomain)) {
return reply.status(400).send({
- error:
- "Invalid domain format. Must be a valid domain like example.com or sub.example.com",
+ error: "Invalid domain format. Must be a valid domain like example.com or sub.example.com",
});
}
try {
// Check if site exists and user has permission
- const siteResult = await db
- .select()
- .from(sites)
- .where(eq(sites.siteId, siteId));
+ const siteResult = await db.select().from(sites).where(eq(sites.siteId, siteId));
if (siteResult.length === 0) {
return reply.status(404).send({ error: "Site not found" });
@@ -52,7 +44,7 @@ export async function changeSiteDomain(
.set({
domain: newDomain,
name: newDomain,
- updatedAt: new Date(),
+ updatedAt: new Date().toISOString(),
})
.where(eq(sites.siteId, siteId));
@@ -65,11 +57,7 @@ export async function changeSiteDomain(
console.error("Error changing site domain:", err);
// Check for unique constraint violation
- if (
- String(err).includes(
- 'duplicate key value violates unique constraint "sites_domain_unique"'
- )
- ) {
+ if (String(err).includes('duplicate key value violates unique constraint "sites_domain_unique"')) {
return reply.status(409).send({ error: "Domain already in use" });
}
diff --git a/server/src/api/sites/changeSitePublic.ts b/server/src/api/sites/changeSitePublic.ts
index d75f0e8fb..5b95666f9 100644
--- a/server/src/api/sites/changeSitePublic.ts
+++ b/server/src/api/sites/changeSitePublic.ts
@@ -12,16 +12,10 @@ interface ChangeSitePublicRequest {
};
}
-export async function changeSitePublic(
- request: FastifyRequest<ChangeSitePublicRequest>,
- reply: FastifyReply
-) {
+export async function changeSitePublic(request: FastifyRequest<ChangeSitePublicRequest>, reply: FastifyReply) {
const { siteId, isPublic } = request.body;
- const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
- request,
- String(siteId)
- );
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(siteId));
if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
@@ -41,7 +35,7 @@ export async function changeSitePublic(
.update(sites)
.set({
public: isPublic,
- updatedAt: new Date(),
+ updatedAt: new Date().toISOString(),
})
.where(eq(sites.siteId, siteId));
diff --git a/server/src/api/sites/changeSiteSalt.ts b/server/src/api/sites/changeSiteSalt.ts
index 107c61891..66e000d73 100644
--- a/server/src/api/sites/changeSiteSalt.ts
+++ b/server/src/api/sites/changeSiteSalt.ts
@@ -12,16 +12,10 @@ interface ChangeSiteSaltRequest {
};
}
-export async function changeSiteSalt(
- request: FastifyRequest<ChangeSiteSaltRequest>,
- reply: FastifyReply
-) {
+export async function changeSiteSalt(request: FastifyRequest<ChangeSiteSaltRequest>, reply: FastifyReply) {
const { siteId, saltUserIds } = request.body;
- const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
- request,
- String(siteId)
- );
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(siteId));
if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
@@ -41,7 +35,7 @@ export async function changeSiteSalt(
.update(sites)
.set({
saltUserIds: saltUserIds,
- updatedAt: new Date(),
+ updatedAt: new Date().toISOString(),
})
.where(eq(sites.siteId, siteId));