Email blocklisting #718

Scalone
epsilon-phase scala 9 commity/ów z email-blocklisting do master 4 lat temu
epsilon-phase skomentował(-a) 4 lat temu (Zmigrowane z 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] skomentował(-a) 4 lat temu (Zmigrowane z 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 (Zmigrowane z github.com) zrecenzowano 4 lat temu
igalic (Zmigrowane z github.com) zostawił komentarz

very very tired 👀

very very tired 👀
igalic (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) zrecenzowano 4 lat temu
epsilon-phase (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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

Fixed.

Oh, that's because rustfmt can't touch the templates :) Fixed.
elegaanz (Zmigrowane z github.com) zrecenzowano 4 lat temu
elegaanz (Zmigrowane z github.com) zostawił komentarz

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

Maybe make this column unique, to avoid duplicated blocks?

Maybe make this column unique, to avoid duplicated blocks?
elegaanz (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu
You could use https://doc.rust-lang.org/std/result/enum.Result.html#method.err
elegaanz (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

It should probably redirect to /admin/emails instead.

It should probably redirect to `/admin/emails` instead.
elegaanz (Zmigrowane z github.com) skomentował(-a) 4 lat temu

It should probably redirect to /admin/emails.

It should probably redirect to `/admin/emails`.
elegaanz (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

This link is absent from the "Instances" page.

This link is absent from the "Instances" page.
elegaanz (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) zrecenzowano 4 lat temu
epsilon-phase (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) zrecenzowano 4 lat temu
@ -177,0 +205,4 @@
}
#[post("/admin/emails/new", data = "<form>")]
pub fn add_email_blocklist(
epsilon-phase (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) zrecenzowano 4 lat temu
epsilon-phase (Zmigrowane z github.com) skomentował(-a) 4 lat temu

That makes sense.

That makes sense.
epsilon-phase (Zmigrowane z github.com) zrecenzowano 4 lat temu
epsilon-phase (Zmigrowane z github.com) skomentował(-a) 4 lat temu

Might as well follow the conventions :)

Might as well follow the conventions :)
epsilon-phase (Zmigrowane z github.com) zrecenzowano 4 lat temu
epsilon-phase (Zmigrowane z github.com) skomentował(-a) 4 lat temu

That's much nicer :)

That's much nicer :)
elegaanz (Zmigrowane z github.com) zrecenzowano 4 lat temu
@ -177,0 +205,4 @@
}
#[post("/admin/emails/new", data = "<form>")]
pub fn add_email_blocklist(
elegaanz (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) zrecenzowano 4 lat temu
elegaanz (Zmigrowane z github.com) zostawił komentarz

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) skomentował(-a) 4 lat temu

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 (Zmigrowane z github.com) zrecenzowano 4 lat temu
epsilon-phase (Zmigrowane z github.com) skomentował(-a) 4 lat temu

What an odd mystery

What an odd mystery
epsilon-phase (Zmigrowane z github.com) zrecenzowano 4 lat temu
epsilon-phase (Zmigrowane z github.com) skomentował(-a) 4 lat temu

That makes sense

That makes sense
elegaanz (Zmigrowane z github.com) zatwierdza te zmiany 4 lat temu
elegaanz (Zmigrowane z github.com) zostawił komentarz

Perfect! Thank you!

Perfect! Thank you!

Recenzenci

Pull Request został scalony jako f3c05dae62.
Możesz także zobaczyć instrukcje wiersza poleceń.

Krok 1:

Z repozytorium twojego projektu, sprawdź nową gałąź i przetestuj zmiany.
git checkout -b email-blocklisting master
git pull origin email-blocklisting

Krok 2:

Połącz zmiany i zaktualizuj na Forgejo.
git checkout master
git merge --no-ff email-blocklisting
git push origin master
Zaloguj się, aby dołączyć do tej rozmowy.
Brak recenzentów
Brak kamienia milowego
Brak przypisanych
Uczestnicy 1
Powiadomienia
Termin realizacji
Data realizacji jest niewłaściwa lub spoza zakresu. Użyj formatu 'yyyy-mm-dd'.

Brak ustawionego terminu realizacji.

Zależności

No dependencies set.

Reference: Plume/Plume#718
Ładowanie…
Nie ma jeszcze treści.