Instance blocks with mod log entry and expiration (fixes #2506) #5214
Conversation
Nutomic
changed the title
Nutomic
force-pushed
the
instance-block-mod-log
branch
from
6262929
to
2a1d3c9
Compare
Nutomic
force-pushed
the
instance-block-mod-log
branch
from
156b352
to
f9bb606
Compare
| .route("/list", get().to(list_taglines)), | ||
| ) | ||
| .route("block_instance", post().to(admin_block_instance)) | ||
| .route("allow_instance", post().to(admin_allow_instance)), |
There was a problem hiding this comment.
I removed useless the web:: prefix all over this file, only real change is here.
Nutomic
force-pushed
the
instance-block-mod-log
branch
from
fc69e7e
to
f0838ed
Compare
Nutomic
requested review from
dessalines,
phiresky,
dullbananas and
SleeplessOne1917
as code owners
Nutomic
force-pushed
the
instance-block-mod-log
branch
from
2768e73
to
ebcde20
Compare
|
Updated |
| pub struct BlockInstanceResponse { | ||
| pub blocked: bool, | ||
| pub struct AdminAllowInstanceParams { | ||
| pub instance: String, |
There was a problem hiding this comment.
Had to change these from instance_id to domain, otherwise it would be very complicated to initialize the tests. It would also be possible to allow both instance id or domain in the same field, but ts-rs would probably not understand that.
There was a problem hiding this comment.
That's fine, especially since you might not be connected to the instance yet anyway, so it might not have an id, and you need to read or create it in the API route.
Nutomic
force-pushed
the
instance-block-mod-log
branch
from
6ed361d
to
7d0f136
Compare
There was a problem hiding this comment.
Thx for the re-org of mod tables also, that'll be useful for my work on #2444
| pub struct BlockInstanceResponse { | ||
| pub blocked: bool, | ||
| pub struct AdminAllowInstanceParams { | ||
| pub instance: String, |
There was a problem hiding this comment.
That's fine, especially since you might not be connected to the instance yet anyway, so it might not have an id, and you need to read or create it in the API route.
| blocked bool NOT NULL, | ||
| reason text, | ||
| expires timestamptz, | ||
| published timestamptz NOT NULL DEFAULT now() |
There was a problem hiding this comment.
All the mod tables use a when_ column instead of published. We should pry keep that uniform for now.
| admin_person_id int NOT NULL REFERENCES person (id) ON UPDATE CASCADE ON DELETE CASCADE, | ||
| allowed bool NOT NULL, | ||
| reason text, | ||
| published timestamptz NOT NULL DEFAULT now() |
| var block_instance_params: AdminBlockInstanceParams = { | ||
| instance: "lemmy-alpha", | ||
| block: true, | ||
| reason: undefined, |
There was a problem hiding this comment.
You should be able to just leave off reason, esp since it should be optional.
| const params: AdminAllowInstanceParams = { | ||
| instance, | ||
| allow: true, | ||
| reason: undefined, |
|
|
||
| diesel::delete( | ||
| federation_blocklist::table.filter(federation_blocklist::expires.lt(now().nullable())), | ||
| ) | ||
| .execute(&mut conn) | ||
| .await | ||
| .inspect_err(|e| error!("Failed to remove federation_blocklist expired rows: {e}")) | ||
| .ok(); |
There was a problem hiding this comment.
Probably a good idea to move this to its own function, since the other two are ban expires, but this is an instance block expires.
PUT /api/v3/siteanymore, instead there are new endpointsPOST /api/v3/admin/block_instanceandPOST /api/v3/admin/allow_instanceThe main implementation is done, will wait for initial code review before making changes to js client and api tests.