✨ remove Matrix homeserver from service list

asozialesnetzwerk · Jan 31, 2024 · 33b1552 · 33b1552
1 parent d22a926
commit 33b1552
Show file tree

Hide file tree

Showing 13 changed files with 157 additions and 139 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -99,7 +99,7 @@ jobs:
       # - name: Start Elasticsearch
       #   uses: elastic/elastic-github-actions/elasticsearch@2c3ec0418fabc996180995c47b86a65b581f1561
       #   with:
-      #     stack-version: 8.11.3
+      #     stack-version: 8.12.0
       #     security-enabled: false
       #     nodes: 3
       #     license: ${{ matrix.license }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -108,7 +108,7 @@ jobs:
       # - name: Start Elasticsearch
       #   uses: elastic/elastic-github-actions/elasticsearch@2c3ec0418fabc996180995c47b86a65b581f1561
       #   with:
-      #     stack-version: 8.11.3
+      #     stack-version: 8.12.0
       #     security-enabled: false
       #     nodes: 3
       #     license: ${{ matrix.license }}

diff --git a/Pipfile b/Pipfile
@@ -9,7 +9,7 @@ beautifulsoup4 = "==4.*"
 # big = {version = "<2", extras = ["time"]}
 blake3 = "<2"
 certifi = "==2023.*"
-# cryptography = "==40.*"
+# cryptography = "==42.*"
 defity = "<2"
 defusedxml = "<2"
 dill = "<2"
@@ -55,7 +55,7 @@ bandit = {version = "==1.*", extras = ["toml"]}
 black = "==23.*"
 build = "<2"
 coverage = "==7.*"
-cryptography = "==40.*"
+cryptography = "==42.*"
 dulwich = "<2"
 Faker = "==22.*"
 flake8 = "==6.*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ You need:
 - Supervisord
 - Redis 6.2
 - redis-cell (for ratelimits)
-- Elasticsearch 8.11+
+- Elasticsearch 8.12+
 - UwUFetch
 
 How:

diff --git a/an_website/__main__.py b/an_website/__main__.py
@@ -22,6 +22,8 @@
 import tracemalloc
 import warnings
 
+from dill._dill import PickleWarning  # type: ignore[import-untyped]
+
 if sys.flags.dev_mode and not (
     "PYTHONWARNINGS" in os.environ or " -W" in " ".join(sys.orig_argv)
 ):
@@ -31,6 +33,7 @@
     warnings.simplefilter("error", DeprecationWarning)
 warnings.filterwarnings("ignore", module="defusedxml")
 warnings.filterwarnings("ignore", module="dill._dill", category=EncodingWarning)
+warnings.simplefilter("ignore", PickleWarning)
 
 try:
     # fmt: off

diff --git a/an_website/backdoor/client.py b/an_website/backdoor/client.py
@@ -619,7 +619,8 @@ def send_to_remote(code: str, *, mode: str) -> Any:
             "    pydoc.Helper(io.StringIO(), helper_output)(*args, **kwargs)\n"
             "    return 'PagerTuple', helper_output.getvalue()\n"
            f"  __str__ = __repr__ = lambda _:{repr(help)!r}\n"  # noqa: E131
-            "help = _HelpHelper_92005ecf3788faea8346a7919fba0232188561ab()\n",
+            "help = _HelpHelper_92005ecf3788faea8346a7919fba0232188561ab()\n"
+            "del _HelpHelper_92005ecf3788faea8346a7919fba0232188561ab",
             # fmt: on
             mode="exec",
         )

diff --git a/an_website/services/services.py b/an_website/services/services.py
@@ -79,22 +79,22 @@ class Service:
             "Installations-Guide": "https://syncplay.pl/guide/install",
         },
     ),
-    Service(
-        "Matrix-Heimserver",
-        (
-            "Der Matrix-Heimserver des Asozialen Netzwerks ist zuverlässig und"
-            " nutzt im Gegensatz zu den meisten anderen Servern Dendrite"
-            " anstatt Synapse. Die Erstellung eines Accounts ist 100% kostenlos"
-            " und ohne E-Mail-Adresse oder Telefonnummer möglich."
-        ),
-        {
-            "Domain": "asozial.org",
-            "Matrix-Client": "https://chat.asozial.org",
-        },
-    ),
+    # Service(
+    #     "Matrix-Heimserver",
+    #     (
+    #         "Der Matrix-Heimserver des Asozialen Netzwerks ist zuverlässig und"
+    #         " nutzt im Gegensatz zu den meisten anderen Servern Dendrite"
+    #         " anstatt Synapse. Die Erstellung eines Accounts ist 100% kostenlos"
+    #         " und ohne E-Mail-Adresse oder Telefonnummer möglich."
+    #     ),
+    #     {
+    #         "Domain": "asozial.org",
+    #         "Matrix-Client": "https://chat.asozial.org",
+    #     },
+    # ),
     Service(
         "XMPP-Server",
-        "Das Asoziale Netzwerk hat auch einen XMPP-Server.",
+        "Das Asoziale Netzwerk hat einen XMPP-Server.",
         {
             "Domain": "asozial.org",
             "Software": "ejabberd",

diff --git a/deno.json b/deno.json
@@ -26,7 +26,7 @@
   "imports": {
     "std/": "https://deno.land/[email protected]/",
     "dax": "https://deno.land/x/[email protected]/mod.ts",
-    "esbuild/": "https://deno.land/x/[email protected].11/"
+    "esbuild/": "https://deno.land/x/[email protected].12/"
   },
   "nodeModulesDir": false,
   "lint": {

diff --git a/deno.lock b/deno.lock
diff --git a/pip-constraints.txt b/pip-constraints.txt
@@ -11,13 +11,13 @@ cfgv==3.4.0
 charset-normalizer==3.3.2
 click==8.1.7
 coverage==7.4.0
-cryptography==40.0.2
+cryptography==42.0.0
 dill==0.3.7
 distlib==0.3.8
 docutils==0.20.1
 dulwich==0.21.7
 exceptiongroup==1.2.0
-faker==20.1.0
+faker==22.5.0
 filelock==3.13.1
 flake8==6.1.0
 flake8-bugbear==23.12.2
@@ -51,7 +51,7 @@ packaging==23.2
 pathspec==0.12.1
 pbr==6.0.0
 pep8-naming==0.13.3
-pipenv==2023.11.15
+pipenv==2023.11.17
 pkginfo==1.9.6
 platformdirs==4.1.0
 pluggy==1.3.0
@@ -101,7 +101,7 @@ types-python-dateutil==2.8.19.20240106
 types-pyyaml==6.0.12.12
 types-redis==4.6.0.20240106
 types-regex==2023.12.25.20240106
-types-setuptools==69.0.0.20240106
+types-setuptools==69.0.0.20240115
 typing-extensions==4.9.0
 urllib3==2.1.0
 virtualenv==20.25.0
@@ -113,7 +113,7 @@ aiohttp==3.9.1
 aiosignal==1.3.1
 ansi2html==1.9.1
 async-timeout==4.0.3
-beautifulsoup4==4.12.2
+beautifulsoup4==4.12.3
 blake3==0.3.4
 brotli==1.1.0
 defity==0.3.1
@@ -122,9 +122,9 @@ dunamai==1.19.0
 ecs-logging==2.1.0
 elastic-apm==6.20.0
 elastic-enterprise-search==8.11.0
-elastic-transport==8.11.0
-elasticsearch==8.11.1
-emoji==2.9.0
+elastic-transport==8.12.0
+elasticsearch==8.12.0
+emoji==2.10.0
 frozenlist==1.4.1
 funcparserlib==1.0.1
 get-version==3.5.5
@@ -137,7 +137,7 @@ jsonpickle==3.0.2
 lxml==5.1.0
 multidict==6.0.4
 openmoji-dist==15.0.0.1
-orjson==3.9.10
+orjson==3.9.12
 pillow==10.2.0
 pillow-jxl-plugin==1.0.2
 pycares==4.4.0

diff --git a/pip-dev-requirements.txt b/pip-dev-requirements.txt
@@ -11,13 +11,13 @@ cfgv==3.4.0; python_version >= '3.8'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
 click==8.1.7; python_version >= '3.7'
 coverage[toml]==7.4.0; python_version >= '3.8'
-cryptography==40.0.2; python_version >= '3.6'
+cryptography==42.0.0; python_version >= '3.7'
 dill==0.3.7; python_version >= '3.7'
 distlib==0.3.8
 docutils==0.20.1; python_version >= '3.7'
 dulwich==0.21.7; python_version >= '3.7'
 exceptiongroup==1.2.0; python_version < '3.11'
-faker==20.1.0; python_version >= '3.8'
+faker==22.5.0; python_version >= '3.8'
 filelock==3.13.1; python_version >= '3.8'
 flake8==6.1.0; python_full_version >= '3.8.1'
 flake8-bugbear==23.12.2; python_full_version >= '3.8.1'
@@ -51,7 +51,7 @@ packaging==23.2; python_version >= '3.7'
 pathspec==0.12.1; python_version >= '3.8'
 pbr==6.0.0; python_version >= '2.6'
 pep8-naming==0.13.3; python_version >= '3.7'
-pipenv==2023.11.15; python_version >= '3.8'
+pipenv==2023.11.17; python_version >= '3.8'
 pkginfo==1.9.6; python_version >= '3.6'
 platformdirs==4.1.0; python_version >= '3.8'
 pluggy==1.3.0; python_version >= '3.8'
@@ -101,8 +101,8 @@ types-python-dateutil==2.8.19.20240106; python_version >= '3.8'
 types-pyyaml==6.0.12.12
 types-redis==4.6.0.20240106; python_version >= '3.8'
 types-regex==2023.12.25.20240106; python_version >= '3.8'
-types-setuptools==69.0.0.20240106; python_version >= '3.8'
-typing-extensions==4.9.0; python_version < '3.12'
+types-setuptools==69.0.0.20240115; python_version >= '3.8'
+typing-extensions==4.9.0; python_version >= '3.8'
 urllib3==2.1.0; python_version >= '3.8'
 virtualenv==20.25.0; python_version >= '3.7'
 webencodings==0.5.1
@@ -113,7 +113,7 @@ aiohttp[speedups]==3.9.1; python_version >= '3.8'
 aiosignal==1.3.1; python_version >= '3.7'
 ansi2html==1.9.1; python_version >= '3.7'
 async-timeout==4.0.3; python_full_version <= '3.11.2'
-beautifulsoup4==4.12.2; python_full_version >= '3.6.0'
+beautifulsoup4==4.12.3; python_full_version >= '3.6.0'
 blake3==0.3.4
 brotli==1.1.0
 defity==0.3.1; python_version >= '3.7'
@@ -122,9 +122,9 @@ dunamai==1.19.0; python_version >= '3.5' and python_version < '4.0'
 ecs-logging==2.1.0; python_version >= '3.6'
 elastic-apm==6.20.0; python_version >= '3.6' and python_version < '4'
 elastic-enterprise-search==8.11.0; python_version >= '3.6'
-elastic-transport==8.11.0; python_version >= '3.7'
-elasticsearch[async]==8.11.1; python_version >= '3.6'
-emoji==2.9.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+elastic-transport==8.12.0; python_version >= '3.7'
+elasticsearch[async]==8.12.0; python_version >= '3.7'
+emoji==2.10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 frozenlist==1.4.1; python_version >= '3.8'
 funcparserlib==1.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6' and python_version < '3.13'
 get-version==3.5.5; python_version >= '3.9'
@@ -137,7 +137,7 @@ jsonpickle==3.0.2; python_version >= '3.7'
 lxml==5.1.0; python_version >= '3.6'
 multidict==6.0.4; python_version >= '3.7'
 openmoji-dist==15.0.0.1
-orjson==3.9.10; python_version >= '3.8'
+orjson==3.9.12; python_version >= '3.8'
 pillow==10.2.0; python_version >= '3.8'
 pillow-jxl-plugin==1.0.2; python_version >= '3.8'
 pycares==4.4.0; python_version >= '3.8'

diff --git a/pip-requirements.txt b/pip-requirements.txt
@@ -5,7 +5,7 @@ aiosignal==1.3.1; python_version >= '3.7'
 ansi2html==1.9.1; python_version >= '3.7'
 async-timeout==4.0.3; python_full_version <= '3.11.2'
 attrs==23.2.0; python_version >= '3.7'
-beautifulsoup4==4.12.2; python_full_version >= '3.6.0'
+beautifulsoup4==4.12.3; python_full_version >= '3.6.0'
 blake3==0.3.4
 brotli==1.1.0
 certifi==2023.11.17; python_version >= '3.6'
@@ -17,9 +17,9 @@ dunamai==1.19.0; python_version >= '3.5' and python_version < '4.0'
 ecs-logging==2.1.0; python_version >= '3.6'
 elastic-apm==6.20.0; python_version >= '3.6' and python_version < '4'
 elastic-enterprise-search==8.11.0; python_version >= '3.6'
-elastic-transport==8.11.0; python_version >= '3.7'
-elasticsearch[async]==8.11.1; python_version >= '3.6'
-emoji==2.9.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
+elastic-transport==8.12.0; python_version >= '3.7'
+elasticsearch[async]==8.12.0; python_version >= '3.7'
+emoji==2.10.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 frozenlist==1.4.1; python_version >= '3.8'
 funcparserlib==1.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6' and python_version < '3.13'
 get-version==3.5.5; python_version >= '3.9'
@@ -33,7 +33,7 @@ jsonpickle==3.0.2; python_version >= '3.7'
 lxml==5.1.0; python_version >= '3.6'
 multidict==6.0.4; python_version >= '3.7'
 openmoji-dist==15.0.0.1
-orjson==3.9.10; python_version >= '3.8'
+orjson==3.9.12; python_version >= '3.8'
 packaging==23.2; python_version >= '3.7'
 pillow==10.2.0; python_version >= '3.8'
 pillow-jxl-plugin==1.0.2; python_version >= '3.8'
@@ -58,7 +58,6 @@ six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3
 soupsieve==2.5; python_version >= '3.8'
 tornado==6.4; python_version >= '3.8'
 typed-stream==0.69.0; python_version >= '3.10'
-typing-extensions==4.9.0; python_version < '3.12'
 tzdata==2023.4; python_version >= '2'
 ultradict==0.0.6; python_version >= '3.8'
 urllib3==2.1.0; python_version >= '3.8'