Merge branch 'main' into route-data-refactor

[lemmy-ui.git] / src / shared / interfaces.ts

diff --git a/src/shared/interfaces.ts b/src/shared/interfaces.ts
index 92fabb8eb2a0470eff8a9fc383c9d513e94f08e0..dbba70406b1314037691fa5b6add9b023138b76d 100644 (file)
--- a/src/shared/interfaces.ts
+++ b/src/shared/interfaces.ts
@@ -1,20 +1,23 @@
-import { Either, Option } from "@sniptt/monads";
-import {
-  CommentView,
-  GetSiteResponse,
-  LemmyHttp,
-  PersonMentionView,
-} from "lemmy-js-client";
+import { CommentView, GetSiteResponse } from "lemmy-js-client";
+import type { ParsedQs } from "qs";
+import { RequestState, WrappedLemmyHttp } from "./services/HttpService";
+import { ErrorPageData } from "./utils";
 
 /**
  * This contains serialized data, it needs to be deserialized before use.
  */
-export interface IsoData {
+export interface IsoData<T extends Record<string, RequestState<any>> = any> {
   path: string;
-  routeData: any[];
+  routeData: T;
   site_res: GetSiteResponse;
+  errorPageData?: ErrorPageData;
 }
 
+export type IsoDataOptionalSite<
+  T extends Record<string, RequestState<any>> = any
+> = Partial<IsoData<T>> &
+  Pick<IsoData<T>, Exclude<keyof IsoData<T>, "site_res">>;
+
 export interface ILemmyConfig {
   wsHost?: string;
 }
@@ -26,35 +29,23 @@ declare global {
   }
 }
 
-export interface InitialFetchRequest {
-  auth: Option<string>;
-  client: LemmyHttp;
+export interface InitialFetchRequest<T extends ParsedQs = ParsedQs> {
+  auth?: string;
+  client: WrappedLemmyHttp;
   path: string;
-}
-
-export interface CommentNode {
-  comment_view: CommentView | PersonMentionView;
-  children?: CommentNode[];
-  depth?: number;
+  query: T;
+  site: GetSiteResponse;
 }
 
 export interface PostFormParams {
-  name: Option<string>;
-  url: Option<string>;
-  body: Option<string>;
-  nameOrId: Option<Either<string, number>>;
-}
-
-export enum CommentSortType {
-  Hot,
-  Top,
-  New,
-  Old,
+  name?: string;
+  url?: string;
+  body?: string;
 }
 
 export enum CommentViewType {
   Tree,
-  Chat,
+  Flat,
 }
 
 export enum DataType {
@@ -68,8 +59,26 @@ export enum BanType {
 }
 
 export enum PersonDetailsView {
-  Overview,
-  Comments,
-  Posts,
-  Saved,
+  Overview = "Overview",
+  Comments = "Comments",
+  Posts = "Posts",
+  Saved = "Saved",
+}
+
+export enum PurgeType {
+  Person,
+  Community,
+  Post,
+  Comment,
+}
+
+export enum VoteType {
+  Upvote,
+  Downvote,
+}
+
+export interface CommentNodeI {
+  comment_view: CommentView;
+  children: Array<CommentNodeI>;
+  depth: number;
 }