Commit graph

368 commits

Author SHA1 Message Date
Izalia Mae d93880d83f Merge branch 'master' of https://git.pleroma.social/pleroma/relay 2022-06-06 08:37:49 -04:00
Izalia Mae 4fc5d692bf exclude git hash if unavailable 2022-06-06 08:37:08 -04:00
Izalia Mae 4847c2bbc0 version bump 2022-06-06 08:29:06 -04:00
Izalia Mae 454f46f04b Merge branch 'master' into 'master'
Bugfixes and documentation clarification

See merge request pleroma/relay!35
2022-05-07 23:12:16 +00:00
Izalia Mae d005ff8f48 add/remove inbox on cli inbox (un)follow 2022-05-06 18:08:55 -04:00
Izalia Mae 1c3b1b39e6 docs: don't assume activityrelay is in PATH 2022-05-06 17:23:44 -04:00
Izalia Mae c24a0ce6d5 fix actor unfollowing and simplify (un)following 2022-05-06 16:10:34 -04:00
Izalia Mae 169c7af822 Merge branch 'fix' into 'master'
fixes

See merge request pleroma/relay!34
2022-05-06 08:27:31 +00:00
Izalia Mae 30a3b92f26 fixes 2022-05-06 04:12:12 -04:00
Izalia Mae 7eac3609a6 Merge branch 'rework' into 'master'
Reorganize codebase

See merge request pleroma/relay!33
2022-05-06 07:04:51 +00:00
Izalia Mae b6494849b5 Reorganize codebase 2022-05-06 07:04:51 +00:00
Izalia Mae 5c5f212d70 Merge branch 'asyncio-3.10' into 'master'
fix DeprecationWarnings on 3.10

See merge request pleroma/relay!32
2021-11-05 19:18:55 +00:00
Joel Beckmeyer 738e0a999f fix DeprecationWarnings on 3.10 2021-10-16 08:58:49 -04:00
Izalia Mae 69947bc60c Merge branch 'packaging' into 'master'
add packaging following best practices

See merge request pleroma/relay!30
2021-10-16 00:42:24 +00:00
Joel Beckmeyer f91afb14f7 update README with new install directions 2021-10-15 20:28:19 -04:00
Haelwenn 0bd0ee49cf Merge branch 'config-arg' into 'master'
add parameter for config location

See merge request pleroma/relay!31
2021-10-15 17:27:13 +00:00
Joel Beckmeyer e1498a8d6e add parameter for config location 2021-10-15 08:24:57 -04:00
Joel Beckmeyer ccaa778a00 add packaging 2021-10-14 16:09:21 -04:00
Izalia Mae e4de3081c0 Merge branch 'masto_actor_fetch' into 'master'
Sign headers when fetching actor

See merge request pleroma/relay!28
2021-09-15 02:17:28 +00:00
Izalia Mae 79276c245c Sign headers when fetching actor 2021-09-15 02:17:27 +00:00
Haelwenn c044dbb694 Merge branch 'html-add-misskey' into 'master'
Add Misskey to landing page

See merge request pleroma/relay!27
2021-08-12 23:05:24 +00:00
Sam Therapy 0456e4ca50 Add Misskey to the list of instances that can subscribe using /inbox 2021-08-12 20:13:10 +00:00
Haelwenn (lanodan) Monnier 26a6d80227
README.md: Requires Python 3.6 2020-12-28 11:36:44 +01:00
Haelwenn 83d56cb570 Merge branch 'block_relays' into 'master'
Block relays

See merge request pleroma/relay!26
2020-12-07 15:38:17 +00:00
Izalia Mae 6cef5d8f38 Apply 1 suggestion(s) to 1 file(s) 2020-12-05 05:35:10 +00:00
Izalia Mae 63be7f2034 Apply 1 suggestion(s) to 1 file(s) 2020-12-05 05:34:58 +00:00
Izalia Mae bc0914b5c1 make software blocklist configurable 2020-12-04 02:34:40 -05:00
Izalia Mae f0e08f26b3 fetch well-known url for nodeinfo 2020-12-04 01:43:49 -05:00
Izalia Mae 1727425bec add relay blocking option 2020-12-02 23:13:33 -05:00
Izalia Mae c59cec0c31 cleanup load_config 2020-12-02 22:41:45 -05:00
Haelwenn 4d4bebd0be Merge branch 'db-inbox-fix' into 'master'
properly create 'relay-list' in db

See merge request pleroma/relay!25
2020-11-23 07:06:50 +00:00
Haelwenn 8b4ef87eba Merge branch 'master' into 'master'
set content-type to application/activity+json for /actor

See merge request pleroma/relay!24
2020-11-23 06:51:56 +00:00
Izalia Mae 89990331d5 properly create 'relay-list' in db 2020-11-22 00:50:57 -05:00
Joel Beckmeyer c2d53df85b set content-type to application/activity+json for /actor 2020-11-19 21:13:24 -05:00
Haelwenn a15d734218 Merge branch 'follows' into 'master'
remove unnecessary actor checking for (un)follows

See merge request pleroma/relay!22
2020-11-12 13:43:09 +00:00
Haelwenn 6e10db1aa0 Merge branch 'headers-fix' into 'master'
Include the headers required by mastodon

See merge request pleroma/relay!23
2020-11-12 13:40:20 +00:00
Izalia Mae 193ea00996 Include the headers required by mastodon 2020-11-12 13:40:19 +00:00
Izalia Mae 436a57971c remove unnecessary actor checking for (un)follows 2020-03-18 00:53:21 -04:00
kaniini 1e8acd3c0b Merge branch 'update_crypto' into 'master'
Update crypto module

See merge request pleroma/relay!21
2019-11-20 11:24:27 +00:00
Izalia Mae 544d790ef2 use pycryptodome instead of pycrypto 2019-11-19 22:08:14 -05:00
kaniini 132cd1ea42 Merge branch 'fix' into 'master'
Fix db wipe on json error and default config checking

See merge request pleroma/relay!19
2019-09-30 10:45:46 +00:00
Izalia Mae b4f0835106 Fix db wipe on json error and default config checking 2019-09-30 10:45:46 +00:00
kaniini f3b4fc44b8 Merge branch 'dockerize' into 'master'
Add a Dockerfile and instructions to run with Docker

See merge request pleroma/relay!20
2019-09-30 10:45:09 +00:00
Louise de Beaufort a8c81f1d40 Add the whole directory in the workdir
(Prevents a fatal error about not being a git repository)
2019-08-20 13:52:27 +02:00
Louise de Beaufort 1fb8ca9ffc Add config file to gitignore 2019-08-20 12:39:18 +02:00
Louise de Beaufort 76743ac1c6 Add a Dockerfile and instructions to run with Docker 2019-08-20 12:38:53 +02:00
kaniini 47e2eb6556 Merge branch 'feature/add_force_remove_relay' into 'master'
implement force-remove in manage.py, should only be used when relay is not running

See merge request pleroma/relay!15
2019-07-31 19:21:12 +00:00
kaniini b3b33c9796 Merge branch 'feature/semaphore_in_push_to_actor' into 'master'
use global semaphore in push_to_actor to prevent overloading system with outbound connections

See merge request pleroma/relay!16
2019-07-31 19:20:46 +00:00
kaniini 723f286f21 Merge branch 'patch-2' into 'master'
Fix relay crashing on signed GET requests

See merge request pleroma/relay!18
2019-07-31 19:20:18 +00:00
Thibaut Girka e56d909fe2 Fix relay crashing on signed GET requests 2019-07-31 05:36:23 +00:00