|
|
@ -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("Failed to make {} a moderator of {}",moderator.email(),list.email(),e); |
|
|
|
LOG.warn("Failed to make {} a moderator of {}",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("Failed to make {} a subscriber of {}",moderator.email(),list.email(),e); |
|
|
|
LOG.warn("Failed to make {} a subscriber of {}",moderator.email(),list.email(),e); |
|
|
|