From 509005fa0c702d4909440a92cb4cf744dff72a97 Mon Sep 17 00:00:00 2001
From: Felix <me@nutomic.com>
Date: Fri, 10 Apr 2020 13:37:35 +0200
Subject: [PATCH] Rename federation-test to federation, puller.rs to fetcher.rs

---
 .gitignore                                                    | 2 +-
 docker/{federation-test => federation}/Dockerfile             | 0
 docker/{federation-test => federation}/docker-compose.yml     | 4 ++--
 docker/{federation-test => federation}/nginx.conf             | 0
 .../{federation-test => federation}/run-federation-test.bash  | 2 +-
 server/src/apub/community.rs                                  | 2 +-
 server/src/apub/{puller.rs => fetcher.rs}                     | 0
 server/src/apub/mod.rs                                        | 2 +-
 server/src/apub/post.rs                                       | 2 +-
 server/src/main.rs                                            | 2 +-
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename docker/{federation-test => federation}/Dockerfile (100%)
 rename docker/{federation-test => federation}/docker-compose.yml (96%)
 rename docker/{federation-test => federation}/nginx.conf (100%)
 rename docker/{federation-test => federation}/run-federation-test.bash (67%)
 rename server/src/apub/{puller.rs => fetcher.rs} (100%)

diff --git a/.gitignore b/.gitignore
index 5e221b038..5e9fd40d6 100644
--- a/.gitignore
+++ b/.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
diff --git a/docker/federation-test/Dockerfile b/docker/federation/Dockerfile
similarity index 100%
rename from docker/federation-test/Dockerfile
rename to docker/federation/Dockerfile
diff --git a/docker/federation-test/docker-compose.yml b/docker/federation/docker-compose.yml
similarity index 96%
rename from docker/federation-test/docker-compose.yml
rename to docker/federation/docker-compose.yml
index 91f167c46..f251a4f97 100644
--- a/docker/federation-test/docker-compose.yml
+++ b/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
diff --git a/docker/federation-test/nginx.conf b/docker/federation/nginx.conf
similarity index 100%
rename from docker/federation-test/nginx.conf
rename to docker/federation/nginx.conf
diff --git a/docker/federation-test/run-federation-test.bash b/docker/federation/run-federation-test.bash
similarity index 67%
rename from docker/federation-test/run-federation-test.bash
rename to docker/federation/run-federation-test.bash
index b9f150a07..7cf26206f 100755
--- a/docker/federation-test/run-federation-test.bash
+++ b/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
\ No newline at end of file
diff --git a/server/src/apub/community.rs b/server/src/apub/community.rs
index 444ee4403..59c9329b4 100644
--- a/server/src/apub/community.rs
+++ b/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;
diff --git a/server/src/apub/puller.rs b/server/src/apub/fetcher.rs
similarity index 100%
rename from server/src/apub/puller.rs
rename to server/src/apub/fetcher.rs
diff --git a/server/src/apub/mod.rs b/server/src/apub/mod.rs
index eb3097c7a..371835076 100644
--- a/server/src/apub/mod.rs
+++ b/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};
diff --git a/server/src/apub/post.rs b/server/src/apub/post.rs
index 8458e8c91..48c8b2db2 100644
--- a/server/src/apub/post.rs
+++ b/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;
diff --git a/server/src/main.rs b/server/src/main.rs
index c1bec7e02..9f78d43e2 100644
--- a/server/src/main.rs
+++ b/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;