Commit Graph

224 Commits

Author SHA1 Message Date
cunningpike 0f2339b481
Create .dockerignore 2023-01-15 21:41:50 -05:00
cunningpike ed40843cb9
Create .dockerignore 2023-01-15 20:13:13 -05:00
cunningpike 7989627c09
Merge branch 'eigenmagic:main' into main 2023-01-15 20:10:43 -05:00
cunningpike 97890831db
Create Dockerfile 2023-01-15 20:08:59 -05:00
Justin Warren 44d4e78045
Merge branch 'main' into release-v0.4.1 2023-01-16 07:31:18 +11:00
Justin Warren 8d2f7a7f35
Merge pull request #26 from eigenmagic/scopes-hack-fix
Fix incorrect SQL instructions for scope setting. See: #20
2023-01-16 07:30:27 +11:00
Justin Warren 550916dc9b
Fix incorrect SQL instructions for scope setting. See: #20 2023-01-16 07:29:19 +11:00
Justin Warren d7d0859030
Added sample configs to demo allowlists. 2023-01-16 06:07:41 +11:00
Justin Warren 42cdddbe3f
Updated changelog. 2023-01-15 17:51:42 +11:00
Justin Warren 12cbee0e0c
Merge pull request #24 from eigenmagic/allowlists
Add allowlists
2023-01-15 17:22:18 +11:00
Justin Warren dc4bbd740b
Updated README to explain allowlist mechanism. 2023-01-15 13:38:07 +11:00
Justin Warren a25773f838
Allowlists just remove blocks from merged list before push. 2023-01-15 13:33:32 +11:00
Justin Warren 9bd79145dc
Edited sample config to better explain URL source 2023-01-15 13:32:45 +11:00
Justin Warren bf48a9639e
Added helper submodule for testing utils 2023-01-15 13:32:13 +11:00
Justin Warren a3d3571a20
Added basic tests of allowlist config args. 2023-01-15 10:10:52 +11:00
Justin Warren 3aa2e378e3
Remove implied setting of reject_media/reports
if severity is set to 'suspend'.
Complicates understanding of what the code actually does.
2023-01-15 10:02:12 +11:00
Justin Warren 04c19c62df
Merge branch 'main' into allowlists 2023-01-15 09:56:13 +11:00
Justin Warren e5f31a6bd1
Merge pull request #23 from eigenmagic/min-merge-bug
Mergeplan setting in config file now gets loaded.
2023-01-15 09:48:16 +11:00
Justin Warren 11accf33d3
Restructured argparsing for easier testing.
Fixed bug: mergeplan in config file was ignored. Reported in #22
Added test cases for cmdline parsing.
Added test cases for configfile parsing.
2023-01-15 09:46:37 +11:00
Justin Warren 7bc10d6690
Version bump to v0.4.1 2023-01-14 11:09:53 +11:00
Justin Warren 26f5464826
Added documentation on allowlists. 2023-01-14 11:09:38 +11:00
Justin Warren 17e0bdab0b
Force allowlist entries to always be severity 'noop'. 2023-01-14 11:00:21 +11:00
Justin Warren 6d4e18bbf6
Fixed bug in how DomainBlock defaults
handle reject_media, reject_reports.
2023-01-14 10:59:19 +11:00
Justin Warren 7a31c3380e
Added support for allowlists.
Updated docstring for merge_blocklists()
2023-01-14 10:44:08 +11:00
Justin Warren 894b133fbb
str2bool() now converts '' to False.
Added some extra debug logging of blocklist parsing.
2023-01-14 10:43:17 +11:00
Justin Warren 9817c99e40
Fixed bug in _asdict() of severity level. 2023-01-14 10:41:54 +11:00
Justin Warren 101803eff2
Merge pull request #21 from eigenmagic/measures-scopes
`admin:read` scope is needed to fetch measures
2023-01-14 07:15:14 +11:00
Justin Warren 2cec9e14c6
Updated documentation to explain need
for `admin:read` access to fetch followers stats.
2023-01-14 07:08:00 +11:00
Justin Warren 3d39ae7e87
Merge pull request #19 from eigenmagic/release-v0.4.0
Release v0.4.0
2023-01-13 19:34:43 +11:00
Justin Warren 1323678673
Add last few changes to changelog for release. 2023-01-13 19:14:40 +11:00
Justin Warren 69c28f1a3f
add DomainBlock type hint to update_known_block().
Use ._asdict() to get info to pass to add block API call.
2023-01-13 17:31:50 +11:00
Justin Warren a718af5a0b
Fix DomainBlock.id usage during __iter__() 2023-01-13 17:30:41 +11:00
Justin Warren 55dad3fa32
Aligned API call rate limit with server default. 2023-01-13 17:12:23 +11:00
Justin Warren 9fb575bb2f
Starting to prep for v0.4.0 release. 2023-01-12 15:49:41 +11:00
Justin Warren ee9625d075
Updated README documentation. 2023-01-12 10:41:01 +11:00
Justin Warren c89edffa69
Merge pull request #16 from eigenmagic/rapidblock-support
Refactor codebase to support multiple blocklist formats
2023-01-12 09:51:22 +11:00
Justin Warren e0d40b5861
Fixed bug in severity change detection. 2023-01-12 09:31:16 +11:00
Justin Warren 327a44d907
Removed redundant global vars.
Refactored fetch from URLs and instances.
Change API delay to be in calls per hour.
Improved check_followed_severity() behaviour.
Updated sample config to include new format.
Added support for per-instance-source import_fields.
BlockSeverity of 'suspend' implies reject_media and reject_reports.
2023-01-12 09:09:06 +11:00
Justin Warren 66f0373cbe
Added boolean fields like 'reject_reports' to mergeplan handling.
Clarified logic in apply_mergeplan() for boolean fields.
Added tests for boolean merge situations.
2023-01-12 08:08:09 +11:00
Justin Warren 0a6eec4bf2
Improved comment merging. 2023-01-12 07:39:17 +11:00
Justin Warren 10011a5ffb
Refactored to add a DomainBlock object.
Refactored to use a BlockParser structure.
Added ability to limit max severity per-URL source.
Improved method for checking if changes are needed.
2023-01-12 07:02:48 +11:00
Justin Warren ea5e7d01d9
Merge pull request #14 from eigenmagic/v0.3.0
v0.3.0 release
2023-01-11 08:30:52 +11:00
Justin Warren 13d26a4ded
Updated changelog. 2023-01-11 08:29:20 +11:00
Justin Warren ca9d958b9d
Added CHANGELOG.md 2023-01-11 08:27:15 +11:00
Justin Warren f37ab70252
Bumped version to 0.3.0 ready for release.
Changed min Python version to v3.10.
2023-01-11 08:27:01 +11:00
Justin Warren edbc418e5e
Merge pull request #13 from eigenmagic/timeouts
Added timeout to requests calls
2023-01-10 18:50:33 +11:00
Justin Warren 478bab8d34
Merge pull request #12 from eigenmagic/version-arg
Add args to show version information.
2023-01-10 18:49:38 +11:00
Justin Warren 1d0649ace5
Add args to show version information. 2023-01-10 13:16:23 +11:00
Justin Warren 23b8833a67
Added timeout to requests calls 2023-01-10 13:06:53 +11:00
Justin Warren dfaf578356
Merge pull request #11 from eigenmagic/user-agent
Set User-Agent to FediBlockHole
2023-01-10 09:15:48 +11:00