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

Merge branch 'main' into lang_de

lang_de
Stephan Richter 2 years ago
parent
6eb6fba6f2 265ec4483f
commit
9177851150
9 changed files with 187 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 90
      doc/data structure.dia
  2. 2
      pom.xml
  3. 22
      src/main/java/de/srsoftware/widerhall/data/Database.java
  4. 38
      src/main/java/de/srsoftware/widerhall/data/MailingList.java
  5. 29
      src/main/java/de/srsoftware/widerhall/mail/ImapClient.java
  6. 1
      src/main/java/de/srsoftware/widerhall/web/Rest.java
  7. 3
      src/main/java/de/srsoftware/widerhall/web/Web.java
  8. 21
      static/templates/inspect.st
  9. 3
      static/templates/js.st

90
doc/data structure.dia
Unescape View File

@ -1740,5 +1740,95 @@ @@ -1740,5 +1740,95 @@
</dia:composite>
</dia:attribute>
</dia:object>
<dia:object type="Flowchart - Box" version="0" id="O38">
<dia:attribute name="obj_pos">
<dia:point val="12,33"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="11.95,32.95;17.05,35.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="12,33"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="5"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
<dia:attribute name="show_background">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="padding">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#hold_time#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="14.5,34.1941"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:object>
<dia:object type="Flowchart - Box" version="0" id="O39">
<dia:attribute name="obj_pos">
<dia:point val="12,31"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="11.95,30.95;17.05,33.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="12,31"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="5"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2"/>
</dia:attribute>
<dia:attribute name="show_background">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="padding">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#last_error#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="14.5,32.1941"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000ff"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:object>
</dia:layer>
</dia:diagram>

2
pom.xml
Unescape View File

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

22
src/main/java/de/srsoftware/widerhall/data/Database.java
Unescape View File

@ -11,6 +11,7 @@ import java.sql.SQLException; @@ -11,6 +11,7 @@ import java.sql.SQLException;
import java.util.*;
import static de.srsoftware.widerhall.Util.t;
import static de.srsoftware.widerhall.data.MailingList.HOLD_TIME;
/**
* @author Stephan Richter, 2022
@ -280,9 +281,30 @@ public class Database { @@ -280,9 +281,30 @@ public class Database {
if (!tableExists(MailingList.TABLE_NAME)) MailingList.createTable();
if (!tableExists(ListMember.TABLE_NAME)) ListMember.createTable();
if (!tableExists(Post.TABLE_NAME)) Post.createTable();
if (!columnExists(MailingList.TABLE_NAME,HOLD_TIME)) MailingList.createHoldTimeColumn();
return this;
}
private boolean columnExists(String tableName, String columnName) throws SQLException {
var rs = Database.open().select("pragma_table_info('"+tableName+"')","COUNT(*) AS num").where("name",columnName).compile().exec();
try {
if (rs.next()) return rs.getInt("num") > 0;
} finally {
rs.close();
}
return false;
}
public void createColumn(String tableName, String colName, String...typeArgs) throws SQLException {
var sql = new StringBuilder("ALTER TABLE ")
.append(tableName)
.append(" ADD COLUMN ")
.append(colName)
.append(" ")
.append(String.join(" ",typeArgs));
new Request(sql).compile().run();
}
/**
* prepare a deletion statement
* @param tableName

38
src/main/java/de/srsoftware/widerhall/data/MailingList.java
Unescape View File

@ -12,8 +12,7 @@ import org.stringtemplate.v4.ST; @@ -12,8 +12,7 @@ import org.stringtemplate.v4.ST;
import javax.mail.*;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import javax.ws.rs.HEAD;
import java.io.*;
import java.io.UnsupportedEncodingException;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
@ -28,14 +27,16 @@ import static de.srsoftware.widerhall.data.User.PERMISSION_ADMIN; @@ -28,14 +27,16 @@ import static de.srsoftware.widerhall.data.User.PERMISSION_ADMIN;
* this class encapsulates a MailingList db object
*/
public class MailingList implements MessageHandler, ProblemListener {
public static final String KEY_FORWARD_FROM = "forward_from";
public static final String KEY_ARCHIVE = "archive";
public static final String KEY_DELETE_MESSAGES = "delete_messages";
public static final String KEY_FORWARD_ATTACHED = "forward_attached";
public static final String KEY_FORWARD_FROM = "forward_from";
public static final String KEY_HIDE_RECEIVERS = "hide_receivers";
public static final String KEY_REPLY_TO_LIST = "reply_to_list";
public static final String KEY_MODS_CAN_EDIT_MODS = "edit_mods";
public static final String KEY_OPEN_FOR_GUESTS = "open_for_guests";
public static final String KEY_OPEN_FOR_SUBSCRIBERS = "open_for_subscribers";
public static final String KEY_ARCHIVE = "archive";
public static final String KEY_MODS_CAN_EDIT_MODS = "edit_mods";
public static final String KEY_REPLY_TO_LIST = "reply_to_list";
public static final String HOLD_TIME = "hold_time";
private static final Logger LOG = LoggerFactory.getLogger(MailingList.class);
private static final String IMAP_HOST = "imap_host";
private static final String IMAP_PORT = "imap_port";
@ -69,6 +70,7 @@ public class MailingList implements MessageHandler, ProblemListener { @@ -69,6 +70,7 @@ public class MailingList implements MessageHandler, ProblemListener {
private ImapClient imap;
private static final HashMap<String,MailingList> cache = new HashMap<>();
private Integer holdTime = null;
/**
* create a new ML object
@ -124,6 +126,10 @@ public class MailingList implements MessageHandler, ProblemListener { @@ -124,6 +126,10 @@ public class MailingList implements MessageHandler, ProblemListener {
return new MailingList(email, name, imapHost, imapPort, imapUser, imapPass, inbox, smtpHost, smtpPort, smtpUser, smtpPass, DEFAULT_STATE).save();
}
public static void createHoldTimeColumn() throws SQLException {
Database.open().createColumn(TABLE_NAME,HOLD_TIME,INT);
}
/**
* create underlying db table
* @throws SQLException
@ -149,6 +155,20 @@ public class MailingList implements MessageHandler, ProblemListener { @@ -149,6 +155,20 @@ public class MailingList implements MessageHandler, ProblemListener {
Database.open().query(sql).compile().run();
}
public void deleteMessages(boolean enable, String daysString) {
try {
holdTime = enable ? Integer.parseInt(daysString) : null;
Database.open().update(TABLE_NAME).set(HOLD_TIME, holdTime).run();
} catch (SQLException throwables) {
LOG.warn("Failed to update {} setting!",HOLD_TIME);
}
}
private void dropOldMails() throws MessagingException {
if (holdTime == null) return;
imap.dropMailsOlderThan(holdTime);
}
public String email() {
return email;
}
@ -227,6 +247,10 @@ public class MailingList implements MessageHandler, ProblemListener { @@ -227,6 +247,10 @@ public class MailingList implements MessageHandler, ProblemListener {
return setFlag(STATE_HIDE_RECEIVERS,hide);
}
public Integer holdTime() {
return holdTime;
}
/**
* test, whether the current ML is subscribable by a given user
* @param user
@ -437,7 +461,7 @@ public class MailingList implements MessageHandler, ProblemListener { @@ -437,7 +461,7 @@ public class MailingList implements MessageHandler, ProblemListener {
} catch (SQLException e){
LOG.warn("Failed to process message '{}'",subject,e);
}
dropOldMails();
}
public MailingList openForGuests(boolean open) throws SQLException {

29
src/main/java/de/srsoftware/widerhall/mail/ImapClient.java
Unescape View File

@ -6,6 +6,8 @@ import org.slf4j.Logger; @@ -6,6 +6,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.mail.*;
import java.time.Duration;
import java.util.Date;
import java.util.HashSet;
import java.util.Properties;
@ -72,10 +74,8 @@ public class ImapClient { @@ -72,10 +74,8 @@ public class ImapClient {
}
private void handleMessages() throws MessagingException {
LOG.debug("Lese E-Mail von {}:",username);
if (!inbox.isOpen()){
inbox.open(IMAPFolder.READ_WRITE);
}
LOG.debug("Reading email of {}:",username);
if (!inbox.isOpen()) inbox.open(IMAPFolder.READ_WRITE);
for (Message message : inbox.getMessages()){
if (message.isSet(Flags.Flag.SEEN)) continue;
handle(message);
@ -145,6 +145,27 @@ public class ImapClient { @@ -145,6 +145,27 @@ public class ImapClient {
return this;
}
public void dropMailsOlderThan(Integer holdTime) throws MessagingException {
var now = new Date();
if (holdTime == null) return;
LOG.info("Removing mails older than {} days:",holdTime);
if (!inbox.isOpen()) inbox.open(IMAPFolder.READ_WRITE);
for (Message message : inbox.getMessages()){
Date receivedDate = message.getReceivedDate();
Duration duration = Duration.between(receivedDate.toInstant(),now.toInstant());
var days = duration.toDays();
LOG.info("Message {} is {} days old!");
if (days > holdTime){
LOG.info("…removing");
Folder folder = message.getFolder();
if (!folder.isOpen()) folder.open(Folder.READ_WRITE);
message.setFlag(Flags.Flag.DELETED, true);
}
}
inbox.expunge();
}
public String host(){
return host;
}

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

@ -309,6 +309,7 @@ public class Rest extends HttpServlet { @@ -309,6 +309,7 @@ public class Rest extends HttpServlet {
if (list.isOpenForSubscribers()) map.put(KEY_OPEN_FOR_SUBSCRIBERS,true);
if (list.hasState(MailingList.STATE_PUBLIC_ARCHIVE)) map.put(KEY_ARCHIVE,true);
if (list.hasState(STATE_MODS_CAN_EDIT_MODS)) map.put(KEY_MODS_CAN_EDIT_MODS,true);
if (list.holdTime() != null) map.put(KEY_DELETE_MESSAGES,list.holdTime());
return map;
}

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

@ -409,7 +409,8 @@ public class Web extends TemplateServlet { @@ -409,7 +409,8 @@ public class Web extends TemplateServlet {
.modsMayNominateMods(Util.getCheckbox(req, KEY_MODS_CAN_EDIT_MODS))
.openForGuests(Util.getCheckbox(req,KEY_OPEN_FOR_GUESTS))
.openForSubscribers(Util.getCheckbox(req,KEY_OPEN_FOR_SUBSCRIBERS))
.archive(Util.getCheckbox(req,KEY_ARCHIVE));
.archive(Util.getCheckbox(req,KEY_ARCHIVE))
.deleteMessages(Util.getCheckbox(req,KEY_DELETE_MESSAGES),req.getParameter(HOLD_TIME));
data.put(NOTES,t("Mailing-Liste aktualisiert!"));
} catch (SQLException e){
LOG.warn("Aktualisierung der Mailing-Liste fehlgeschlagen:",e);

21
static/templates/inspect.st
Unescape View File

@ -17,43 +17,48 @@ @@ -17,43 +17,48 @@
</p>
✓ Besitzer und Moderatoren
<label>
<input type="checkbox" name="open_for_subscribers">
<input type="checkbox" name="open_for_subscribers" />
Allen Abonnenten
</label>
<label>
<input type="checkbox" name="open_for_guests">
<input type="checkbox" name="open_for_guests" />
Allen (m.a.W.: auch Nicht-Abonnenten, GEFAHR!)
</label>
</fieldset>
<fieldset>
<legend>Weiterleitungs-Optionen</legend>
<label>
<input type="checkbox" name="forward_from">
<input type="checkbox" name="forward_from"/>
Ursprünglichen Absender beim Weiterleiten verwenden
</label>
<label>
<input type="checkbox" name="reply_to_list">
<input type="checkbox" name="reply_to_list" />
Listen-Adresse im „ReplyTo“-Header setzen
</label>
<label>
<input type="checkbox" name="forward_attached">
<input type="checkbox" name="forward_attached" />
Ursprüngliche Nachricht beim Weiterleiten als Anhang versenden
</label>
<label>
<input type="checkbox" name="hide_receivers">
<input type="checkbox" name="hide_receivers" />
Emfänger voreinander verbergen (BCC benutzen)
</label>
</fieldset>
<fieldset>
<legend>andere Optionen</legend>
<label>
<input type="checkbox" name="archive">
<input type="checkbox" name="archive" />
Nachrichten in öffentlichem Archiv sammeln
</label>
<label>
<input type="checkbox" name="edit_mods">
<input type="checkbox" name="edit_mods" />
Moderatoren können die Liste der Moderatoren bearbeiten
</label>
<label>
<input type="checkbox" name="delete_messages" />
Nachrichten nach
<input type="number" name="hold_time" /> Tagen löschen
</label>
</fieldset>
<button type="submit">Speichern</button>
</fieldset>

3
static/templates/js.st
Unescape View File

@ -103,11 +103,12 @@ function showListArchiveSummary(data){ @@ -103,11 +103,12 @@ function showListArchiveSummary(data){
}
function showListDetail(data){
var options = ['forward_from','forward_attached','hide_receivers','reply_to_list','open_for_guests','open_for_subscribers','archive','edit_mods'];
var options = ['forward_from','forward_attached','hide_receivers','reply_to_list','open_for_guests','open_for_subscribers','archive','edit_mods','delete_messages'];
options.forEach(function(option,index,array){
console.log(option,'→',data[option]);
if (data[option]) $('input[name="'+option+'"]').prop('checked',true);
});
if (data['delete_messages']) $('input[name="hold_time"]').val(data['delete_messages']);
}
function showListOfModeratedLists(data){

Write Preview
Loading…
Cancel
Save