fix: more internal follow user fixes

Author: TheNoim

src/api/v1/accounts.ts

@@ -12,6 +12,7 @@ import {
   isNotNull,
   isNull,
   lt,
+  not,
   notInArray,
   or,
   sql,
@@ -26,6 +27,7 @@ import {
   serializeRelationship,
 } from "../../entities/account";
 import { serializeList } from "../../entities/list";
+import { HOLLO_RELAY_ACTOR_ID } from "../../entities/relay";
 import { getPostRelations, serializePost } from "../../entities/status";
 import { federation } from "../../federation";
 import {
@@ -411,9 +413,12 @@ app.get(
       }
     }
     const accountList = await db.query.accounts.findMany({
-      where: or(
-        ilike(accounts.handle, `%${query.q}%`),
-        ilike(accounts.name, `%${query.q}%`),
+      where: and(
+        or(
+          ilike(accounts.handle, `%${query.q}%`),
+          ilike(accounts.name, `%${query.q}%`),
+        ),
+        not(eq(accounts.id, HOLLO_RELAY_ACTOR_ID)),
       ),
       with: { owner: true, successor: true },
       orderBy: [

src/pages/accounts.tsx

@@ -118,6 +118,28 @@ accounts.post("/", async (c) => {
   const bioResult = await formatText(db, bio ?? "", fedCtx);
   const nameEmojis = await extractCustomEmojis(db, name);
   const emojis = { ...nameEmojis, ...bioResult.emojis };
+  const handle = `@${username}@${fedCtx.host}`;
+  if (handle === `@${HOLLO_OFFICIAL_ACCOUNT}@${fedCtx.host}`) {
+    return c.html(
+      <NewAccountPage
+        values={{
+          username,
+          name,
+          bio,
+          protected: protected_,
+          discoverable,
+          language,
+          visibility,
+          news,
+        }}
+        errors={{
+          username: "This handle is reserved",
+        }}
+        officialAccount={HOLLO_OFFICIAL_ACCOUNT}
+      />,
+      400,
+    );
+  }
   const [account, owner] = await db.transaction(async (tx) => {
     await tx
       .insert(instances)
@@ -136,7 +158,7 @@ accounts.post("/", async (c) => {
         type: "Person",
         name,
         emojis,
-        handle: `@${username}@${fedCtx.host}`,
+        handle: handle,
         bioHtml: bioResult.html,
         url: fedCtx.getActorUri(username).href,
         protected: protected_,