You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by hu...@apache.org on 2022/01/24 22:39:44 UTC
[incubator-ponymail-foal] branch master updated (acdcb32 -> b066163)
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git.
from acdcb32 Typo
new 335c5f0 work around find_parent being doubly encoded.
new b066163 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/primer.js | 7 ++++++-
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
7 files changed, 32 insertions(+), 22 deletions(-)
Re: [incubator-ponymail-foal] 01/02: work around find_parent being doubly encoded.
Posted by sebb <se...@gmail.com>.
On Mon, 24 Jan 2022 at 22:39, <hu...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> humbedooh pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
>
> commit 335c5f07e30f7ded480ff8dd09a52d7e444f7a84
> Author: Daniel Gruno <hu...@apache.org>
> AuthorDate: Mon Jan 24 23:38:27 2022 +0100
>
> work around find_parent being doubly encoded.
-1
I think the work-round is wrong.
Your fix does not retrieve the correct mid until it has already been used.
Also '&find_parent=true' is valid as part of a message-id, so your fix
could potentially corrupt a search by message-id.
The way that the find_parent attribute is passed needs a rethink.
> ---
> webui/js/source/primer.js | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/webui/js/source/primer.js b/webui/js/source/primer.js
> index e9a8d0a..2ea3fb2 100644
> --- a/webui/js/source/primer.js
> +++ b/webui/js/source/primer.js
> @@ -172,7 +172,12 @@ function parse_permalink() {
> });
> }
> else {
> - GET('%sapi/thread.lua?id=%s'.format(G_apiURL, encodeURIComponent(mid)), construct_single_thread, {
> + let encoded_mid = encodeURIComponent(mid);
> + // If looking for parent, don't encode this bit of the arg string.
> + if (mid.match(/&find_parent=true/)) {
> + encoded_mid = encodeURIComponent(mid.replace(/&find_parent=true/, '')) + '&find_parent=true';
> + }
> + GET('%sapi/thread.lua?id=%s'.format(G_apiURL, encoded_mid), construct_single_thread, {
> cached: true
> });
> }
[incubator-ponymail-foal] 01/02: work around find_parent being doubly encoded.
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit 335c5f07e30f7ded480ff8dd09a52d7e444f7a84
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Jan 24 23:38:27 2022 +0100
work around find_parent being doubly encoded.
---
webui/js/source/primer.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/webui/js/source/primer.js b/webui/js/source/primer.js
index e9a8d0a..2ea3fb2 100644
--- a/webui/js/source/primer.js
+++ b/webui/js/source/primer.js
@@ -172,7 +172,12 @@ function parse_permalink() {
});
}
else {
- GET('%sapi/thread.lua?id=%s'.format(G_apiURL, encodeURIComponent(mid)), construct_single_thread, {
+ let encoded_mid = encodeURIComponent(mid);
+ // If looking for parent, don't encode this bit of the arg string.
+ if (mid.match(/&find_parent=true/)) {
+ encoded_mid = encodeURIComponent(mid.replace(/&find_parent=true/, '')) + '&find_parent=true';
+ }
+ GET('%sapi/thread.lua?id=%s'.format(G_apiURL, encoded_mid), construct_single_thread, {
cached: true
});
}
[incubator-ponymail-foal] 02/02: regen JS
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit b06616309cfc3b82850f67274dd045daae0b6d8e
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Jan 24 23:39:30 2022 +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 3a45caa..6c448db 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=f6ffdf6" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=335c5f0" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -79,9 +79,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=f6ffdf6"></script>
- <script src="js/wordcloud.js?revision=f6ffdf6"></script>
- <script src="js/ponymail.js?revision=f6ffdf6"></script>
+ <script src="js/config.js?revision=335c5f0"></script>
+ <script src="js/wordcloud.js?revision=335c5f0"></script>
+ <script src="js/ponymail.js?revision=335c5f0"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
diff --git a/webui/index.html b/webui/index.html
index ec701e0..2e6440f 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=f6ffdf6" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=335c5f0" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -60,8 +60,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=f6ffdf6"></script>
- <script src="js/ponymail.js?revision=f6ffdf6"></script>
+ <script src="js/config.js?revision=335c5f0"></script>
+ <script src="js/ponymail.js?revision=335c5f0"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index fe55272..00eec6d 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 = 'f6ffdf6';
+const PONYMAIL_REVISION = '335c5f0';
/******************************************
@@ -3607,7 +3607,12 @@ function parse_permalink() {
});
}
else {
- GET('%sapi/thread.lua?id=%s'.format(G_apiURL, encodeURIComponent(mid)), construct_single_thread, {
+ let encoded_mid = encodeURIComponent(mid);
+ // If looking for parent, don't encode this bit of the arg string.
+ if (mid.match(/&find_parent=true/)) {
+ encoded_mid = encodeURIComponent(mid.replace(/&find_parent=true/, '')) + '&find_parent=true';
+ }
+ GET('%sapi/thread.lua?id=%s'.format(G_apiURL, encoded_mid), construct_single_thread, {
cached: true
});
}
diff --git a/webui/list.html b/webui/list.html
index b8e3b4d..fd616f5 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=f6ffdf6" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=335c5f0" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -181,9 +181,9 @@ the License. -->
</script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=f6ffdf6"></script>
- <script src="js/wordcloud.js?revision=f6ffdf6"></script>
- <script src="js/ponymail.js?revision=f6ffdf6"></script>
+ <script src="js/config.js?revision=335c5f0"></script>
+ <script src="js/wordcloud.js?revision=335c5f0"></script>
+ <script src="js/ponymail.js?revision=335c5f0"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
<script type="text/javascript">
diff --git a/webui/oauth.html b/webui/oauth.html
index d663c65..321b14b 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=f6ffdf6" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=335c5f0" 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="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=f6ffdf6"></script>
- <script src="js/ponymail.js?revision=f6ffdf6"></script>
- <script src="js/oauth.js?revision=f6ffdf6"></script>
+ <script src="js/config.js?revision=335c5f0"></script>
+ <script src="js/ponymail.js?revision=335c5f0"></script>
+ <script src="js/oauth.js?revision=335c5f0"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 68518fb..ab52268 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=f6ffdf6" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=335c5f0" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -97,9 +97,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=f6ffdf6"></script>
- <script src="js/wordcloud.js?revision=f6ffdf6"></script>
- <script src="js/ponymail.js?revision=f6ffdf6"></script>
+ <script src="js/config.js?revision=335c5f0"></script>
+ <script src="js/wordcloud.js?revision=335c5f0"></script>
+ <script src="js/ponymail.js?revision=335c5f0"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>