jake/jarv.is
1
Fork 0
mirror of https://github.com/jakejarvis/jarv.is.git synced 2026-08-20 15:25:39 -04:00
Code Issues Activity

move some cruft from serverless API to client

Browse Source
This commit is contained in:
jake
2021-07-09 14:40:23 -04:00
parent b411560a34
commit 523670fa22
9 changed files with 26 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/hits.ts
+4 -22
View File
@@ -5,9 +5,6 @@ import * as Tracing from "@sentry/tracing"; // eslint-disable-line @typescript-e
import { VercelRequest, VercelResponse } from "@vercel/node";
import { Client, query as q } from "faunadb";
import fetch from "node-fetch";
import pluralize from "pluralize";
import numeral from "numeral";
import { DateTime } from "luxon";
import parser from "fast-xml-parser";
import { decode } from "html-entities";
@@ -68,7 +65,7 @@ export default async (req: VercelRequest, res: VercelResponse) => {
}
};
const incrementPageHits = async (slug: string | string[], client: Client) => {
const incrementPageHits = async (slug: string | string[], client: Client): Promise<PageStats> => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const result = await client.query<any>(
q.Let(
@@ -87,18 +84,11 @@ const incrementPageHits = async (slug: string | string[], client: Client) => {
)
);
// add formatted hits with comma and pluralized "hit(s)", simpler to do here than in browser
const hits: PageStats = {
...result.data,
pretty_hits: numeral(result.data.hits).format("0,0"),
pretty_unit: pluralize("hit", result.data.hits),
};
// send client the *new* hit count
return hits;
return result.data;
};
const getSiteStats = async (client: Client) => {
const getSiteStats = async (client: Client): Promise<OverallStats> => {
// get database and RSS results asynchronously
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const [feed, result] = await Promise.all<{ [key: string]: any }, any>([
@@ -123,13 +113,9 @@ const getSiteStats = async (client: Client) => {
if (match) {
p.title = decode(match.title);
p.url = match.link;
p.date = DateTime.fromRFC2822(match.pubDate).toISO();
p.date = new Date(match.pubDate).toISOString();
}
// it's easier to add comma-separated numbers and proper pluralization here on the backend
p.pretty_hits = numeral(p.hits).format("0,0");
p.pretty_unit = pluralize("hit", p.hits);
// add these hits to running tally
stats.total.hits += p.hits;
@@ -141,9 +127,5 @@ const getSiteStats = async (client: Client) => {
return a.hits > b.hits ? -1 : 1;
});
// do same prettification as above to totals
stats.total.pretty_hits = numeral(stats.total.hits).format("0,0");
stats.total.pretty_unit = pluralize("hit", stats.total.hits);
return stats;
};