Merge branch 'main' into lang_de

This commit is contained in:
2022-04-23 18:08:51 +02:00
4 changed files with 84 additions and 71 deletions

View File

@@ -94,10 +94,15 @@ public class Rest extends HttpServlet {
if (!allowed) return Map.of(ERROR,"Es ist dir nicht gestattet, diese Liste zu löschen!");
try {
list.hide(true).enable(false).openForGuests(false).openForSubscribers(false);
for (ListMember member : list.members()) { // drop all list members except for owner
if (!member.isOwner()) member.unsubscribe();
}
} catch (SQLException e) {
list.members().forEach(listMember -> {
try {
listMember.unsubscribe();
} catch (SQLException e) {
throw new RuntimeException(e);
}
});
} catch (Exception e) {
LOG.debug("Disabling and hiding of {} failed",list.email(),e);
}
return Map.of(SUCCESS,t("Liste {} deaktiviert, Abonnement gesperrt, Liste de-publiziert. Mitglieder wurden entfernt.",list.email()));
@@ -338,7 +343,6 @@ public class Rest extends HttpServlet {
if (!list.membersMayBeListedBy(user)) Map.of(ERROR,t("Es ist dir nicht gestattet, die Mitglieder von '{}' aufzulisten",list.email()));
try {
var members = list.members()
.stream()
.map(ListMember::safeMap)
.toList();
return Map.of(MEMBERS,members,LIST,list.minimalMap());