Don't create or initially follow a default community. Fixes #2317 (#2328)

* Don't create or initially follow a default community. Fixes #2317

* Fix unit tests.

diff --git a/api_tests/src/comment.spec.ts b/api_tests/src/comment.spec.ts
index 6de268542f3ae4089df99de4bbb6327eef781743..be58ff000fd01089d197ac9f22cda3332d6b4ce5 100644 (file)
--- a/api_tests/src/comment.spec.ts
+++ b/api_tests/src/comment.spec.ts
@@ -290,7 +290,8 @@ test('Comment Search', async () => {
 
 test('A and G subscribe to B (center) A posts, G mentions B, it gets announced to A', async () => {
   // Create a local post
-  let alphaPost = await createPost(alpha, 2);
+  let alphaCommunity = await createCommunity(alpha, "main");
+  let alphaPost = await createPost(alpha, alphaCommunity.community_view.community.id);
   expect(alphaPost.post_view.community.local).toBe(true);
 
   // Make sure gamma sees it

diff --git a/api_tests/src/follow.spec.ts b/api_tests/src/follow.spec.ts
index 0515aff44cdeeb68d96673e7b98a83799106c25e..b5588572fd7f85ef70d0176b28f8c8d29f97ca65 100644 (file)
--- a/api_tests/src/follow.spec.ts
+++ b/api_tests/src/follow.spec.ts
@@ -7,6 +7,7 @@ import {
   followCommunity,
   unfollowRemotes,
   getSite,
+  delay,
 } from './shared';
 
 beforeAll(async () => {
@@ -25,6 +26,9 @@ test('Follow federated community', async () => {
     betaCommunity.community.id
   );
 
+  // Wait for it to accept on the alpha side ( follows are async )
+  await delay();
+
   // Make sure the follow response went through
   expect(follow.community_view.community.local).toBe(false);
   expect(follow.community_view.community.name).toBe('main');
@@ -36,6 +40,7 @@ test('Follow federated community', async () => {
     c => c.community.local == false
   ).community.id;
   expect(remoteCommunityId).toBeDefined();
+  expect(site.my_user.follows.length).toBe(1);
 
   // Test an unfollow
   let unfollow = await followCommunity(alpha, false, remoteCommunityId);
@@ -43,5 +48,5 @@ test('Follow federated community', async () => {
 
   // Make sure you are unsubbed locally
   let siteUnfollowCheck = await getSite(alpha);
-  expect(siteUnfollowCheck.my_user.follows.length).toBeGreaterThanOrEqual(1);
+  expect(siteUnfollowCheck.my_user.follows.length).toBe(0);
 });

diff --git a/api_tests/src/shared.ts b/api_tests/src/shared.ts
index 7080485e748d43bf06e0cdc1f25ff0dccbf3ee80..32179eeb2919274bc3734f3b0a0486dd81f118e5 100644 (file)
--- a/api_tests/src/shared.ts
+++ b/api_tests/src/shared.ts
@@ -139,6 +139,10 @@ export async function setupLogins() {
   await gamma.client.editSite({ require_application: false, auth: gamma.auth});
   await delta.client.editSite({ require_application: false, auth: delta.auth});
   await epsilon.client.editSite({ require_application: false, auth: epsilon.auth});
+
+  // Create the main beta community, follow it
+  await createCommunity(beta, "main");
+  await followBeta(beta);
 }
 
 export async function createPost(

diff --git a/crates/api_crud/src/user/create.rs b/crates/api_crud/src/user/create.rs
index 44e5b88204d1f477a9cac6d46503645d742bd232..ee26509b1a3506c349ff8611aaa0d18fa08efb40 100644 (file)
--- a/crates/api_crud/src/user/create.rs
+++ b/crates/api_crud/src/user/create.rs
@@ -6,7 +6,6 @@ use lemmy_api_common::{
   utils::{blocking, honeypot_check, password_length_check, send_verification_email},
 };
 use lemmy_apub::{
-  generate_followers_url,
   generate_inbox_url,
   generate_local_apub_endpoint,
   generate_shared_inbox_url,
@@ -14,22 +13,13 @@ use lemmy_apub::{
 };
 use lemmy_db_schema::{
   aggregates::structs::PersonAggregates,
-  newtypes::CommunityId,
   source::{
-    community::{
-      Community,
-      CommunityFollower,
-      CommunityFollowerForm,
-      CommunityForm,
-      CommunityModerator,
-      CommunityModeratorForm,
-    },
     local_user::{LocalUser, LocalUserForm},
     person::{Person, PersonForm},
     registration_application::{RegistrationApplication, RegistrationApplicationForm},
     site::Site,
   },
-  traits::{Crud, Followable, Joinable},
+  traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_db_views_actor::structs::PersonViewSafe;
@@ -192,67 +182,6 @@ impl PerformCrud for Register {
       .await??;
     }
 
-    let main_community_keypair = generate_actor_keypair()?;
-
-    // Create the main community if it doesn't exist
-    let protocol_and_hostname = context.settings().get_protocol_and_hostname();
-    let main_community = match blocking(context.pool(), move |conn| {
-      Community::read(conn, CommunityId(2))
-    })
-    .await?
-    {
-      Ok(c) => c,
-      Err(_e) => {
-        let default_community_name = "main";
-        let actor_id = generate_local_apub_endpoint(
-          EndpointType::Community,
-          default_community_name,
-          &protocol_and_hostname,
-        )?;
-        let community_form = CommunityForm {
-          name: default_community_name.to_string(),
-          title: "The Default Community".to_string(),
-          description: Some("The Default Community".to_string()),
-          actor_id: Some(actor_id.to_owned()),
-          private_key: Some(Some(main_community_keypair.private_key)),
-          public_key: main_community_keypair.public_key,
-          followers_url: Some(generate_followers_url(&actor_id)?),
-          inbox_url: Some(generate_inbox_url(&actor_id)?),
-          shared_inbox_url: Some(Some(generate_shared_inbox_url(&actor_id)?)),
-          ..CommunityForm::default()
-        };
-        blocking(context.pool(), move |conn| {
-          Community::create(conn, &community_form)
-        })
-        .await??
-      }
-    };
-
-    // Sign them up for main community no matter what
-    let community_follower_form = CommunityFollowerForm {
-      community_id: main_community.id,
-      person_id: inserted_person.id,
-      pending: false,
-    };
-
-    let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);
-    blocking(context.pool(), follow)
-      .await?
-      .map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
-
-    // If its an admin, add them as a mod and follower to main
-    if no_admins {
-      let community_moderator_form = CommunityModeratorForm {
-        community_id: main_community.id,
-        person_id: inserted_person.id,
-      };
-
-      let join = move |conn: &'_ _| CommunityModerator::join(conn, &community_moderator_form);
-      blocking(context.pool(), join)
-        .await?
-        .map_err(|e| LemmyError::from_error_message(e, "community_moderator_already_exists"))?;
-    }
-
     let mut login_response = LoginResponse {
       jwt: None,
       registration_created: false,