From 769ea93f8fb002ba04002d5f88c6d14bad2ed01b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 6 Jun 2023 22:11:46 +0200
Subject: [PATCH] Continued: - renamed package 'network' -> 'federation'

---
 fba/__init__.py                         | 2 +-
 fba/blacklist.py                        | 2 +-
 fba/commands.py                         | 2 +-
 fba/fba.py                              | 5 +++--
 fba/{network => federation}/__init__.py | 0
 fba/{network => federation}/lemmy.py    | 0
 fba/{network => federation}/mastodon.py | 0
 fba/{network => federation}/misskey.py  | 0
 fba/{network => federation}/peertube.py | 0
 fba/{network => federation}/pleroma.py  | 0
 10 files changed, 6 insertions(+), 5 deletions(-)
 rename fba/{network => federation}/__init__.py (100%)
 rename fba/{network => federation}/lemmy.py (100%)
 rename fba/{network => federation}/mastodon.py (100%)
 rename fba/{network => federation}/misskey.py (100%)
 rename fba/{network => federation}/peertube.py (100%)
 rename fba/{network => federation}/pleroma.py (100%)

diff --git a/fba/__init__.py b/fba/__init__.py
index 9844f11..48c3116 100644
--- a/fba/__init__.py
+++ b/fba/__init__.py
@@ -5,7 +5,7 @@ __all__ = [
     'cache',
     'commands',
     'config',
+    'federation',
     'fba',
     'instances',
-    'network',
 ]
diff --git a/fba/blacklist.py b/fba/blacklist.py
index e208840..d78cde8 100644
--- a/fba/blacklist.py
+++ b/fba/blacklist.py
@@ -16,7 +16,7 @@
 
 # Don't check these, known trolls/flooders/testing/developing
 blacklist = [
-    # Floods network with fake nodes as "research" project
+    # Floods federation with fake nodes as "research" project
     "activitypub-troll.cf",
     # Similar troll
     "gab.best",
diff --git a/fba/commands.py b/fba/commands.py
index 84ae5ed..9fbda99 100644
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -31,7 +31,7 @@ from fba import blocks
 from fba import boot
 from fba import config
 from fba import fba
-from fba.network import *
+from fba.federation import *
 
 def check_instance(args: argparse.Namespace) -> int:
     # DEBUG: print(f"DEBUG: args.domain='{args.domain}' - CALLED!")
diff --git a/fba/fba.py b/fba/fba.py
index 53e788c..c376a04 100644
--- a/fba/fba.py
+++ b/fba/fba.py
@@ -32,8 +32,9 @@ from fba import cache
 from fba import config
 from fba import instances
 
-from fba.network import lemmy
-from fba.network import misskey
+from fba.federation import lemmy
+from fba.federation import misskey
+from fba.federation import peertube
 
 # Array with pending errors needed to be written to database
 pending_errors = {
diff --git a/fba/network/__init__.py b/fba/federation/__init__.py
similarity index 100%
rename from fba/network/__init__.py
rename to fba/federation/__init__.py
diff --git a/fba/network/lemmy.py b/fba/federation/lemmy.py
similarity index 100%
rename from fba/network/lemmy.py
rename to fba/federation/lemmy.py
diff --git a/fba/network/mastodon.py b/fba/federation/mastodon.py
similarity index 100%
rename from fba/network/mastodon.py
rename to fba/federation/mastodon.py
diff --git a/fba/network/misskey.py b/fba/federation/misskey.py
similarity index 100%
rename from fba/network/misskey.py
rename to fba/federation/misskey.py
diff --git a/fba/network/peertube.py b/fba/federation/peertube.py
similarity index 100%
rename from fba/network/peertube.py
rename to fba/federation/peertube.py
diff --git a/fba/network/pleroma.py b/fba/federation/pleroma.py
similarity index 100%
rename from fba/network/pleroma.py
rename to fba/federation/pleroma.py
-- 
2.39.5