From 1e0aa5dd3d8b616a5be49887f284047d09cd1871 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Thu, 25 Apr 2019 18:42:21 -0700
Subject: [PATCH 1/9] Added sponsor

---
 ui/src/components/sponsors.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/sponsors.tsx b/ui/src/components/sponsors.tsx
index c9923beea..dd1026e69 100644
--- a/ui/src/components/sponsors.tsx
+++ b/ui/src/components/sponsors.tsx
@@ -1,7 +1,10 @@
 import { Component } from 'inferno';
 
 let general = 
-  ["Eduardo Cavazos"];
+  [
+  "Nathan J. Goode",
+  "Eduardo Cavazos"
+];
 // let highlighted = [];
 // let silver = [];
 // let gold = [];
@@ -43,10 +46,10 @@ export class Sponsors extends Component<any, any> {
   }
   sponsors() {
     return (
-      <div>
+      <div class="container">
         <h5>Sponsors</h5>
         <p>General Sponsors are those that pledged $10 to $39 to Lemmy.</p>
-        <div class="">
+        <div class="row card-columns">
           {general.map(s => 
             <div class="card col-12 col-md-2">
               <div>{s}</div>

From 9374aefa56a707cafce8740cd45a0d254ea2184f Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Thu, 25 Apr 2019 20:14:52 -0700
Subject: [PATCH 2/9] Temp

---
 server/src/websocket_server/server.rs | 2 +-
 ui/src/components/community-form.tsx  | 5 ++++-
 ui/src/components/login.tsx           | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/server/src/websocket_server/server.rs b/server/src/websocket_server/server.rs
index dbd1be8d5..c99b32a63 100644
--- a/server/src/websocket_server/server.rs
+++ b/server/src/websocket_server/server.rs
@@ -969,7 +969,7 @@ impl Perform for ListCommunities {
 
     let sort = SortType::from_str(&self.sort)?;
 
-    let communities: Vec<CommunityView> = CommunityView::list(&conn, user_id, sort, self.page, self.limit)?;
+    let communities: Vec<CommunityView> = CommunityView::list(&conn, user_id, sort, self.page, Some(50))?;
 
     // Return the jwt
     Ok(
diff --git a/ui/src/components/community-form.tsx b/ui/src/components/community-form.tsx
index 66071a3fa..5effa73ae 100644
--- a/ui/src/components/community-form.tsx
+++ b/ui/src/components/community-form.tsx
@@ -120,7 +120,10 @@ export class CommunityForm extends Component<CommunityFormProps, CommunityFormSt
     if (i.props.community) {
       WebSocketService.Instance.editCommunity(i.state.communityForm);
     } else {
-      WebSocketService.Instance.createCommunity(i.state.communityForm);
+
+      setTimeout(function(){
+        WebSocketService.Instance.createCommunity(i.state.communityForm);
+      }, 10000);
     }
     i.setState(i.state);
   }
diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx
index f86faa2e1..2a9f8d7d9 100644
--- a/ui/src/components/login.tsx
+++ b/ui/src/components/login.tsx
@@ -157,7 +157,9 @@ export class Login extends Component<any, State> {
     i.state.registerLoading = true;
     i.setState(i.state);
     event.preventDefault();
-    WebSocketService.Instance.register(i.state.registerForm);
+    setTimeout(function(){
+      WebSocketService.Instance.register(i.state.registerForm);
+    }, 10000);
   }
 
   handleRegisterUsernameChange(i: Login, event: any) {

From fba4d372fcc175f1da53b72980c97e09fdb77d9c Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Thu, 25 Apr 2019 22:50:42 -0700
Subject: [PATCH 3/9] Spamtimer

---
 server/src/websocket_server/server.rs |  2 +-
 ui/src/components/communities.tsx     |  2 +-
 ui/src/components/login.tsx           | 14 +++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/src/websocket_server/server.rs b/server/src/websocket_server/server.rs
index c99b32a63..dbd1be8d5 100644
--- a/server/src/websocket_server/server.rs
+++ b/server/src/websocket_server/server.rs
@@ -969,7 +969,7 @@ impl Perform for ListCommunities {
 
     let sort = SortType::from_str(&self.sort)?;
 
-    let communities: Vec<CommunityView> = CommunityView::list(&conn, user_id, sort, self.page, Some(50))?;
+    let communities: Vec<CommunityView> = CommunityView::list(&conn, user_id, sort, self.page, self.limit)?;
 
     // Return the jwt
     Ok(
diff --git a/ui/src/components/communities.tsx b/ui/src/components/communities.tsx
index 383440079..b5233c222 100644
--- a/ui/src/components/communities.tsx
+++ b/ui/src/components/communities.tsx
@@ -33,7 +33,7 @@ export class Communities extends Component<any, CommunitiesState> {
 
     let listCommunitiesForm: ListCommunitiesForm = {
       sort: SortType[SortType.TopAll],
-      limit: 9999,
+      limit: 100,
     }
 
     WebSocketService.Instance.listCommunities(listCommunitiesForm);
diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx
index 2a9f8d7d9..e6dec2d2e 100644
--- a/ui/src/components/login.tsx
+++ b/ui/src/components/login.tsx
@@ -10,6 +10,7 @@ interface State {
   registerForm: RegisterForm;
   loginLoading: boolean;
   registerLoading: boolean;
+  spamTimer: number;
 }
 
 
@@ -28,7 +29,8 @@ export class Login extends Component<any, State> {
       admin: false,
     },
     loginLoading: false,
-    registerLoading: false
+    registerLoading: false,
+    spamTimer: new Date().getTime()
   }
 
   constructor(props: any, context: any) {
@@ -124,6 +126,7 @@ 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.spamTimer} />
         <div class="form-group row">
           <div class="col-sm-10">
             <button type="submit" class="btn btn-secondary">{this.state.registerLoading ? 
@@ -157,9 +160,14 @@ export class Login extends Component<any, State> {
     i.state.registerLoading = true;
     i.setState(i.state);
     event.preventDefault();
-    setTimeout(function(){
+
+    let endTimer = new Date().getTime();
+    let elapsed = endTimer - i.state.spamTimer;
+    if (elapsed > 4500) {
       WebSocketService.Instance.register(i.state.registerForm);
-    }, 10000);
+    } else {
+      location.reload(true);
+    }
   }
 
   handleRegisterUsernameChange(i: Login, event: any) {

From be943f7b72be5c2471419e2405eb194e33fa5165 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Fri, 26 Apr 2019 07:34:04 -0700
Subject: [PATCH 4/9] Fixing rust warning.

- Fixes #111
---
 server/Cargo.toml                     |  1 +
 server/src/websocket_server/server.rs |  5 +++++
 ui/src/components/login.tsx           | 14 ++++++++------
 ui/src/interfaces.ts                  |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/server/Cargo.toml b/server/Cargo.toml
index 93bd6acb2..1daaca663 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -2,6 +2,7 @@
 name = "server"
 version = "0.0.1"
 authors = ["Dessalines <happydooby@gmail.com>"]
+autobins = false
 
 [[bin]]
 name = "lemmy"
diff --git a/server/src/websocket_server/server.rs b/server/src/websocket_server/server.rs
index dbd1be8d5..d6a9226b2 100644
--- a/server/src/websocket_server/server.rs
+++ b/server/src/websocket_server/server.rs
@@ -92,6 +92,7 @@ pub struct Register {
   password: String,
   password_verify: String,
   admin: bool,
+  spam_timer: i64,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -789,6 +790,10 @@ impl Perform for Register {
       return Err(self.error("Passwords do not match."))?
     }
 
+    if self.spam_timer < 1142 {
+      return Err(self.error("Too fast"))?
+    }
+
     if has_slurs(&self.username) {
       return Err(self.error("No slurs"))?
     }
diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx
index e6dec2d2e..0713b7766 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;
-  spamTimer: number;
 }
 
 
@@ -27,10 +26,10 @@ export class Login extends Component<any, State> {
       password: undefined,
       password_verify: undefined,
       admin: false,
+      spam_timer: undefined,
     },
     loginLoading: false,
     registerLoading: false,
-    spamTimer: new Date().getTime()
   }
 
   constructor(props: any, context: any) {
@@ -126,7 +125,7 @@ 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.spamTimer} />
+        <input type="hidden" value={this.state.registerForm.spam_timer} />
         <div class="form-group row">
           <div class="col-sm-10">
             <button type="submit" class="btn btn-secondary">{this.state.registerLoading ? 
@@ -162,16 +161,19 @@ export class Login extends Component<any, State> {
     event.preventDefault();
 
     let endTimer = new Date().getTime();
-    let elapsed = endTimer - i.state.spamTimer;
-    if (elapsed > 4500) {
+    let elapsed = endTimer - i.state.registerForm.spam_timer;
+
+    i.state.registerForm.spam_timer = elapsed;
+    if (elapsed > 1142) {
       WebSocketService.Instance.register(i.state.registerForm);
     } else {
-      location.reload(true);
+      window.location.href = "https://github.com/dessalines/lemmy";
     }
   }
 
   handleRegisterUsernameChange(i: Login, event: any) {
     i.state.registerForm.username = event.target.value;
+    i.state.registerForm.spam_timer = new Date().getTime();
     i.setState(i.state);
   }
 
diff --git a/ui/src/interfaces.ts b/ui/src/interfaces.ts
index 68d1b4122..4fa30d188 100644
--- a/ui/src/interfaces.ts
+++ b/ui/src/interfaces.ts
@@ -330,6 +330,7 @@ export interface RegisterForm {
   email?: string;
   password: string;
   password_verify: string;
+  spam_timer: number;
   admin: boolean;
 }
 

From 242255ed0e897ee83df5480c3914428e36ff9856 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Fri, 26 Apr 2019 08:31:23 -0700
Subject: [PATCH 5/9] Spam

---
 ui/src/components/login.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx
index 0713b7766..ecf09a2c6 100644
--- a/ui/src/components/login.tsx
+++ b/ui/src/components/login.tsx
@@ -10,6 +10,7 @@ interface State {
   registerForm: RegisterForm;
   loginLoading: boolean;
   registerLoading: boolean;
+  spamNada: string;
 }
 
 
@@ -30,6 +31,7 @@ export class Login extends Component<any, State> {
     },
     loginLoading: false,
     registerLoading: false,
+    spamNada: undefined
   }
 
   constructor(props: any, context: any) {
@@ -126,6 +128,7 @@ export class Login extends Component<any, State> {
           </div>
         </div>
         <input type="hidden" value={this.state.registerForm.spam_timer} />
+        <input type="text" class="d-none" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} />
         <div class="form-group row">
           <div class="col-sm-10">
             <button type="submit" class="btn btn-secondary">{this.state.registerLoading ? 
@@ -164,7 +167,7 @@ export class Login extends Component<any, State> {
     let elapsed = endTimer - i.state.registerForm.spam_timer;
 
     i.state.registerForm.spam_timer = elapsed;
-    if (elapsed > 1142) {
+    if (elapsed > 1142 && i.state.spamNada == undefined) {
       WebSocketService.Instance.register(i.state.registerForm);
     } else {
       window.location.href = "https://github.com/dessalines/lemmy";
@@ -177,6 +180,11 @@ export class Login extends Component<any, State> {
     i.setState(i.state);
   }
 
+  handleSpamNada(i: Login, event: any) {
+    i.state.spamNada = event.target.value;
+    i.setState(i.state);
+  }
+
   handleRegisterEmailChange(i: Login, event: any) {
     i.state.registerForm.email = event.target.value;
     i.setState(i.state);

From 4d890596e5d6bcad3b909f6ee5c7f9349968844d Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Fri, 26 Apr 2019 08:53:45 -0700
Subject: [PATCH 6/9] Spam

---
 ui/src/components/login.tsx | 1 +
 ui/src/css/main.css         | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx
index ecf09a2c6..eb974c797 100644
--- a/ui/src/components/login.tsx
+++ b/ui/src/components/login.tsx
@@ -129,6 +129,7 @@ export class Login extends Component<any, State> {
         </div>
         <input type="hidden" value={this.state.registerForm.spam_timer} />
         <input type="text" class="d-none" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} />
+        <input type="text" class="no-s-how" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} />
         <div class="form-group row">
           <div class="col-sm-10">
             <button type="submit" class="btn btn-secondary">{this.state.registerLoading ? 
diff --git a/ui/src/css/main.css b/ui/src/css/main.css
index 5af8a0f55..6fd81eca9 100644
--- a/ui/src/css/main.css
+++ b/ui/src/css/main.css
@@ -100,3 +100,7 @@ blockquote {
   max-height: 50px;
   max-width: 50px;
 }
+
+.no-s-how {
+  display: none;
+}

From 366e4955820ff50d715432b15aef849d8c43f7e6 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Fri, 26 Apr 2019 09:11:04 -0700
Subject: [PATCH 7/9] Spam

---
 README.md                   | 1 +
 ui/src/components/login.tsx | 8 +++++---
 ui/src/css/main.css         | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 94238136f..eb923f3fa 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,7 @@ and goto http://localhost:8536
 #### Running
 ```
 git clone https://github.com/dessalines/lemmy
+export DATABASE_URL=postgres://rrr:rrr@localhost/rrr
 cd lemmy
 ./install.sh
 # For live coding, where both the front and back end, automagically reload on any save, do:
diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx
index eb974c797..b64c7a7cd 100644
--- a/ui/src/components/login.tsx
+++ b/ui/src/components/login.tsx
@@ -129,7 +129,7 @@ export class Login extends Component<any, State> {
         </div>
         <input type="hidden" value={this.state.registerForm.spam_timer} />
         <input type="text" class="d-none" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} />
-        <input type="text" class="no-s-how" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} />
+        <input type="text" class="no-s-hows" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} />
         <div class="form-group row">
           <div class="col-sm-10">
             <button type="submit" class="btn btn-secondary">{this.state.registerLoading ? 
@@ -168,10 +168,12 @@ export class Login extends Component<any, State> {
     let elapsed = endTimer - i.state.registerForm.spam_timer;
 
     i.state.registerForm.spam_timer = elapsed;
-    if (elapsed > 1142 && i.state.spamNada == undefined) {
+    if (elapsed > 1423 && i.state.spamNada == undefined) {
       WebSocketService.Instance.register(i.state.registerForm);
     } else {
-      window.location.href = "https://github.com/dessalines/lemmy";
+      i.state.spamNada = "nt";
+      i.setState(i.state);
+      {/* window.location.href = "https://github.com/dessalines/lemmy"; */}
     }
   }
 
diff --git a/ui/src/css/main.css b/ui/src/css/main.css
index 6fd81eca9..1ddd33eb0 100644
--- a/ui/src/css/main.css
+++ b/ui/src/css/main.css
@@ -101,6 +101,6 @@ blockquote {
   max-width: 50px;
 }
 
-.no-s-how {
+.no-s-hows {
   display: none;
 }

From 66cbd050a10b9a13d911f77d18983b982c6c7326 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Fri, 26 Apr 2019 09:15:17 -0700
Subject: [PATCH 8/9] Documentation

---
 README.md  | 1 -
 install.sh | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eb923f3fa..94238136f 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,6 @@ and goto http://localhost:8536
 #### Running
 ```
 git clone https://github.com/dessalines/lemmy
-export DATABASE_URL=postgres://rrr:rrr@localhost/rrr
 cd lemmy
 ./install.sh
 # For live coding, where both the front and back end, automagically reload on any save, do:
diff --git a/install.sh b/install.sh
index a06681f27..071acc6fb 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
 
+export DATABASE_URL=postgres://rrr:rrr@localhost/rrr
+
 cd ui
 yarn
 yarn build

From 4625aa3060840aa7c603c20c6f5f8d7f24ffcb8e Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Fri, 26 Apr 2019 09:21:20 -0700
Subject: [PATCH 9/9] Spam

---
 server/src/websocket_server/server.rs |  4 ++--
 ui/src/components/login.tsx           | 17 +++++++----------
 ui/src/css/main.css                   |  4 +++-
 ui/src/interfaces.ts                  |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/server/src/websocket_server/server.rs b/server/src/websocket_server/server.rs
index d6a9226b2..9c609a470 100644
--- a/server/src/websocket_server/server.rs
+++ b/server/src/websocket_server/server.rs
@@ -92,7 +92,7 @@ pub struct Register {
   password: String,
   password_verify: String,
   admin: bool,
-  spam_timer: i64,
+  spam_timeri: i64,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -790,7 +790,7 @@ impl Perform for Register {
       return Err(self.error("Passwords do not match."))?
     }
 
-    if self.spam_timer < 1142 {
+    if self.spam_timeri < 1142 {
       return Err(self.error("Too fast"))?
     }
 
diff --git a/ui/src/components/login.tsx b/ui/src/components/login.tsx
index b64c7a7cd..5c0b8dd1d 100644
--- a/ui/src/components/login.tsx
+++ b/ui/src/components/login.tsx
@@ -27,7 +27,7 @@ export class Login extends Component<any, State> {
       password: undefined,
       password_verify: undefined,
       admin: false,
-      spam_timer: undefined,
+      spam_timeri: undefined,
     },
     loginLoading: false,
     registerLoading: false,
@@ -103,6 +103,7 @@ 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">
@@ -127,9 +128,7 @@ 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_timer} />
-        <input type="text" class="d-none" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} />
-        <input type="text" class="no-s-hows" value={this.state.spamNada} onInput={linkEvent(this, this.handleSpamNada)} />
+        <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 ? 
@@ -165,21 +164,19 @@ export class Login extends Component<any, State> {
     event.preventDefault();
 
     let endTimer = new Date().getTime();
-    let elapsed = endTimer - i.state.registerForm.spam_timer;
+    let elapsed = endTimer - i.state.registerForm.spam_timeri;
 
-    i.state.registerForm.spam_timer = elapsed;
+    i.state.registerForm.spam_timeri = elapsed;
     if (elapsed > 1423 && i.state.spamNada == undefined) {
       WebSocketService.Instance.register(i.state.registerForm);
     } else {
-      i.state.spamNada = "nt";
-      i.setState(i.state);
-      {/* window.location.href = "https://github.com/dessalines/lemmy"; */}
+      window.location.href = "https://github.com/dessalines/lemmy";
     }
   }
 
   handleRegisterUsernameChange(i: Login, event: any) {
     i.state.registerForm.username = event.target.value;
-    i.state.registerForm.spam_timer = new Date().getTime();
+    i.state.registerForm.spam_timeri = new Date().getTime();
     i.setState(i.state);
   }
 
diff --git a/ui/src/css/main.css b/ui/src/css/main.css
index 1ddd33eb0..53d500b7e 100644
--- a/ui/src/css/main.css
+++ b/ui/src/css/main.css
@@ -102,5 +102,7 @@ blockquote {
 }
 
 .no-s-hows {
-  display: none;
+  position: absolute !important;
+  top: -9999px !important;
+  left: -9999px !important;
 }
diff --git a/ui/src/interfaces.ts b/ui/src/interfaces.ts
index 4fa30d188..51582f3a1 100644
--- a/ui/src/interfaces.ts
+++ b/ui/src/interfaces.ts
@@ -330,7 +330,7 @@ export interface RegisterForm {
   email?: string;
   password: string;
   password_verify: string;
-  spam_timer: number;
+  spam_timeri: number;
   admin: boolean;
 }