]> Untitled Git - lemmy-ui.git/commitdiff
Remove max length constraints on actors. Fixes #350 (#351)
authorDessalines <dessalines@users.noreply.github.com>
Thu, 22 Jul 2021 15:39:33 +0000 (11:39 -0400)
committerGitHub <noreply@github.com>
Thu, 22 Jul 2021 15:39:33 +0000 (11:39 -0400)
src/shared/components/community/community-form.tsx
src/shared/components/home/login.tsx
src/shared/components/home/setup.tsx
src/shared/components/login.tsx [deleted file]
src/shared/components/person/person.tsx

index ecc2b8900fdd40bd72b66c502a739e0283ad6fd2..f76d548561d7473aa2dcd0598301a61c915f898d 100644 (file)
@@ -139,7 +139,6 @@ export class CommunityForm extends Component<
                   onInput={linkEvent(this, this.handleCommunityNameChange)}
                   required
                   minLength={3}
-                  maxLength={20}
                   pattern="[a-z0-9_]+"
                   title={i18n.t("community_reqs")}
                 />
index d9d427d028cf14ee1131c358588bf467ced45308..e57825590a8980d690a26204974b85663bc71315 100644 (file)
@@ -187,7 +187,6 @@ export class Login extends Component<any, State> {
               onInput={linkEvent(this, this.handleRegisterUsernameChange)}
               required
               minLength={3}
-              maxLength={20}
               pattern="[a-zA-Z0-9_]+"
             />
           </div>
index e104cea4e213c00c4fac42a085786fd9a819815b..eef59bd00d8a3fe2f0ef4d0289b3dd0c5b119531 100644 (file)
@@ -89,7 +89,6 @@ export class Setup extends Component<any, State> {
               onInput={linkEvent(this, this.handleRegisterUsernameChange)}
               required
               minLength={3}
-              maxLength={20}
               pattern="[a-zA-Z0-9_]+"
             />
           </div>
diff --git a/src/shared/components/login.tsx b/src/shared/components/login.tsx
deleted file mode 100644 (file)
index 7d0163e..0000000
+++ /dev/null
@@ -1,490 +0,0 @@
-import { Component, linkEvent } from "inferno";
-import { T } from "inferno-i18next";
-import {
-  GetCaptchaResponse,
-  GetSiteResponse,
-  Login as LoginForm,
-  LoginResponse,
-  PasswordReset,
-  Register,
-  SiteView,
-  UserOperation,
-} from "lemmy-js-client";
-import { Subscription } from "rxjs";
-import { i18n } from "../i18next";
-import { UserService, WebSocketService } from "../services";
-import {
-  authField,
-  isBrowser,
-  joinLemmyUrl,
-  setIsoData,
-  toast,
-  validEmail,
-  wsClient,
-  wsJsonToRes,
-  wsSubscribe,
-  wsUserOp,
-} from "../utils";
-import { HtmlTags } from "./common/html-tags";
-import { Icon, Spinner } from "./common/icon";
-
-interface State {
-  loginForm: LoginForm;
-  registerForm: Register;
-  loginLoading: boolean;
-  registerLoading: boolean;
-  captcha: GetCaptchaResponse;
-  captchaPlaying: boolean;
-  site_view: SiteView;
-}
-
-export class Login extends Component<any, State> {
-  private isoData = setIsoData(this.context);
-  private subscription: Subscription;
-
-  emptyState: State = {
-    loginForm: {
-      username_or_email: undefined,
-      password: undefined,
-    },
-    registerForm: {
-      username: undefined,
-      password: undefined,
-      password_verify: undefined,
-      show_nsfw: false,
-      captcha_uuid: undefined,
-      captcha_answer: undefined,
-    },
-    loginLoading: false,
-    registerLoading: false,
-    captcha: undefined,
-    captchaPlaying: false,
-    site_view: this.isoData.site_res.site_view,
-  };
-
-  constructor(props: any, context: any) {
-    super(props, context);
-
-    this.state = this.emptyState;
-
-    this.parseMessage = this.parseMessage.bind(this);
-    this.subscription = wsSubscribe(this.parseMessage);
-
-    if (isBrowser()) {
-      WebSocketService.Instance.send(wsClient.getCaptcha());
-    }
-  }
-
-  componentWillUnmount() {
-    if (isBrowser()) {
-      this.subscription.unsubscribe();
-    }
-  }
-
-  get documentTitle(): string {
-    return `${i18n.t("login")} - ${this.state.site_view.site.name}`;
-  }
-
-  get isLemmyMl(): boolean {
-    return isBrowser() && window.location.hostname == "lemmy.ml";
-  }
-
-  render() {
-    return (
-      <div class="container">
-        <HtmlTags
-          title={this.documentTitle}
-          path={this.context.router.route.match.url}
-        />
-        <div class="row">
-          <div class="col-12 col-lg-6 mb-4">{this.loginForm()}</div>
-          <div class="col-12 col-lg-6">{this.registerForm()}</div>
-        </div>
-      </div>
-    );
-  }
-
-  loginForm() {
-    return (
-      <div>
-        <form onSubmit={linkEvent(this, this.handleLoginSubmit)}>
-          <h5>{i18n.t("login")}</h5>
-          <div class="form-group row">
-            <label
-              class="col-sm-2 col-form-label"
-              htmlFor="login-email-or-username"
-            >
-              {i18n.t("email_or_username")}
-            </label>
-            <div class="col-sm-10">
-              <input
-                type="text"
-                class="form-control"
-                id="login-email-or-username"
-                value={this.state.loginForm.username_or_email}
-                onInput={linkEvent(this, this.handleLoginUsernameChange)}
-                autoComplete="email"
-                required
-                minLength={3}
-              />
-            </div>
-          </div>
-          <div class="form-group row">
-            <label class="col-sm-2 col-form-label" htmlFor="login-password">
-              {i18n.t("password")}
-            </label>
-            <div class="col-sm-10">
-              <input
-                type="password"
-                id="login-password"
-                value={this.state.loginForm.password}
-                onInput={linkEvent(this, this.handleLoginPasswordChange)}
-                class="form-control"
-                autoComplete="current-password"
-                required
-                maxLength={60}
-              />
-              <button
-                type="button"
-                onClick={linkEvent(this, this.handlePasswordReset)}
-                className="btn p-0 btn-link d-inline-block float-right text-muted small font-weight-bold pointer-events not-allowed"
-                disabled={!validEmail(this.state.loginForm.username_or_email)}
-                title={i18n.t("no_password_reset")}
-              >
-                {i18n.t("forgot_password")}
-              </button>
-            </div>
-          </div>
-          <div class="form-group row">
-            <div class="col-sm-10">
-              <button type="submit" class="btn btn-secondary">
-                {this.state.loginLoading ? <Spinner /> : i18n.t("login")}
-              </button>
-            </div>
-          </div>
-        </form>
-      </div>
-    );
-  }
-
-  registerForm() {
-    return (
-      <form onSubmit={linkEvent(this, this.handleRegisterSubmit)}>
-        <h5>{i18n.t("sign_up")}</h5>
-
-        <div class="form-group row">
-          <label class="col-sm-2 col-form-label" htmlFor="register-username">
-            {i18n.t("username")}
-          </label>
-
-          <div class="col-sm-10">
-            <input
-              type="text"
-              id="register-username"
-              class="form-control"
-              value={this.state.registerForm.username}
-              onInput={linkEvent(this, this.handleRegisterUsernameChange)}
-              required
-              minLength={3}
-              maxLength={20}
-              pattern="[a-zA-Z0-9_]+"
-            />
-          </div>
-        </div>
-
-        <div class="form-group row">
-          <label class="col-sm-2 col-form-label" htmlFor="register-email">
-            {i18n.t("email")}
-          </label>
-          <div class="col-sm-10">
-            <input
-              type="email"
-              id="register-email"
-              class="form-control"
-              placeholder={i18n.t("optional")}
-              value={this.state.registerForm.email}
-              autoComplete="email"
-              onInput={linkEvent(this, this.handleRegisterEmailChange)}
-              minLength={3}
-            />
-            {!validEmail(this.state.registerForm.email) && (
-              <div class="mt-2 mb-0 alert alert-light" role="alert">
-                <Icon icon="alert-triangle" classes="icon-inline mr-2" />
-                {i18n.t("no_password_reset")}
-              </div>
-            )}
-          </div>
-        </div>
-
-        <div class="form-group row">
-          <label class="col-sm-2 col-form-label" htmlFor="register-password">
-            {i18n.t("password")}
-          </label>
-          <div class="col-sm-10">
-            <input
-              type="password"
-              id="register-password"
-              value={this.state.registerForm.password}
-              autoComplete="new-password"
-              onInput={linkEvent(this, this.handleRegisterPasswordChange)}
-              maxLength={60}
-              class="form-control"
-              required
-            />
-          </div>
-        </div>
-
-        <div class="form-group row">
-          <label
-            class="col-sm-2 col-form-label"
-            htmlFor="register-verify-password"
-          >
-            {i18n.t("verify_password")}
-          </label>
-          <div class="col-sm-10">
-            <input
-              type="password"
-              id="register-verify-password"
-              value={this.state.registerForm.password_verify}
-              autoComplete="new-password"
-              onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
-              maxLength={60}
-              class="form-control"
-              required
-            />
-          </div>
-        </div>
-
-        {this.state.captcha && (
-          <div class="form-group row">
-            <label class="col-sm-2" htmlFor="register-captcha">
-              <span class="mr-2">{i18n.t("enter_code")}</span>
-              <button
-                type="button"
-                class="btn btn-secondary"
-                onClick={linkEvent(this, this.handleRegenCaptcha)}
-                aria-label={i18n.t("captcha")}
-              >
-                <Icon icon="refresh-cw" classes="icon-refresh-cw" />
-              </button>
-            </label>
-            {this.showCaptcha()}
-            <div class="col-sm-6">
-              <input
-                type="text"
-                class="form-control"
-                id="register-captcha"
-                value={this.state.registerForm.captcha_answer}
-                onInput={linkEvent(
-                  this,
-                  this.handleRegisterCaptchaAnswerChange
-                )}
-                required
-              />
-            </div>
-          </div>
-        )}
-        {this.state.site_view.site.enable_nsfw && (
-          <div class="form-group row">
-            <div class="col-sm-10">
-              <div class="form-check">
-                <input
-                  class="form-check-input"
-                  id="register-show-nsfw"
-                  type="checkbox"
-                  checked={this.state.registerForm.show_nsfw}
-                  onChange={linkEvent(this, this.handleRegisterShowNsfwChange)}
-                />
-                <label class="form-check-label" htmlFor="register-show-nsfw">
-                  {i18n.t("show_nsfw")}
-                </label>
-              </div>
-            </div>
-          </div>
-        )}
-        {this.isLemmyMl && (
-          <div class="mt-2 mb-0 alert alert-light" role="alert">
-            <T i18nKey="lemmy_ml_registration_message">
-              #<a href={joinLemmyUrl}>#</a>
-            </T>
-          </div>
-        )}
-        <div class="form-group row">
-          <div class="col-sm-10">
-            <button type="submit" class="btn btn-secondary">
-              {this.state.registerLoading ? <Spinner /> : i18n.t("sign_up")}
-            </button>
-          </div>
-        </div>
-      </form>
-    );
-  }
-
-  showCaptcha() {
-    return (
-      <div class="col-sm-4">
-        {this.state.captcha.ok && (
-          <>
-            <img
-              class="rounded-top img-fluid"
-              src={this.captchaPngSrc()}
-              style="border-bottom-right-radius: 0; border-bottom-left-radius: 0;"
-              alt={i18n.t("captcha")}
-            />
-            {this.state.captcha.ok.wav && (
-              <button
-                class="rounded-bottom btn btn-sm btn-secondary btn-block"
-                style="border-top-right-radius: 0; border-top-left-radius: 0;"
-                title={i18n.t("play_captcha_audio")}
-                onClick={linkEvent(this, this.handleCaptchaPlay)}
-                type="button"
-                disabled={this.state.captchaPlaying}
-              >
-                <Icon icon="play" classes="icon-play" />
-              </button>
-            )}
-          </>
-        )}
-      </div>
-    );
-  }
-
-  handleLoginSubmit(i: Login, event: any) {
-    event.preventDefault();
-    i.state.loginLoading = true;
-    i.setState(i.state);
-    WebSocketService.Instance.send(wsClient.login(i.state.loginForm));
-  }
-
-  handleLoginUsernameChange(i: Login, event: any) {
-    i.state.loginForm.username_or_email = event.target.value;
-    i.setState(i.state);
-  }
-
-  handleLoginPasswordChange(i: Login, event: any) {
-    i.state.loginForm.password = event.target.value;
-    i.setState(i.state);
-  }
-
-  handleRegisterSubmit(i: Login, event: any) {
-    event.preventDefault();
-    i.state.registerLoading = true;
-    i.setState(i.state);
-    WebSocketService.Instance.send(wsClient.register(i.state.registerForm));
-  }
-
-  handleRegisterUsernameChange(i: Login, event: any) {
-    i.state.registerForm.username = event.target.value;
-    i.setState(i.state);
-  }
-
-  handleRegisterEmailChange(i: Login, event: any) {
-    i.state.registerForm.email = event.target.value;
-    if (i.state.registerForm.email == "") {
-      i.state.registerForm.email = undefined;
-    }
-    i.setState(i.state);
-  }
-
-  handleRegisterPasswordChange(i: Login, event: any) {
-    i.state.registerForm.password = event.target.value;
-    i.setState(i.state);
-  }
-
-  handleRegisterPasswordVerifyChange(i: Login, event: any) {
-    i.state.registerForm.password_verify = event.target.value;
-    i.setState(i.state);
-  }
-
-  handleRegisterShowNsfwChange(i: Login, event: any) {
-    i.state.registerForm.show_nsfw = event.target.checked;
-    i.setState(i.state);
-  }
-
-  handleRegisterCaptchaAnswerChange(i: Login, event: any) {
-    i.state.registerForm.captcha_answer = event.target.value;
-    i.setState(i.state);
-  }
-
-  handleRegenCaptcha(_i: Login, event: any) {
-    event.preventDefault();
-    WebSocketService.Instance.send(wsClient.getCaptcha());
-  }
-
-  handlePasswordReset(i: Login, event: any) {
-    event.preventDefault();
-    let resetForm: PasswordReset = {
-      email: i.state.loginForm.username_or_email,
-    };
-    WebSocketService.Instance.send(wsClient.passwordReset(resetForm));
-  }
-
-  handleCaptchaPlay(i: Login, event: any) {
-    event.preventDefault();
-    let snd = new Audio("data:audio/wav;base64," + i.state.captcha.ok.wav);
-    snd.play();
-    i.state.captchaPlaying = true;
-    i.setState(i.state);
-    snd.addEventListener("ended", () => {
-      snd.currentTime = 0;
-      i.state.captchaPlaying = false;
-      i.setState(this.state);
-    });
-  }
-
-  captchaPngSrc() {
-    return `data:image/png;base64,${this.state.captcha.ok.png}`;
-  }
-
-  parseMessage(msg: any) {
-    let op = wsUserOp(msg);
-    console.log(msg);
-    if (msg.error) {
-      toast(i18n.t(msg.error), "danger");
-      this.state = this.emptyState;
-      this.state.registerForm.captcha_answer = undefined;
-      // Refetch another captcha
-      WebSocketService.Instance.send(wsClient.getCaptcha());
-      this.setState(this.state);
-      return;
-    } else {
-      if (op == UserOperation.Login) {
-        let data = wsJsonToRes<LoginResponse>(msg).data;
-        this.state = this.emptyState;
-        this.setState(this.state);
-        UserService.Instance.login(data);
-        WebSocketService.Instance.send(
-          wsClient.userJoin({
-            auth: authField(),
-          })
-        );
-        toast(i18n.t("logged_in"));
-        this.props.history.push("/");
-      } else if (op == UserOperation.Register) {
-        let data = wsJsonToRes<LoginResponse>(msg).data;
-        this.state = this.emptyState;
-        this.setState(this.state);
-        UserService.Instance.login(data);
-        WebSocketService.Instance.send(
-          wsClient.userJoin({
-            auth: authField(),
-          })
-        );
-        this.props.history.push("/communities");
-      } else if (op == UserOperation.GetCaptcha) {
-        let data = wsJsonToRes<GetCaptchaResponse>(msg).data;
-        if (data.ok) {
-          this.state.captcha = data;
-          this.state.registerForm.captcha_uuid = data.ok.uuid;
-          this.setState(this.state);
-        }
-      } else if (op == UserOperation.PasswordReset) {
-        toast(i18n.t("reset_password_mail_sent"));
-      } else if (op == UserOperation.GetSite) {
-        let data = wsJsonToRes<GetSiteResponse>(msg).data;
-        this.state.site_view = data.site_view;
-        this.setState(this.state);
-      }
-    }
-  }
-}
index 320c046192f32562d4f12e12a2604f8d70b5a8b1..b6cc4b394d6e6dec9db0b192cefdddea6237b571 100644 (file)
@@ -679,7 +679,6 @@ export class Person extends Component<any, PersonState> {
                 )}
                 pattern="^(?!@)(.+)$"
                 minLength={3}
-                maxLength={20}
               />
             </div>
           </div>