(incubator-ponymail-site) branch asf-site updated: Fix About page

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 07030bf  Fix About page
07030bf is described below

commit 07030bfcbc3e2a2ab3fb50ee2d56c81bee81dd04
Author: Sebb 
AuthorDate: Fri May 17 17:06:52 2024 +0100

Fix About page

This fixes PR #4
---
 source/markdown/about.md | 48 
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/source/markdown/about.md b/source/markdown/about.md
index 1e07f1f..6b4f909 100644
--- a/source/markdown/about.md
+++ b/source/markdown/about.md
@@ -1,4 +1,11 @@
-# About Pony Mail and its Contributors
+# About The Apache Pony Mail Project and its Contributors
+
+### Pony Mail - Mail Archiving, Ponified!
+
+Apache Pony Mail (Incubating) is a new web-based mailing list archive with 
+both strong searching and browsing features, and includes the ability to 
+reply within a thread from your web browser.  It is currently deployed 
+to provide an archive for all Apache Software Foundation mailing lists.
 
 ### Background
 Pony Mail began as a response to two things; the lack of diversity in
@@ -9,7 +16,7 @@ of software want to jump right into a discussion they see, but 
cannot
 normally do so in a mailing list driven environment because of the rules
 generally surrounding said environment. Pony Mail, along with a select
 handful of newer archive systems, provides an interface that allows
-people to just hop into a thread, and take part. Without the need to
+people to just hop into a thread, and take part from their web browser. 
Without the need to
 subscribe, download the mbox archive, load it into your MTA, and
 respond.
 
@@ -30,11 +37,13 @@ mailing lists are an old person's tool, and web-based 
communication -
 forums - are the way to go in the 21st Century. Providing a
 full-featured forum-like interface to mailing lists is one goal,while
 keeping all of the enormous benefits that mailing lists already provide.
-Asecond goal is to provide the ability to "jump in" to a mailing list
+A second goal is to provide the ability to "jump in" to a mailing list
 conversation - even one that was a while back, without the convolutions
-that a mailing list requires. That is, to join this conversation the old
+that a mailing list requires.
+
+That is, to join this pre-existing conversation the old
 way, one would have had to subscribe to the mailing list, download an
-mbox, and import it into ones mail client, in order that I be able to
+mbox (or ask the archive software for a copy), and import it into ones mail 
client, in order that I be able to
 reply to this message with correct threading. With Pony Mail, one has to
 do none of those things, but can simply reply using the Web UI. To us,
 this is a HUGE benefit for building community. The requirement to jump
@@ -46,18 +55,17 @@ into our projects.
 
 ### Who are we?
 
-We're a small bunch of people committed to making mailing list interaction as 
easy as possible.
- Currently, we consist of (in alphabetical order):
- 
- Andrew Bayer / abayer - mentor
- Daniel Gruno / humbedooh - committer
- Francesco Chicchiriccò / ilgrosso - committer
- Jim Jagielski / jimjag - committer
- John D. Ament / johndament - mentor
- Rich Bowen / rbowen - committer
- Sam Ruby / rubys - committer
- Sean B Palmer / sbp - committer
- Shane Curcu / curcuru - committer
- Tony Stevenson / pctony - committer
- Ulises Cerviño Beresi / ucb - committer
- 
+We're a small bunch of people committed to making mailing list interaction as 
easy as possible.
+Currently, we consist of (in alphabetical order):
+
+ - Andrew Bayer / abayer - mentor
+ - Daniel Gruno / humbedooh - committer
+ - Francesco Chicchiriccò / ilgrosso - committer
+ - Jim Jagielski / jimjag - committer
+ - John D. Ament / johndament - mentor
+ - Rich Bowen / rbowen - committer
+ - Sam Ruby / rubys - committer
+ - Sean B Palmer / sbp - committer
+ - Shane Curcu / curcuru - committer
+ - Tony Stevenson / pctony - committer
+ - Ulises Cerviño Beresi / ucb - committer

(incubator-ponymail-site) branch asf-site updated: Ensure deletions are noticed

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 52d7ac8  Ensure deletions are noticed
52d7ac8 is described below

commit 52d7ac84691bf30c8ee940eee33613d85bfe28e9
Author: Sebb 
AuthorDate: Fri May 17 16:41:38 2024 +0100

Ensure deletions are noticed
---
 .github/workflows/build-site.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index ed65038..edae06f 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -20,6 +20,7 @@ jobs:
 sudo pip3 install markdown
 - name: Build site
   run: |
+find content -name '*.html' -delete # Ensure deletions are picked up
 cd source
 python3 generate.py
 cd ..

(incubator-ponymail-site) branch asf-site updated: Unused imports [skip ci]

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new c37321e  Unused imports [skip ci]
c37321e is described below

commit c37321e64bf4a78767c8b55330f82f09a8945328
Author: Sebb 
AuthorDate: Fri May 17 16:40:01 2024 +0100

Unused imports [skip ci]
---
 source/generate.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/generate.py b/source/generate.py
index a19dd4d..f898a1c 100644
--- a/source/generate.py
+++ b/source/generate.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import markdown, codecs, os, sys, re, time, io
+import markdown, codecs, os, re, io
 
 """
 Script to process the markdown files:
@@ -59,4 +59,4 @@ def runDir(path):
 out.close()
 
 runDir('markdown')
-print("All done!")
\ No newline at end of file
+print("All done!")

(incubator-ponymail-foal) branch master updated: Allow local logins

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new e23d868  Allow local logins
e23d868 is described below

commit e23d8680933d23fb71c2940ba6e8b83c196647fc
Author: Sebb 
AuthorDate: Wed May 15 23:50:43 2024 +0100

Allow local logins
---
 DOCKER.md | 5 +
 1 file changed, 5 insertions(+)

diff --git a/DOCKER.md b/DOCKER.md
index d2b6d07..7ad6a0b 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -76,6 +76,11 @@ Or you can combine them:
 
 ```$ docker exec -it pmfoal-pmfoal-1 bash -c 'cd server; python3 main.py 
--testendpoints'```
 
+Update config.js to allow local login
+=
+
+If you wish to test functions that require login, update config.js to enable 
the two logins.
+
 Connect to the server
 =
 

(incubator-ponymail-foal) branch master updated: Typos

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 1fcb8fc  Typos
1fcb8fc is described below

commit 1fcb8fc110bec4b7cda26969c4dbfa8c81a408e3
Author: Sebb 
AuthorDate: Wed May 15 23:47:36 2024 +0100

Typos
---
 DOCKER.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DOCKER.md b/DOCKER.md
index 3dcf409..d2b6d07 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -73,9 +73,10 @@ $ docker exec -it pmfoal-pmfoal-1 bash
 ```
 
 Or you can combine them:
+
 ```$ docker exec -it pmfoal-pmfoal-1 bash -c 'cd server; python3 main.py 
--testendpoints'```
 
 Connect to the server
 =
 
-Browse to http://localhost/
+Browse to http://localhost:1080/

(incubator-ponymail-foal) branch master updated: Typos

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 49b1fca  Typos
49b1fca is described below

commit 49b1fca8ea2e4f86a7b17cbf3865ecfd5da3a058
Author: Sebb 
AuthorDate: Wed May 15 23:46:04 2024 +0100

Typos
---
 DOCKER.md | 33 +++--
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/DOCKER.md b/DOCKER.md
index 2fcc894..3dcf409 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -7,13 +7,15 @@ Build Docker image
 ==
 Checkout Ponymail Foal from Git:
 
+```
 $ get clone https://github.com/apache/incubator-ponymail-foal.git ponymail-foal
 $ cd ponymail-foal
+```
 
 start Docker (e.g. open ~/Applications/Docker.app)
 Build the image:
 
-$ docker compose build pmfoal
+```$ docker compose build pmfoal```
 
 Resolve any issues (e.g. ensure Docker has access to the required 
directories), and rebuild
 
@@ -21,32 +23,41 @@ Start ElasticSearch and the main server
 ===
 
 Open a new terminal session
-$ cd ponymail-foal
 
+```
+$ cd ponymail-foal
 $ docker compose up
+```
 
 To stop the server, either use ^C, or issue the following in another terminal 
session:
 
-$ docker stop pmfoal-pmfoal-1
+```$ docker stop pmfoal-pmfoal-1```
 
 Setup the ElasticSearch database
 
 
 This only needs to be done once.
+[The container must already be running.]
 
 Open a new terminal session, start a shell in the container:
+```
 $ docker exec -it pmfoal-pmfoal-1 bash
-\# cd tools
-\# python3 setup.py --devel
+# cd tools
+# python3 setup.py --devel
+```
+
+Or you can do it all in one command:
 
-$ docker exec -it pmfoal-pmfoal-1 bash -c 'cd tools; python3 setup.py --devel'
+```$ docker exec -it pmfoal-pmfoal-1 bash -c 'cd tools; python3 setup.py 
--devel'```
 
 Or you can set up the database from the host.
 The container must already be running, and the Python packages (as per 
tools/requirements.txt)
-muts have been installed.
+must have been installed.
 
+```
 $ cd ponymail-foal; cd tools
 $ python3 setup.py --devel
+```
 
 You can then use archiver.py or import-mbox.py to populate the database.
 
@@ -55,12 +66,14 @@ Start the Ponymail api server
 
 Open a new terminal session, start a shell in the container:
 
+```
 $ docker exec -it pmfoal-pmfoal-1 bash
-\# cd server
-\# python3 main.py --testendpoints
+# cd server
+# python3 main.py --testendpoints
+```
 
 Or you can combine them:
-$ docker exec -it pmfoal-pmfoal-1 bash -c 'cd server; python3 main.py 
--testendpoints'
+```$ docker exec -it pmfoal-pmfoal-1 bash -c 'cd server; python3 main.py 
--testendpoints'```
 
 Connect to the server
 =

(incubator-ponymail-foal) branch master updated: Type tests only depend on Python files

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 8d932c7  Type tests only depend on Python files
8d932c7 is described below

commit 8d932c754acdca543f0ed4a7ed4bb29d2fb1a0d7
Author: Sebb 
AuthorDate: Wed May 15 23:15:13 2024 +0100

Type tests only depend on Python files

[skip ci]
---
 .github/workflows/type-tests.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml
index 41632bd..1988f1b 100644
--- a/.github/workflows/type-tests.yml
+++ b/.github/workflows/type-tests.yml
@@ -2,10 +2,10 @@ name: Foal Type Tests
 
 on: 
   push:
-paths-ignore:
-  - '**/integration-tests.yml'
-  - '**/unittest.yml'
-  - 'test/itest*'
+paths:
+  - '**/type-tests.yml'
+  - '**/*.py'
+  - '**/requirements.txt'
   
   workflow_dispatch:
 

(incubator-ponymail-foal) branch master updated: Rebuild JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 55f47e1  Rebuild JS
55f47e1 is described below

commit 55f47e1f3da756f46f96079aae250f5804ac3103
Author: Sebb 
AuthorDate: Wed May 15 23:10:11 2024 +0100

Rebuild JS
---
 webui/admin.html  | 8 
 webui/index.html  | 6 +++---
 webui/list.html   | 8 
 webui/oauth.html  | 8 
 webui/thread.html | 8 
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 96f1e1b..f891818 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index b844153..5057f0b 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/list.html b/webui/list.html
index 4a1227d..104bee4 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -179,9 +179,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index aa019cc..cc83d74 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=78ad7bf" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=f51d5f8" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index f5627b4..6fa9eda 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) branch master updated: Docker build - alpha

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new f51d5f8  Docker build - alpha
f51d5f8 is described below

commit f51d5f8fd0145d8b79f4012accff40034e416749
Author: Sebb 
AuthorDate: Wed May 15 23:06:48 2024 +0100

Docker build - alpha
---
 .dockerignore |  6 +
 DOCKER.md | 68 +++
 Dockerfile| 42 +
 docker-compose.yaml   | 13 +
 docker-config/pmfoal.conf | 21 +++
 elastic/README.md |  8 ++
 webui/js/config.js| 13 -
 7 files changed, 170 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000..ef56ff3
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+# Ignore everything initially
+**
+
+# Allow what we want
+!docker-config/**
+!**/requirements.txt
diff --git a/DOCKER.md b/DOCKER.md
new file mode 100644
index 000..2fcc894
--- /dev/null
+++ b/DOCKER.md
@@ -0,0 +1,68 @@
+Docker execution instructions
+=
+
+These are initial instructions; so far only tested on macOS (M1)
+
+Build Docker image
+==
+Checkout Ponymail Foal from Git:
+
+$ get clone https://github.com/apache/incubator-ponymail-foal.git ponymail-foal
+$ cd ponymail-foal
+
+start Docker (e.g. open ~/Applications/Docker.app)
+Build the image:
+
+$ docker compose build pmfoal
+
+Resolve any issues (e.g. ensure Docker has access to the required 
directories), and rebuild
+
+Start ElasticSearch and the main server
+===
+
+Open a new terminal session
+$ cd ponymail-foal
+
+$ docker compose up
+
+To stop the server, either use ^C, or issue the following in another terminal 
session:
+
+$ docker stop pmfoal-pmfoal-1
+
+Setup the ElasticSearch database
+
+
+This only needs to be done once.
+
+Open a new terminal session, start a shell in the container:
+$ docker exec -it pmfoal-pmfoal-1 bash
+\# cd tools
+\# python3 setup.py --devel
+
+$ docker exec -it pmfoal-pmfoal-1 bash -c 'cd tools; python3 setup.py --devel'
+
+Or you can set up the database from the host.
+The container must already be running, and the Python packages (as per 
tools/requirements.txt)
+muts have been installed.
+
+$ cd ponymail-foal; cd tools
+$ python3 setup.py --devel
+
+You can then use archiver.py or import-mbox.py to populate the database.
+
+Start the Ponymail api server
+=
+
+Open a new terminal session, start a shell in the container:
+
+$ docker exec -it pmfoal-pmfoal-1 bash
+\# cd server
+\# python3 main.py --testendpoints
+
+Or you can combine them:
+$ docker exec -it pmfoal-pmfoal-1 bash -c 'cd server; python3 main.py 
--testendpoints'
+
+Connect to the server
+=
+
+Browse to http://localhost/
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000..e1b1b84
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,42 @@
+FROM ubuntu:24.04
+
+ENV \
+LANG=C.UTF-8 \
+LC_ALL=C.UTF-8
+
+RUN apt-get update && \
+DEBIAN_FRONTEND='noninteractive' apt-get install -y \
+curl git vim apache2 apache2-dev python3-pip
+
+RUN curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | gpg 
--dearmor -o /usr/share/keyrings/elastic.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/elastic.gpg] 
https://artifacts.elastic.co/packages/7.x/apt stable main" | tee -a 
/etc/apt/sources.list.d/elastic-7.x.list
+RUN apt-get update && \
+DEBIAN_FRONTEND='noninteractive' apt-get install -y \
+elasticsearch
+
+RUN \
+a2enmod cgi && \
+a2enmod headers && \
+a2enmod rewrite && \
+a2enmod authnz_ldap && \
+a2enmod speling && \
+a2enmod remoteip && \
+a2enmod expires && \
+a2enmod proxy_http && \
+echo "ServerName pmfoal.local" > /etc/apache2/conf-enabled/servername.conf
+
+COPY server/requirements.txt /tmp/requirements.txt
+RUN pip install -r /tmp/requirements.txt  --break-system-packages
+COPY tools/requirements.txt /tmp/requirements.txt
+RUN pip install -r /tmp/requirements.txt  --break-system-packages
+
+COPY docker-config/pmfoal.conf /etc/apache2/sites-enabled/000-default.conf
+
+# Allow access to ES from host node
+RUN echo "network.host: 0.0.0.0\ndiscovery.type: single-node" >> 
/etc/elasticsearch/elasticsearch.yml
+
+# Add new items at the end so previous layers can be re-used
+
+WORKDIR /var/www/ponymail
+
+CMD /etc/init.d/elasticsearch start; apache2ctl -DFOREGROUND
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 000..c1c3119
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,13

(incubator-ponymail-foal) branch master updated: Docco

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 173435a  Docco
173435a is described below

commit 173435a311a2d970f70bfe3c0f19fedd411269c3
Author: Sebb 
AuthorDate: Wed May 15 23:02:05 2024 +0100

Docco
---
 server/testendpoints/testauth.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/testendpoints/testauth.py b/server/testendpoints/testauth.py
index 20ad6b9..9737f5b 100644
--- a/server/testendpoints/testauth.py
+++ b/server/testendpoints/testauth.py
@@ -45,6 +45,8 @@ oauth:
 oauth_url: "http://localhost/api/testauth;
 },
 (This assumes that the test installation is at http://localhost/. Adjust as 
necessary.)
+Note: if using a Docker container with a different host port, adjust the 
oauth_portal entries only
+(the oauth_url entries relate to the port used by the container webserver)
 
 This will add two extra options to the login screen.
 Clicking on either "Test sign in as ..." link will automatically login 
(without prompting)

(incubator-ponymail-foal) branch master updated (6b92a05 -> 75afefb)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 6b92a05  Update server version
 new 78ad7bf  Link wordCloud entries to correct daterange
 new 75afefb  Regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/admin.html | 8 
 webui/index.html | 6 +++---
 webui/js/ponymail.js | 9 +++--
 webui/js/source/sidebar-stats.js | 7 ++-
 webui/js/wordcloud.js| 8 
 webui/list.html  | 8 
 webui/oauth.html | 8 
 webui/thread.html| 8 
 8 files changed, 36 insertions(+), 26 deletions(-)

(incubator-ponymail-foal) 01/02: Link wordCloud entries to correct daterange

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 78ad7bf532d23fdd914da765c8be2c9b8e7cd216
Author: Sebb 
AuthorDate: Sat May 11 15:49:15 2024 +0100

Link wordCloud entries to correct daterange
---
 webui/js/source/sidebar-stats.js | 7 ++-
 webui/js/wordcloud.js| 8 
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/webui/js/source/sidebar-stats.js b/webui/js/source/sidebar-stats.js
index a75a4b5..44241b8 100644
--- a/webui/js/source/sidebar-stats.js
+++ b/webui/js/source/sidebar-stats.js
@@ -80,7 +80,12 @@ async function sidebar_stats(json) {
 // word cloud is delayed by 50ms to let the rest render first
 // this is a chrome-specific slowdown we're addressing.
 window.setTimeout(function() {
-wordCloud(json.cloud, 220, 100, wc);
+if (G_current_month) {
+daterange = G_current_year + '-' + G_current_month
+} else {
+daterange = G_current_year
+}
+wordCloud(json.cloud, 220, 100, wc, daterange);
 }, 50);
 }
 if (G_show_stats_sidebar === false) {
diff --git a/webui/js/wordcloud.js b/webui/js/wordcloud.js
index 8594012..2fed3dd 100644
--- a/webui/js/wordcloud.js
+++ b/webui/js/wordcloud.js
@@ -33,18 +33,18 @@ function fastIntersect(x,y,nx,ny) {
 || b.bottom+spacing < (a.top+ny));
 }
 
-function makeWord(word, size) {
+function makeWord(word, size, daterange) {
 let textBox = document.createElementNS(SVG_NAMESPACE, "text");
 textBox.setAttribute("font-size", size + "px")
 textBox.setAttribute("x", "0")
 textBox.setAttribute("y", "40")
 textBox.setAttribute("class", "cloudword")
-textBox.setAttribute("onclick", "search(\"" + word + "\", 'lte=1M')")
+textBox.setAttribute("onclick", "search(\"" + word + "\", '" + daterange + 
"')")
 textBox.textContent = word
 return textBox
 }
 
-async function wordCloud(hash, width, height, obj) {
+async function wordCloud(hash, width, height, obj, daterange) {
 let total = 0
 let boxes = []
 let space = width * height
@@ -85,7 +85,7 @@ async function wordCloud(hash, width, height, obj) {
 
 // Try with random placement
 
-textBox = makeWord(word, size)
+textBox = makeWord(word, size, daterange)
 textBox.setAttribute("id", "svg_wc_" + word)
 svg.appendChild(textBox)
 if (!popped) {

(incubator-ponymail-foal) 02/02: Regen JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 75afefb9fa4001e7cbfa5f9b6f9530b80af34c17
Author: Sebb 
AuthorDate: Sat May 11 15:51:16 2024 +0100

Regen JS
---
 webui/admin.html | 8 
 webui/index.html | 6 +++---
 webui/js/ponymail.js | 9 +++--
 webui/list.html  | 8 
 webui/oauth.html | 8 
 webui/thread.html| 8 
 6 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 7f9be4c..96f1e1b 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index a938ac5..b844153 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 9e39231..8c049b0 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'a36fb3e';
+const PONYMAIL_REVISION = '78ad7bf';
 
 
 /**
@@ -4600,7 +4600,12 @@ async function sidebar_stats(json) {
 // word cloud is delayed by 50ms to let the rest render first
 // this is a chrome-specific slowdown we're addressing.
 window.setTimeout(function() {
-wordCloud(json.cloud, 220, 100, wc);
+if (G_current_month) {
+daterange = G_current_year + '-' + G_current_month
+} else {
+daterange = G_current_year
+}
+wordCloud(json.cloud, 220, 100, wc, daterange);
 }, 50);
 }
 if (G_show_stats_sidebar === false) {
diff --git a/webui/list.html b/webui/list.html
index bf0458c..4a1227d 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -179,9 +179,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index 57421c3..aa019cc 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=a36fb3e" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=78ad7bf" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index 6617788..f5627b4 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-site) branch asf-site updated: More sense to have this at top level

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 00608b8  More sense to have this at top level
00608b8 is described below

commit 00608b8c51c3bc1b8db11712b603bcce8c588b26
Author: Sebb 
AuthorDate: Fri May 10 23:44:08 2024 +0100

More sense to have this at top level
---
 source/BUILDING.txt => BUILDING.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/source/BUILDING.txt b/BUILDING.txt
similarity index 100%
rename from source/BUILDING.txt
rename to BUILDING.txt

(incubator-ponymail-site) branch asf-site updated: Not current

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 467be3d  Not current
467be3d is described below

commit 467be3d7041e26540760a88df3ea08a364e8a100
Author: Sebb 
AuthorDate: Fri May 10 23:29:46 2024 +0100

Not current
---
 source/markdown/docs/INSTALLING.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/markdown/docs/INSTALLING.md 
b/source/markdown/docs/INSTALLING.md
index e43ce6e..4339647 100644
--- a/source/markdown/docs/INSTALLING.md
+++ b/source/markdown/docs/INSTALLING.md
@@ -1,5 +1,7 @@
 # Installing Pony Mail #
 
+**These instructions are out of date.
+They have yet to be updated for the Foal version line**
 
 If your distro is on this list, please refer to that specific document
 for detailed package installation instructions:

(incubator-ponymail-site) branch asf-site updated: Indentation

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 85ce51a  Indentation
85ce51a is described below

commit 85ce51a12f4853a349bcfc9d87e2cb5512352235
Author: Sebb 
AuthorDate: Fri May 10 23:17:47 2024 +0100

Indentation
---
 .github/workflows/build-site.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index f0696c4..ed65038 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -33,4 +33,4 @@ jobs:
 else
   echo "No change"
   true # ensure step is successful
-  fi
+fi

(incubator-ponymail-site) branch asf-site updated: Allow for no change

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 41d94d9  Allow for no change
41d94d9 is described below

commit 41d94d9337811d6592a256befa658b0bbb9a880c
Author: Sebb 
AuthorDate: Fri May 10 23:17:04 2024 +0100

Allow for no change
---
 .github/workflows/build-site.yml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index e3860fe..f0696c4 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -27,7 +27,10 @@ jobs:
 git config --global user.name "Ponymail PPMC"
 git status
 git add content
-git commit -m "Commit build products"
-git push
-  # env: # for gh
-  #   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+if git commit -m "Commit build products"
+then
+  git push
+else
+  echo "No change"
+  true # ensure step is successful
+  fi

(incubator-ponymail-site) branch asf-site updated: Now use GHA to build the site

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new e58d682  Now use GHA to build the site
e58d682 is described below

commit e58d6821f964f39f84f870e420cacbcf4deb80ef
Author: Sebb 
AuthorDate: Fri May 10 23:01:59 2024 +0100

Now use GHA to build the site
---
 source/BUILDING.txt | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/BUILDING.txt b/source/BUILDING.txt
index df7b82f..8d8feb3 100644
--- a/source/BUILDING.txt
+++ b/source/BUILDING.txt
@@ -1,12 +1,10 @@
-NOTE: This is now handled by the buildbot, you only need to change the markdown
-  files and the buildbot will regenerate the site and publish it.
+NOTE: This is now handled by GitHub, you only need to change the markdown
+  files and the GitHub Action will regenerate the site and publish it.
   
-# Building the web site
+# Building the web site locally
 
 * Install the markdown module for Python 3: sudo pip3 install markdown
 * Edit or create the appropriate markdown file in source/ (you can have 
sub-dirs there)
 * open a shell, go to the source/ dir
 * Run: python3 generate.py
 * Commit the changes to git :)
-
-

(incubator-ponymail-site) branch asf-site updated: Push back

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 7c5eca6  Push back
7c5eca6 is described below

commit 7c5eca6f6334b9079b721d867247c5554459cc2c
Author: Sebb 
AuthorDate: Fri May 10 22:57:23 2024 +0100

Push back
---
 .github/workflows/build-site.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index 3245beb..e3860fe 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -5,6 +5,7 @@ on:
   push:
 paths:
 - 'source/**/*'
+- '.github/workflows/build-site.yml'
 
 permissions:
   contents: write
@@ -27,5 +28,6 @@ jobs:
 git status
 git add content
 git commit -m "Commit build products"
+git push
   # env: # for gh
   #   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

(incubator-ponymail-site) branch asf-site updated: Need id

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new b48ddba  Need id
b48ddba is described below

commit b48ddba0cbb5d22a5070aa1e4634eda5984ae46a
Author: Sebb 
AuthorDate: Fri May 10 22:53:35 2024 +0100

Need id
---
 .github/workflows/build-site.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index bd58a55..3245beb 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -22,6 +22,8 @@ jobs:
 cd source
 python3 generate.py
 cd ..
+git config --global user.email "d...@ponymail.apache.org"
+git config --global user.name "Ponymail PPMC"
 git status
 git add content
 git commit -m "Commit build products"

(incubator-ponymail-site) branch asf-site updated: Replace local alias

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new bb355f9  Replace local alias
bb355f9 is described below

commit bb355f993bdfda2673b25ced39fa5d862ba4e631
Author: Sebb 
AuthorDate: Fri May 10 22:50:40 2024 +0100

Replace local alias
---
 .github/workflows/build-site.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
index ee17a04..bd58a55 100644
--- a/.github/workflows/build-site.yml
+++ b/.github/workflows/build-site.yml
@@ -23,6 +23,7 @@ jobs:
 python3 generate.py
 cd ..
 git status
-git acm "Commit build products"
+git add content
+git commit -m "Commit build products"
   # env: # for gh
   #   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

(incubator-ponymail-site) branch asf-site updated: Initial stab at site build script

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new a24583a  Initial stab at site build script
a24583a is described below

commit a24583a57150e54ef4e2b5b3624c1939f4e7fcb9
Author: Sebb 
AuthorDate: Fri May 10 22:45:08 2024 +0100

Initial stab at site build script
---
 .github/workflows/build-site.yml | 28 
 1 file changed, 28 insertions(+)

diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
new file mode 100644
index 000..ee17a04
--- /dev/null
+++ b/.github/workflows/build-site.yml
@@ -0,0 +1,28 @@
+name: Build site
+
+on:
+  workflow_dispatch:
+  push:
+paths:
+- 'source/**/*'
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+runs-on: ubuntu-latest
+steps:
+- uses: actions/checkout@v4
+- name: Installs
+  run: |
+sudo pip3 install markdown
+- name: Build site
+  run: |
+cd source
+python3 generate.py
+cd ..
+git status
+git acm "Commit build products"
+  # env: # for gh
+  #   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

(incubator-ponymail-site) 01/02: Backport changes to HTML

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git

commit d1ec202b4a6e20b072d897abc689e2167f0f2797
Author: Sebb 
AuthorDate: Fri May 10 17:37:15 2024 +0100

Backport changes to HTML
---
 source/markdown/docs/INSTALL.centos.md | 2 +-
 source/markdown/docs/INSTALL.debian.md | 2 +-
 source/markdown/docs/INSTALL.fedora.md | 2 +-
 source/markdown/docs/INSTALL.ubuntu.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/markdown/docs/INSTALL.centos.md 
b/source/markdown/docs/INSTALL.centos.md
index 99e2882..efacf7f 100644
--- a/source/markdown/docs/INSTALL.centos.md
+++ b/source/markdown/docs/INSTALL.centos.md
@@ -97,7 +97,7 @@ sudo /etc/init.d/elasticsearch start
 Check out a copy of Pony Mail:
 ~~~
 cd /var/www
-git clone https://github.com/apache/incubator-ponymail.git
+git clone https://github.com/apache/incubator-ponymail-foal.git
 ~~~
 
 
diff --git a/source/markdown/docs/INSTALL.debian.md 
b/source/markdown/docs/INSTALL.debian.md
index 33b058d..b0e49b9 100644
--- a/source/markdown/docs/INSTALL.debian.md
+++ b/source/markdown/docs/INSTALL.debian.md
@@ -31,7 +31,7 @@ sudo apt-get update && sudo apt-get install elasticsearch
 Check out a copy of Pony Mail:
 ~~~
 cd /var/www
-sudo git clone https://github.com/apache/incubator-ponymail.git
+sudo git clone https://github.com/apache/incubator-ponymail-foal.git
 ~~~
 
 Start up ElasticSearch:
diff --git a/source/markdown/docs/INSTALL.fedora.md 
b/source/markdown/docs/INSTALL.fedora.md
index f27e1ee..449187a 100644
--- a/source/markdown/docs/INSTALL.fedora.md
+++ b/source/markdown/docs/INSTALL.fedora.md
@@ -61,7 +61,7 @@ sudo /etc/init.d/elasticsearch start
 Check out a copy of Pony Mail:
 ~~~
 cd /var/www
-sudo git clone https://github.com/apache/incubator-ponymail.git
+sudo git clone https://github.com/apache/incubator-ponymail-foal.git
 ~~~
 
 
diff --git a/source/markdown/docs/INSTALL.ubuntu.md 
b/source/markdown/docs/INSTALL.ubuntu.md
index 95c47a2..9cc58c6 100644
--- a/source/markdown/docs/INSTALL.ubuntu.md
+++ b/source/markdown/docs/INSTALL.ubuntu.md
@@ -37,7 +37,7 @@ sudo apxs -I/usr/include/lua5.2 -cia mod_lua.c lua_*.c -lm 
-llua5.2
 
 Check out a copy of Pony Mail:
 ~~~
-sudo git clone https://github.com/apache/incubator-ponymail.git 
/var/www/ponymail
+sudo git clone https://github.com/apache/incubator-ponymail-foal.git 
/var/www/ponymail
 ~~~
 
 Configure Elasticsearch to automatically start during bootup. For Ubuntu <= 
14.10:

(incubator-ponymail-site) branch asf-site updated (6cbe54f -> 05f0f5a)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


from 6cbe54f  MD Syntax
 new d1ec202  Backport changes to HTML
 new 05f0f5a  Backport changes to HTML

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 source/markdown/docs/INSTALL.centos.md | 2 +-
 source/markdown/docs/INSTALL.debian.md | 2 +-
 source/markdown/docs/INSTALL.fedora.md | 2 +-
 source/markdown/docs/INSTALL.ubuntu.md | 2 +-
 source/markdown/docs/INSTALLING.md | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(incubator-ponymail-site) 02/02: Backport changes to HTML

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git

commit 05f0f5a1ac98fa3e48675f49289915c3e932b0e6
Author: Sebb 
AuthorDate: Fri May 10 17:37:53 2024 +0100

Backport changes to HTML
---
 source/markdown/docs/INSTALLING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/markdown/docs/INSTALLING.md 
b/source/markdown/docs/INSTALLING.md
index 0ecd8d3..e43ce6e 100644
--- a/source/markdown/docs/INSTALLING.md
+++ b/source/markdown/docs/INSTALLING.md
@@ -24,7 +24,7 @@ You will need the following software installed on your 
machine:
 
 ## Download and Install ##
 
-- Download the git repo: `git clone 
https://github.com/apache/incubator-ponymail.git`
+- Download the git repo: `git clone 
https://github.com/apache/incubator-ponymail-foal.git`
 - Start ElasticSearch on the machine it needs to run on.
 - Run setup.py in the `tools` dir:
 ```
@@ -34,7 +34,7 @@ You will need the following software installed on your 
machine:
 ```
 - Edit `site/js/config.js` to suit your needs (usually very little editing is 
needed)
 - Set up the appropriate authorisation for private lists. For examples, see:
-  https://github.com/apache/incubator-ponymail/tree/master/aaa_examples
+  https://github.com/apache/incubator-ponymail-foal/tree/master/aaa_examples
 
 
 

(incubator-ponymail-site) branch asf-site updated: MD Syntax

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 6cbe54f  MD Syntax
6cbe54f is described below

commit 6cbe54f8dc2823891e3219c3d56c56bfa662ed09
Author: Sebb 
AuthorDate: Fri May 10 17:34:35 2024 +0100

MD Syntax
---
 source/markdown/docs/DESIGN-NOTES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/markdown/docs/DESIGN-NOTES.md 
b/source/markdown/docs/DESIGN-NOTES.md
index 1feee34..ca228d0 100644
--- a/source/markdown/docs/DESIGN-NOTES.md
+++ b/source/markdown/docs/DESIGN-NOTES.md
@@ -12,8 +12,8 @@ The MID is used to insert the document in the database, and 
can be used to fetch
 
 ### Database design
 The mails are stored in two separate ES indexes:
-* "mbox" - this stores information about the document, plus the parsed 
content, and is used for searching and summary displays.
-* "mbox_source" - this is used to store the raw content of the document.
+- "mbox" - this stores information about the document, plus the parsed 
content, and is used for searching and summary displays.
+- "mbox_source" - this is used to store the raw content of the document.
 The two versions of the document are linked by using the same MID.
 
 ### Requirements for the MID

(incubator-ponymail-site) branch asf-site updated: Update MD not HTML

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 96eb269  Update MD not HTML
96eb269 is described below

commit 96eb269dca7a905ee0e1a9e5b9512e7ab4baad51
Author: Sebb 
AuthorDate: Fri May 10 16:07:54 2024 +0100

Update MD not HTML
---
 source/markdown/downloads.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/markdown/downloads.md b/source/markdown/downloads.md
index 70953fe..4a640ea 100644
--- a/source/markdown/downloads.md
+++ b/source/markdown/downloads.md
@@ -2,7 +2,9 @@
 
 Be sure to [verify your downloads](https://www.apache.org/info/verification) 
using the folowing [KEYS](https://downloads.apache.org/incubator/ponymail/KEYS).
 
-The latest release of Pony Mail is 0.11, released on 2019-04-20. You can fetch 
it here:
+There has been no release of Pony Mail Foal yet.
+
+The latest release of Pony Mail (original) is 0.11, released on 2019-04-20. 
You can fetch it here:
 
 [Download Apache Pony Mail (Incubating) 0.11 from a 
mirror](https://www.apache.org/dyn/closer.lua/incubator/ponymail/apache-pony-mail-0.11-incubating.tar.gz)
 
 Verify:

(incubator-ponymail-site) branch asf-site updated: Updates re Foal

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 5ece8da  Updates re Foal
5ece8da is described below

commit 5ece8da7cb20ef5e549fd562edd2fe3001278b44
Author: Sebb 
AuthorDate: Fri May 10 15:53:11 2024 +0100

Updates re Foal
---
 content/downloads.html  | 3 ++-
 source/markdown/docs/API.md | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/content/downloads.html b/content/downloads.html
index 67c54a5..f5ad1d8 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -36,7 +36,8 @@
 
 Download Apache Pony Mail 
(Incubating)
 Be sure to https://www.apache.org/info/verification;>verify your 
downloads using the folowing https://downloads.apache.org/incubator/ponymail/KEYS;>KEYS.
-The latest release of Pony Mail is 0.11, released on 2019-04-20. You can 
fetch it here:
+There have not yet been any releases of Ponymail Foal.
+The latest release of Pony Mail (original) is 0.11, released on 2019-04-20. 
You can fetch it here:
 https://www.apache.org/dyn/closer.lua/incubator/ponymail/apache-pony-mail-0.11-incubating.tar.gz;>Download
 Apache Pony Mail (Incubating) 0.11 from a mirror 
 Verify:
https://downloads.apache.org/incubator/ponymail/apache-pony-mail-0.11-incubating.tar.gz.asc;>asc
diff --git a/source/markdown/docs/API.md b/source/markdown/docs/API.md
index ee7a269..7df0037 100644
--- a/source/markdown/docs/API.md
+++ b/source/markdown/docs/API.md
@@ -243,6 +243,8 @@ TBA
 Usage:
 `GET /api/atom.lua(?list=$lid|?mid=$mid)`
 
+**Not available in Ponymail Foal**
+
 Parameters: (cookie may be required)
   - $lid: the list id, e.g. d...@ponymail.apache.org
   - $mid: The email ID (Permalink)

(incubator-ponymail-site) branch asf-site updated: Typo

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new fa049b1  Typo
fa049b1 is described below

commit fa049b1e907f55b59ccd6257215d2995695b57a5
Author: Sebb 
AuthorDate: Fri May 10 15:45:08 2024 +0100

Typo
---
 content/docs/api.html   | 2 +-
 source/markdown/docs/API.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/docs/api.html b/content/docs/api.html
index 07b5dd7..dbc7089 100644
--- a/content/docs/api.html
+++ b/content/docs/api.html
@@ -245,7 +245,7 @@ TBA
 
 Get ATOM data for list or email
 Usage:
-GET /api/atom/lua(?list=$lid|?mid=$mid)
+GET /api/atom.lua(?list=$lid|?mid=$mid)
 Parameters: (cookie may be required)
   - $lid: the list id, e.g. d...@ponymail.apache.org
   - $mid: The email ID (Permalink)
diff --git a/source/markdown/docs/API.md b/source/markdown/docs/API.md
index b9120d0..ee7a269 100644
--- a/source/markdown/docs/API.md
+++ b/source/markdown/docs/API.md
@@ -241,7 +241,7 @@ TBA
 ### Get ATOM data for list or email
 
 Usage:
-`GET /api/atom/lua(?list=$lid|?mid=$mid)`
+`GET /api/atom.lua(?list=$lid|?mid=$mid)`
 
 Parameters: (cookie may be required)
   - $lid: the list id, e.g. d...@ponymail.apache.org

(incubator-ponymail-foal) branch bad_encoding updated (c1db43c -> 3c5f20a)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from c1db43c  Merge branch 'master' into bad_encoding
 add f8dc8ff  Show message dispatch error
 add 3093ef4  Merge pull request #253 from 
raboof/show-message-dispatch-error
 add fee7837  Rebuild JS
 add 027d666  Show an error popup for internal server errors
 add 505fa9a  Merge pull request #252 from 
raboof/show-internal-server-errors
 add 18cecc2  Show error alert when oauth fails
 add 9970074  Merge pull request #251 from raboof/show-oauth-error
 add 13ed038  Support 'Cc' in the web mail/reply composer
 add 0ba4cc4  Bcc as well
 add 7aade30  Merge pull request #250 from raboof/cc
 add 2635b49  Rebuild JS
 add 034e905  Update certifi to latest
 add abc5cf8  checkall is not used; search only has 2 args
 add ac738ec  G_current_query is never read
 add 8da  Regen JS
 add a50ae4e  G_current_query is never read
 add 8e89624  Regen JS
 add 86af91a  Oops, need to change source
 add 6d3465b  Regen JS
 add 74bc1dc  Only encode parameter values, not the delimiters
 add 32e6e5b  Regen JS
 add a36fb3e  pony mail search result url does not work as link
 add 69b93f0  Regen JS
 add 8d5fe62  Check all recipients against allowed domains
 add 1605108  Update composer User-Agent version
 add ce71e02  Merge pull request #258 from raboof/check-all-recipients
 add 6b92a05  Update server version
 add 3c5f20a  Merge branch 'master' into bad_encoding

No new revisions were added by this update.

Summary of changes:
 server/endpoints/compose.py | 29 +-
 server/requirements.txt |  2 +-
 server/server_version.py|  2 +-
 tools/requirements.txt  |  2 +-
 webui/admin.html|  8 ++--
 webui/index.html|  6 +--
 webui/js/oauth.js   | 25 +++--
 webui/js/ponymail.js| 75 -
 webui/js/source/aavariables.js  |  1 -
 webui/js/source/composer.js | 40 ++--
 webui/js/source/primer.js   |  1 -
 webui/js/source/search.js   | 25 -
 webui/js/source/sidebar-calendar.js |  8 ++--
 webui/list.html | 12 +++---
 webui/oauth.html|  8 ++--
 webui/thread.html   |  8 ++--
 16 files changed, 185 insertions(+), 67 deletions(-)

(incubator-ponymail-foal) branch master updated: Update server version

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 6b92a05  Update server version
6b92a05 is described below

commit 6b92a053af207819eaf7355ace4c2913bf77ba48
Author: Sebb 
AuthorDate: Wed May 1 20:39:05 2024 +0100

Update server version
---
 server/server_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/server_version.py b/server/server_version.py
index a78d1f6..8157d05 100644
--- a/server/server_version.py
+++ b/server/server_version.py
@@ -1,2 +1,2 @@
 # This file is generated by server/update_version.sh
-PONYMAIL_SERVER_VERSION = '4d644b1'
+PONYMAIL_SERVER_VERSION = '1605108'

(incubator-ponymail-foal) 02/02: Regen JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 69b93f0b19673be3d87aa82326f892ce08db1b6d
Author: Sebb 
AuthorDate: Wed May 1 19:49:38 2024 +0100

Regen JS
---
 webui/admin.html |  8 
 webui/index.html |  6 +++---
 webui/js/ponymail.js | 26 --
 webui/list.html  |  8 
 webui/oauth.html |  8 
 webui/thread.html|  8 
 6 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 20a79ff..7f9be4c 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index 5a0fc09..a938ac5 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index d044a51..9e39231 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = '74bc1dc';
+const PONYMAIL_REVISION = 'a36fb3e';
 
 
 /**
@@ -4237,12 +4237,33 @@ function search(query, date) {
 let listid = '%s@%s'.format(list, domain);
 G_current_list = list;
 G_current_domain = domain;
-let newhref = "list?%s:%s:%s".format(listid, date, query);
 
 let header_from = document.getElementById('header_from');
 let header_subject = document.getElementById('header_subject');
 let header_to = document.getElementById('header_to');
 let header_body = document.getElementById('header_body');
+let qparts = query.split('&'); // look for additional query options
+if (qparts.length > 0) { // i.e. query + header bits
+query = qparts.shift(); // Keep only the query
+// store the values to be picked up below
+for (let part of qparts) {
+let hv = part.split('=',2);
+if (hv[0] == 'header_from') {
+header_from.value = hv[1];
+}
+if (hv[0] == 'header_subject') {
+header_subject.value = hv[1];
+}
+if (hv[0] == 'header_to') {
+header_to.value = hv[1];
+}
+if (hv[0] == 'header_body') {
+header_body.value = hv[1];
+}
+// N.B. other options are currently ignored
+}
+}
+let newhref = "list?%s:%s:%s".format(listid, date, query);
 let sURL = '%sapi/stats.lua?d=%s=%s=%s=%s'.format(
 G_apiURL, encodeURIComponent(date), encodeURIComponent(list), 
encodeURIComponent(domain), encodeURIComponent(query)
 );
@@ -4302,6 +4323,7 @@ function search_set_list(what) {
 document.getElementById('q').setAttribute("placeholder", "Search 
%s...".format(whatxt));
 }
 
+
 /**
  Fetched from source/sidebar-calendar.js
 **/
diff --git a/webui/list.html b/webui/list.html
index 31441aa..bf0458c 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -179,9 +179,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index 4db94b8..57421c3 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=74bc1dc" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=a36fb3e" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index 19bd066..6617788 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) 01/02: pony mail search result url does not work as link

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit a36fb3e930cf933195d8748bfd3f7b505f956f05
Author: Sebb 
AuthorDate: Wed May 1 19:48:21 2024 +0100

pony mail search result url does not work as link

This fixes #255
---
 webui/js/source/search.js | 25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/webui/js/source/search.js b/webui/js/source/search.js
index f9e7c8d..79047d9 100644
--- a/webui/js/source/search.js
+++ b/webui/js/source/search.js
@@ -32,12 +32,33 @@ function search(query, date) {
 let listid = '%s@%s'.format(list, domain);
 G_current_list = list;
 G_current_domain = domain;
-let newhref = "list?%s:%s:%s".format(listid, date, query);
 
 let header_from = document.getElementById('header_from');
 let header_subject = document.getElementById('header_subject');
 let header_to = document.getElementById('header_to');
 let header_body = document.getElementById('header_body');
+let qparts = query.split('&'); // look for additional query options
+if (qparts.length > 0) { // i.e. query + header bits
+query = qparts.shift(); // Keep only the query
+// store the values to be picked up below
+for (let part of qparts) {
+let hv = part.split('=',2);
+if (hv[0] == 'header_from') {
+header_from.value = hv[1];
+}
+if (hv[0] == 'header_subject') {
+header_subject.value = hv[1];
+}
+if (hv[0] == 'header_to') {
+header_to.value = hv[1];
+}
+if (hv[0] == 'header_body') {
+header_body.value = hv[1];
+}
+// N.B. other options are currently ignored
+}
+}
+let newhref = "list?%s:%s:%s".format(listid, date, query);
 let sURL = '%sapi/stats.lua?d=%s=%s=%s=%s'.format(
 G_apiURL, encodeURIComponent(date), encodeURIComponent(list), 
encodeURIComponent(domain), encodeURIComponent(query)
 );
@@ -95,4 +116,4 @@ function search_set_list(what) {
 }
 }
 document.getElementById('q').setAttribute("placeholder", "Search 
%s...".format(whatxt));
-}
\ No newline at end of file
+}

(incubator-ponymail-foal) branch master updated (32e6e5b -> 69b93f0)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 32e6e5b  Regen JS
 new a36fb3e  pony mail search result url does not work as link
 new 69b93f0  Regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/admin.html  |  8 
 webui/index.html  |  6 +++---
 webui/js/ponymail.js  | 26 --
 webui/js/source/search.js | 25 +++--
 webui/list.html   |  8 
 webui/oauth.html  |  8 
 webui/thread.html |  8 
 7 files changed, 66 insertions(+), 23 deletions(-)

(incubator-ponymail-foal) branch master updated (6d3465b -> 32e6e5b)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 6d3465b  Regen JS
 new 74bc1dc  Only encode parameter values, not the delimiters
 new 32e6e5b  Regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/admin.html|  8 
 webui/index.html|  6 +++---
 webui/js/ponymail.js| 10 ++
 webui/js/source/sidebar-calendar.js |  8 +---
 webui/list.html |  8 
 webui/oauth.html|  8 
 webui/thread.html   |  8 
 7 files changed, 30 insertions(+), 26 deletions(-)

(incubator-ponymail-foal) 02/02: Regen JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 32e6e5b873e6d71d7376106cabb4de7071e1d5d2
Author: Sebb 
AuthorDate: Wed May 1 19:32:58 2024 +0100

Regen JS
---
 webui/admin.html |  8 
 webui/index.html |  6 +++---
 webui/js/ponymail.js | 10 ++
 webui/list.html  |  8 
 webui/oauth.html |  8 
 webui/thread.html|  8 
 6 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 977cd4d..20a79ff 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index 073172e..5a0fc09 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 2b319ac..d044a51 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = '86af91a';
+const PONYMAIL_REVISION = '74bc1dc';
 
 
 /**
@@ -4472,12 +4472,13 @@ function calendar_scroll(me, direction) {
 function calendar_click(year, month) {
 G_current_year = year;
 G_current_month = month;
-let searching = false;
-let q = "";
+let q = ""; // components are not encoded
+let qapi = ""; // components need to be encoded for the api call
 let calendar_current_list = G_current_list;
 let calendar_current_domain = G_current_domain;
 if (G_current_json && G_current_json.searchParams) {
 q = G_current_json.searchParams.q || "";
+qapi = encodeURIComponent(q);
 calendar_current_list = G_current_json.searchParams.list;
 calendar_current_domain = G_current_json.searchParams.domain;
 // Weave in header parameters
@@ -4485,6 +4486,7 @@ function calendar_click(year, month) {
 if (key.match(/^header_/)) {
 let value = G_current_json.searchParams[key];
 q += `&${key}=${value}`;
+qapi += `&${key}=${encodeURIComponent(value)}`; // only encode 
the values
 }
 }
 }
@@ -4498,7 +4500,7 @@ function calendar_click(year, month) {
 G_apiURL, encodeURIComponent(calendar_current_list),
 encodeURIComponent(calendar_current_domain),
 encodeURIComponent(year), encodeURIComponent(month),
-encodeURIComponent(q)
+qapi
 ),
 renderListView, {
 to: (q && q.length > 0) ? 'search' : 
'%s@%s'.format(calendar_current_list, calendar_current_domain),
diff --git a/webui/list.html b/webui/list.html
index b411a41..31441aa 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -179,9 +179,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index f8fd2b4..4db94b8 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=86af91a" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=74bc1dc" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index b34ad10..19bd066 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) 01/02: Only encode parameter values, not the delimiters

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 74bc1dc12d39ae8831de64b2bd7186337bae1e72
Author: Sebb 
AuthorDate: Wed May 1 19:29:28 2024 +0100

Only encode parameter values, not the delimiters
---
 webui/js/source/sidebar-calendar.js | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/webui/js/source/sidebar-calendar.js 
b/webui/js/source/sidebar-calendar.js
index c042aa8..491b322 100644
--- a/webui/js/source/sidebar-calendar.js
+++ b/webui/js/source/sidebar-calendar.js
@@ -181,12 +181,13 @@ function calendar_scroll(me, direction) {
 function calendar_click(year, month) {
 G_current_year = year;
 G_current_month = month;
-let searching = false;
-let q = "";
+let q = ""; // components are not encoded
+let qapi = ""; // components need to be encoded for the api call
 let calendar_current_list = G_current_list;
 let calendar_current_domain = G_current_domain;
 if (G_current_json && G_current_json.searchParams) {
 q = G_current_json.searchParams.q || "";
+qapi = encodeURIComponent(q);
 calendar_current_list = G_current_json.searchParams.list;
 calendar_current_domain = G_current_json.searchParams.domain;
 // Weave in header parameters
@@ -194,6 +195,7 @@ function calendar_click(year, month) {
 if (key.match(/^header_/)) {
 let value = G_current_json.searchParams[key];
 q += `&${key}=${value}`;
+qapi += `&${key}=${encodeURIComponent(value)}`; // only encode 
the values
 }
 }
 }
@@ -207,7 +209,7 @@ function calendar_click(year, month) {
 G_apiURL, encodeURIComponent(calendar_current_list),
 encodeURIComponent(calendar_current_domain),
 encodeURIComponent(year), encodeURIComponent(month),
-encodeURIComponent(q)
+qapi
 ),
 renderListView, {
 to: (q && q.length > 0) ? 'search' : 
'%s@%s'.format(calendar_current_list, calendar_current_domain),

(incubator-ponymail-foal) branch master updated (8e89624 -> 6d3465b)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 8e89624  Regen JS
 new 86af91a  Oops, need to change source
 new 6d3465b  Regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/admin.html|  8 
 webui/index.html|  6 +++---
 webui/js/ponymail.js| 27 +--
 webui/js/source/composer.js | 26 --
 webui/list.html |  8 
 webui/oauth.html|  8 
 webui/thread.html   |  8 
 7 files changed, 68 insertions(+), 23 deletions(-)

(incubator-ponymail-foal) 01/02: Oops, need to change source

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 86af91a9d1af8f63a07df1ede9aa385b3b4904ec
Author: Sebb 
AuthorDate: Wed May 1 17:30:39 2024 +0100

Oops, need to change source
---
 webui/js/source/composer.js | 26 --
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/webui/js/source/composer.js b/webui/js/source/composer.js
index 08fe5be..f35b4af 100644
--- a/webui/js/source/composer.js
+++ b/webui/js/source/composer.js
@@ -5,8 +5,10 @@ function compose_send() {
 for (let k in mua_headers) {
 content.push(k + "=" + encodeURIComponent(mua_headers[k]));
 }
-// Push the subject and email body into the form data
+// Push the subject, (b)cc and email body into the form data
 content.push("subject=" + 
encodeURIComponent(document.getElementById('composer_subject').value));
+content.push("cc=" + 
encodeURIComponent(document.getElementById('composer_cc').value));
+content.push("bcc=" + 
encodeURIComponent(document.getElementById('composer_bcc').value));
 content.push("body=" + 
encodeURIComponent(document.getElementById('composer_body').value));
 if (G_ponymail_preferences.login && 
G_ponymail_preferences.login.alternates && 
document.getElementById('composer_alt')) {
 content.push("alt=" + 
encodeURIComponent(document.getElementById('composer_alt').options[document.getElementById('composer_alt').selectedIndex].value));
@@ -108,6 +110,26 @@ function compose_email(replyto, list) {
 value: eml_subject
 }));
 form.push(new HTML('br'));
+form.push(new HTML('b', {}, "Cc:"));
+form.push(new HTML('br'));
+form.push(new HTML('input', {
+style: {
+width: '90%'
+},
+id: 'composer_cc',
+type: 'text',
+}));
+form.push(new HTML('br'));
+form.push(new HTML('b', {}, "Bcc:"));
+form.push(new HTML('br'));
+form.push(new HTML('input', {
+style: {
+width: '90%'
+},
+id: 'composer_bcc',
+type: 'text',
+}));
+form.push(new HTML('br'));
 form.push(new HTML('b', {}, "Reply:"));
 form.push(new HTML('br'));
 let body = new HTML('textarea', {
@@ -195,4 +217,4 @@ function mua_link(email, xlist) {
 let listname = email.list_raw.replace(/[<>]/g, '').replace('.', '@', 1);
 let xlink = 'mailto:' + listname + "?subject=" + 
encodeURIComponent(subject) + "In-Reply-To=" + 
encodeURIComponent(email['message-id']) + "=" + 
encodeURIComponent(eml_raw_short);
 return xlink;
-}
\ No newline at end of file
+}

(incubator-ponymail-foal) 02/02: Regen JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 6d3465b01efa19a71999851a91bf260d11837815
Author: Sebb 
AuthorDate: Wed May 1 17:36:09 2024 +0100

Regen JS
---
 webui/admin.html |  8 
 webui/index.html |  6 +++---
 webui/js/ponymail.js | 27 +--
 webui/list.html  |  8 
 webui/oauth.html |  8 
 webui/thread.html|  8 
 6 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 274fb6a..977cd4d 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index 4912f1b..073172e 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index d9038ff..2b319ac 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'a50ae4e';
+const PONYMAIL_REVISION = '86af91a';
 
 
 /**
@@ -681,8 +681,10 @@ function compose_send() {
 for (let k in mua_headers) {
 content.push(k + "=" + encodeURIComponent(mua_headers[k]));
 }
-// Push the subject and email body into the form data
+// Push the subject, (b)cc and email body into the form data
 content.push("subject=" + 
encodeURIComponent(document.getElementById('composer_subject').value));
+content.push("cc=" + 
encodeURIComponent(document.getElementById('composer_cc').value));
+content.push("bcc=" + 
encodeURIComponent(document.getElementById('composer_bcc').value));
 content.push("body=" + 
encodeURIComponent(document.getElementById('composer_body').value));
 if (G_ponymail_preferences.login && 
G_ponymail_preferences.login.alternates && 
document.getElementById('composer_alt')) {
 content.push("alt=" + 
encodeURIComponent(document.getElementById('composer_alt').options[document.getElementById('composer_alt').selectedIndex].value));
@@ -784,6 +786,26 @@ function compose_email(replyto, list) {
 value: eml_subject
 }));
 form.push(new HTML('br'));
+form.push(new HTML('b', {}, "Cc:"));
+form.push(new HTML('br'));
+form.push(new HTML('input', {
+style: {
+width: '90%'
+},
+id: 'composer_cc',
+type: 'text',
+}));
+form.push(new HTML('br'));
+form.push(new HTML('b', {}, "Bcc:"));
+form.push(new HTML('br'));
+form.push(new HTML('input', {
+style: {
+width: '90%'
+},
+id: 'composer_bcc',
+type: 'text',
+}));
+form.push(new HTML('br'));
 form.push(new HTML('b', {}, "Reply:"));
 form.push(new HTML('br'));
 let body = new HTML('textarea', {
@@ -873,6 +895,7 @@ function mua_link(email, xlist) {
 return xlink;
 }
 
+
 /**
  Fetched from source/construct-thread.js
 **/
diff --git a/webui/list.html b/webui/list.html
index 21d2913..b411a41 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -179,9 +179,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index b3171bd..f8fd2b4 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=a50ae4e" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=86af91a" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index 1f2ad9a..b34ad10 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) 01/02: G_current_query is never read

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit a50ae4e4ad3dceb479fa071a948984ef03868a26
Author: Sebb 
AuthorDate: Tue Apr 30 23:37:31 2024 +0100

G_current_query is never read
---
 webui/js/source/aavariables.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webui/js/source/aavariables.js b/webui/js/source/aavariables.js
index 80c8353..8f8765e 100644
--- a/webui/js/source/aavariables.js
+++ b/webui/js/source/aavariables.js
@@ -29,7 +29,6 @@ let G_current_list = '';
 let G_current_domain = '';
 let G_current_year = 0;
 let G_current_month = 0;
-let G_current_query = '';
 let G_current_open_email = null;
 let G_select_primed = false;
 let G_ponymail_preferences = {};

(incubator-ponymail-foal) 02/02: Regen JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 8e89624b49ecf53c70e6f2a3a989d96bffa509a5
Author: Sebb 
AuthorDate: Tue Apr 30 23:37:51 2024 +0100

Regen JS
---
 webui/admin.html | 8 
 webui/index.html | 6 +++---
 webui/js/ponymail.js | 3 +--
 webui/list.html  | 8 
 webui/oauth.html | 8 
 webui/thread.html| 8 
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 8ea5d41..274fb6a 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index b7935bf..4912f1b 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 2a2956c..d9038ff 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'ac738ec';
+const PONYMAIL_REVISION = 'a50ae4e';
 
 
 /**
@@ -37,7 +37,6 @@ let G_current_list = '';
 let G_current_domain = '';
 let G_current_year = 0;
 let G_current_month = 0;
-let G_current_query = '';
 let G_current_open_email = null;
 let G_select_primed = false;
 let G_ponymail_preferences = {};
diff --git a/webui/list.html b/webui/list.html
index f63f5b4..21d2913 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -179,9 +179,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index 461b383..b3171bd 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=ac738ec" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=a50ae4e" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index b6b08cd..1f2ad9a 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) branch master updated (8d2222a -> 8e89624)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 8da  Regen JS
 new a50ae4e  G_current_query is never read
 new 8e89624  Regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/admin.html   | 8 
 webui/index.html   | 6 +++---
 webui/js/ponymail.js   | 3 +--
 webui/js/source/aavariables.js | 1 -
 webui/list.html| 8 
 webui/oauth.html   | 8 
 webui/thread.html  | 8 
 7 files changed, 20 insertions(+), 22 deletions(-)

(incubator-ponymail-foal) branch master updated (abc5cf8 -> 8d2222a)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from abc5cf8  checkall is not used; search only has 2 args
 new ac738ec  G_current_query is never read
 new 8da  Regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/admin.html  | 8 
 webui/index.html  | 6 +++---
 webui/js/ponymail.js  | 3 +--
 webui/js/source/primer.js | 1 -
 webui/list.html   | 8 
 webui/oauth.html  | 8 
 webui/thread.html | 8 
 7 files changed, 20 insertions(+), 22 deletions(-)

(incubator-ponymail-foal) 01/02: G_current_query is never read

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit ac738ecc384be4610bd646aa934d8f3cc4298862
Author: Sebb 
AuthorDate: Tue Apr 30 23:35:47 2024 +0100

G_current_query is never read
---
 webui/js/ponymail.js  | 4 ++--
 webui/js/source/primer.js | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6f990fc..b047636 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -37,7 +37,7 @@ let G_current_list = '';
 let G_current_domain = '';
 let G_current_year = 0;
 let G_current_month = 0;
-let G_current_query = '';
+let G_current_query = ''; // NOT USED
 let G_current_open_email = null;
 let G_select_primed = false;
 let G_ponymail_preferences = {};
@@ -3516,7 +3516,7 @@ function post_prime(state) {
 if (G_current_year && G_current_month) {
 sURL += "=%u-%u".format(G_current_year, G_current_month);
 }
-if (!(state && state.search)) {
+if (!(state && state.search)) { // FIX: reverse logic
 if (state && state.array) {
 G_collated_json = {};
 for (let entry of state.array) {
diff --git a/webui/js/source/primer.js b/webui/js/source/primer.js
index 377f91a..b7b7232 100644
--- a/webui/js/source/primer.js
+++ b/webui/js/source/primer.js
@@ -96,7 +96,6 @@ function parseURL(state) {
 let month = bits[1];
 let query = bits[2];
 state = state || {};
-G_current_query = query || "";
 G_current_month = 0;
 G_current_year = 0;
 

(incubator-ponymail-foal) 02/02: Regen JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 8dada83926c399ee1e00161c59af0321b015
Author: Sebb 
AuthorDate: Tue Apr 30 23:36:50 2024 +0100

Regen JS
---
 webui/admin.html | 8 
 webui/index.html | 6 +++---
 webui/js/ponymail.js | 7 +++
 webui/list.html  | 8 
 webui/oauth.html | 8 
 webui/thread.html| 8 
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 9c725b1..8ea5d41 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index ed05c16..b7935bf 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index b047636..2a2956c 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'f8dc8ff';
+const PONYMAIL_REVISION = 'ac738ec';
 
 
 /**
@@ -37,7 +37,7 @@ let G_current_list = '';
 let G_current_domain = '';
 let G_current_year = 0;
 let G_current_month = 0;
-let G_current_query = ''; // NOT USED
+let G_current_query = '';
 let G_current_open_email = null;
 let G_select_primed = false;
 let G_ponymail_preferences = {};
@@ -3516,7 +3516,7 @@ function post_prime(state) {
 if (G_current_year && G_current_month) {
 sURL += "=%u-%u".format(G_current_year, G_current_month);
 }
-if (!(state && state.search)) { // FIX: reverse logic
+if (!(state && state.search)) {
 if (state && state.array) {
 G_collated_json = {};
 for (let entry of state.array) {
@@ -3541,7 +3541,6 @@ function parseURL(state) {
 let month = bits[1];
 let query = bits[2];
 state = state || {};
-G_current_query = query || "";
 G_current_month = 0;
 G_current_year = 0;
 
diff --git a/webui/list.html b/webui/list.html
index e82a93b..f63f5b4 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -179,9 +179,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index 631f211..461b383 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=9970074" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=ac738ec" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index 404095e..b6b08cd 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) branch master updated: checkall is not used; search only has 2 args

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new abc5cf8  checkall is not used; search only has 2 args
abc5cf8 is described below

commit abc5cf82225b1b1dc0fdff0d73824a12886554e5
Author: Sebb 
AuthorDate: Tue Apr 30 23:33:11 2024 +0100

checkall is not used; search only has 2 args
---
 webui/list.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/webui/list.html b/webui/list.html
index 08a244a..e82a93b 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -53,11 +53,9 @@ the License. -->
 
 
   
-  
+  
 
 
-
-
 
   Where to search:
   This list

(incubator-ponymail-foal) branch master updated: Update certifi to latest

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 034e905  Update certifi to latest
034e905 is described below

commit 034e9057c18ae9d0d2403aba9f4f0895ea31e6ae
Author: Sebb 
AuthorDate: Tue Apr 30 17:23:59 2024 +0100

Update certifi to latest
---
 server/requirements.txt | 2 +-
 tools/requirements.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/requirements.txt b/server/requirements.txt
index 7642068..584f8c3 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -5,7 +5,7 @@ multipart~=0.2.1 # MIT
 elasticsearch-dsl>=7.0.0,<8.0.0  # AL2.0
 # N.B. ES 7.14 introduces strict server version compatibility checks
 elasticsearch[async]>=7.13.1,<7.14.0 # AL2.0 (includes aiohttp)
-certifi~=2020.6.20   # MPL2.0
+certifi~=2024.2.2# MPL2.0
 netaddr~=0.8.0   # BSD, MIT
 formatflowed~=2.0.0  # Python Software Foundation
 google-auth~=1.30.0  # AL2.0
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 9aedca9..0b690fe 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -3,6 +3,6 @@ PyYAML~=6.0.1 # MIT
 # elasticsearch-dsl>=7.0.0,<8.0.0   # AL2.0 - not used by tools currently
 # N.B. ES 7.14 introduces strict server version compatibility checks
 elasticsearch[async]>=7.13.1,<7.14.0  # AL2.0
-certifi~=2020.6.20# MPL 2.0
+certifi~=2024.2.2 # MPL 2.0
 netaddr~=0.8.0# BSD, MIT
 formatflowed~=2.0.0   # Python Software Foundation

(incubator-ponymail-foal) branch master updated: Rebuild JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 2635b49  Rebuild JS
2635b49 is described below

commit 2635b49b674db02b0421d39f90c5fbb812b6f4fb
Author: Sebb 
AuthorDate: Tue Apr 30 17:19:52 2024 +0100

Rebuild JS
---
 webui/admin.html |  8 
 webui/index.html |  6 +++---
 webui/js/ponymail.js | 24 +---
 webui/list.html  |  8 
 webui/oauth.html |  8 
 webui/thread.html|  8 
 6 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 53a2b1c..9c725b1 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index b803470..ed05c16 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 676ab51..6f990fc 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -682,10 +682,8 @@ function compose_send() {
 for (let k in mua_headers) {
 content.push(k + "=" + encodeURIComponent(mua_headers[k]));
 }
-// Push the subject, (b)cc and email body into the form data
+// Push the subject and email body into the form data
 content.push("subject=" + 
encodeURIComponent(document.getElementById('composer_subject').value));
-content.push("cc=" + 
encodeURIComponent(document.getElementById('composer_cc').value));
-content.push("bcc=" + 
encodeURIComponent(document.getElementById('composer_bcc').value));
 content.push("body=" + 
encodeURIComponent(document.getElementById('composer_body').value));
 if (G_ponymail_preferences.login && 
G_ponymail_preferences.login.alternates && 
document.getElementById('composer_alt')) {
 content.push("alt=" + 
encodeURIComponent(document.getElementById('composer_alt').options[document.getElementById('composer_alt').selectedIndex].value));
@@ -787,26 +785,6 @@ function compose_email(replyto, list) {
 value: eml_subject
 }));
 form.push(new HTML('br'));
-form.push(new HTML('b', {}, "Cc:"));
-form.push(new HTML('br'));
-form.push(new HTML('input', {
-style: {
-width: '90%'
-},
-id: 'composer_cc',
-type: 'text',
-}));
-form.push(new HTML('br'));
-form.push(new HTML('b', {}, "Bcc:"));
-form.push(new HTML('br'));
-form.push(new HTML('input', {
-style: {
-width: '90%'
-},
-id: 'composer_bcc',
-type: 'text',
-}));
-form.push(new HTML('br'));
 form.push(new HTML('b', {}, "Reply:"));
 form.push(new HTML('br'));
 let body = new HTML('textarea', {
diff --git a/webui/list.html b/webui/list.html
index 87aa518..08a244a 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -181,9 +181,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index 833682c..631f211 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=f8dc8ff" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=9970074" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index 70577ae..404095e 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-site) branch asf-site updated: Current version is Ponymail Foal

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 2d0a52f  Current version is Ponymail Foal
2d0a52f is described below

commit 2d0a52fbb74c41b1fb9a150d4e4c2b95d9f8564f
Author: Sebb 
AuthorDate: Tue Apr 30 17:16:18 2024 +0100

Current version is Ponymail Foal

This fixes https://github.com/apache/incubator-ponymail-foal/issues/256
---
 content/contribute.html  | 8 
 content/docs/contributing.html   | 2 +-
 content/docs/install.centos.html | 2 +-
 content/docs/install.debian.html | 2 +-
 content/docs/install.fedora.html | 2 +-
 content/docs/install.ubuntu.html | 2 +-
 content/docs/installing.html | 4 ++--
 content/source.html  | 2 +-
 content/support.html | 2 +-
 source/markdown/contribute.md| 8 
 source/markdown/docs/CONTRIBUTING.md | 2 +-
 source/markdown/source.md| 2 +-
 source/markdown/support.md   | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/content/contribute.html b/content/contribute.html
index ee32491..b91558b 100644
--- a/content/contribute.html
+++ b/content/contribute.html
@@ -39,8 +39,8 @@
 Any form of contribution is most welcome, whether it be programming,
 documentation, evangelism, marketing, or helping out other users.
 Source code and issue tracker
-Our source repository is at: https://github.com/apache/incubator-ponymail;>https://github.com/apache/incubator-ponymail
-We currently use GitHub Issues for tracking bugs and improvements: https://github.com/apache/incubator-ponymail/issues;>https://github.com/apache/incubator-ponymail/issues
+Our source repository is at: https://github.com/apache/incubator-ponymail-foal;>https://github.com/apache/incubator-ponymail-foal
+We currently use GitHub Issues for tracking bugs and improvements: https://github.com/apache/incubator-ponymail-foal/issues;>https://github.com/apache/incubator-ponymail-foal/issues
 Contributing guideline
 To contribute to Pony Mail, follow these steps:
 
@@ -51,7 +51,7 @@ documentation, evangelism, marketing, or helping out other 
users.
 
 
 Find something to fix or help out with.
-Let us know what you want to do by opening an https://github.com/apache/incubator-ponymail/issues;>issue or a pull 
request.
+Let us know what you want to do by opening an https://github.com/apache/incubator-ponymail-foal/issues;>issue or a 
pull request.
 Join us on #ponymail on the Freenode IRC network.
 
 Git Workflow
@@ -62,7 +62,7 @@ repository configured as a remote. In this case we will add 
it as a
 remote called "ponymail":
 
 cd ponymail
-git remote add ponymail https://github.com/apache/incubator-ponymail.git
+git remote add ponymail https://github.com/apache/incubator-ponymail-foal.git
 
 Create the feature branch
 When beginning working on the feature, take a branch from the latest master 
version:
diff --git a/content/docs/contributing.html b/content/docs/contributing.html
index 22eea97..5a9b42d 100644
--- a/content/docs/contributing.html
+++ b/content/docs/contributing.html
@@ -43,7 +43,7 @@ are always on the lookout for user experiences. If you have 
used
 Pony Mail and have feedback or ideas you wish to share, please let
 us know either through an issue/PR here or on the mailing list.
 Code
-The Pony Mail code is on GitHub at 
https://github.com/apache/incubator-ponymail
+The Pony Mail code is on GitHub at 
https://github.com/apache/incubator-ponymail-foal
 and pull requests are welcome.
 Mailing lists
 Developers list:
diff --git a/content/docs/install.centos.html b/content/docs/install.centos.html
index 475d0df..a6a2b39 100644
--- a/content/docs/install.centos.html
+++ b/content/docs/install.centos.html
@@ -120,7 +120,7 @@ sudo /etc/init.d/elasticsearch start
 Check out a copy of Pony Mail:
 
 cd /var/www
-git clone https://github.com/apache/incubator-ponymail.git
+git clone https://github.com/apache/incubator-ponymail-foal.git
 
 Set up Pony Mail:
 
diff --git a/content/docs/install.debian.html b/content/docs/install.debian.html
index 0b99dbd..57f0a66 100644
--- a/content/docs/install.debian.html
+++ b/content/docs/install.debian.html
@@ -64,7 +64,7 @@ sudo apt-get update && sudo apt-get install elasticsearch
 Check out a copy of Pony Mail:
 
 cd /var/www
-sudo git clone https://github.com/apache/incubator-ponymail.git
+sudo git clone https://github.com/apache/incubator-ponymail-foal.git
 
 Start up ElasticSearch:
 
diff --git a/content/docs/install.fedora.html b/content/docs/install.fedora.html
index 394f7cf..252df8d 100644
--- a/content/docs/install.fedora.html
+++ b/content/docs/install.fedora.html
@@ -89,7 +89,7 @@ sudo /etc/init.d/elasticsearch start
 Check out a copy of Pony Mail:
 
 cd /var/www
-sudo git clone

(incubator-ponymail-foal) branch master updated (9970074 -> 7aade30)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 9970074  Merge pull request #251 from raboof/show-oauth-error
 add 13ed038  Support 'Cc' in the web mail/reply composer
 add 0ba4cc4  Bcc as well
 new 7aade30  Merge pull request #250 from raboof/cc

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 server/endpoints/compose.py |  6 ++
 webui/js/ponymail.js| 24 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)

(incubator-ponymail-foal) 01/01: Merge pull request #250 from raboof/cc

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 7aade3057f09888549309ec596a8a36d5d058a7f
Merge: 9970074 0ba4cc4
Author: Sebb 
AuthorDate: Tue Apr 30 16:58:57 2024 +0100

Merge pull request #250 from raboof/cc

Support 'Cc' in the web mail/reply composer

 server/endpoints/compose.py |  6 ++
 webui/js/ponymail.js| 24 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)

(incubator-ponymail-foal) 01/01: Merge pull request #251 from raboof/show-oauth-error

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 99700746f5207d670fd246e329962bc405916ed0
Merge: 505fa9a 18cecc2
Author: Sebb 
AuthorDate: Tue Apr 30 16:57:15 2024 +0100

Merge pull request #251 from raboof/show-oauth-error

Show error alert when oauth fails

 webui/js/oauth.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(incubator-ponymail-foal) branch master updated (505fa9a -> 9970074)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 505fa9a  Merge pull request #252 from 
raboof/show-internal-server-errors
 add 18cecc2  Show error alert when oauth fails
 new 9970074  Merge pull request #251 from raboof/show-oauth-error

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/js/oauth.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(incubator-ponymail-foal) branch master updated (fee7837 -> 505fa9a)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from fee7837  Rebuild JS
 add 027d666  Show an error popup for internal server errors
 new 505fa9a  Merge pull request #252 from 
raboof/show-internal-server-errors

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/js/oauth.js | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

(incubator-ponymail-foal) 01/01: Merge pull request #252 from raboof/show-internal-server-errors

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 505fa9acd8884744d9429a32bd5689a0a73b8ea5
Merge: fee7837 027d666
Author: Sebb 
AuthorDate: Tue Apr 30 16:53:56 2024 +0100

Merge pull request #252 from raboof/show-internal-server-errors

Show an error popup for internal server errors
[skip ci]

 webui/js/oauth.js | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

(incubator-ponymail-foal) branch master updated: Rebuild JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new fee7837  Rebuild JS
fee7837 is described below

commit fee7837aa2ad55b35053528daba66179da73bff5
Author: Sebb 
AuthorDate: Tue Apr 30 16:48:08 2024 +0100

Rebuild JS
---
 webui/admin.html |  8 
 webui/index.html |  6 +++---
 webui/js/ponymail.js | 16 +---
 webui/list.html  |  8 
 webui/oauth.html |  8 
 webui/thread.html|  8 
 6 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 9c67643..53a2b1c 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index c0d5ef4..b803470 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index a1e3516..6f990fc 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = '5a0f102';
+const PONYMAIL_REVISION = 'f8dc8ff';
 
 
 /**
@@ -694,8 +694,18 @@ function compose_send() {
 request.setRequestHeader("Content-type", 
"application/x-www-form-urlencoded");
 request.send(content.join("&")); // send email as a POST string
 
-document.getElementById('composer_modal').style.display = 'none';
-modal("Message dispatched!", "Your email has been sent. Depending on 
moderation rules, it may take a while before it shows up in the archives.", 
"help");
+request.onreadystatechange = function(state) {
+if (request.readyState == 4) {
+document.getElementById('composer_modal').style.display = 'none';
+let response = JSON.parse(request.responseText)
+if (response.error) {
+modal("Message dispatch failed!", response.error, "error");
+} else {
+modal("Message dispatched!", "Your email has been sent. 
Depending on moderation rules, it may take a while before it shows up in the 
archives.", "help");
+}
+}
+}
+
 }
 
 function compose_email(replyto, list) {
diff --git a/webui/list.html b/webui/list.html
index 8466aed..87aa518 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -181,9 +181,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index ae4bb24..833682c 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=f8dc8ff" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index 4a18034..70577ae 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) branch master updated (d12e247 -> 3093ef4)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from d12e247  Satisfy mypy
 add f8dc8ff  Show message dispatch error
 new 3093ef4  Merge pull request #253 from 
raboof/show-message-dispatch-error

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 webui/js/source/composer.js | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

(incubator-ponymail-foal) 01/01: Merge pull request #253 from raboof/show-message-dispatch-error

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 3093ef4fe32b294368aa46e3ae6699a15c4b0522
Merge: d12e247 f8dc8ff
Author: Sebb 
AuthorDate: Tue Apr 30 16:47:26 2024 +0100

Merge pull request #253 from raboof/show-message-dispatch-error

Show message dispatch error
[skip ci] - need to run build.sh

 webui/js/source/composer.js | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

(incubator-ponymail-foal) branch bad_encoding updated (0b12cfc -> c1db43c)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 0b12cfc  Update server version
 add d12e247  Satisfy mypy
 add c1db43c  Merge branch 'master' into bad_encoding

No new revisions were added by this update.

Summary of changes:
 tools/archiver.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

(incubator-ponymail-foal) branch master updated: Satisfy mypy

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new d12e247  Satisfy mypy
d12e247 is described below

commit d12e247c41f4298028181a4e54f1627e7cc04509
Author: Sebb 
AuthorDate: Tue Apr 30 16:06:29 2024 +0100

Satisfy mypy
---
 tools/archiver.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index f924374..9d364fd 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -430,7 +430,11 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
 ):
 first_html = Body(part)
 except Exception as err:
-print('Error on line 
{}:'.format(sys.exc_info()[-1].tb_lineno), type(err).__name__, err)
+entry = sys.exc_info()[-1]
+if entry: # avoid mypy complaint
+print('Error on line {}:'.format(entry.tb_lineno), 
type(err).__name__, err)
+else: # Should not happen, but just in case
+print('Failed to create Body(part):',type(err).__name__, 
err)
 
 # this requires a GPL lib, user will have to install it themselves
 if first_html and (

(incubator-ponymail-foal) branch bad_encoding updated (b7e6b5a -> 0b12cfc)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from b7e6b5a  Merge branch 'master' into bad_encoding
 add 0b12cfc  Update server version

No new revisions were added by this update.

Summary of changes:
 server/server_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(incubator-ponymail-foal) branch bad_encoding updated (1c9c701 -> b7e6b5a)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 1c9c701  Merge branch 'master' into bad_encoding
 add 5313738  Sync with server version
 add b7e6b5a  Merge branch 'master' into bad_encoding

No new revisions were added by this update.

Summary of changes:
 tools/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(incubator-ponymail-foal) branch master updated: Sync with server version

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 5313738  Sync with server version
5313738 is described below

commit 531373825e003c4d0578864f84f1d1fde520dcbd
Author: Sebb 
AuthorDate: Tue Apr 30 11:39:48 2024 +0100

Sync with server version
---
 tools/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/requirements.txt b/tools/requirements.txt
index 7a70f22..9aedca9 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,5 +1,5 @@
 # Items in this file must have a licence compatible with AL 2.0
-PyYAML~=5.4.1 # WTFPL
+PyYAML~=6.0.1 # MIT
 # elasticsearch-dsl>=7.0.0,<8.0.0   # AL2.0 - not used by tools currently
 # N.B. ES 7.14 introduces strict server version compatibility checks
 elasticsearch[async]>=7.13.1,<7.14.0  # AL2.0

(incubator-ponymail-foal) branch drydump deleted (was 3635a88)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


 was 3635a88  Rebuild JS

This change permanently discards the following revisions:

 discard 3635a88  Rebuild JS
 discard 22455c9  Fix version again
 discard 95b8a40  Fix old versions
 discard 9e6dfef  Allow dump with dryrun

(incubator-ponymail-foal) branch bad_encoding updated (492855c -> 1c9c701)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 492855c  3.10 is having issues
 add 8bc8196  Merge branch 'master' into bad_encoding
 add 6b2b8f7  Allow for 3.10 setup issued
 add f1e458c  Regen JS
 add 4d644b1  Type checking fixes
 add 8a9afd9  Fix server version
 add ab4bbbf  PyYAML needs updating for current Python
 add 949ddf5  Fix up Python versions
 add 8e3ebc4  Try to find where Unit tests fail
 add b3031fe  Is it an issue with PyYAML
 add ff47237  Show installed
 add 5078483  Temp test fix?
 add c870dc5  No need to trigger here
 add 4fdbcea  Not a problem; 3.7 is obsolete
 add 4f6c14b  Very simple ES debug class
 add 3935744  Revert b3031fef2b38d0fc08e9c06d10a282126b188363; not relevant
 add d7d680d  Merge branch 'master' into bad_encoding
 add cab6a1d  Add some context for error messages
 add 1c9c701  Merge branch 'master' into bad_encoding

No new revisions were added by this update.

Summary of changes:
 .github/workflows/integration-tests.yml |  4 +-
 .github/workflows/type-tests.yml|  4 +-
 .github/workflows/unittest.yml  | 10 ++--
 server/plugins/messages.py  |  1 +
 server/requirements.txt |  2 +-
 server/server_version.py|  2 +-
 test/esintercept/elasticsearch.py   | 83 +
 tools/archiver.py   |  6 ++-
 8 files changed, 102 insertions(+), 10 deletions(-)
 create mode 100644 test/esintercept/elasticsearch.py

(incubator-ponymail-foal) branch master updated: Add some context for error messages

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new cab6a1d  Add some context for error messages
cab6a1d is described below

commit cab6a1d0979d4c4ee900412fb8f61c702a52b093
Author: Sebb 
AuthorDate: Tue Apr 30 11:31:36 2024 +0100

Add some context for error messages
---
 tools/archiver.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index 96e831a..f924374 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -430,7 +430,7 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
 ):
 first_html = Body(part)
 except Exception as err:
-print(err)
+print('Error on line 
{}:'.format(sys.exc_info()[-1].tb_lineno), type(err).__name__, err)
 
 # this requires a GPL lib, user will have to install it themselves
 if first_html and (
@@ -761,7 +761,7 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
 # If we have a dump dir and ES failed, push to dump dir instead as a 
JSON object
 # We'll leave it to another process to pick up the slack.
 except Exception as err:
-print(err)
+print('Error on line {}:'.format(sys.exc_info()[-1].tb_lineno), 
type(err).__name__, err)
 if dump:
 print(
 "Pushing to ES failed, but dumponfail specified, dumping 
JSON docs"

(incubator-ponymail-foal) branch master updated: Revert b3031fef2b38d0fc08e9c06d10a282126b188363; not relevant

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 3935744  Revert b3031fef2b38d0fc08e9c06d10a282126b188363; not relevant
3935744 is described below

commit 3935744f8c3685532ebce9afc0c79bbfcd24c391
Author: Sebb 
AuthorDate: Tue Apr 30 11:21:12 2024 +0100

Revert b3031fef2b38d0fc08e9c06d10a282126b188363; not relevant
---
 tools/requirements.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/requirements.txt b/tools/requirements.txt
index 37264d3..7a70f22 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,6 +1,5 @@
 # Items in this file must have a licence compatible with AL 2.0
-PyYAML~=6.0.1 ; python_version > "3.8"   # MIT
-PyYAML~=5.4.1 ; python_version < "3.9"   # MIT
+PyYAML~=5.4.1 # WTFPL
 # elasticsearch-dsl>=7.0.0,<8.0.0   # AL2.0 - not used by tools currently
 # N.B. ES 7.14 introduces strict server version compatibility checks
 elasticsearch[async]>=7.13.1,<7.14.0  # AL2.0

(incubator-ponymail-foal) branch master updated: Very simple ES debug class

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 4f6c14b  Very simple ES debug class
4f6c14b is described below

commit 4f6c14baa89d8a8b2c3dbd92b64fee73d0afac71
Author: Sebb 
AuthorDate: Sun Apr 28 14:04:38 2024 +0100

Very simple ES debug class

[skip ci]
---
 test/esintercept/elasticsearch.py | 83 +++
 1 file changed, 83 insertions(+)

diff --git a/test/esintercept/elasticsearch.py 
b/test/esintercept/elasticsearch.py
new file mode 100644
index 000..4e43a70
--- /dev/null
+++ b/test/esintercept/elasticsearch.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Very simple module to intercept calls to Elasticsearch methods
+# Writes call parameters to a file.
+#
+# Use it by defining PYTHONPATH to include its parent dir, e.g.
+# [OUT=/tmp/pmfoal_out.txt] PYTHONPATH=test/esintercept python3 
tools/archiver.py 

(incubator-ponymail-foal) branch master updated: Not a problem; 3.7 is obsolete

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 4fdbcea  Not a problem; 3.7 is obsolete
4fdbcea is described below

commit 4fdbceafa3a07e9985e658e3072a352b00f5e4f7
Author: Sebb 
AuthorDate: Sun Apr 28 12:56:42 2024 +0100

Not a problem; 3.7 is obsolete

[skip ci]
---
 .github/workflows/unittest.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 9f8e8cf..43e66cf 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -16,7 +16,7 @@ jobs:
   max-parallel: 1
   matrix:
 # 3.8 EOL 2024-10 approx
-python-version: [3.7, 3.8, "3.10", 3.12]
+python-version: [3.8, "3.10", 3.12]
 
 steps:
 - uses: actions/checkout@master
@@ -37,8 +37,8 @@ jobs:
 python -m pip install --upgrade pip
 pip install -r tools/requirements.txt
 pip install -r test/requirements.txt
-# WARNING: Later versions of html2text cause some tests to fail
-# It is not yet clear if this is a testing issue or a genuine problem
+# Later versions of html2text cause html-based tests to fail, because 
of a changed conversion
+# This only affects the appearance of the message body, so does not 
matter for compatibility
 pip install html2text==2020.1.16 # optional dependency, but needed for 
tests
 pip list
 - name: Check versions

(incubator-ponymail-foal) branch master updated: No need to trigger here

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new c870dc5  No need to trigger here
c870dc5 is described below

commit c870dc5216301c7844fe709bc169979d51b0bb1b
Author: Sebb 
AuthorDate: Sun Apr 28 08:21:09 2024 +0100

No need to trigger here

[skip ci]
---
 .github/workflows/type-tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml
index 91b7c96..41632bd 100644
--- a/.github/workflows/type-tests.yml
+++ b/.github/workflows/type-tests.yml
@@ -4,6 +4,7 @@ on:
   push:
 paths-ignore:
   - '**/integration-tests.yml'
+  - '**/unittest.yml'
   - 'test/itest*'
   
   workflow_dispatch:

(incubator-ponymail-foal) branch master updated: Temp test fix?

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 5078483  Temp test fix?
5078483 is described below

commit 50784830190508ce80240bba0c1d836d669ed649
Author: Sebb 
AuthorDate: Sun Apr 28 01:25:54 2024 +0100

Temp test fix?
---
 .github/workflows/unittest.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 4891f9b..9f8e8cf 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -37,7 +37,9 @@ jobs:
 python -m pip install --upgrade pip
 pip install -r tools/requirements.txt
 pip install -r test/requirements.txt
-pip install html2text # optional dependency, but needed for tests
+# WARNING: Later versions of html2text cause some tests to fail
+# It is not yet clear if this is a testing issue or a genuine problem
+pip install html2text==2020.1.16 # optional dependency, but needed for 
tests
 pip list
 - name: Check versions
   run: |

(incubator-ponymail-foal) branch master updated: Show installed

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new ff47237  Show installed
ff47237 is described below

commit ff47237e2e4045742fbd5343d25a888bb60b30ef
Author: Sebb 
AuthorDate: Sun Apr 28 01:13:32 2024 +0100

Show installed
---
 .github/workflows/integration-tests.yml | 1 +
 .github/workflows/unittest.yml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/integration-tests.yml 
b/.github/workflows/integration-tests.yml
index 3a647d9..8ea7174 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -61,6 +61,7 @@ jobs:
 pip install -r tools/requirements.txt
 pip install -r server/requirements.txt
 pip install -r test/requirements.txt
+pip list
 - name: Basic test
   run: |
 curl -sq "http://localhost:9200/_cluster/health?level=indices;
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 7f110f7..4891f9b 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -38,6 +38,7 @@ jobs:
 pip install -r tools/requirements.txt
 pip install -r test/requirements.txt
 pip install html2text # optional dependency, but needed for tests
+pip list
 - name: Check versions
   run: |
 webui/js/source/build.sh

(incubator-ponymail-foal) branch master updated: Is it an issue with PyYAML

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new b3031fe  Is it an issue with PyYAML
b3031fe is described below

commit b3031fef2b38d0fc08e9c06d10a282126b188363
Author: Sebb 
AuthorDate: Sun Apr 28 01:08:05 2024 +0100

Is it an issue with PyYAML
---
 tools/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/requirements.txt b/tools/requirements.txt
index 97d0c7b..37264d3 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,6 +1,6 @@
 # Items in this file must have a licence compatible with AL 2.0
-PyYAML~=6.0.1 ; python_version > "3.7"   # MIT
-PyYAML~=5.4.1 ; python_version < "3.8"   # MIT
+PyYAML~=6.0.1 ; python_version > "3.8"   # MIT
+PyYAML~=5.4.1 ; python_version < "3.9"   # MIT
 # elasticsearch-dsl>=7.0.0,<8.0.0   # AL2.0 - not used by tools currently
 # N.B. ES 7.14 introduces strict server version compatibility checks
 elasticsearch[async]>=7.13.1,<7.14.0  # AL2.0

(incubator-ponymail-foal) branch master updated: Try to find where Unit tests fail

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 8e3ebc4  Try to find where Unit tests fail
8e3ebc4 is described below

commit 8e3ebc4e6a7d3ea6692959f923a2d4428c7ea87d
Author: Sebb 
AuthorDate: Sun Apr 28 01:03:51 2024 +0100

Try to find where Unit tests fail
---
 .github/workflows/unittest.yml | 2 +-
 tools/requirements.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 062f1c4..7f110f7 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -16,7 +16,7 @@ jobs:
   max-parallel: 1
   matrix:
 # 3.8 EOL 2024-10 approx
-python-version: [3.8, "3.10", 3.12]
+python-version: [3.7, 3.8, "3.10", 3.12]
 
 steps:
 - uses: actions/checkout@master
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 9aedca9..97d0c7b 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,5 +1,6 @@
 # Items in this file must have a licence compatible with AL 2.0
-PyYAML~=6.0.1 # MIT
+PyYAML~=6.0.1 ; python_version > "3.7"   # MIT
+PyYAML~=5.4.1 ; python_version < "3.8"   # MIT
 # elasticsearch-dsl>=7.0.0,<8.0.0   # AL2.0 - not used by tools currently
 # N.B. ES 7.14 introduces strict server version compatibility checks
 elasticsearch[async]>=7.13.1,<7.14.0  # AL2.0

(incubator-ponymail-foal) branch master updated: Fix up Python versions

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 949ddf5  Fix up Python versions
949ddf5 is described below

commit 949ddf5f0a5dc4e81ae7cbe68c6e4d3e324e9ac5
Author: Sebb 
AuthorDate: Sun Apr 28 00:29:43 2024 +0100

Fix up Python versions
---
 .github/workflows/integration-tests.yml | 3 ++-
 .github/workflows/type-tests.yml| 3 ++-
 .github/workflows/unittest.yml  | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integration-tests.yml 
b/.github/workflows/integration-tests.yml
index 1062ebd..3a647d9 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -52,7 +52,8 @@ jobs:
 - name: Setup python
   uses: actions/setup-python@v2
   with:
-python-version: '3.9'
+# 3.12 current as of 2024
+python-version: '3.12'
 architecture: x64
 - name: Install dependencies
   run: |
diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml
index 41a6302..91b7c96 100644
--- a/.github/workflows/type-tests.yml
+++ b/.github/workflows/type-tests.yml
@@ -15,7 +15,8 @@ jobs:
 strategy:
   max-parallel: 1
   matrix:
-python-version: [3.7, 3.9, "3.10"]
+# 3.8 EOL 2024-10 approx
+python-version: [3.8, "3.10", 3.12]
 steps:
 - uses: actions/checkout@master
   with:
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 1decd10..062f1c4 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -13,11 +13,10 @@ jobs:
 
 runs-on: ubuntu-latest
 strategy:
-  # Ensure 3.7 runs first
   max-parallel: 1
   matrix:
-# python-version: [2.7, 3.5, 3.6, 3.7]
-python-version: [3.7, "3.10"]
+# 3.8 EOL 2024-10 approx
+python-version: [3.8, "3.10", 3.12]
 
 steps:
 - uses: actions/checkout@master

(incubator-ponymail-foal) branch master updated: PyYAML needs updating for current Python

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new ab4bbbf  PyYAML needs updating for current Python
ab4bbbf is described below

commit ab4bbbf26b4917a051d004a3dd5420f536e9eb17
Author: Sebb 
AuthorDate: Sun Apr 28 00:24:32 2024 +0100

PyYAML needs updating for current Python
---
 server/requirements.txt | 2 +-
 tools/requirements.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/requirements.txt b/server/requirements.txt
index a9ad6f3..7642068 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
@@ -1,5 +1,5 @@
 # Items in this file must have a licence compatible with AL 2.0
-PyYAML~=5.4.1# WTFPL
+PyYAML~=6.0.1# MIT
 types-PyYAML # AL2.0
 multipart~=0.2.1 # MIT
 elasticsearch-dsl>=7.0.0,<8.0.0  # AL2.0
diff --git a/tools/requirements.txt b/tools/requirements.txt
index 7a70f22..9aedca9 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1,5 +1,5 @@
 # Items in this file must have a licence compatible with AL 2.0
-PyYAML~=5.4.1 # WTFPL
+PyYAML~=6.0.1 # MIT
 # elasticsearch-dsl>=7.0.0,<8.0.0   # AL2.0 - not used by tools currently
 # N.B. ES 7.14 introduces strict server version compatibility checks
 elasticsearch[async]>=7.13.1,<7.14.0  # AL2.0

(incubator-ponymail-foal) branch master updated: Fix server version

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 8a9afd9  Fix server version
8a9afd9 is described below

commit 8a9afd9e270edab702c16e0b174fc912dfb65797
Author: Sebb 
AuthorDate: Sun Apr 28 00:05:39 2024 +0100

Fix server version
---
 server/server_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/server_version.py b/server/server_version.py
index ad04347..a78d1f6 100644
--- a/server/server_version.py
+++ b/server/server_version.py
@@ -1,2 +1,2 @@
 # This file is generated by server/update_version.sh
-PONYMAIL_SERVER_VERSION = '218c4f5'
+PONYMAIL_SERVER_VERSION = '4d644b1'

(incubator-ponymail-foal) branch master updated: Type checking fixes

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 4d644b1  Type checking fixes
4d644b1 is described below

commit 4d644b1058fc015236e68a28f3ff43506d93830a
Author: Sebb 
AuthorDate: Sat Apr 27 23:54:05 2024 +0100

Type checking fixes
---
 server/plugins/messages.py | 1 +
 tools/archiver.py  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/server/plugins/messages.py b/server/plugins/messages.py
index 584df4d..7443954 100644
--- a/server/plugins/messages.py
+++ b/server/plugins/messages.py
@@ -558,6 +558,7 @@ class ThreadConstructor:
 """Turns a flat array of emails into a nested structure of threads"""
 for cur_email in sorted(self.emails, key=lambda x: x["epoch"]):
 author = cur_email.get("from")
+assert(author)
 if author not in self.authors:
 self.authors[author] = [0, cur_email.get("gravatar", "")]
 self.authors[author][0] += 1
diff --git a/tools/archiver.py b/tools/archiver.py
index 2feb887..96e831a 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -158,6 +158,7 @@ def parse_attachment(
 # Allow for empty string
 if fd is None:
 return None, None
+assert(isinstance(fd, bytes)) # decode=True generates bytes
 if filename:
 attachment = {
 "content_type": part.get_content_type(),
@@ -202,6 +203,7 @@ class Body:
 self.bytes = part.get_payload(decode=True)
 self.html_as_source = False
 if self.bytes is not None:
+assert(isinstance(self.bytes, bytes)) # decode=True generates bytes
 valid_encodings = [x for x in self.charsets if x]
 if valid_encodings:
 for cs in valid_encodings:

(incubator-ponymail-foal) branch master updated: Regen JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new f1e458c  Regen JS
f1e458c is described below

commit f1e458c9171481628c8d2189377e1ad44dcd756f
Author: Sebb 
AuthorDate: Sat Apr 27 11:01:50 2024 +0100

Regen JS
---
 webui/admin.html | 8 
 webui/index.html | 6 +++---
 webui/js/ponymail.js | 4 ++--
 webui/list.html  | 8 
 webui/oauth.html | 8 
 webui/thread.html| 8 
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 6473d30..9c67643 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index ddcf7a4..c0d5ef4 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6b6a35e..a1e3516 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'f3a4716';
+const PONYMAIL_REVISION = '5a0f102';
 
 
 /**
@@ -627,7 +627,7 @@ function fixup_quotes(splicer) {
 quote = m[0];
 i = quote.length;
 t = splicer.substr(0, i);
-quote = quote.replace(/(>*\s*\r?\n)+$/g, "");
+quote = quote.replace(/\n>[>\s]*$/g, "\n");
 qdiv = new HTML('div', {
 "class": "email_quote_parent"
 }, [
diff --git a/webui/list.html b/webui/list.html
index 4006aee..8466aed 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -181,9 +181,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index f44c0f8..ae4bb24 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index d229418..4a18034 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) branch master updated (2dcc8fb -> 6b2b8f7)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 2dcc8fb  Merge pull request #243 from raboof/faster-quote-regex
 add 6b2b8f7  Allow for 3.10 setup issued

No new revisions were added by this update.

Summary of changes:
 .github/workflows/type-tests.yml | 2 +-
 .github/workflows/unittest.yml   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(incubator-ponymail-foal) branch bad_encoding updated (ffa7c41 -> 492855c)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from ffa7c41  Regen JS
 add 492855c  3.10 is having issues

No new revisions were added by this update.

Summary of changes:
 .github/workflows/type-tests.yml | 2 +-
 .github/workflows/unittest.yml   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(incubator-ponymail-foal) 02/02: Regen JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit ffa7c4145fb47c5790749bdabc6774bbe1afb64e
Author: Sebb 
AuthorDate: Fri Apr 26 23:41:21 2024 +0100

Regen JS
---
 webui/admin.html | 8 
 webui/index.html | 6 +++---
 webui/js/ponymail.js | 4 ++--
 webui/list.html  | 8 
 webui/oauth.html | 8 
 webui/thread.html| 8 
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 6473d30..9c67643 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index ddcf7a4..c0d5ef4 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6b6a35e..a1e3516 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'f3a4716';
+const PONYMAIL_REVISION = '5a0f102';
 
 
 /**
@@ -627,7 +627,7 @@ function fixup_quotes(splicer) {
 quote = m[0];
 i = quote.length;
 t = splicer.substr(0, i);
-quote = quote.replace(/(>*\s*\r?\n)+$/g, "");
+quote = quote.replace(/\n>[>\s]*$/g, "\n");
 qdiv = new HTML('div', {
 "class": "email_quote_parent"
 }, [
diff --git a/webui/list.html b/webui/list.html
index 4006aee..8466aed 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -181,9 +181,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index f44c0f8..ae4bb24 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index d229418..4a18034 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) branch bad_encoding created (now ffa7c41)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


  at ffa7c41  Regen JS

This branch includes the following new commits:

 new 1164bf8  Skip bad encoding
 new ffa7c41  Regen JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(incubator-ponymail-foal) 01/02: Skip bad encoding

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch bad_encoding
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 1164bf8661232365286dcb27ed157246eb704146
Author: Sebb 
AuthorDate: Fri Apr 26 23:40:05 2024 +0100

Skip bad encoding
---
 tools/archiver.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index 2feb887..89d7af1 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -211,6 +211,9 @@ class Body:
 break
 except UnicodeDecodeError:
 pass
+except LookupError:
+print("Body detected invalid encoding: %s" % cs)
+pass
 # If no character set was defined, the email MUST be US-ASCII by 
RFC822 defaults
 # This isn't always the case, as we're about to discover.
 if not self.string:
@@ -428,7 +431,7 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
 ):
 first_html = Body(part)
 except Exception as err:
-print(err)
+print("Failed to extract Body: %s" % err)
 
 # this requires a GPL lib, user will have to install it themselves
 if first_html and (

(incubator-ponymail-foal) 02/02: Rebuild JS

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 3635a88135347960cce05cc99be732bab47a8a32
Author: Sebb 
AuthorDate: Fri Apr 26 00:21:30 2024 +0100

Rebuild JS
---
 webui/admin.html | 8 
 webui/index.html | 6 +++---
 webui/js/ponymail.js | 4 ++--
 webui/list.html  | 8 
 webui/oauth.html | 8 
 webui/thread.html| 8 
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/webui/admin.html b/webui/admin.html
index 6473d30..9c67643 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -79,9 +79,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   
diff --git a/webui/index.html b/webui/index.html
index ddcf7a4..c0d5ef4 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -63,8 +63,8 @@ the License. -->
 
 
 
-
-
+
+
   
 
 
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 6b6a35e..a1e3516 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
 
-const PONYMAIL_REVISION = 'f3a4716';
+const PONYMAIL_REVISION = '5a0f102';
 
 
 /**
@@ -627,7 +627,7 @@ function fixup_quotes(splicer) {
 quote = m[0];
 i = quote.length;
 t = splicer.substr(0, i);
-quote = quote.replace(/(>*\s*\r?\n)+$/g, "");
+quote = quote.replace(/\n>[>\s]*$/g, "\n");
 qdiv = new HTML('div', {
 "class": "email_quote_parent"
 }, [
diff --git a/webui/list.html b/webui/list.html
index 4006aee..8466aed 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -181,9 +181,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
 
diff --git a/webui/oauth.html b/webui/oauth.html
index f44c0f8..ae4bb24 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
 
 <!-- CSS -->
 <link href="css/bootstrap.min.css" rel="stylesheet" media="all">
-<link href="css/scaffolding.css?revision=f3a4716" rel="stylesheet" 
media="all">
+<link href="css/scaffolding.css?revision=5a0f102" rel="stylesheet" 
media="all">
 <link href="css/modal.css" rel="stylesheet" media="all">
 <link href="css/spinner.css" rel="stylesheet" media="all">
 
@@ -54,8 +54,8 @@ the License. -->
 <script src="js/jquery-1.12.4.min.js" 
integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=">
 
 
-
-
-
+
+
+
   
 
diff --git a/webui/thread.html b/webui/thread.html
index d229418..4a18034 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
 
 
 
-
+
 
 
 
@@ -97,9 +97,9 @@ the License. -->
 
 
 
-
-
-
+
+
+
   
 
   

(incubator-ponymail-foal) branch drydump updated (95b8a40 -> 3635a88)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


from 95b8a40  Fix old versions
 new 22455c9  Fix version again
 new 3635a88  Rebuild JS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/integration-tests.yml | 2 +-
 .github/workflows/type-tests.yml| 2 +-
 .github/workflows/unittest.yml  | 2 +-
 webui/admin.html| 8 
 webui/index.html| 6 +++---
 webui/js/ponymail.js| 4 ++--
 webui/list.html | 8 
 webui/oauth.html| 8 
 webui/thread.html   | 8 
 9 files changed, 24 insertions(+), 24 deletions(-)

(incubator-ponymail-foal) 01/02: Fix version again

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 22455c954845611c64c41f232b4193c54b9a69bd
Author: Sebb 
AuthorDate: Fri Apr 26 00:20:08 2024 +0100

Fix version again
---
 .github/workflows/integration-tests.yml | 2 +-
 .github/workflows/type-tests.yml| 2 +-
 .github/workflows/unittest.yml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/integration-tests.yml 
b/.github/workflows/integration-tests.yml
index 0444a42..0288555 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -50,7 +50,7 @@ jobs:
   with:
 persist-credentials: false
 - name: Setup python
-  uses: actions/setup-python@v4
+  uses: actions/setup-python@v5
   with:
 python-version: '3.9'
 architecture: x64
diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml
index 687c428..d3a828c 100644
--- a/.github/workflows/type-tests.yml
+++ b/.github/workflows/type-tests.yml
@@ -21,7 +21,7 @@ jobs:
   with:
 persist-credentials: false
 - name: Set up Python ${{ matrix.python-version }}
-  uses: actions/setup-python@v4
+  uses: actions/setup-python@v5
   with:
 python-version: ${{ matrix.python-version }}
 - name: Install dependencies
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 32d9350..b4bc938 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -29,7 +29,7 @@ jobs:
 repository: apache/incubator-ponymail-unit-tests
 path: pmtests
 - name: Set up Python ${{ matrix.python-version }}
-  uses: actions/setup-python@v4
+  uses: actions/setup-python@v5
   with:
 python-version: ${{ matrix.python-version }}
 - name: Install dependencies

(incubator-ponymail-foal) branch drydump updated: Fix old versions

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/drydump by this push:
 new 95b8a40  Fix old versions
95b8a40 is described below

commit 95b8a40e69e6094dc836ea0ec78f10fb70cc6b21
Author: Sebb 
AuthorDate: Fri Apr 26 00:14:19 2024 +0100

Fix old versions
---
 .github/workflows/integration-tests.yml | 2 +-
 .github/workflows/type-tests.yml| 4 ++--
 .github/workflows/unittest.yml  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integration-tests.yml 
b/.github/workflows/integration-tests.yml
index 1062ebd..0444a42 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -50,7 +50,7 @@ jobs:
   with:
 persist-credentials: false
 - name: Setup python
-  uses: actions/setup-python@v2
+  uses: actions/setup-python@v4
   with:
 python-version: '3.9'
 architecture: x64
diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml
index 16cab27..687c428 100644
--- a/.github/workflows/type-tests.yml
+++ b/.github/workflows/type-tests.yml
@@ -15,13 +15,13 @@ jobs:
 strategy:
   max-parallel: 1
   matrix:
-python-version: ["3.10", 3.7, 3.9]
+python-version: [3.7, 3.9, "3.10"]
 steps:
 - uses: actions/checkout@master
   with:
 persist-credentials: false
 - name: Set up Python ${{ matrix.python-version }}
-  uses: actions/setup-python@v2
+  uses: actions/setup-python@v4
   with:
 python-version: ${{ matrix.python-version }}
 - name: Install dependencies
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 077a395..32d9350 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -13,7 +13,7 @@ jobs:
 
 runs-on: ubuntu-latest
 strategy:
-  max-parallel: 4
+  max-parallel: 1
   matrix:
 # python-version: [2.7, 3.5, 3.6, 3.7]
 python-version: [3.7, "3.10"]
@@ -29,7 +29,7 @@ jobs:
 repository: apache/incubator-ponymail-unit-tests
 path: pmtests
 - name: Set up Python ${{ matrix.python-version }}
-  uses: actions/setup-python@v2
+  uses: actions/setup-python@v4
   with:
 python-version: ${{ matrix.python-version }}
 - name: Install dependencies

(incubator-ponymail-foal) 01/01: Allow dump with dryrun

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit 9e6dfefa7497b7770db114ab30bd28092f15fe85
Author: Sebb 
AuthorDate: Fri Apr 26 00:04:56 2024 +0100

Allow dump with dryrun
---
 tools/archiver.py | 44 +---
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index 2feb887..519f1cb 100755
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -645,6 +645,28 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
 
 return output_json, contents, msg_metadata, irt, False
 
+def dump_message(self, dump, ojson, msg_metadata, raw_message, contents):
+uid = uuid.uuid4()
+mbox_path = os.path.join(dump, "%s.json" % uid)
+print("Dumping data to %s" % mbox_path)
+with open(mbox_path, "w") as f:
+json.dump(
+{
+"id": ojson["mid"],
+"mbox": ojson,
+"mbox_source": {
+"id": ojson["dbid"],
+"permalink": ojson["mid"],
+"message-id": msg_metadata["message-id"],
+"source": mbox_source(raw_message),
+},
+"attachments": contents,
+},
+f,
+indent=2,
+)
+f.close()
+
 def archive_message(self, mlist, msg, raw_message=None, dry=False, 
dump=None, defaultepoch=None, digest=False):
 """Send the message to the archiver.
 
@@ -687,6 +709,8 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
 return lid, ojson["mid"]
 if dry:
 print(" Dry run, not saving message to database *")
+if dump:
+self.dump_message(dump, ojson, msg_metadata, raw_message, 
contents)
 return lid, ojson["mid"]
 
 if dump:
@@ -764,25 +788,7 @@ class Archiver(object):  # N.B. Also used by import-mbox.py
 print(
 "Pushing to ES failed, but dumponfail specified, dumping 
JSON docs"
 )
-uid = uuid.uuid4()
-mbox_path = os.path.join(dump, "%s.json" % uid)
-with open(mbox_path, "w") as f:
-json.dump(
-{
-"id": ojson["mid"],
-"mbox": ojson,
-"mbox_source": {
-"id": ojson["dbid"],
-"permalink": ojson["mid"],
-"message-id": msg_metadata["message-id"],
-"source": mbox_source(raw_message),
-},
-"attachments": contents,
-},
-f,
-indent=2,
-)
-f.close()
+self.dump_message(dump, ojson, msg_metadata, raw_message, 
contents)
 sys.exit(0)  # We're exiting here, the rest can't be done 
without ES
 # otherwise fail as before
 raise err

(incubator-ponymail-foal) branch drydump created (now 9e6dfef)

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a change to branch drydump
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


  at 9e6dfef  Allow dump with dryrun

This branch includes the following new commits:

 new 9e6dfef  Allow dump with dryrun

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

(incubator-ponymail-site) branch asf-site updated: Document some mbox.lua options

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new fd6437e  Document some mbox.lua options
fd6437e is described below

commit fd6437e372493d3eccd8b54f988fc7305c035426
Author: Sebb 
AuthorDate: Wed Apr 3 14:46:18 2024 +0100

Document some mbox.lua options
---
 source/markdown/docs/API.md | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/source/markdown/docs/API.md b/source/markdown/docs/API.md
index 2b548f8..b9120d0 100644
--- a/source/markdown/docs/API.md
+++ b/source/markdown/docs/API.md
@@ -225,6 +225,13 @@ or
 Usage:
 `GET /api/mbox.lua?list=iss...@ponymail.apache.org=2016-06`
 
+Optional qualifiers include:
+- _from=$email
+- _subject=$subject_words
+- _body=$body_words
+
+Can also use various [timespan](#Timespans) values
+
 Response example:
 
 ~~~

(incubator-ponymail-site) branch asf-site updated: Must link to parent dir here

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new a3e6cb4  Must link to parent dir here
a3e6cb4 is described below

commit a3e6cb44320d3ebcb0f38a3c57d65c0efd27d87e
Author: Sebb 
AuthorDate: Thu Mar 21 17:56:05 2024 +

Must link to parent dir here
---
 source/template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/template.html b/source/template.html
index ca0b58d..c0e7965 100644
--- a/source/template.html
+++ b/source/template.html
@@ -60,7 +60,7 @@
 https://www.apache.org/foundation/thanks.html;>Thanks
 https://www.apache.org/foundation/sponsorship.html;>Become a 
Sponsor
 https://www.apache.org/security/;>Security
-https://www.apache.org/licenses/LICENSE-2.0;>License
+https://www.apache.org/licenses/;>License
 
 
 

[incubator-ponymail-foal] branch master updated: Catch all python files

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new f5addb5  Catch all python files
f5addb5 is described below

commit f5addb5824e0c4d08474b22840ce556deade48f6
Author: Sebb 
AuthorDate: Tue Mar 28 23:15:12 2023 +0100

Catch all python files
---
 .github/workflows/type-tests.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/type-tests.yml b/.github/workflows/type-tests.yml
index 91f8d17..16cab27 100644
--- a/.github/workflows/type-tests.yml
+++ b/.github/workflows/type-tests.yml
@@ -34,8 +34,7 @@ jobs:
 - name: Type testing with mypy
   run: |
   mypy --cache-dir /tmp/ --install-types
-  mypy --cache-dir /tmp/ --ignore-missing-imports tools/archiver.py
-  mypy --cache-dir /tmp/ --ignore-missing-imports tools/import-mbox.py
-  mypy --cache-dir /tmp/ --ignore-missing-imports server/main.py
+  mypy --cache-dir /tmp/ --ignore-missing-imports tools/*.py
+  mypy --cache-dir /tmp/ --ignore-missing-imports server/*.py
   mypy --cache-dir /tmp/ --ignore-missing-imports server/plugins/*.py
   mypy --cache-dir /tmp/ --ignore-missing-imports server/endpoints/*.py

[incubator-ponymail-foal] branch master updated: Fix server version

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 94a294f  Fix server version
94a294f is described below

commit 94a294fa40fdd0d633d7c248612b637e05629cad
Author: Sebb 
AuthorDate: Tue Mar 28 23:14:15 2023 +0100

Fix server version
---
 server/server_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/server_version.py b/server/server_version.py
index dccc7b0..ad04347 100644
--- a/server/server_version.py
+++ b/server/server_version.py
@@ -1,2 +1,2 @@
 # This file is generated by server/update_version.sh
-PONYMAIL_SERVER_VERSION = '7b8cb11'
+PONYMAIL_SERVER_VERSION = '218c4f5'

[incubator-ponymail-foal] branch master updated: Duplicate definition

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 649d4a1  Duplicate definition
649d4a1 is described below

commit 649d4a1f35e2956365c81a5b82412825996ff4bd
Author: Sebb 
AuthorDate: Tue Mar 28 23:08:53 2023 +0100

Duplicate definition
---
 tools/plugins/elastic.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/plugins/elastic.py b/tools/plugins/elastic.py
index b36263b..6837098 100755
--- a/tools/plugins/elastic.py
+++ b/tools/plugins/elastic.py
@@ -178,9 +178,6 @@ class Elastic:
 def scroll(self, **kwargs):
 return self.es.scroll(**kwargs)
 
-def info(self, **kwargs):
-return self.es.info(**kwargs)
-
 def bulk(self, actions, **kwargs):
 return helpers.bulk(self.es, actions, **kwargs)
 

[incubator-ponymail-foal] branch master updated: mypy typing fixes

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 218c4f5  mypy typing fixes
218c4f5 is described below

commit 218c4f5287860f15996d2bdcc30e2a31877b26ef
Author: Sebb 
AuthorDate: Tue Mar 28 23:08:26 2023 +0100

mypy typing fixes

[skip ci]
---
 server/endpoints/gravatar.py|  5 +++--
 server/endpoints/plain.py   |  5 +++--
 server/endpoints/preferences.py |  4 ++--
 server/endpoints/thread.py  |  1 +
 server/plugins/database.py  |  4 ++--
 server/plugins/messages.py  | 10 +-
 tools/archiver.py   |  2 +-
 tools/migrate.py|  5 +++--
 tools/plugins/dkim_id.py|  2 --
 tools/plugins/textlib.py|  2 +-
 tools/setup.py  | 21 -
 11 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/server/endpoints/gravatar.py b/server/endpoints/gravatar.py
index d8311d7..c496ca7 100644
--- a/server/endpoints/gravatar.py
+++ b/server/endpoints/gravatar.py
@@ -71,6 +71,7 @@ async def fetch_gravatar(gid: str) -> None:
 
 
 async def gravatar_exists_in_db(session: plugins.session.SessionObject, gid: 
str) -> bool:
+assert session.database is not None # make mypy happy
 res = await session.database.search(
 index=session.database.dbs.db_mbox,
 size=1,
@@ -81,7 +82,7 @@ async def gravatar_exists_in_db(session: 
plugins.session.SessionObject, gid: str
 return False
 
 
-async def process(server: plugins.server.BaseServer, session: dict, indata: 
dict) -> aiohttp.web.Response:
+async def process(server: plugins.server.BaseServer, session: 
plugins.session.SessionObject, indata: dict) -> aiohttp.web.Response:
 gid = indata.get("md5", "null")
 # Ensure md5 hash is valid
 is_valid_md5 = len(gid) == 32 and all(letter in string.hexdigits for 
letter in gid)
@@ -110,5 +111,5 @@ async def process(server: plugins.server.BaseServer, 
session: dict, indata: dict
 return aiohttp.web.Response(headers=headers, content_type="image/png", 
body=gravatar_default)
 
 
-def register(server: plugins.server.BaseServer):
+def register(_server: plugins.server.BaseServer):
 return plugins.server.Endpoint(process)
diff --git a/server/endpoints/plain.py b/server/endpoints/plain.py
index 88c1fd0..ef9348a 100644
--- a/server/endpoints/plain.py
+++ b/server/endpoints/plain.py
@@ -24,6 +24,7 @@
 import plugins.server
 import plugins.session
 import plugins.messages
+import plugins.defuzzer
 import aiohttp.web
 import html
 
@@ -59,7 +60,7 @@ async def process(
 "@".join(email.get("list_raw", "").strip("<>").split(".", 1))
 )
 date = html.escape(email.get("date", ""))
-author = html.escape(email.get("from"))
+author = html.escape(email.get("from", ""))
 output += f"""Posted to {listname} by {author} on {date} UTC"""
 title = html.escape(email.get("subject", ""))
 body = html.escape(email.get("body", ""))
@@ -69,7 +70,7 @@ async def process(
 output += 
f"""{email["subject"]}{body}\n"""
 for tid, email in _pdocs.items():
 body = html.escape(email.get("body", ""))
-author = html.escape(email.get("from"))
+author = html.escape(email.get("from", ""))
 output += f"""{email["subject"]}\nPosted by 
{author}.{body}\n"""
 # Show a list
 elif list_id:
diff --git a/server/endpoints/preferences.py b/server/endpoints/preferences.py
index 79a8e25..ad85702 100644
--- a/server/endpoints/preferences.py
+++ b/server/endpoints/preferences.py
@@ -31,12 +31,12 @@ async def process(
 ) -> typing.Union[dict, aiohttp.web.Response]:
 
 versions: dict = {
-"foal": server.foal_version,
+"foal": server.foal_version, # type: ignore [attr-defined]
 }
 
 # Require login for this info
 if session.credentials and session.credentials.authoritative:
-versions["server"] = server.server_version
+versions["server"] = server.server_version  # type: ignore 
[attr-defined]
 if session.credentials.admin:
 versions["elasticsearch_engine"] = server.engine_version
 versions["elasticsearch_library"] = server.library_version
diff --git a/server/endpoints/thread.py b/server/endpoints/thread.py
index 4e0d41a..98f2320 100644
--- a/server/endpoints/th

[incubator-ponymail-foal] branch master updated: Minor tweaks

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 5530b14  Minor tweaks
5530b14 is described below

commit 5530b14fcad8eaccaf3840d3bf2b6274630b6e69
Author: Sebb 
AuthorDate: Tue Mar 28 16:47:49 2023 +0100

Minor tweaks
---
 test/test_archiver.py | 9 ++---
 test/test_msgid.py| 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/test/test_archiver.py b/test/test_archiver.py
index ea1982c..4db5749 100644
--- a/test/test_archiver.py
+++ b/test/test_archiver.py
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import pytest
-
 # To be run as: python3 -m pytest test/test_archiver.py
 # This ensures sys.path is set up correctly
 
@@ -37,8 +35,8 @@ def test_archiver_1():
 )
 list_override = 'a.b.c.d'
 private = False
-file = open("test/resources/rfc2822-A5.eml","rb")
-message_raw = file.read()
+mlfile = open("test/resources/rfc2822-A5.eml","rb")
+message_raw = mlfile.read()
 message = email.message_from_bytes(message_raw, 
policy=email.policy.SMTPUTF8)
 json, contents, _msgdata, _irt, skipit = archie.compute_updates(
 list_override, private, message, message_raw
@@ -53,6 +51,3 @@ def test_archiver_1():
 print(_irt)
 print("--skipit--")
 print(skipit)
-# assert False, json
-
-test_archiver_1()
\ No newline at end of file
diff --git a/test/test_msgid.py b/test/test_msgid.py
index 39ddd11..403c210 100755
--- a/test/test_msgid.py
+++ b/test/test_msgid.py
@@ -4,7 +4,6 @@ import sys
 import email
 import gzip
 from email.policy import default
-from email.policy import compat32
 
 class MyHeaderClass(email.headerregistry.UnstructuredHeader):
 @classmethod

svn commit: r53219 - in /release/incubator/ponymail: apache-pony-mail-0.10-incubating.tar.xz apache-pony-mail-0.10-incubating.tar.xz.asc apache-pony-mail-0.10-incubating.tar.xz.sha256

[sebb]

Author: sebb
Date: Sun Mar 20 11:27:23 2022
New Revision: 53219

Log:
Archive incubator/ponymail release 0.10

Removed:
release/incubator/ponymail/apache-pony-mail-0.10-incubating.tar.xz
release/incubator/ponymail/apache-pony-mail-0.10-incubating.tar.xz.asc
release/incubator/ponymail/apache-pony-mail-0.10-incubating.tar.xz.sha256

[incubator-ponymail-foal] branch master updated: Forgot to update database setup

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
 new 84a71d5  Forgot to update database setup
84a71d5 is described below

commit 84a71d5aa80a4de74e370d61cf252671fb2af747
Author: Sebb 
AuthorDate: Wed Feb 23 22:43:51 2022 +

Forgot to update database setup
---
 .github/workflows/integration-tests.yml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/integration-tests.yml 
b/.github/workflows/integration-tests.yml
index 1d908a7..1062ebd 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -92,6 +92,11 @@ jobs:
 tools/import-mbox.py --source 
test/resources/users_ponymail_apache_org_2019-09.mbox --private --lid 
users.ponymail.apache.org
 tools/import-mbox.py --source 
test/resources/users_ponymail_apache_org_2022-01.mbox
 tools/import-mbox.py --source 
test/resources/dev_ponymail_apache_org_2020-10.mbox
+
+tools/archiver.py