diff options
author | Dessalines <happydooby@gmail.com> | 2019-05-15 09:32:33 -0700 |
---|---|---|
committer | Dessalines <happydooby@gmail.com> | 2019-05-15 09:32:33 -0700 |
commit | db5b0a951e77d08af3b9a762f14a5b26e73740bf (patch) | |
tree | 44b43dee89aa9f2ef8f198166aa46cfa7f9d7a7b | |
parent | 6b87cdcb63e53a759181574a56794f2fe74a91dd (diff) |
Removing need for spam_timer
-rw-r--r-- | docs/api.md | 3 | ||||
-rw-r--r-- | server/src/api/user.rs | 5 | ||||
-rw-r--r-- | ui/src/components/login.tsx | 21 | ||||
-rw-r--r-- | ui/src/components/setup.tsx | 1 | ||||
-rw-r--r-- | ui/src/interfaces.ts | 1 |
5 files changed, 2 insertions, 29 deletions
diff --git a/docs/api.md b/docs/api.md index 69229c16..032c08aa 100644 --- a/docs/api.md +++ b/docs/api.md @@ -68,8 +68,7 @@ Only the first user will be able to be the admin. email: Option<String>, password: String, password_verify: String, - admin: bool, - spam_timeri: i64, + admin: bool } } ``` diff --git a/server/src/api/user.rs b/server/src/api/user.rs index ab0f24a5..9361ca4d 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -15,7 +15,6 @@ pub struct Register { password: String, password_verify: String, admin: bool, - spam_timeri: i64, } #[derive(Serialize, Deserialize)] @@ -133,10 +132,6 @@ impl Perform<LoginResponse> for Oper<Register> { return Err(APIError::err(&self.op, "Passwords do not match."))? } - if data.spam_timeri < 1142 { - return Err(APIError::err(&self.op, "Too fast"))? - } - if has_slurs(&data.username) { return Err(APIError::err(&self.op, "No slurs"))? } diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx index b2ad70a1..33cebdd6 100644 --- a/ui/src/components/login.tsx +++ b/ui/src/components/login.tsx @@ -10,7 +10,6 @@ interface State { registerForm: RegisterForm; loginLoading: boolean; registerLoading: boolean; - spamNada: string; } @@ -27,11 +26,9 @@ export class Login extends Component<any, State> { password: undefined, password_verify: undefined, admin: false, - spam_timeri: undefined, }, loginLoading: false, registerLoading: false, - spamNada: undefined } constructor(props: any, context: any) { @@ -103,7 +100,6 @@ export class Login extends Component<any, State> { return ( <form onSubmit={linkEvent(this, this.handleRegisterSubmit)}> <h5>Sign Up</h5> - <input type="text" class="no-s-hows" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} /> <div class="form-group row"> <label class="col-sm-2 col-form-label">Username</label> <div class="col-sm-10"> @@ -128,7 +124,6 @@ export class Login extends Component<any, State> { <input type="password" value={this.state.registerForm.password_verify} onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)} class="form-control" required /> </div> </div> - <input type="hidden" value={this.state.registerForm.spam_timeri} /> <div class="form-group row"> <div class="col-sm-10"> <button type="submit" class="btn btn-secondary">{this.state.registerLoading ? @@ -162,25 +157,11 @@ export class Login extends Component<any, State> { i.state.registerLoading = true; i.setState(i.state); - let endTimer = new Date().getTime(); - let elapsed = endTimer - i.state.registerForm.spam_timeri; - - i.state.registerForm.spam_timeri = elapsed; - if (elapsed > 1423 && i.state.spamNada == undefined) { - WebSocketService.Instance.register(i.state.registerForm); - } else { - window.location.href = "https://github.com/dessalines/lemmy"; - } + WebSocketService.Instance.register(i.state.registerForm); } handleRegisterUsernameChange(i: Login, event: any) { i.state.registerForm.username = event.target.value; - i.state.registerForm.spam_timeri = new Date().getTime(); - i.setState(i.state); - } - - handleSpamNada(i: Login, event: any) { - i.state.spamNada = event.target.value; i.setState(i.state); } diff --git a/ui/src/components/setup.tsx b/ui/src/components/setup.tsx index 83eff0c5..edb98260 100644 --- a/ui/src/components/setup.tsx +++ b/ui/src/components/setup.tsx @@ -20,7 +20,6 @@ export class Setup extends Component<any, State> { username: undefined, password: undefined, password_verify: undefined, - spam_timeri: 3000, admin: true, }, doneRegisteringUser: false, diff --git a/ui/src/interfaces.ts b/ui/src/interfaces.ts index 1558f7ae..50cf2c71 100644 --- a/ui/src/interfaces.ts +++ b/ui/src/interfaces.ts @@ -333,7 +333,6 @@ export interface RegisterForm { email?: string; password: string; password_verify: string; - spam_timeri: number; admin: boolean; } |