Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix search page to stop couldnt_find_object error #1669

Merged
merged 5 commits into from
Jun 29, 2023
Merged

Fix search page to stop couldnt_find_object error #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f0922f
Add silent client and use it for resolve object
scme0 Jun 27, 2023
73dbf40
more changes
scme0 Jun 28, 2023
f83cdf0
Fix more issues
scme0 Jun 28, 2023
5a6b69e
make double equals a triple equals
scme0 Jun 29, 2023
c1fd0c9
Merge branch 'main' into scme/add-silent_client
scme0 Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/shared/components/search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,7 @@ export class Search extends Component<any, SearchState> {
}

async componentDidMount() {
if (
!(this.state.isIsomorphic || this.props.history.location.state?.searched)
) {
if (!this.state.isIsomorphic) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this because it was causing no search results to display.

const promises = [this.fetchCommunities()];
if (this.state.searchText) {
promises.push(this.search());
Expand Down Expand Up @@ -432,7 +430,15 @@ export class Search extends Component<any, SearchState> {
q: query,
auth,
};
resolveObjectResponse = await client.resolveObject(resolveObjectForm);
resolveObjectResponse = await HttpService.silent_client.resolveObject(
resolveObjectForm
);

// If we return this object with a state of failed, the catch-all-handler will redirect
// to an error page, so we ignore it by covering up the error with the empty state.
if (resolveObjectResponse.state === "failed") {
resolveObjectResponse = { state: "empty" };
}
}
}
}
Expand Down Expand Up @@ -950,7 +956,7 @@ export class Search extends Component<any, SearchState> {
if (auth) {
this.setState({ resolveObjectRes: { state: "loading" } });
this.setState({
resolveObjectRes: await HttpService.client.resolveObject({
resolveObjectRes: await HttpService.silent_client.resolveObject({
q,
auth,
}),
Expand Down Expand Up @@ -1097,10 +1103,6 @@ export class Search extends Component<any, SearchState> {
sort: sort ?? urlSort,
};

this.props.history.push(`/search${getQueryString(queryParams)}`, {
searched: true,
});

await this.search();
this.props.history.push(`/search${getQueryString(queryParams)}`);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we create a global siteUrl constant at some point, in case someone installs Lemmy in a subdirectory or something?

}
}
29 changes: 21 additions & 8 deletions src/shared/services/HttpService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { getHttpBase } from "@utils/env";
import { LemmyHttp } from "lemmy-js-client";
import { toast } from "../../shared/toast";
import { toast } from "../toast";
import { I18NextService } from "./I18NextService";

type EmptyRequestState = {
export type EmptyRequestState = {
state: "empty";
};

Expand Down Expand Up @@ -45,7 +45,7 @@ export type WrappedLemmyHttp = {
class WrappedLemmyHttpClient {
#client: LemmyHttp;

constructor(client: LemmyHttp) {
constructor(client: LemmyHttp, silent = false) {
this.#client = client;

for (const key of Object.getOwnPropertyNames(
Expand All @@ -61,8 +61,10 @@ class WrappedLemmyHttpClient {
state: !(res === undefined || res === null) ? "success" : "empty",
};
} catch (error) {
console.error(`API error: ${error}`);
toast(I18NextService.i18n.t(error), "danger");
if (!silent) {
console.error(`API error: ${error}`);
toast(I18NextService.i18n.t(error), "danger");
}
return {
state: "failed",
msg: error,
Expand All @@ -74,16 +76,23 @@ class WrappedLemmyHttpClient {
}
}

export function wrapClient(client: LemmyHttp) {
return new WrappedLemmyHttpClient(client) as unknown as WrappedLemmyHttp; // unfortunately, this verbose cast is necessary
export function wrapClient(client: LemmyHttp, silent = false) {
// unfortunately, this verbose cast is necessary
return new WrappedLemmyHttpClient(
client,
silent
) as unknown as WrappedLemmyHttp;
}

export class HttpService {
static #_instance: HttpService;
#silent_client: WrappedLemmyHttp;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a nicer way to achieve this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't think of any.

#client: WrappedLemmyHttp;

private constructor() {
this.#client = wrapClient(new LemmyHttp(getHttpBase()));
const lemmyHttp = new LemmyHttp(getHttpBase());
this.#client = wrapClient(lemmyHttp);
this.#silent_client = wrapClient(lemmyHttp, true);
}

static get #Instance() {
Expand All @@ -93,4 +102,8 @@ export class HttpService {
public static get client() {
return this.#Instance.#client;
}

public static get silent_client() {
return this.#Instance.#silent_client;
}
}