Delete `transformers` directory, rename `views`

src/controllers/activitypub/actor.ts

@@ -1,7 +1,7 @@
 import { findUser } from '@/db/users.ts';
 import { getAuthor } from '@/queries.ts';
-import { toActor } from '@/transformers/nostr-to-activitypub.ts';
 import { activityJson } from '@/utils/web.ts';
+import { toActor } from '@/views/nostr-to-activitypub.ts';
 
 import type { AppContext, AppController } from '@/app.ts';
 

src/controllers/api/accounts.ts

@@ -1,17 +1,17 @@
 import { type AppController } from '@/app.ts';
 import { Conf } from '@/config.ts';
+import { insertUser } from '@/db/users.ts';
 import { type Filter, findReplyTag, nip19, z } from '@/deps.ts';
 import * as mixer from '@/mixer.ts';
 import { getAuthor, getFollowedPubkeys, getFollows, syncUser } from '@/queries.ts';
 import { booleanParamSchema, fileSchema } from '@/schema.ts';
 import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
-import { accountFromPubkey, toAccount, toRelationship, toStatus } from '@/transformers/nostr-to-mastoapi.ts';
+import { uploadFile } from '@/upload.ts';
 import { isFollowing, lookupAccount, nostrNow, Time } from '@/utils.ts';
 import { paginated, paginationSchema, parseBody } from '@/utils/web.ts';
 import { createEvent } from '@/utils/web.ts';
 import { renderEventAccounts } from '@/views.ts';
-import { insertUser } from '@/db/users.ts';
-import { uploadFile } from '@/upload.ts';
+import { accountFromPubkey, toAccount, toRelationship, toStatus } from '@/views/nostr-to-mastoapi.ts';
 
 const usernameSchema = z
   .string().min(1).max(30)

src/controllers/api/notifications.ts

@@ -1,8 +1,8 @@
 import { type AppController } from '@/app.ts';
 import * as mixer from '@/mixer.ts';
-import { paginated, paginationSchema } from '@/utils/web.ts';
-import { toNotification } from '@/transformers/nostr-to-mastoapi.ts';
 import { Time } from '@/utils.ts';
+import { paginated, paginationSchema } from '@/utils/web.ts';
+import { toNotification } from '@/views/nostr-to-mastoapi.ts';
 
 const notificationsController: AppController = async (c) => {
   const pubkey = c.get('pubkey')!;

src/controllers/api/search.ts

@@ -4,9 +4,9 @@ import { type Event, type Filter, nip19, z } from '@/deps.ts';
 import * as mixer from '@/mixer.ts';
 import { booleanParamSchema } from '@/schema.ts';
 import { nostrIdSchema } from '@/schemas/nostr.ts';
-import { toAccount, toStatus } from '@/transformers/nostr-to-mastoapi.ts';
 import { dedupeEvents, Time } from '@/utils.ts';
 import { lookupNip05Cached } from '@/utils/nip05.ts';
+import { toAccount, toStatus } from '@/views/nostr-to-mastoapi.ts';
 
 /** Matches NIP-05 names with or without an @ in front. */
 const ACCT_REGEX = /^@?(?:([\w.+-]+)@)?([\w.-]+)$/;

src/controllers/api/statuses.ts

@@ -1,10 +1,10 @@
 import { type AppController } from '@/app.ts';
+import { getUnattachedMediaByIds } from '@/db/unattached-media.ts';
 import { type Event, ISO6391, z } from '@/deps.ts';
 import { getAncestors, getDescendants, getEvent } from '@/queries.ts';
-import { toStatus } from '@/transformers/nostr-to-mastoapi.ts';
 import { createEvent, paginationSchema, parseBody } from '@/utils/web.ts';
 import { renderEventAccounts } from '@/views.ts';
-import { getUnattachedMediaByIds } from '@/db/unattached-media.ts';
+import { toStatus } from '@/views/nostr-to-mastoapi.ts';
 
 const createStatusSchema = z.object({
   in_reply_to_id: z.string().regex(/[0-9a-f]{64}/).nullish(),

src/controllers/api/streaming.ts

@@ -3,8 +3,8 @@ import { z } from '@/deps.ts';
 import { type DittoFilter } from '@/filter.ts';
 import { getFeedPubkeys } from '@/queries.ts';
 import { Sub } from '@/subs.ts';
-import { toStatus } from '@/transformers/nostr-to-mastoapi.ts';
 import { bech32ToPubkey } from '@/utils.ts';
+import { toStatus } from '@/views/nostr-to-mastoapi.ts';
 
 /**
  * Streaming timelines/categories.

src/controllers/api/timelines.ts

@@ -3,9 +3,9 @@ import { type DittoFilter } from '@/filter.ts';
 import * as mixer from '@/mixer.ts';
 import { getFeedPubkeys } from '@/queries.ts';
 import { booleanParamSchema } from '@/schema.ts';
-import { toStatus } from '@/transformers/nostr-to-mastoapi.ts';
-import { paginated, paginationSchema } from '@/utils/web.ts';
 import { Time } from '@/utils.ts';
+import { paginated, paginationSchema } from '@/utils/web.ts';
+import { toStatus } from '@/views/nostr-to-mastoapi.ts';
 
 import type { AppContext, AppController } from '@/app.ts';