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

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

@@ -69,9 +69,9 @@ public class ListMember {
}
try {
if (member == null) {
ListMember.create(list, moderator, ListMember.STATE_MODERATOR);
ListMember.create(list, moderator, STATE_MODERATOR);
} else {
member.setState((member.state | STATE_MODERATOR) ^ STATE_AWAITING_CONFIRMATION);
member.setState(Util.unset(member.state|STATE_MODERATOR,STATE_AWAITING_CONFIRMATION));
}
} catch (SQLException e) {
LOG.warn("Ernennen von {} zum Moderator von {} fehlgeschlagen",moderator.email(),list.email(),e);
@@ -212,7 +212,7 @@ public class ListMember {
if (member == null) {
ListMember.create(list, moderator, ListMember.STATE_SUBSCRIBER);
} else {
member.setState(ListMember.STATE_SUBSCRIBER);
member.setState(Util.unset(member.state,STATE_MODERATOR));
}
} catch (SQLException 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);
var rs = query.compile().exec();
while (rs.next()) userList.add(User.from(rs));
Collections.sort(userList,(u1,u2)->u1.name.compareTo(u2.name));
return userList;
}