Merge remote-tracking branch 'upstream/main' into persist-share-as-im…

…age-choices

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*.{js,ts,jsx,tsx,yaml,json}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

src/features/feed/helpers.ts

@@ -1,12 +1,21 @@
 import { ListingType } from "lemmy-js-client";
 import { getFeedUrlName } from "../community/mod/ModActions";
 
+type InternalFeedType =
+  | "PostsSearch"
+  | "CommentsSearch"
+  | "CommunitiesSearch"
+  | "CommunitiesExplore";
+
 export type AnyFeed =
   | {
       remoteCommunityHandle: string;
     }
   | {
       listingType: ListingType;
+    }
+  | {
+      internal: InternalFeedType;
     };
 
 export function serializeFeedName(feed: AnyFeed): string {
@@ -15,6 +24,8 @@ export function serializeFeedName(feed: AnyFeed): string {
       return feed.remoteCommunityHandle; // always contains @ - will never overlap with getFeedUrlName
     case "listingType" in feed:
       return getFeedUrlName(feed.listingType);
+    case "internal" in feed:
+      return `@@voyager_${feed.internal}`;
     default:
       return feed;
   }

src/features/post/appearance/appearanceSlice.ts

@@ -1,7 +1,6 @@
 import { PayloadAction, createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import { ListingType } from "lemmy-js-client";
 import { PostAppearanceType, db } from "../../../services/db";
-import { serializeFeedName } from "../../feed/helpers";
+import { AnyFeed, serializeFeedName } from "../../feed/helpers";
 
 interface PostAppearanceState {
   /**
@@ -21,7 +20,7 @@ export const postAppearanceSlice = createSlice({
     setPostAppeartance: (
       state,
       action: PayloadAction<{
-        feed: FeedSortFeed;
+        feed: AnyFeed;
         postAppearance: PostAppearanceType;
       }>,
     ) => {
@@ -47,17 +46,9 @@ export const { setPostAppeartance } = postAppearanceSlice.actions;
 
 export default postAppearanceSlice.reducer;
 
-export type FeedSortFeed =
-  | {
-      remoteCommunityHandle: string;
-    }
-  | {
-      listingType: ListingType;
-    };
-
 export const getPostAppearance = createAsyncThunk(
   "postAppearance/getPostAppearance",
-  async (feed: FeedSortFeed) => {
+  async (feed: AnyFeed) => {
     const feedName = serializeFeedName(feed);
     const postAppearance =
       (await db.getSetting("post_appearance_type", {

src/routes/pages/search/CommunitiesResultsPage.tsx

@@ -29,7 +29,11 @@ export default function CommunitiesResultsPage({
 }: CommunitiesResultsPageProps) {
   const buildGeneralBrowseLink = useBuildGeneralBrowseLink();
   const client = useClient();
-  const [sort, setSort] = useFeedSort("posts", undefined, "TopAll");
+  const [sort, setSort] = useFeedSort(
+    "posts",
+    { internal: search ? "CommunitiesSearch" : "CommunitiesExplore" },
+    "TopAll",
+  );
   const [listingType, setListingType] = useState<ListingType>("All");
 
   const fetchFn: FetchFn<CommunityView> = useCallback(

src/routes/pages/search/results/SearchFeedResultsPage.tsx

@@ -37,7 +37,9 @@ export default function SearchFeedResultsPage({
   }>();
   const buildGeneralBrowseLink = useBuildGeneralBrowseLink();
   const client = useClient();
-  const [sort, setSort] = useFeedSort("posts");
+  const [sort, setSort] = useFeedSort("posts", {
+    internal: `${type}Search`,
+  });
 
   const search = decodeURIComponent(_encodedSearch);