From c0ac309c7ca70790fba3715cdb61e75570c5950d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 21 Jun 2023 04:21:45 +0200 Subject: [PATCH] Continued: - moved fba.federation|network to package fba.http --- api.py | 3 ++- fba/__init__.py | 3 +-- fba/commands.py | 5 +++-- fba/csrf.py | 3 ++- fba/fba.py | 6 +++--- fba/http/__init__.py | 19 +++++++++++++++++++ fba/{ => http}/federation.py | 3 ++- fba/{ => http}/network.py | 0 fba/models/instances.py | 5 +++-- fba/networks/friendica.py | 4 ++-- fba/networks/lemmy.py | 5 +++-- fba/networks/mastodon.py | 3 ++- fba/networks/misskey.py | 3 ++- fba/networks/peertube.py | 3 ++- fba/networks/pleroma.py | 5 +++-- 15 files changed, 49 insertions(+), 21 deletions(-) create mode 100644 fba/http/__init__.py rename fba/{ => http}/federation.py (99%) rename fba/{ => http}/network.py (100%) diff --git a/api.py b/api.py index 41580f3..ff0fa99 100644 --- a/api.py +++ b/api.py @@ -30,11 +30,12 @@ import requests import validators from fba import fba -from fba import network from fba.helpers import config from fba.helpers import tidyup +from fba.http import network + router = fastapi.FastAPI(docs_url=config.get("base_url") + "/docs", redoc_url=config.get("base_url") + "/redoc") templates = Jinja2Templates(directory="templates") diff --git a/fba/__init__.py b/fba/__init__.py index e5e1748..e716e10 100644 --- a/fba/__init__.py +++ b/fba/__init__.py @@ -18,11 +18,10 @@ __all__ = [ 'boot', 'commands', 'csrf', - 'federation', 'fba', - 'network', # Sub packages: 'helpers', + 'http', 'models', 'networks', ] diff --git a/fba/commands.py b/fba/commands.py index 24d4840..277a1b7 100644 --- a/fba/commands.py +++ b/fba/commands.py @@ -26,9 +26,7 @@ import markdown import reqto import validators -from fba import federation from fba import fba -from fba import network from fba.helpers import blacklist from fba.helpers import config @@ -36,6 +34,9 @@ from fba.helpers import cookies from fba.helpers import locking from fba.helpers import tidyup +from fba.http import federation +from fba.http import network + from fba.models import blocks from fba.models import instances diff --git a/fba/csrf.py b/fba/csrf.py index 8cd8c5e..5158ca5 100644 --- a/fba/csrf.py +++ b/fba/csrf.py @@ -18,11 +18,12 @@ import bs4 import reqto import validators -from fba import network from fba.helpers import config from fba.helpers import cookies +from fba.http import network + def determine(domain: str, headers: dict) -> dict: # DEBUG: print(f"DEBUG: domain='{domain}',headers()={len(headers)} - CALLED!") if not isinstance(domain, str): diff --git a/fba/fba.py b/fba/fba.py index 368de88..e945ffd 100644 --- a/fba/fba.py +++ b/fba/fba.py @@ -21,12 +21,12 @@ from urllib.parse import urlparse import requests import validators -from fba import federation -from fba import network - from fba.helpers import blacklist from fba.helpers import cookies +from fba.http import federation +from fba.http import network + from fba.models import instances # Connect to database diff --git a/fba/http/__init__.py b/fba/http/__init__.py new file mode 100644 index 0000000..5d1da3a --- /dev/null +++ b/fba/http/__init__.py @@ -0,0 +1,19 @@ +# Copyright (C) 2023 Free Software Foundation +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +__all__ = [ + 'federation', + 'network', +] diff --git a/fba/federation.py b/fba/http/federation.py similarity index 99% rename from fba/federation.py rename to fba/http/federation.py index b41e651..054fc3f 100644 --- a/fba/federation.py +++ b/fba/http/federation.py @@ -19,13 +19,14 @@ import bs4 import validators from fba import csrf -from fba import network from fba.helpers import blacklist from fba.helpers import config from fba.helpers import tidyup from fba.helpers import version +from fba.http import network + from fba.models import instances from fba.networks import lemmy diff --git a/fba/network.py b/fba/http/network.py similarity index 100% rename from fba/network.py rename to fba/http/network.py diff --git a/fba/models/instances.py b/fba/models/instances.py index ecb5454..571475f 100644 --- a/fba/models/instances.py +++ b/fba/models/instances.py @@ -21,13 +21,14 @@ import requests import validators from fba import fba -from fba import federation -from fba import network from fba.helpers import blacklist from fba.helpers import cache from fba.helpers import config +from fba.http import federation +from fba.http import network + from fba.models import error_log # Found info from node, such as nodeinfo URL, detection mode that needs to be diff --git a/fba/networks/friendica.py b/fba/networks/friendica.py index 1ebd0a0..20814a6 100644 --- a/fba/networks/friendica.py +++ b/fba/networks/friendica.py @@ -17,12 +17,12 @@ import bs4 import validators -from fba import network - from fba.helpers import blacklist from fba.helpers import config from fba.helpers import tidyup +from fba.http import network + from fba.models import instances def fetch_blocks(domain: str) -> dict: diff --git a/fba/networks/lemmy.py b/fba/networks/lemmy.py index cf44f42..7dd8f1d 100644 --- a/fba/networks/lemmy.py +++ b/fba/networks/lemmy.py @@ -21,13 +21,14 @@ import validators from fba import csrf from fba import fba -from fba import federation -from fba import network from fba.helpers import blacklist from fba.helpers import config from fba.helpers import tidyup +from fba.http import federation +from fba.http import network + from fba.models import blocks from fba.models import instances diff --git a/fba/networks/mastodon.py b/fba/networks/mastodon.py index 29718a0..a440c04 100644 --- a/fba/networks/mastodon.py +++ b/fba/networks/mastodon.py @@ -21,12 +21,13 @@ import validators from fba import csrf from fba import fba -from fba import network from fba.helpers import blacklist from fba.helpers import config from fba.helpers import tidyup +from fba.http import network + from fba.models import blocks from fba.models import instances diff --git a/fba/networks/misskey.py b/fba/networks/misskey.py index ff5da39..47a3de0 100644 --- a/fba/networks/misskey.py +++ b/fba/networks/misskey.py @@ -17,13 +17,14 @@ import json from fba import csrf -from fba import network from fba.helpers import blacklist from fba.helpers import config from fba.helpers import dicts from fba.helpers import tidyup +from fba.http import network + from fba.models import instances def fetch_peers(domain: str) -> list: diff --git a/fba/networks/peertube.py b/fba/networks/peertube.py index 13672ea..b9764c5 100644 --- a/fba/networks/peertube.py +++ b/fba/networks/peertube.py @@ -15,10 +15,11 @@ # along with this program. If not, see . from fba import csrf -from fba import network from fba.helpers import config +from fba.http import network + from fba.models import instances def fetch_peers(domain: str) -> list: diff --git a/fba/networks/pleroma.py b/fba/networks/pleroma.py index f82575e..9d6dab0 100644 --- a/fba/networks/pleroma.py +++ b/fba/networks/pleroma.py @@ -20,13 +20,14 @@ import bs4 import validators from fba import fba -from fba import federation -from fba import network from fba.helpers import blacklist from fba.helpers import config from fba.helpers import tidyup +from fba.http import federation +from fba.http import network + from fba.models import blocks from fba.models import instances -- 2.39.5