Merge branch 'dev'

1 files changed, 20 insertions, 2 deletions

diff --git a/server/src/api/user.rs b/server/src/api/user.rs
index 9361ca4d..d6d5962e 100644
--- a/server/src/api/user.rs
+++ b/server/src/api/user.rs
@@ -161,9 +161,27 @@ impl Perform<LoginResponse> for Oper<Register> {
       }
     };
 
+    // Create the main community if it doesn't exist
+    let main_community: Community = match Community::read_from_name(&conn, "main".to_string()) {
+      Ok(c) => c,
+      Err(_e) => {
+        let community_form = CommunityForm {
+          name: "main".to_string(),
+          title: "The Default Community".to_string(),
+          description: Some("The Default Community".to_string()),
+          category_id: 1,
+          creator_id: inserted_user.id,
+          removed: None,
+          deleted: None,
+          updated: None,
+        };
+        Community::create(&conn, &community_form).unwrap()
+      }
+    };
+
     // Sign them up for main community no matter what
     let community_follower_form = CommunityFollowerForm {
-      community_id: 1,
+      community_id: main_community.id,
       user_id: inserted_user.id,
     };
 
@@ -177,7 +195,7 @@ impl Perform<LoginResponse> for Oper<Register> {
     // If its an admin, add them as a mod and follower to main
     if data.admin {
       let community_moderator_form = CommunityModeratorForm {
-        community_id: 1,
+        community_id: main_community.id,
         user_id: inserted_user.id,
       };