chore: further conflict cleanup

Author: Kai-ros

server/api/atproto/bluesky-oembed.get.ts

@@ -1,18 +1,5 @@
-import {
-  boolean,
-  minLength,
-  nonEmpty,
-  object,
-  optional,
-  picklist,
-  pipe,
-  regex,
-  startsWith,
-  string,
-  url,
-} from 'valibot'
+import { boolean, object, optional, pipe, string, url } from 'valibot'
 import type { InferOutput } from 'valibot'
-import { AT_URI_REGEX, BLUESKY_URL_REGEX, ERROR_BLUESKY_URL_FAILED } from '#shared/utils/constants'
 
 /**
  * INFO: Validates AT Protocol createSession response
@@ -29,45 +16,6 @@ export const PDSSessionSchema = object({
 
 export type PDSSessionResponse = InferOutput<typeof PDSSessionSchema>
 
-/**
- * INFO: Validates AT Protocol URI format (at://did:plc:.../app.bsky.feed.post/...)
- * Used for referencing Bluesky posts in our database and API routes.
- */
-export const BlueSkyUriSchema = object({
-  uri: pipe(
-    string(),
-    startsWith('at://'),
-    minLength(10),
-    regex(AT_URI_REGEX, 'Must be a valid at:// URI'),
-  ),
-})
-
-export type BlueSkyUri = InferOutput<typeof BlueSkyUriSchema>
-
-/**
- * INFO: Validates query parameters for Bluesky oEmbed generation.
- * - url: Must be a valid bsky.app profile post URL
- * - colorMode: Optional theme preference (defaults to 'system')
- */
-export const BlueskyOEmbedRequestSchema = object({
-  url: pipe(string(), nonEmpty(), regex(BLUESKY_URL_REGEX, ERROR_BLUESKY_URL_FAILED)),
-  colorMode: optional(picklist(['system', 'dark', 'light']), 'system'),
-})
-
-export type BlueskyOEmbedRequest = InferOutput<typeof BlueskyOEmbedRequestSchema>
-
-/**
- * INFO: Explicit type generation for the response.
- */
-export const BlueskyOEmbedResponseSchema = object({
-  embedUrl: string(),
-  did: string(),
-  postId: string(),
-  handle: string(),
-})
-
-export type BlueskyOEmbedResponse = InferOutput<typeof BlueskyOEmbedResponseSchema>
-
 export const BlogMetaRequestSchema = object({
   url: pipe(string(), url()),
 })

shared/schemas/atproto.ts

@@ -9,7 +9,6 @@ export const CACHE_MAX_AGE_ONE_YEAR = 60 * 60 * 24 * 365
 
 // API Strings
 export const NPMX_SITE = 'https://npmx.dev'
-export const BLUESKY_EMBED_BASE_ROUTE = 'https://embed.bsky.app'
 export const BLUESKY_API = 'https://public.api.bsky.app/'
 export const BLUESKY_COMMENTS_REQUEST = '/api/atproto/bluesky-comments'
 export const NPM_REGISTRY = 'https://registry.npmjs.org'
@@ -18,9 +17,6 @@ export const ERROR_PACKAGE_ANALYSIS_FAILED = 'Failed to analyze package.'
 export const ERROR_PACKAGE_VERSION_AND_FILE_FAILED = 'Version and file path are required.'
 export const ERROR_PACKAGE_REQUIREMENTS_FAILED =
   'Package name, version, and file path are required.'
-export const ERROR_BLUESKY_URL_FAILED =
-  'Invalid Bluesky URL format. Expected: https://bsky.app/profile/HANDLE/post/POST_ID'
-export const ERROR_BLUESKY_EMBED_FAILED = 'Failed to generate Bluesky embed.'
 export const ERROR_FILE_LIST_FETCH_FAILED = 'Failed to fetch file list.'
 export const ERROR_CALC_INSTALL_SIZE_FAILED = 'Failed to calculate install size.'
 export const NPM_MISSING_README_SENTINEL = 'ERROR: No README data found!'
@@ -77,10 +73,7 @@ export const BACKGROUND_THEMES = {
   black: 'oklch(0.4 0 0)',
 } as const
 
-// Regex
-export const AT_URI_REGEX = /^at:\/\/(did:plc:[a-z0-9]+)\/app\.bsky\.feed\.post\/([a-z0-9]+)$/
-export const BLUESKY_URL_REGEX = /^https:\/\/bsky\.app\/profile\/[^/]+\/post\/[^/]+$/
-// INFO: For capture groups
+// INFO: Regex for capture groups
 export const BLUESKY_URL_EXTRACT_REGEX = /profile\/([^/]+)\/post\/([^/]+)/
 export const BSKY_POST_AT_URI_REGEX =
   /^at:\/\/(did:plc:[a-z0-9]+)\/app\.bsky\.feed\.post\/([a-z0-9]+)$/