LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-28 23:31:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into fix_vote_buttons_logged_out

Browse source
This commit is contained in:
SleeplessOne1917 2023-11-28 21:16:52 -05:00 committed by GitHub
commit 462dea7034
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/shared/components/person/settings.tsx
View file

@ -35,7 +35,7 @@ import {
SuccessResponse,
UpdateTotpResponse,
} from "lemmy-js-client";
import { elementUrl, emDash, relTags } from "../../config";
import { elementUrl, emDash, fetchLimit, relTags } from "../../config";
import { FirstLoadService, UserService } from "../../services";
import {
EMPTY_REQUEST,
@ -276,6 +276,7 @@ export class Settings extends Component<any, SettingsState> {
...this.state,
personBlocks: mui.person_blocks,
communityBlocks: mui.community_blocks,
instanceBlocks: mui.instance_blocks,
saveUserSettingsForm: {
...this.state.saveUserSettingsForm,
show_nsfw,
@ -1240,16 +1241,16 @@ export class Settings extends Component<any, SettingsState> {
searchInstanceOptions =
this.state.instancesRes.data.federated_instances?.linked.filter(
instance =>
instance.domain.toLowerCase().includes(text.toLowerCase()) ||
instance.domain.toLowerCase().includes(text.toLowerCase()) &&
!this.state.instanceBlocks.some(
blockedIntance => blockedIntance.instance.id === instance.id,
blockedInstance => blockedInstance.instance.id === instance.id,
),
) ?? [];
}
this.setState({
searchInstanceOptions: searchInstanceOptions
.slice(0, 30)
.slice(0, fetchLimit)
.map(instanceToChoice),
});
});
@ -1552,7 +1553,7 @@ export class Settings extends Component<any, SettingsState> {
}
}
handleImportFileChange(i: Settings, event) {
handleImportFileChange(i: Settings, event: any) {
i.setState({ settingsFile: event.target.files?.item(0) });
}