From 9ca3ec08a3bd81c6d2e6e2e15fd4f581721564a2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 6 Oct 2023 12:02:24 -0500
Subject: [PATCH] Delete `transformers` directory, rename `views`

---
 src/controllers/activitypub/actor.ts                | 2 +-
 src/controllers/api/accounts.ts                     | 6 +++---
 src/controllers/api/notifications.ts                | 4 ++--
 src/controllers/api/search.ts                       | 2 +-
 src/controllers/api/statuses.ts                     | 4 ++--
 src/controllers/api/streaming.ts                    | 2 +-
 src/controllers/api/timelines.ts                    | 4 ++--
 src/{transformers => views}/nostr-to-activitypub.ts | 0
 src/{transformers => views}/nostr-to-mastoapi.ts    | 0
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{transformers => views}/nostr-to-activitypub.ts (100%)
 rename src/{transformers => views}/nostr-to-mastoapi.ts (100%)

diff --git a/src/controllers/activitypub/actor.ts b/src/controllers/activitypub/actor.ts
index 6c9ed02..4f051c0 100644
--- a/src/controllers/activitypub/actor.ts
+++ b/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';
 
diff --git a/src/controllers/api/accounts.ts b/src/controllers/api/accounts.ts
index f14efaf..d86a410 100644
--- a/src/controllers/api/accounts.ts
+++ b/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)
diff --git a/src/controllers/api/notifications.ts b/src/controllers/api/notifications.ts
index bd8fe4d..c5f3e7e 100644
--- a/src/controllers/api/notifications.ts
+++ b/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')!;
diff --git a/src/controllers/api/search.ts b/src/controllers/api/search.ts
index ee8497e..4c71135 100644
--- a/src/controllers/api/search.ts
+++ b/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.-]+)$/;
diff --git a/src/controllers/api/statuses.ts b/src/controllers/api/statuses.ts
index 4756df0..73fb982 100644
--- a/src/controllers/api/statuses.ts
+++ b/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(),
diff --git a/src/controllers/api/streaming.ts b/src/controllers/api/streaming.ts
index acbc545..1e495b8 100644
--- a/src/controllers/api/streaming.ts
+++ b/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.
diff --git a/src/controllers/api/timelines.ts b/src/controllers/api/timelines.ts
index 4b1825f..56b8ddf 100644
--- a/src/controllers/api/timelines.ts
+++ b/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';
 
diff --git a/src/transformers/nostr-to-activitypub.ts b/src/views/nostr-to-activitypub.ts
similarity index 100%
rename from src/transformers/nostr-to-activitypub.ts
rename to src/views/nostr-to-activitypub.ts
diff --git a/src/transformers/nostr-to-mastoapi.ts b/src/views/nostr-to-mastoapi.ts
similarity index 100%
rename from src/transformers/nostr-to-mastoapi.ts
rename to src/views/nostr-to-mastoapi.ts