Rename federation-test to federation, puller.rs to fetcher.rs

.gitignore

@@ -6,7 +6,7 @@ ansible/passwords/
 # docker build files
 docker/lemmy_mine.hjson
 docker/dev/env_deploy.sh
-docker/federation-test/volumes
+docker/federation/volumes
 docker/dev/volumes
 
 # local build files

docker/federation/docker-compose.yml

@@ -17,7 +17,7 @@ services:
     restart: "always"
 
   lemmy_alpha:
-    image: lemmy-federation-test:latest
+    image: lemmy-federation:latest
     environment:
       - LEMMY_HOSTNAME=lemmy_alpha:8540
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_alpha:5432/lemmy
@@ -47,7 +47,7 @@ services:
     restart: always
 
   lemmy_beta:
-    image: lemmy-federation-test:latest
+    image: lemmy-federation:latest
     environment:
       - LEMMY_HOSTNAME=lemmy_beta:8550
       - LEMMY_DATABASE_URL=postgres://lemmy:password@postgres_beta:5432/lemmy

docker/federation/run-federation-test.bash

@@ -9,6 +9,6 @@ pushd ../../server/ || exit
 cargo build
 popd || exit
 
-sudo docker build ../../ -f Dockerfile -t lemmy-federation-test:latest
+sudo docker build ../../ -f Dockerfile -t lemmy-federation:latest
 
 sudo docker-compose up

server/src/apub/community.rs

@@ -1,4 +1,4 @@
-use crate::apub::puller::{fetch_remote_object, fetch_remote_user};
+use crate::apub::fetcher::{fetch_remote_object, fetch_remote_user};
 use crate::apub::*;
 use crate::db::community::{Community, CommunityForm};
 use crate::db::community_view::CommunityFollowerView;

server/src/apub/mod.rs

@@ -1,8 +1,8 @@
 pub mod activities;
 pub mod community;
+pub mod fetcher;
 pub mod inbox;
 pub mod post;
-pub mod puller;
 pub mod user;
 use crate::Settings;
 use openssl::{pkey::PKey, rsa::Rsa};

server/src/apub/post.rs

@@ -1,4 +1,4 @@
-use crate::apub::puller::{fetch_remote_community, fetch_remote_user};
+use crate::apub::fetcher::{fetch_remote_community, fetch_remote_user};
 use crate::apub::{create_apub_response, make_apub_endpoint, EndpointType};
 use crate::convert_datetime;
 use crate::db::community::Community;

server/src/main.rs

@@ -7,7 +7,7 @@ use actix_web::*;
 use diesel::r2d2::{ConnectionManager, Pool};
 use diesel::PgConnection;
 use failure::Error;
-use lemmy_server::apub::puller::fetch_all;
+use lemmy_server::apub::fetcher::fetch_all;
 use lemmy_server::db::code_migrations::run_advanced_migrations;
 use lemmy_server::routes::{api, federation, feeds, index, nodeinfo, webfinger, websocket};
 use lemmy_server::settings::Settings;