StephanRichter/Widerhall
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

Merge branch 'main' into lang_de

Browse Source
This commit is contained in:
Stephan Richter
2022-05-04 00:52:37 +02:00
parent f225a348a4 0fa9796294
commit 99611fd654
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>org.example</groupId> <groupId>org.example</groupId>
<artifactId>Widerhall</artifactId> <artifactId>Widerhall</artifactId>
<version>0.2.60</version> <version>0.2.61</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

6
src/main/java/de/srsoftware/widerhall/data/ListMember.java
View File

@@ -69,9 +69,9 @@ public class ListMember {
} }
try { try {
if (member == null) { if (member == null) {
ListMember.create(list, moderator, ListMember.STATE_MODERATOR); ListMember.create(list, moderator, STATE_MODERATOR);
} else { } else {
member.setState((member.state | STATE_MODERATOR) ^ STATE_AWAITING_CONFIRMATION); member.setState(Util.unset(member.state|STATE_MODERATOR,STATE_AWAITING_CONFIRMATION));
} }
} catch (SQLException e) { } catch (SQLException e) {
LOG.warn("Ernennen von {} zum Moderator von {} fehlgeschlagen",moderator.email(),list.email(),e); LOG.warn("Ernennen von {} zum Moderator von {} fehlgeschlagen",moderator.email(),list.email(),e);
@@ -212,7 +212,7 @@ public class ListMember {
if (member == null) { if (member == null) {
ListMember.create(list, moderator, ListMember.STATE_SUBSCRIBER); ListMember.create(list, moderator, ListMember.STATE_SUBSCRIBER);
} else { } else {
member.setState(ListMember.STATE_SUBSCRIBER); member.setState(Util.unset(member.state,STATE_MODERATOR));
} }
} catch (SQLException e) { } catch (SQLException e) {
LOG.warn("Ernennen von {} zum normalen Abonnenten von {} fehlgeschlagen",moderator.email(),list.email(),e); LOG.warn("Ernennen von {} zum normalen Abonnenten von {} fehlgeschlagen",moderator.email(),list.email(),e);

1
src/main/java/de/srsoftware/widerhall/data/User.java
View File

@@ -175,6 +175,7 @@ public class User {
if (emails != null) query.where(EMAIL,emails); if (emails != null) query.where(EMAIL,emails);
var rs = query.compile().exec(); var rs = query.compile().exec();
while (rs.next()) userList.add(User.from(rs)); while (rs.next()) userList.add(User.from(rs));
Collections.sort(userList,(u1,u2)->u1.name.compareTo(u2.name));
return userList; return userList;
} }

3
src/main/java/de/srsoftware/widerhall/web/Rest.java
View File

@@ -167,7 +167,7 @@ public class Rest extends HttpServlet {
} }
break; break;
case LIST_MODERATED: case LIST_MODERATED:
json.put("lists", MailingList.moderatedBy(user).stream().map(MailingList::safeMap).toList()); json.put("lists", MailingList.moderatedBy(user).stream().sorted((l1,l2)->l1.name().compareTo(l2.name())).map(MailingList::safeMap).toList());
break; break;
case LIST_SUBSCRIBABLE: case LIST_SUBSCRIBABLE:
json.put("lists", MailingList.subscribable(user).stream().map(MailingList::minimalMap).toList()); json.put("lists", MailingList.subscribable(user).stream().map(MailingList::minimalMap).toList());
@@ -348,6 +348,7 @@ public class Rest extends HttpServlet {
if (!list.membersMayBeListedBy(user)) Map.of(ERROR,t("Es ist dir nicht gestattet, die Mitglieder von '{}' aufzulisten",list.email())); if (!list.membersMayBeListedBy(user)) Map.of(ERROR,t("Es ist dir nicht gestattet, die Mitglieder von '{}' aufzulisten",list.email()));
try { try {
var members = list.members() var members = list.members()
.sorted((m1,m2)->m1.user().name().compareTo(m2.user().name()))
.map(ListMember::safeMap) .map(ListMember::safeMap)
.toList(); .toList();
return Map.of(MEMBERS,members,LIST,list.minimalMap()); return Map.of(MEMBERS,members,LIST,list.minimalMap());