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 c25f5b16d155f09de702cdcb94707b2b442a3d2d..dbba70406b1314037691fa5b6add9b023138b76d 100644 (file)
--- a/src/shared/interfaces.ts
+++ b/src/shared/interfaces.ts
@@ -1,15 +1,23 @@
-import { Either, Option } from "@sniptt/monads";
-import { GetSiteResponse, LemmyHttp } 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;
 }
@@ -21,17 +29,18 @@ declare global {
   }
 }
 
-export interface InitialFetchRequest {
-  auth: Option<string>;
-  client: LemmyHttp;
+export interface InitialFetchRequest<T extends ParsedQs = ParsedQs> {
+  auth?: string;
+  client: WrappedLemmyHttp;
   path: string;
+  query: T;
+  site: GetSiteResponse;
 }
 
 export interface PostFormParams {
-  name: Option<string>;
-  url: Option<string>;
-  body: Option<string>;
-  nameOrId: Option<Either<string, number>>;
+  name?: string;
+  url?: string;
+  body?: string;
 }
 
 export enum CommentViewType {
@@ -50,10 +59,10 @@ export enum BanType {
 }
 
 export enum PersonDetailsView {
-  Overview,
-  Comments,
-  Posts,
-  Saved,
+  Overview = "Overview",
+  Comments = "Comments",
+  Posts = "Posts",
+  Saved = "Saved",
 }
 
 export enum PurgeType {
@@ -62,3 +71,14 @@ export enum PurgeType {
   Post,
   Comment,
 }
+
+export enum VoteType {
+  Upvote,
+  Downvote,
+}
+
+export interface CommentNodeI {
+  comment_view: CommentView;
+  children: Array<CommentNodeI>;
+  depth: number;
+}