Email blocklisting #718

Sammanfogat
epsilon-phase sammanfogade 9 incheckningar från email-blocklisting in i master 4 år sedan
epsilon-phase kommenterad 4 år sedan (Migrerad från github.com)

This should address #587 and any concerns for the terminology hopefully.

This should address #587 and any concerns for the terminology hopefully.
codecov[bot] kommenterad 4 år sedan (Migrerad från github.com)

Codecov Report

Merging #718 into master will decrease coverage by 0.18%.
The diff coverage is 27.89%.

@@            Coverage Diff             @@
##           master     #718      +/-   ##
==========================================
- Coverage    39.3%   39.11%   -0.19%     
==========================================
  Files          72       73       +1     
  Lines        9534     9676     +142     
  Branches     2275     2313      +38     
==========================================
+ Hits         3747     3785      +38     
- Misses       4714     4807      +93     
- Partials     1073     1084      +11
# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/718?src=pr&el=h1) Report > Merging [#718](https://codecov.io/gh/Plume-org/Plume/pull/718?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/458baf5f78daec1b823e0bbd17eaa96c23ae92f8?src=pr&el=desc) will **decrease** coverage by `0.18%`. > The diff coverage is `27.89%`. ```diff @@ Coverage Diff @@ ## master #718 +/- ## ========================================== - Coverage 39.3% 39.11% -0.19% ========================================== Files 72 73 +1 Lines 9534 9676 +142 Branches 2275 2313 +38 ========================================== + Hits 3747 3785 +38 - Misses 4714 4807 +93 - Partials 1073 1084 +11 ```
igalic (Migrerad från github.com) granskad av 4 år sedan
igalic (Migrerad från github.com) lämnade en kommentar

very very tired 👀

very very tired 👀
igalic (Migrerad från github.com) kommenterad 4 år sedan

I'm a bit confused as to why there are no spaces after , s in function calls, starting here

I'm a bit confused as to why there are no spaces after `, `s in function calls, starting here
epsilon-phase (Migrerad från github.com) granskad av 4 år sedan
epsilon-phase (Migrerad från github.com) kommenterad 4 år sedan

Oh, that's because rustfmt can't touch the templates :)

Fixed.

Oh, that's because rustfmt can't touch the templates :) Fixed.
elegaanz (Migrerad från github.com) granskad av 4 år sedan
elegaanz (Migrerad från github.com) lämnade en kommentar

Globally it works fine, great job! I left comments about "details", but after that it should be good!

Globally it works fine, great job! I left comments about "details", but after that it should be good!
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

Maybe make this column unique, to avoid duplicated blocks?

Maybe make this column unique, to avoid duplicated blocks?
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

Little detail, so if you don't feel like doing it, don't change, but: keywords in SQL usually are in all caps.

Little detail, so if you don't feel like doing it, don't change, but: keywords in SQL usually are in all caps.
elegaanz (Migrerad från github.com) kommenterad 4 år sedan
You could use https://doc.rust-lang.org/std/result/enum.Result.html#method.err
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

Maybe add a @ so that in only matches one domain, and not all domains with the same ending (I doubt this case will ever be encountered actually, be just to be sure).

Maybe add a `@` so that in only matches one domain, and not all domains with the same ending (I doubt this case will ever be encountered actually, be just to be sure).
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

It should probably redirect to /admin/emails instead.

It should probably redirect to `/admin/emails` instead.
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

It should probably redirect to /admin/emails.

It should probably redirect to `/admin/emails`.
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

Maybe call it /admin/emails/delete if it is what it does?

Maybe call it `/admin/emails/delete` if it is what it does?
@ -177,0 +205,4 @@
}
#[post("/admin/emails/new", data = "<form>")]
pub fn add_email_blocklist(
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

I'm almost sure I did something similar for user management, couldn't the code be shared between the two?

I'm almost sure I did something similar for user management, couldn't the code be shared between the two?
@ -14,6 +14,7 @@
(&uri!(instance::admin).to_string(), i18n!(ctx.1, "Configuration"), true),
(&uri!(instance::admin_instances: page = _).to_string(), i18n!(ctx.1, "Instances"), false),
(&uri!(instance::admin_users: page = _).to_string(), i18n!(ctx.1, "Users"), false),
(&uri!(instance::admin_email_blocklist: page=_).to_string(), i18n!(ctx.1, "Email blocklist"), false)
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

This link is absent from the "Instances" page.

This link is absent from the "Instances" page.
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

This button should probably be red (class="destructive" IIRC), and explicitly say that it deletes all blocklisted emails if it is what it does.

This button should probably be red (`class="destructive"` IIRC), and explicitly say that it deletes all blocklisted emails if it is what it does.
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

This <input> should be before the label IMO, as it is usually done with checkboxes.

This `<input>` should be before the label IMO, as it is usually done with checkboxes.
@ -0,0 +6,4 @@
@(ctx:BaseContext, emails: Vec<BlocklistedEmail>, page:i32, n_pages:i32)
@:base(ctx, i18n!(ctx.1, "Blocklisted Emails"), {}, {}, {
<h1>@i18n!(ctx.1,"Blocklisted Emails")</h1>
@tabs(&[
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

There should probably be a <h1> here, like on other administration pages.

There should probably be a `<h1>` here, like on other administration pages.
epsilon-phase (Migrerad från github.com) granskad av 4 år sedan
epsilon-phase (Migrerad från github.com) kommenterad 4 år sedan

It deletes only the ones selected.

But yeah, that's a good idea

It deletes only the ones selected. But yeah, that's a good idea
epsilon-phase (Migrerad från github.com) granskad av 4 år sedan
@ -177,0 +205,4 @@
}
#[post("/admin/emails/new", data = "<form>")]
pub fn add_email_blocklist(
epsilon-phase (Migrerad från github.com) kommenterad 4 år sedan

We couldn't see how to do that cleanly, since that's significantly more complicated.

We couldn't see how to do that cleanly, since that's significantly more complicated.
epsilon-phase (Migrerad från github.com) granskad av 4 år sedan
epsilon-phase (Migrerad från github.com) kommenterad 4 år sedan

That makes sense.

That makes sense.
epsilon-phase (Migrerad från github.com) granskad av 4 år sedan
epsilon-phase (Migrerad från github.com) kommenterad 4 år sedan

Might as well follow the conventions :)

Might as well follow the conventions :)
epsilon-phase (Migrerad från github.com) granskad av 4 år sedan
epsilon-phase (Migrerad från github.com) kommenterad 4 år sedan

That's much nicer :)

That's much nicer :)
elegaanz (Migrerad från github.com) granskad av 4 år sedan
@ -177,0 +205,4 @@
}
#[post("/admin/emails/new", data = "<form>")]
pub fn add_email_blocklist(
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

OK, let's do it this way then, we can always refactor later if needed.

OK, let's do it this way then, we can always refactor later if needed.
elegaanz (Migrerad från github.com) granskad av 4 år sedan
elegaanz (Migrerad från github.com) lämnade en kommentar

Sorry, actually there is more… 😕 (but it should be the last this time!)

Sorry, actually there is more… :confused: (but it should be the last this time!)
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

Actually, this button should probably be hidden if there is currently no blocked addresses, and a placeholder message should be shown (<p class="center"> is made for that).

Actually, this button should probably be hidden if there is currently no blocked addresses, and a placeholder message should be shown (`<p class="center">` is made for that).
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

Moving it inside of the <label> tag would be better, otherwise they are not on the same line, and it is hard to understand they are linked.

Moving it inside of the `<label>` tag would be better, otherwise they are not on the same line, and it is hard to understand they are linked.
elegaanz (Migrerad från github.com) kommenterad 4 år sedan

There is a i missing in i18n here, it doesn't show correctly (it shouldn't even compile, but for some reason, it does).

There is a `i` missing in `i18n` here, it doesn't show correctly (it shouldn't even compile, but for some reason, it does).
epsilon-phase (Migrerad från github.com) granskad av 4 år sedan
epsilon-phase (Migrerad från github.com) kommenterad 4 år sedan

What an odd mystery

What an odd mystery
epsilon-phase (Migrerad från github.com) granskad av 4 år sedan
epsilon-phase (Migrerad från github.com) kommenterad 4 år sedan

That makes sense

That makes sense
elegaanz (Migrerad från github.com) godkände dessa ändringar 4 år sedan
elegaanz (Migrerad från github.com) lämnade en kommentar

Perfect! Thank you!

Perfect! Thank you!

Granskare

Pull-förfrågan har sammanfogats som f3c05dae62.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b email-blocklisting master
git pull origin email-blocklisting

Step 2:

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff email-blocklisting
git push origin master
Logga in för att delta i denna konversation.
Inga granskare
Ingen Milsten
Ingen tilldelad
1 Deltagare
Notiser
Förfallodatum
Förfallodatumet är ogiltigt eller utanför gränserna. Använd formatet 'åååå-mm-dd'.

Inget förfallodatum satt.

Beroenden

No dependencies set.

Reference: Plume/Plume#718
Laddar…
Det finns inget innehåll än.