Don't include Server.js in Interface.js

ts/sql/Interface.ts

@@ -29,10 +29,6 @@ import type {
 import type { BadgeType } from '../badges/types.js';
 import type { ReadStatus } from '../messages/MessageReadStatus.js';
 import type { RawBodyRange } from '../types/BodyRange.js';
-import type {
-  GetMessagesBetweenOptions,
-  MaybeStaleCallHistory,
-} from './Server.js';
 import type { MessageTimestamps } from '../state/ducks/conversations.js';
 import type {
   CallHistoryDetails,
@@ -596,6 +592,16 @@ export type KyberPreKeyTripleType = Readonly<{
   baseKey: Uint8Array;
 }>;
 
+export type GetMessagesBetweenOptions = Readonly<{
+  after: { received_at: number; sent_at: number };
+  before: { received_at: number; sent_at: number };
+  includeStoryReplies: boolean;
+}>;
+
+export type MaybeStaleCallHistory = Readonly<
+  Pick<CallHistoryDetails, 'callId' | 'peerId'>
+>;
+
 export const MESSAGE_ATTACHMENT_COLUMNS = [
   'messageId',
   'conversationId',

ts/sql/Server.ts

@@ -189,6 +189,8 @@ import type {
   ServerMessageSearchResultType,
   MessageCountBySchemaVersionType,
   BackupAttachmentDownloadProgress,
+  GetMessagesBetweenOptions,
+  MaybeStaleCallHistory,
 } from './Interface.js';
 import {
   AttachmentDownloadSource,
@@ -3887,12 +3889,6 @@ function getNewestMessageForConversation(
   return row;
 }
 
-export type GetMessagesBetweenOptions = Readonly<{
-  after: { received_at: number; sent_at: number };
-  before: { received_at: number; sent_at: number };
-  includeStoryReplies: boolean;
-}>;
-
 function getMessagesBetween(
   db: ReadableDB,
   conversationId: string,
@@ -5238,10 +5234,6 @@ function markCallHistoryMissed(
   return db.transaction(() => _markCallHistoryMissed(db, callIds))();
 }
 
-export type MaybeStaleCallHistory = Readonly<
-  Pick<CallHistoryDetails, 'callId' | 'peerId'>
->;
-
 function getRecentStaleRingsAndMarkOlderMissed(
   db: WritableDB
 ): ReadonlyArray<MaybeStaleCallHistory> {

ts/test-electron/sql/getRecentStaleRingsAndMarkOlderMissed_test.ts

@@ -15,7 +15,7 @@ import {
 } from '../../types/CallDisposition.js';
 import { generateAci } from '../../types/ServiceId.js';
 import type { CallHistoryDetails } from '../../types/CallDisposition.js';
-import type { MaybeStaleCallHistory } from '../../sql/Server.js';
+import type { MaybeStaleCallHistory } from '../../sql/Interface.js';
 
 const { times } = lodash;