Compare commits

..

No commits in common. "04368c782d9255a4c1bcd6fa3fb58a6d4af61591" and "aa8090eebb12c967b2e2d6d2e87eefeb982b9527" have entirely different histories.

6 changed files with 19 additions and 16 deletions

View file

@ -15,7 +15,7 @@ the [official pipx docs](https://pypa.github.io/pipx/installation/) for more in-
Now simply install ActivityRelay directly from git
pipx install git+https://git.pleroma.social/pleroma/relay@0.2.4
pipx install git+https://git.pleroma.social/pleroma/relay@0.2.3
Or from a cloned git repo.
@ -39,7 +39,7 @@ be installed via [pyenv](https://github.com/pyenv/pyenv).
The instructions for installation via pip are very similar to pipx. Installation can be done from
git
python3 -m pip install git+https://git.pleroma.social/pleroma/relay@0.2.4
python3 -m pip install git+https://git.pleroma.social/pleroma/relay@0.2.3
or a cloned git repo.

View file

@ -1,3 +1,3 @@
__version__ = '0.2.4'
__version__ = '0.2.3'
from . import logger

View file

@ -4,7 +4,6 @@ import os
import queue
import signal
import threading
import traceback
from aiohttp import web
from datetime import datetime, timedelta
@ -176,10 +175,6 @@ class PushWorker(threading.Thread):
except queue.Empty:
pass
## make sure an exception doesn't bring down the worker
except Exception:
traceback.print_exc()
await self.client.close()

View file

@ -98,6 +98,12 @@ class RelayConfig(DotDict):
'whitelist': []
})
if self.is_docker:
self.update({
'db': Path('/data/relay.jsonld'),
'listen': '127.0.0.1'
})
def ban_instance(self, instance):
if instance.startswith('http'):

View file

@ -1,5 +1 @@
aiohttp>=3.8.0
aputils@https://git.barkshark.xyz/barkshark/aputils/archive/0.1.3.tar.gz
cachetools>=5.2.0
click>=8.1.2
pyyaml>=6.0
.

View file

@ -1,6 +1,6 @@
[metadata]
name = relay
version = attr: relay.__version__
version = 0.2.3
description = Generic LitePub relay (works with all LitePub consumers and Mastodon)
long_description = file: README.md
long_description_content_type = text/markdown; charset=UTF-8
@ -22,8 +22,14 @@ project_urls =
[options]
zip_safe = False
packages = find:
install_requires = file: requirements.txt
python_requires = >=3.7
install_requires =
aiohttp >= 3.8.0
cachetools >= 5.0.0
click >= 8.1.2
pycryptodome >= 3.14.1
PyYAML >= 5.0.0
aputils @ git+https://git.barkshark.xyz/barkshark/aputils@2cd1776f12
python_requires = >=3.6
[options.extras_require]
dev =