rm user function aliases

src/activity.ts

@@ -5,7 +5,7 @@ import { User, getByActor } from "./user.js";
 import { fillRoute, reverseRoute } from "./router.js";
 import { streamToString, hashDigest } from "./util.js";
 import { signedFetch, SignedInit, getActor } from "./net.js";
-import { getById as getUserById, keyIdFromNickname } from "./user.js";
+import { getUserById, keyIdFromNickname } from "./user.js";
 import parser from "activitypub-http-signatures";
 import type { Request, Response } from "express";
 import { addFollower } from "./follower.js";

src/command.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import markdownit from 'markdown-it'
 import { slugRegex } from "./article.js";
-import { newUser, get as getUserByNickname, getFollowerInboxes, keyIdFromNickname } from "./user.js";
+import { newUser, getUserByNickname, getFollowerInboxes, keyIdFromNickname } from "./user.js";
 import { insert as insertArticle } from "./article.js";
 import { add as addToOutbox } from "./outbox.js";
 import { createArticleActivity, sendAll } from "./activity.js";

src/follower.ts

@@ -2,7 +2,7 @@ import { TYPE } from "./activity.js";
 import { CollectionEntry, orderedCollection } from "./collection.js";
 import db from "./db.js";
 import { fillRoute } from "./router.js";
-import { get as getUserByNickname } from "./user.js";
+import { getUserByNickname } from "./user.js";
 import { Request, Response } from "express";
 
 export interface Follower {

src/index.ts

@@ -1,7 +1,7 @@
 import express, { Request } from "express";
 import bodyParser from "body-parser";
 import { toCollection as getOutbox } from "./outbox.js";
-import { getById as getUserById, getNickname, get as getUserByNickname, getId as getUserId, User } from "./user.js";
+import { getUserById, getUserNicknameById, getUserByNickname, User } from "./user.js";
 import { Routes } from "./router.js";
 import { getBySlug as getArticleBySlug, getById, getByUserId, getAll as getAllArticles } from "./article.js";
 import { userToPerson, TYPE as ACTIVITYPUB_TYPE, handleInboxPost, createArticleObject, CONTEXT, createArticleActivity } from "./activity.js";
@@ -58,7 +58,7 @@ app.get(Routes.object, async (req, res) => {
       "application/ld+json",
       "json"
     ])) {
-      const nickname = await getNickname(article.users_id) as string;
+      const nickname = await getUserNicknameById(article.users_id) as string;
 
       const obj = createArticleObject(article, nickname);
       obj["@context"] = CONTEXT;

src/net.ts

@@ -6,7 +6,7 @@ import { actorSchema } from "./activitypub_types.js";
 import type { Actor } from "./activitypub_types.js";
 import type { Request, Response } from "express";
 import { fillRoute } from "./router.js";
-import { get as getUserByNickname } from "./user.js";
+import { getUserByNickname } from "./user.js";
 
 export const flattenHeaders = (headers: Record<string, string>) =>
     Object.entries(headers).map(([key, value]) => `${key}: ${value}`);

src/outbox.ts

@@ -1,6 +1,6 @@
 import db from "./db.js";
 import { z } from "zod";
-import { get as getUserByNickname } from "./user.js";
+import { getUserByNickname } from "./user.js";
 import { fillRoute } from "./router.js";
 import { getByUserId as getArticlesByUserId, getById as getArticleById, Article } from "./article.js";
 import { createArticleActivity, deleteArticleActivity } from "./activity.js";

src/user.ts

@@ -27,13 +27,13 @@ export const zUser = z.object({
 
 export type User = z.infer<typeof zUser>;
 
-export const get = async (nickname: string) =>
+export const getUserByNickname = async (nickname: string) =>
     db<User>("users")
         .where("nickname", nickname)
         .first()
     ;
 
-export const getById = async (id: number) =>
+export const getUserById = async (id: number) =>
     db<User>("users")
         .where("id", id)
         .first()
@@ -45,12 +45,12 @@ export const getByActor = async (actor: string) => {
     const matchArray = actor.match(EXTRACT_NICKNAME);
     if (matchArray) {
         const nickname = matchArray[1];
-        return get(nickname);
+        return getUserByNickname(nickname);
     }
     else return null;
 };
 
-export const getNickname = async (userId: number): Promise<string | null> =>
+export const getUserNicknameById = async (userId: number): Promise<string | null> =>
     db("users")
         .select("nickname")
         .where("id", userId)
@@ -58,7 +58,7 @@ export const getNickname = async (userId: number): Promise<string | null> =>
         .then((rec) => !!rec ? rec.nickname : null)
     ;
 
-export const getId = async (nickname: string): Promise<number | null> =>
+export const getUserIdByNickname = async (nickname: string): Promise<number | null> =>
     db("users")
         .select("id")
         .where("nickname", nickname)