+import { NoOptionI18nKeys } from "i18next";
import { Component, linkEvent } from "inferno";
-import ISO6391 from "iso-639-1";
import {
BlockCommunity,
BlockCommunityResponse,
BlockPersonResponse,
ChangePassword,
CommunityBlockView,
- CommunityView,
DeleteAccount,
GetSiteResponse,
ListingType,
LoginResponse,
PersonBlockView,
- PersonViewSafe,
SaveUserSettings,
SortType,
UserOperation,
+ wsJsonToRes,
+ wsUserOp,
} from "lemmy-js-client";
import { Subscription } from "rxjs";
-import { i18n } from "../../i18next";
+import { i18n, languages } from "../../i18next";
import { UserService, WebSocketService } from "../../services";
import {
- authField,
+ Choice,
capitalizeFirstLetter,
- choicesConfig,
- communitySelectName,
communityToChoice,
debounce,
elementUrl,
+ emDash,
+ enableNsfw,
fetchCommunities,
+ fetchThemeList,
fetchUsers,
- getLanguage,
- isBrowser,
- languages,
- personSelectName,
+ getLanguages,
+ myAuth,
personToChoice,
+ relTags,
setIsoData,
setTheme,
setupTippy,
showLocal,
- themes,
toast,
updateCommunityBlock,
updatePersonBlock,
wsClient,
- wsJsonToRes,
wsSubscribe,
- wsUserOp,
} from "../../utils";
import { HtmlTags } from "../common/html-tags";
import { Icon, Spinner } from "../common/icon";
import { ImageUploadForm } from "../common/image-upload-form";
+import { LanguageSelect } from "../common/language-select";
import { ListingTypeSelect } from "../common/listing-type-select";
import { MarkdownTextArea } from "../common/markdown-textarea";
+import { SearchableSelect } from "../common/searchable-select";
import { SortSelect } from "../common/sort-select";
+import Tabs from "../common/tabs";
import { CommunityLink } from "../community/community-link";
import { PersonListing } from "./person-listing";
-var Choices: any;
-if (isBrowser()) {
- Choices = require("choices.js");
-}
-
interface SettingsState {
- saveUserSettingsForm: SaveUserSettings;
- changePasswordForm: ChangePassword;
+ // TODO redo these forms
+ saveUserSettingsForm: {
+ show_nsfw?: boolean;
+ theme?: string;
+ default_sort_type?: SortType;
+ default_listing_type?: ListingType;
+ interface_language?: string;
+ avatar?: string;
+ banner?: string;
+ display_name?: string;
+ email?: string;
+ bio?: string;
+ matrix_user_id?: string;
+ show_avatars?: boolean;
+ show_scores?: boolean;
+ send_notifications_to_email?: boolean;
+ bot_account?: boolean;
+ show_bot_accounts?: boolean;
+ show_read_posts?: boolean;
+ show_new_post_notifs?: boolean;
+ discussion_languages?: number[];
+ generate_totp_2fa?: boolean;
+ };
+ changePasswordForm: {
+ new_password?: string;
+ new_password_verify?: string;
+ old_password?: string;
+ };
+ deleteAccountForm: {
+ password?: string;
+ };
+ personBlocks: PersonBlockView[];
+ communityBlocks: CommunityBlockView[];
+ currentTab: string;
+ themeList: string[];
saveUserSettingsLoading: boolean;
changePasswordLoading: boolean;
deleteAccountLoading: boolean;
deleteAccountShowConfirm: boolean;
- deleteAccountForm: DeleteAccount;
- personBlocks: PersonBlockView[];
- blockPersonId: number;
- blockPerson?: PersonViewSafe;
- communityBlocks: CommunityBlockView[];
- blockCommunityId: number;
- blockCommunity?: CommunityView;
- currentTab: string;
siteRes: GetSiteResponse;
+ searchCommunityLoading: boolean;
+ searchCommunityOptions: Choice[];
+ searchPersonLoading: boolean;
+ searchPersonOptions: Choice[];
}
+type FilterType = "user" | "community";
+
+const Filter = ({
+ filterType,
+ options,
+ onChange,
+ onSearch,
+ loading,
+}: {
+ filterType: FilterType;
+ options: Choice[];
+ onSearch: (text: string) => void;
+ onChange: (choice: Choice) => void;
+ loading: boolean;
+}) => (
+ <div className="form-group row">
+ <label
+ className="col-md-4 col-form-label"
+ htmlFor={`block-${filterType}-filter`}
+ >
+ {i18n.t(`block_${filterType}` as NoOptionI18nKeys)}
+ </label>
+ <div className="col-md-8">
+ <SearchableSelect
+ id={`block-${filterType}-filter`}
+ options={[
+ { label: emDash, value: "0", disabled: true } as Choice,
+ ].concat(options)}
+ loading={loading}
+ onChange={onChange}
+ onSearch={onSearch}
+ />
+ </div>
+ </div>
+);
+
export class Settings extends Component<any, SettingsState> {
private isoData = setIsoData(this.context);
- private blockPersonChoices: any;
- private blockCommunityChoices: any;
- private subscription: Subscription;
- private emptyState: SettingsState = {
- saveUserSettingsForm: {
- auth: authField(false),
- },
- changePasswordForm: {
- new_password: null,
- new_password_verify: null,
- old_password: null,
- auth: authField(false),
- },
- saveUserSettingsLoading: null,
+ private subscription?: Subscription;
+ state: SettingsState = {
+ saveUserSettingsForm: {},
+ changePasswordForm: {},
+ saveUserSettingsLoading: false,
changePasswordLoading: false,
- deleteAccountLoading: null,
+ deleteAccountLoading: false,
deleteAccountShowConfirm: false,
- deleteAccountForm: {
- password: null,
- auth: authField(false),
- },
+ deleteAccountForm: {},
personBlocks: [],
- blockPersonId: 0,
communityBlocks: [],
- blockCommunityId: 0,
currentTab: "settings",
siteRes: this.isoData.site_res,
+ themeList: [],
+ searchCommunityLoading: false,
+ searchCommunityOptions: [],
+ searchPersonLoading: false,
+ searchPersonOptions: [],
};
constructor(props: any, context: any) {
super(props, context);
- this.state = this.emptyState;
this.handleSortTypeChange = this.handleSortTypeChange.bind(this);
this.handleListingTypeChange = this.handleListingTypeChange.bind(this);
this.handleBioChange = this.handleBioChange.bind(this);
+ this.handleDiscussionLanguageChange =
+ this.handleDiscussionLanguageChange.bind(this);
this.handleAvatarUpload = this.handleAvatarUpload.bind(this);
this.handleAvatarRemove = this.handleAvatarRemove.bind(this);
this.handleBannerUpload = this.handleBannerUpload.bind(this);
this.handleBannerRemove = this.handleBannerRemove.bind(this);
+ this.userSettings = this.userSettings.bind(this);
+ this.blockCards = this.blockCards.bind(this);
this.parseMessage = this.parseMessage.bind(this);
this.subscription = wsSubscribe(this.parseMessage);
- this.setUserInfo();
+ const mui = UserService.Instance.myUserInfo;
+ if (mui) {
+ const {
+ local_user: {
+ show_nsfw,
+ theme,
+ default_sort_type,
+ default_listing_type,
+ interface_language,
+ show_avatars,
+ show_bot_accounts,
+ show_scores,
+ show_read_posts,
+ show_new_post_notifs,
+ send_notifications_to_email,
+ email,
+ },
+ person: {
+ avatar,
+ banner,
+ display_name,
+ bot_account,
+ bio,
+ matrix_user_id,
+ },
+ } = mui.local_user_view;
+
+ this.state = {
+ ...this.state,
+ personBlocks: mui.person_blocks,
+ communityBlocks: mui.community_blocks,
+ saveUserSettingsForm: {
+ ...this.state.saveUserSettingsForm,
+ show_nsfw,
+ theme: theme ?? "browser",
+ default_sort_type,
+ default_listing_type,
+ interface_language,
+ discussion_languages: mui.discussion_languages,
+ avatar,
+ banner,
+ display_name,
+ show_avatars,
+ bot_account,
+ show_bot_accounts,
+ show_scores,
+ show_read_posts,
+ show_new_post_notifs,
+ email,
+ bio,
+ send_notifications_to_email,
+ matrix_user_id,
+ },
+ };
+ }
+ }
+ async componentDidMount() {
setupTippy();
+ this.setState({ themeList: await fetchThemeList() });
}
componentWillUnmount() {
- this.subscription.unsubscribe();
+ this.subscription?.unsubscribe();
}
get documentTitle(): string {
render() {
return (
- <div class="container">
- <>
- <HtmlTags
- title={this.documentTitle}
- path={this.context.router.route.match.url}
- description={this.documentTitle}
- image={this.state.saveUserSettingsForm.avatar}
- />
- <ul class="nav nav-tabs mb-2">
- <li class="nav-item">
- <button
- class={`nav-link btn ${
- this.state.currentTab == "settings" && "active"
- }`}
- onClick={linkEvent(
- { ctx: this, tab: "settings" },
- this.handleSwitchTab
- )}
- >
- {i18n.t("settings")}
- </button>
- </li>
- <li class="nav-item">
- <button
- class={`nav-link btn ${
- this.state.currentTab == "blocks" && "active"
- }`}
- onClick={linkEvent(
- { ctx: this, tab: "blocks" },
- this.handleSwitchTab
- )}
- >
- {i18n.t("blocks")}
- </button>
- </li>
- </ul>
- {this.state.currentTab == "settings" && this.userSettings()}
- {this.state.currentTab == "blocks" && this.blockCards()}
- </>
+ <div className="container-lg">
+ <HtmlTags
+ title={this.documentTitle}
+ path={this.context.router.route.match.url}
+ description={this.documentTitle}
+ image={this.state.saveUserSettingsForm.avatar}
+ />
+ <Tabs
+ tabs={[
+ {
+ key: "settings",
+ label: i18n.t("settings"),
+ getNode: this.userSettings,
+ },
+ {
+ key: "blocks",
+ label: i18n.t("blocks"),
+ getNode: this.blockCards,
+ },
+ ]}
+ />
</div>
);
}
userSettings() {
return (
- <div class="row">
- <div class="col-12 col-md-6">
- <div class="card border-secondary mb-3">
- <div class="card-body">{this.saveUserSettingsHtmlForm()}</div>
+ <div className="row">
+ <div className="col-12 col-md-6">
+ <div className="card border-secondary mb-3">
+ <div className="card-body">{this.saveUserSettingsHtmlForm()}</div>
</div>
</div>
- <div class="col-12 col-md-6">
- <div class="card border-secondary mb-3">
- <div class="card-body">{this.changePasswordHtmlForm()}</div>
+ <div className="col-12 col-md-6">
+ <div className="card border-secondary mb-3">
+ <div className="card-body">{this.changePasswordHtmlForm()}</div>
</div>
</div>
</div>
blockCards() {
return (
- <div class="row">
- <div class="col-12 col-md-6">
- <div class="card border-secondary mb-3">
- <div class="card-body">{this.blockUserCard()}</div>
+ <div className="row">
+ <div className="col-12 col-md-6">
+ <div className="card border-secondary mb-3">
+ <div className="card-body">{this.blockUserCard()}</div>
</div>
</div>
- <div class="col-12 col-md-6">
- <div class="card border-secondary mb-3">
- <div class="card-body">{this.blockCommunityCard()}</div>
+ <div className="col-12 col-md-6">
+ <div className="card border-secondary mb-3">
+ <div className="card-body">{this.blockCommunityCard()}</div>
</div>
</div>
</div>
<>
<h5>{i18n.t("change_password")}</h5>
<form onSubmit={linkEvent(this, this.handleChangePasswordSubmit)}>
- <div class="form-group row">
- <label class="col-sm-5 col-form-label" htmlFor="user-password">
+ <div className="form-group row">
+ <label className="col-sm-5 col-form-label" htmlFor="user-password">
{i18n.t("new_password")}
</label>
- <div class="col-sm-7">
+ <div className="col-sm-7">
<input
type="password"
id="user-password"
- class="form-control"
+ className="form-control"
value={this.state.changePasswordForm.new_password}
autoComplete="new-password"
maxLength={60}
/>
</div>
</div>
- <div class="form-group row">
+ <div className="form-group row">
<label
- class="col-sm-5 col-form-label"
+ className="col-sm-5 col-form-label"
htmlFor="user-verify-password"
>
{i18n.t("verify_password")}
</label>
- <div class="col-sm-7">
+ <div className="col-sm-7">
<input
type="password"
id="user-verify-password"
- class="form-control"
+ className="form-control"
value={this.state.changePasswordForm.new_password_verify}
autoComplete="new-password"
maxLength={60}
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-5 col-form-label" htmlFor="user-old-password">
+ <div className="form-group row">
+ <label
+ className="col-sm-5 col-form-label"
+ htmlFor="user-old-password"
+ >
{i18n.t("old_password")}
</label>
- <div class="col-sm-7">
+ <div className="col-sm-7">
<input
type="password"
id="user-old-password"
- class="form-control"
+ className="form-control"
value={this.state.changePasswordForm.old_password}
autoComplete="new-password"
maxLength={60}
/>
</div>
</div>
- <div class="form-group">
- <button type="submit" class="btn btn-block btn-secondary mr-4">
+ <div className="form-group">
+ <button type="submit" className="btn btn-block btn-secondary mr-4">
{this.state.changePasswordLoading ? (
<Spinner />
) : (
}
blockUserCard() {
+ const { searchPersonLoading, searchPersonOptions } = this.state;
+
return (
<div>
- {this.blockUserForm()}
+ <Filter
+ filterType="user"
+ loading={searchPersonLoading}
+ onChange={this.handleBlockPerson}
+ onSearch={this.handlePersonSearch}
+ options={searchPersonOptions}
+ />
{this.blockedUsersList()}
</div>
);
return (
<>
<h5>{i18n.t("blocked_users")}</h5>
- <ul class="list-unstyled mb-0">
+ <ul className="list-unstyled mb-0">
{this.state.personBlocks.map(pb => (
- <li>
+ <li key={pb.target.id}>
<span>
<PersonListing person={pb.target} />
<button
);
}
- blockUserForm() {
- return (
- <div class="form-group row">
- <label class="col-md-4 col-form-label" htmlFor="block-person-filter">
- {i18n.t("block_user")}
- </label>
- <div class="col-md-8">
- <select
- class="form-control"
- id="block-person-filter"
- value={this.state.blockPersonId}
- >
- <option value="0">—</option>
- {this.state.blockPerson && (
- <option value={this.state.blockPerson.person.id}>
- {personSelectName(this.state.blockPerson)}
- </option>
- )}
- </select>
- </div>
- </div>
- );
- }
-
blockCommunityCard() {
+ const { searchCommunityLoading, searchCommunityOptions } = this.state;
+
return (
<div>
- {this.blockCommunityForm()}
+ <Filter
+ filterType="community"
+ loading={searchCommunityLoading}
+ onChange={this.handleBlockCommunity}
+ onSearch={this.handleCommunitySearch}
+ options={searchCommunityOptions}
+ />
{this.blockedCommunitiesList()}
</div>
);
return (
<>
<h5>{i18n.t("blocked_communities")}</h5>
- <ul class="list-unstyled mb-0">
+ <ul className="list-unstyled mb-0">
{this.state.communityBlocks.map(cb => (
- <li>
+ <li key={cb.community.id}>
<span>
<CommunityLink community={cb.community} />
<button
);
}
- blockCommunityForm() {
- return (
- <div class="form-group row">
- <label class="col-md-4 col-form-label" htmlFor="block-community-filter">
- {i18n.t("block_community")}
- </label>
- <div class="col-md-8">
- <select
- class="form-control"
- id="block-community-filter"
- value={this.state.blockCommunityId}
- >
- <option value="0">—</option>
- {this.state.blockCommunity && (
- <option value={this.state.blockCommunity.community.id}>
- {communitySelectName(this.state.blockCommunity)}
- </option>
- )}
- </select>
- </div>
- </div>
- );
- }
-
saveUserSettingsHtmlForm() {
+ let selectedLangs = this.state.saveUserSettingsForm.discussion_languages;
+
return (
<>
<h5>{i18n.t("settings")}</h5>
<form onSubmit={linkEvent(this, this.handleSaveSettingsSubmit)}>
- <div class="form-group row">
- <label class="col-sm-5 col-form-label" htmlFor="display-name">
+ <div className="form-group row">
+ <label className="col-sm-5 col-form-label" htmlFor="display-name">
{i18n.t("display_name")}
</label>
- <div class="col-sm-7">
+ <div className="col-sm-7">
<input
id="display-name"
type="text"
- class="form-control"
+ className="form-control"
placeholder={i18n.t("optional")}
value={this.state.saveUserSettingsForm.display_name}
onInput={linkEvent(this, this.handleDisplayNameChange)}
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-3 col-form-label" htmlFor="user-bio">
+ <div className="form-group row">
+ <label className="col-sm-3 col-form-label" htmlFor="user-bio">
{i18n.t("bio")}
</label>
- <div class="col-sm-9">
+ <div className="col-sm-9">
<MarkdownTextArea
initialContent={this.state.saveUserSettingsForm.bio}
onContentChange={this.handleBioChange}
maxLength={300}
hideNavigationWarnings
+ allLanguages={this.state.siteRes.all_languages}
+ siteLanguages={this.state.siteRes.discussion_languages}
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-3 col-form-label" htmlFor="user-email">
+ <div className="form-group row">
+ <label className="col-sm-3 col-form-label" htmlFor="user-email">
{i18n.t("email")}
</label>
- <div class="col-sm-9">
+ <div className="col-sm-9">
<input
type="email"
id="user-email"
- class="form-control"
+ className="form-control"
placeholder={i18n.t("optional")}
value={this.state.saveUserSettingsForm.email}
onInput={linkEvent(this, this.handleEmailChange)}
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-5 col-form-label" htmlFor="matrix-user-id">
- <a href={elementUrl} rel="noopener">
+ <div className="form-group row">
+ <label className="col-sm-5 col-form-label" htmlFor="matrix-user-id">
+ <a href={elementUrl} rel={relTags}>
{i18n.t("matrix_user_id")}
</a>
</label>
- <div class="col-sm-7">
+ <div className="col-sm-7">
<input
id="matrix-user-id"
type="text"
- class="form-control"
+ className="form-control"
placeholder="@user:example.com"
value={this.state.saveUserSettingsForm.matrix_user_id}
onInput={linkEvent(this, this.handleMatrixUserIdChange)}
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-3">{i18n.t("avatar")}</label>
- <div class="col-sm-9">
+ <div className="form-group row">
+ <label className="col-sm-3">{i18n.t("avatar")}</label>
+ <div className="col-sm-9">
<ImageUploadForm
uploadTitle={i18n.t("upload_avatar")}
imageSrc={this.state.saveUserSettingsForm.avatar}
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-3">{i18n.t("banner")}</label>
- <div class="col-sm-9">
+ <div className="form-group row">
+ <label className="col-sm-3">{i18n.t("banner")}</label>
+ <div className="col-sm-9">
<ImageUploadForm
uploadTitle={i18n.t("upload_banner")}
imageSrc={this.state.saveUserSettingsForm.banner}
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-3" htmlFor="user-language">
- {i18n.t("language")}
+ <div className="form-group row">
+ <label className="col-sm-3" htmlFor="user-language">
+ {i18n.t("interface_language")}
</label>
- <div class="col-sm-9">
+ <div className="col-sm-9">
<select
id="user-language"
- value={this.state.saveUserSettingsForm.lang}
- onChange={linkEvent(this, this.handleLangChange)}
- class="custom-select w-auto"
+ value={this.state.saveUserSettingsForm.interface_language}
+ onChange={linkEvent(this, this.handleInterfaceLangChange)}
+ className="custom-select w-auto"
>
<option disabled aria-hidden="true">
- {i18n.t("language")}
+ {i18n.t("interface_language")}
</option>
<option value="browser">{i18n.t("browser_default")}</option>
<option disabled aria-hidden="true">
──
</option>
- {languages.sort().map(lang => (
- <option value={lang.code}>
- {ISO6391.getNativeName(lang.code) || lang.code}
- </option>
- ))}
+ {languages
+ .sort((a, b) => a.code.localeCompare(b.code))
+ .map(lang => (
+ <option key={lang.code} value={lang.code}>
+ {lang.name}
+ </option>
+ ))}
</select>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-3" htmlFor="user-theme">
+ <LanguageSelect
+ allLanguages={this.state.siteRes.all_languages}
+ siteLanguages={this.state.siteRes.discussion_languages}
+ selectedLanguageIds={selectedLangs}
+ multiple={true}
+ showSite
+ onChange={this.handleDiscussionLanguageChange}
+ />
+ <div className="form-group row">
+ <label className="col-sm-3" htmlFor="user-theme">
{i18n.t("theme")}
</label>
- <div class="col-sm-9">
+ <div className="col-sm-9">
<select
id="user-theme"
value={this.state.saveUserSettingsForm.theme}
onChange={linkEvent(this, this.handleThemeChange)}
- class="custom-select w-auto"
+ className="custom-select w-auto"
>
<option disabled aria-hidden="true">
{i18n.t("theme")}
</option>
<option value="browser">{i18n.t("browser_default")}</option>
- {themes.map(theme => (
- <option value={theme}>{theme}</option>
+ {this.state.themeList.map(theme => (
+ <option key={theme} value={theme}>
+ {theme}
+ </option>
))}
</select>
</div>
</div>
<form className="form-group row">
- <label class="col-sm-3">{i18n.t("type")}</label>
- <div class="col-sm-9">
+ <label className="col-sm-3">{i18n.t("type")}</label>
+ <div className="col-sm-9">
<ListingTypeSelect
type_={
- Object.values(ListingType)[
- this.state.saveUserSettingsForm.default_listing_type
- ]
+ this.state.saveUserSettingsForm.default_listing_type ??
+ "Local"
}
showLocal={showLocal(this.isoData)}
+ showSubscribed
onChange={this.handleListingTypeChange}
/>
</div>
</form>
<form className="form-group row">
- <label class="col-sm-3">{i18n.t("sort_type")}</label>
- <div class="col-sm-9">
+ <label className="col-sm-3">{i18n.t("sort_type")}</label>
+ <div className="col-sm-9">
<SortSelect
sort={
- Object.values(SortType)[
- this.state.saveUserSettingsForm.default_sort_type
- ]
+ this.state.saveUserSettingsForm.default_sort_type ?? "Active"
}
onChange={this.handleSortTypeChange}
/>
</div>
</form>
- {this.state.siteRes.site_view.site.enable_nsfw && (
- <div class="form-group">
- <div class="form-check">
+ {enableNsfw(this.state.siteRes) && (
+ <div className="form-group">
+ <div className="form-check">
<input
- class="form-check-input"
+ className="form-check-input"
id="user-show-nsfw"
type="checkbox"
checked={this.state.saveUserSettingsForm.show_nsfw}
onChange={linkEvent(this, this.handleShowNsfwChange)}
/>
- <label class="form-check-label" htmlFor="user-show-nsfw">
+ <label className="form-check-label" htmlFor="user-show-nsfw">
{i18n.t("show_nsfw")}
</label>
</div>
</div>
)}
- <div class="form-group">
- <div class="form-check">
+ <div className="form-group">
+ <div className="form-check">
<input
- class="form-check-input"
+ className="form-check-input"
id="user-show-scores"
type="checkbox"
checked={this.state.saveUserSettingsForm.show_scores}
onChange={linkEvent(this, this.handleShowScoresChange)}
/>
- <label class="form-check-label" htmlFor="user-show-scores">
+ <label className="form-check-label" htmlFor="user-show-scores">
{i18n.t("show_scores")}
</label>
</div>
</div>
- <div class="form-group">
- <div class="form-check">
+ <div className="form-group">
+ <div className="form-check">
<input
- class="form-check-input"
+ className="form-check-input"
id="user-show-avatars"
type="checkbox"
checked={this.state.saveUserSettingsForm.show_avatars}
onChange={linkEvent(this, this.handleShowAvatarsChange)}
/>
- <label class="form-check-label" htmlFor="user-show-avatars">
+ <label className="form-check-label" htmlFor="user-show-avatars">
{i18n.t("show_avatars")}
</label>
</div>
</div>
- <div class="form-group">
- <div class="form-check">
+ <div className="form-group">
+ <div className="form-check">
<input
- class="form-check-input"
+ className="form-check-input"
id="user-bot-account"
type="checkbox"
checked={this.state.saveUserSettingsForm.bot_account}
onChange={linkEvent(this, this.handleBotAccount)}
/>
- <label class="form-check-label" htmlFor="user-bot-account">
+ <label className="form-check-label" htmlFor="user-bot-account">
{i18n.t("bot_account")}
</label>
</div>
</div>
- <div class="form-group">
- <div class="form-check">
+ <div className="form-group">
+ <div className="form-check">
<input
- class="form-check-input"
+ className="form-check-input"
id="user-show-bot-accounts"
type="checkbox"
checked={this.state.saveUserSettingsForm.show_bot_accounts}
onChange={linkEvent(this, this.handleShowBotAccounts)}
/>
- <label class="form-check-label" htmlFor="user-show-bot-accounts">
+ <label
+ className="form-check-label"
+ htmlFor="user-show-bot-accounts"
+ >
{i18n.t("show_bot_accounts")}
</label>
</div>
</div>
- <div class="form-group">
- <div class="form-check">
+ <div className="form-group">
+ <div className="form-check">
<input
- class="form-check-input"
+ className="form-check-input"
id="user-show-read-posts"
type="checkbox"
checked={this.state.saveUserSettingsForm.show_read_posts}
onChange={linkEvent(this, this.handleReadPosts)}
/>
- <label class="form-check-label" htmlFor="user-show-read-posts">
+ <label
+ className="form-check-label"
+ htmlFor="user-show-read-posts"
+ >
{i18n.t("show_read_posts")}
</label>
</div>
</div>
- <div class="form-group">
- <div class="form-check">
+ <div className="form-group">
+ <div className="form-check">
<input
- class="form-check-input"
+ className="form-check-input"
id="user-show-new-post-notifs"
type="checkbox"
checked={this.state.saveUserSettingsForm.show_new_post_notifs}
onChange={linkEvent(this, this.handleShowNewPostNotifs)}
/>
<label
- class="form-check-label"
+ className="form-check-label"
htmlFor="user-show-new-post-notifs"
>
{i18n.t("show_new_post_notifs")}
</label>
</div>
</div>
- <div class="form-group">
- <div class="form-check">
+ <div className="form-group">
+ <div className="form-check">
<input
- class="form-check-input"
+ className="form-check-input"
id="user-send-notifications-to-email"
type="checkbox"
disabled={!this.state.saveUserSettingsForm.email}
)}
/>
<label
- class="form-check-label"
+ className="form-check-label"
htmlFor="user-send-notifications-to-email"
>
{i18n.t("send_notifications_to_email")}
</label>
</div>
</div>
- <div class="form-group">
- <button type="submit" class="btn btn-block btn-secondary mr-4">
+ {this.totpSection()}
+ <div className="form-group">
+ <button type="submit" className="btn btn-block btn-secondary mr-4">
{this.state.saveUserSettingsLoading ? (
<Spinner />
) : (
</button>
</div>
<hr />
- <div class="form-group">
+ <div className="form-group">
<button
- class="btn btn-block btn-danger"
+ className="btn btn-block btn-danger"
onClick={linkEvent(
this,
this.handleDeleteAccountShowConfirmToggle
</button>
{this.state.deleteAccountShowConfirm && (
<>
- <div class="my-2 alert alert-danger" role="alert">
+ <div className="my-2 alert alert-danger" role="alert">
{i18n.t("delete_account_confirm")}
</div>
<input
this,
this.handleDeleteAccountPasswordChange
)}
- class="form-control my-2"
+ className="form-control my-2"
/>
<button
- class="btn btn-danger mr-4"
+ className="btn btn-danger mr-4"
disabled={!this.state.deleteAccountForm.password}
onClick={linkEvent(this, this.handleDeleteAccount)}
>
)}
</button>
<button
- class="btn btn-secondary"
+ className="btn btn-secondary"
onClick={linkEvent(
this,
this.handleDeleteAccountShowConfirmToggle
);
}
- setupBlockPersonChoices() {
- if (isBrowser()) {
- let selectId: any = document.getElementById("block-person-filter");
- if (selectId) {
- this.blockPersonChoices = new Choices(selectId, choicesConfig);
- this.blockPersonChoices.passedElement.element.addEventListener(
- "choice",
- (e: any) => {
- this.handleBlockPerson(Number(e.detail.choice.value));
- },
- false
- );
- this.blockPersonChoices.passedElement.element.addEventListener(
- "search",
- debounce(async (e: any) => {
- let persons = (await fetchUsers(e.detail.value)).users;
- let choices = persons.map(pvs => personToChoice(pvs));
- this.blockPersonChoices.setChoices(choices, "value", "label", true);
- }, 400),
- false
- );
- }
- }
+ totpSection() {
+ let totpUrl =
+ UserService.Instance.myUserInfo?.local_user_view.local_user.totp_2fa_url;
+
+ return (
+ <>
+ {!totpUrl && (
+ <div className="form-group">
+ <div className="form-check">
+ <input
+ className="form-check-input"
+ id="user-generate-totp"
+ type="checkbox"
+ checked={this.state.saveUserSettingsForm.generate_totp_2fa}
+ onChange={linkEvent(this, this.handleGenerateTotp)}
+ />
+ <label className="form-check-label" htmlFor="user-generate-totp">
+ {i18n.t("set_up_two_factor")}
+ </label>
+ </div>
+ </div>
+ )}
+
+ {totpUrl && (
+ <>
+ <div>
+ <a className="btn btn-secondary mb-2" href={totpUrl}>
+ {i18n.t("two_factor_link")}
+ </a>
+ </div>
+ <div className="form-group">
+ <div className="form-check">
+ <input
+ className="form-check-input"
+ id="user-remove-totp"
+ type="checkbox"
+ checked={
+ this.state.saveUserSettingsForm.generate_totp_2fa == false
+ }
+ onChange={linkEvent(this, this.handleRemoveTotp)}
+ />
+ <label className="form-check-label" htmlFor="user-remove-totp">
+ {i18n.t("remove_two_factor")}
+ </label>
+ </div>
+ </div>
+ </>
+ )}
+ </>
+ );
}
- setupBlockCommunityChoices() {
- if (isBrowser()) {
- let selectId: any = document.getElementById("block-community-filter");
- if (selectId) {
- this.blockCommunityChoices = new Choices(selectId, choicesConfig);
- this.blockCommunityChoices.passedElement.element.addEventListener(
- "choice",
- (e: any) => {
- this.handleBlockCommunity(Number(e.detail.choice.value));
- },
- false
- );
- this.blockCommunityChoices.passedElement.element.addEventListener(
- "search",
- debounce(async (e: any) => {
- let communities = (await fetchCommunities(e.detail.value))
- .communities;
- let choices = communities.map(cv => communityToChoice(cv));
- this.blockCommunityChoices.setChoices(
- choices,
- "value",
- "label",
- true
- );
- }, 400),
- false
- );
- }
+ handlePersonSearch = debounce(async (text: string) => {
+ this.setState({ searchPersonLoading: true });
+
+ const searchPersonOptions: Choice[] = [];
+
+ if (text.length > 0) {
+ searchPersonOptions.push(
+ ...(await fetchUsers(text)).users.map(personToChoice)
+ );
+ }
+
+ this.setState({
+ searchPersonLoading: false,
+ searchPersonOptions,
+ });
+ });
+
+ handleCommunitySearch = debounce(async (text: string) => {
+ this.setState({ searchCommunityLoading: true });
+
+ const searchCommunityOptions: Choice[] = [];
+
+ if (text.length > 0) {
+ searchCommunityOptions.push(
+ ...(await fetchCommunities(text)).communities.map(communityToChoice)
+ );
}
- }
- handleBlockPerson(personId: number) {
- if (personId != 0) {
- let blockUserForm: BlockPerson = {
- person_id: personId,
+ this.setState({
+ searchCommunityLoading: false,
+ searchCommunityOptions,
+ });
+ });
+
+ handleBlockPerson({ value }: Choice) {
+ const auth = myAuth();
+ if (auth && value !== "0") {
+ const blockUserForm: BlockPerson = {
+ person_id: Number(value),
block: true,
- auth: authField(),
+ auth,
};
+
WebSocketService.Instance.send(wsClient.blockPerson(blockUserForm));
}
}
handleUnblockPerson(i: { ctx: Settings; recipientId: number }) {
- let blockUserForm: BlockPerson = {
- person_id: i.recipientId,
- block: false,
- auth: authField(),
- };
- WebSocketService.Instance.send(wsClient.blockPerson(blockUserForm));
+ const auth = myAuth();
+ if (auth) {
+ const blockUserForm: BlockPerson = {
+ person_id: i.recipientId,
+ block: false,
+ auth,
+ };
+ WebSocketService.Instance.send(wsClient.blockPerson(blockUserForm));
+ }
}
- handleBlockCommunity(community_id: number) {
- if (community_id != 0) {
- let blockCommunityForm: BlockCommunity = {
- community_id,
+ handleBlockCommunity({ value }: Choice) {
+ const auth = myAuth();
+ if (auth && value !== "0") {
+ const blockCommunityForm: BlockCommunity = {
+ community_id: Number(value),
block: true,
- auth: authField(),
+ auth,
};
WebSocketService.Instance.send(
wsClient.blockCommunity(blockCommunityForm)
}
handleUnblockCommunity(i: { ctx: Settings; communityId: number }) {
- let blockCommunityForm: BlockCommunity = {
- community_id: i.communityId,
- block: false,
- auth: authField(),
- };
- WebSocketService.Instance.send(wsClient.blockCommunity(blockCommunityForm));
+ const auth = myAuth();
+ if (auth) {
+ const blockCommunityForm: BlockCommunity = {
+ community_id: i.communityId,
+ block: false,
+ auth,
+ };
+ WebSocketService.Instance.send(
+ wsClient.blockCommunity(blockCommunityForm)
+ );
+ }
}
handleShowNsfwChange(i: Settings, event: any) {
handleShowAvatarsChange(i: Settings, event: any) {
i.state.saveUserSettingsForm.show_avatars = event.target.checked;
- UserService.Instance.myUserInfo.local_user_view.local_user.show_avatars =
- event.target.checked; // Just for instant updates
+ let mui = UserService.Instance.myUserInfo;
+ if (mui) {
+ mui.local_user_view.local_user.show_avatars = event.target.checked;
+ }
i.setState(i.state);
}
handleShowScoresChange(i: Settings, event: any) {
i.state.saveUserSettingsForm.show_scores = event.target.checked;
- UserService.Instance.myUserInfo.local_user_view.local_user.show_scores =
- event.target.checked; // Just for instant updates
+ let mui = UserService.Instance.myUserInfo;
+ if (mui) {
+ mui.local_user_view.local_user.show_scores = event.target.checked;
+ }
+ i.setState(i.state);
+ }
+
+ handleGenerateTotp(i: Settings, event: any) {
+ // Coerce false to undefined here, so it won't generate it.
+ let checked: boolean | undefined = event.target.checked || undefined;
+ if (checked) {
+ toast(i18n.t("two_factor_setup_instructions"));
+ }
+ i.state.saveUserSettingsForm.generate_totp_2fa = checked;
+ i.setState(i.state);
+ }
+
+ handleRemoveTotp(i: Settings, event: any) {
+ // Coerce true to undefined here, so it won't generate it.
+ let checked: boolean | undefined = !event.target.checked && undefined;
+ i.state.saveUserSettingsForm.generate_totp_2fa = checked;
i.setState(i.state);
}
i.setState(i.state);
}
- handleLangChange(i: Settings, event: any) {
- i.state.saveUserSettingsForm.lang = event.target.value;
- i18n.changeLanguage(getLanguage(i.state.saveUserSettingsForm.lang));
+ handleInterfaceLangChange(i: Settings, event: any) {
+ i.state.saveUserSettingsForm.interface_language = event.target.value;
+ i18n.changeLanguage(
+ getLanguages(i.state.saveUserSettingsForm.interface_language).at(0)
+ );
i.setState(i.state);
}
+ handleDiscussionLanguageChange(val: number[]) {
+ this.setState(
+ s => ((s.saveUserSettingsForm.discussion_languages = val), s)
+ );
+ }
+
handleSortTypeChange(val: SortType) {
- this.state.saveUserSettingsForm.default_sort_type =
- Object.keys(SortType).indexOf(val);
- this.setState(this.state);
+ this.setState(s => ((s.saveUserSettingsForm.default_sort_type = val), s));
}
handleListingTypeChange(val: ListingType) {
- this.state.saveUserSettingsForm.default_listing_type =
- Object.keys(ListingType).indexOf(val);
- this.setState(this.state);
+ this.setState(
+ s => ((s.saveUserSettingsForm.default_listing_type = val), s)
+ );
}
handleEmailChange(i: Settings, event: any) {
}
handleBioChange(val: string) {
- this.state.saveUserSettingsForm.bio = val;
- this.setState(this.state);
+ this.setState(s => ((s.saveUserSettingsForm.bio = val), s));
}
handleAvatarUpload(url: string) {
- this.state.saveUserSettingsForm.avatar = url;
- this.setState(this.state);
+ this.setState(s => ((s.saveUserSettingsForm.avatar = url), s));
}
handleAvatarRemove() {
- this.state.saveUserSettingsForm.avatar = "";
- this.setState(this.state);
+ this.setState(s => ((s.saveUserSettingsForm.avatar = ""), s));
}
handleBannerUpload(url: string) {
- this.state.saveUserSettingsForm.banner = url;
- this.setState(this.state);
+ this.setState(s => ((s.saveUserSettingsForm.banner = url), s));
}
handleBannerRemove() {
- this.state.saveUserSettingsForm.banner = "";
- this.setState(this.state);
+ this.setState(s => ((s.saveUserSettingsForm.banner = ""), s));
}
handleDisplayNameChange(i: Settings, event: any) {
handleMatrixUserIdChange(i: Settings, event: any) {
i.state.saveUserSettingsForm.matrix_user_id = event.target.value;
- if (
- i.state.saveUserSettingsForm.matrix_user_id == "" &&
- !UserService.Instance.myUserInfo.local_user_view.person.matrix_user_id
- ) {
- i.state.saveUserSettingsForm.matrix_user_id = undefined;
- }
i.setState(i.state);
}
handleSaveSettingsSubmit(i: Settings, event: any) {
event.preventDefault();
- i.state.saveUserSettingsLoading = true;
- i.setState(i.state);
-
- WebSocketService.Instance.send(
- wsClient.saveUserSettings(i.state.saveUserSettingsForm)
- );
+ i.setState({ saveUserSettingsLoading: true });
+ let auth = myAuth();
+ if (auth) {
+ let form: SaveUserSettings = { ...i.state.saveUserSettingsForm, auth };
+ WebSocketService.Instance.send(wsClient.saveUserSettings(form));
+ }
}
handleChangePasswordSubmit(i: Settings, event: any) {
event.preventDefault();
- i.state.changePasswordLoading = true;
- i.setState(i.state);
+ i.setState({ changePasswordLoading: true });
+ let auth = myAuth();
+ let pForm = i.state.changePasswordForm;
+ let new_password = pForm.new_password;
+ let new_password_verify = pForm.new_password_verify;
+ let old_password = pForm.old_password;
+ if (auth && new_password && old_password && new_password_verify) {
+ let form: ChangePassword = {
+ new_password,
+ new_password_verify,
+ old_password,
+ auth,
+ };
- WebSocketService.Instance.send(
- wsClient.changePassword(i.state.changePasswordForm)
- );
+ WebSocketService.Instance.send(wsClient.changePassword(form));
+ }
}
handleDeleteAccountShowConfirmToggle(i: Settings, event: any) {
event.preventDefault();
- i.state.deleteAccountShowConfirm = !i.state.deleteAccountShowConfirm;
- i.setState(i.state);
+ i.setState({ deleteAccountShowConfirm: !i.state.deleteAccountShowConfirm });
}
handleDeleteAccountPasswordChange(i: Settings, event: any) {
i.setState(i.state);
}
- handleLogoutClick(i: Settings) {
- UserService.Instance.logout();
- i.context.router.history.push("/");
- }
-
handleDeleteAccount(i: Settings, event: any) {
event.preventDefault();
- i.state.deleteAccountLoading = true;
- i.setState(i.state);
-
- WebSocketService.Instance.send(
- wsClient.deleteAccount(i.state.deleteAccountForm)
- );
+ i.setState({ deleteAccountLoading: true });
+ let auth = myAuth();
+ let password = i.state.deleteAccountForm.password;
+ if (auth && password) {
+ let form: DeleteAccount = {
+ password,
+ auth,
+ };
+ WebSocketService.Instance.send(wsClient.deleteAccount(form));
+ }
}
handleSwitchTab(i: { ctx: Settings; tab: string }) {
i.ctx.setState({ currentTab: i.tab });
-
- if (i.ctx.state.currentTab == "blocks") {
- i.ctx.setupBlockPersonChoices();
- i.ctx.setupBlockCommunityChoices();
- }
- }
-
- setUserInfo() {
- let luv = UserService.Instance.myUserInfo.local_user_view;
- this.state.saveUserSettingsForm.show_nsfw = luv.local_user.show_nsfw;
- this.state.saveUserSettingsForm.theme = luv.local_user.theme
- ? luv.local_user.theme
- : "browser";
- this.state.saveUserSettingsForm.default_sort_type =
- luv.local_user.default_sort_type;
- this.state.saveUserSettingsForm.default_listing_type =
- luv.local_user.default_listing_type;
- this.state.saveUserSettingsForm.lang = luv.local_user.lang;
- this.state.saveUserSettingsForm.avatar = luv.person.avatar;
- this.state.saveUserSettingsForm.banner = luv.person.banner;
- this.state.saveUserSettingsForm.display_name = luv.person.display_name;
- this.state.saveUserSettingsForm.show_avatars = luv.local_user.show_avatars;
- this.state.saveUserSettingsForm.bot_account = luv.person.bot_account;
- this.state.saveUserSettingsForm.show_bot_accounts =
- luv.local_user.show_bot_accounts;
- this.state.saveUserSettingsForm.show_scores = luv.local_user.show_scores;
- this.state.saveUserSettingsForm.show_read_posts =
- luv.local_user.show_read_posts;
- this.state.saveUserSettingsForm.show_new_post_notifs =
- luv.local_user.show_new_post_notifs;
- this.state.saveUserSettingsForm.email = luv.local_user.email;
- this.state.saveUserSettingsForm.bio = luv.person.bio;
- this.state.saveUserSettingsForm.send_notifications_to_email =
- luv.local_user.send_notifications_to_email;
- this.state.saveUserSettingsForm.matrix_user_id = luv.person.matrix_user_id;
- this.state.personBlocks = UserService.Instance.myUserInfo.person_blocks;
- this.state.communityBlocks =
- UserService.Instance.myUserInfo.community_blocks;
}
parseMessage(msg: any) {
let op = wsUserOp(msg);
console.log(msg);
if (msg.error) {
+ this.setState({
+ saveUserSettingsLoading: false,
+ changePasswordLoading: false,
+ deleteAccountLoading: false,
+ });
toast(i18n.t(msg.error), "danger");
return;
} else if (op == UserOperation.SaveUserSettings) {
- let data = wsJsonToRes<LoginResponse>(msg).data;
- UserService.Instance.login(data);
- this.state.saveUserSettingsLoading = false;
- this.setState(this.state);
-
+ this.setState({ saveUserSettingsLoading: false });
+ toast(i18n.t("saved"));
window.scrollTo(0, 0);
} else if (op == UserOperation.ChangePassword) {
- let data = wsJsonToRes<LoginResponse>(msg).data;
+ let data = wsJsonToRes<LoginResponse>(msg);
UserService.Instance.login(data);
- this.state.changePasswordLoading = false;
- this.setState(this.state);
+ this.setState({ changePasswordLoading: false });
window.scrollTo(0, 0);
toast(i18n.t("password_changed"));
} else if (op == UserOperation.DeleteAccount) {
UserService.Instance.logout();
window.location.href = "/";
} else if (op == UserOperation.BlockPerson) {
- let data = wsJsonToRes<BlockPersonResponse>(msg).data;
- this.setState({ personBlocks: updatePersonBlock(data) });
+ let data = wsJsonToRes<BlockPersonResponse>(msg);
+ updatePersonBlock(data);
+ let mui = UserService.Instance.myUserInfo;
+ if (mui) {
+ this.setState({ personBlocks: mui.person_blocks });
+ }
} else if (op == UserOperation.BlockCommunity) {
- let data = wsJsonToRes<BlockCommunityResponse>(msg).data;
- this.setState({ communityBlocks: updateCommunityBlock(data) });
+ let data = wsJsonToRes<BlockCommunityResponse>(msg);
+ updateCommunityBlock(data);
+ let mui = UserService.Instance.myUserInfo;
+ if (mui) {
+ this.setState({ communityBlocks: mui.community_blocks });
+ }
}
}
}
projects / lemmy-ui.git / blobdiff