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 2021/06/04 17:29:25 UTC
[incubator-ponymail-foal] branch master updated: rename mbox plugin
to messages
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
The following commit(s) were added to refs/heads/master by this push:
new 01abff9 rename mbox plugin to messages
01abff9 is described below
commit 01abff9b8b9c75b8e3a6dfcc000b77f76823183a
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Jun 4 19:29:13 2021 +0200
rename mbox plugin to messages
---
server/endpoints/email.py | 8 ++++----
server/endpoints/mbox.py | 6 +++---
server/endpoints/mgmt.py | 8 ++++----
server/endpoints/source.py | 8 ++++----
server/endpoints/stats.py | 16 ++++++++--------
server/endpoints/thread.py | 10 +++++-----
server/plugins/{mbox.py => messages.py} | 0
7 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/server/endpoints/email.py b/server/endpoints/email.py
index c80351f..1a55521 100644
--- a/server/endpoints/email.py
+++ b/server/endpoints/email.py
@@ -20,7 +20,7 @@
import plugins.server
import plugins.session
-import plugins.mbox
+import plugins.messages
import plugins.database
import aiohttp.web
import plugins.aaa
@@ -33,18 +33,18 @@ async def process(
) -> typing.Union[dict, aiohttp.web.Response]:
# First, assume permalink and look up the email based on that
- email = await plugins.mbox.get_email(session, permalink=indata.get("id"))
+ email = await plugins.messages.get_email(session, permalink=indata.get("id"))
# If not found via permalink, it might be message-id instead, so try that
if email is None:
- email = await plugins.mbox.get_email(session, messageid=indata.get("id"))
+ email = await plugins.messages.get_email(session, messageid=indata.get("id"))
# If email was found, process the request if we are allowed to display it
if email and isinstance(email, dict) and not email.get("deleted"):
if plugins.aaa.can_access_email(session, email):
# Are we fetching an attachment?
if not indata.get("attachment"):
- email["gravatar"] = plugins.mbox.gravatar(email)
+ email["gravatar"] = plugins.messages.gravatar(email)
return email
else:
fid = indata.get("file")
diff --git a/server/endpoints/mbox.py b/server/endpoints/mbox.py
index aff4ee8..87d3256 100644
--- a/server/endpoints/mbox.py
+++ b/server/endpoints/mbox.py
@@ -18,7 +18,7 @@
"""Endpoint for returning emails in mbox format as a single archive"""
import plugins.server
import plugins.session
-import plugins.mbox
+import plugins.messages
import plugins.defuzzer
import re
import typing
@@ -30,11 +30,11 @@ async def process(
) -> typing.Union[dict, aiohttp.web.Response]:
query_defuzzed = plugins.defuzzer.defuzz(indata)
- results = await plugins.mbox.query(session, query_defuzzed, query_limit=server.config.database.max_hits,)
+ results = await plugins.messages.query(session, query_defuzzed, query_limit=server.config.database.max_hits,)
sources = []
for email in results:
- source = await plugins.mbox.get_source(session, permalink=email["mid"])
+ source = await plugins.messages.get_source(session, permalink=email["mid"])
if source:
stext = source["_source"]["source"]
# Convert to mboxrd format
diff --git a/server/endpoints/mgmt.py b/server/endpoints/mgmt.py
index 9b6b977..68bed57 100644
--- a/server/endpoints/mgmt.py
+++ b/server/endpoints/mgmt.py
@@ -19,7 +19,7 @@
import plugins.server
import plugins.session
-import plugins.mbox
+import plugins.messages
import plugins.defuzzer
import plugins.auditlog
import typing
@@ -54,7 +54,7 @@ async def process(
delcount = 0
for doc in docs:
assert isinstance(doc, str), "Document ID must be a string"
- email = await plugins.mbox.get_email(session, permalink=doc)
+ email = await plugins.messages.get_email(session, permalink=doc)
if email and isinstance(email, dict) and plugins.aaa.can_access_email(session, email):
email["deleted"] = True
await session.database.index(
@@ -82,7 +82,7 @@ async def process(
# Convert List-ID after verification
lid = "<" + new_list.strip("<>").replace("@", ".") + ">" # foo@bar.baz -> <foo.bar.baz>
- email = await plugins.mbox.get_email(session, permalink=doc)
+ email = await plugins.messages.get_email(session, permalink=doc)
if email and isinstance(email, dict) and plugins.aaa.can_access_email(session, email):
email["from_raw"] = new_from
email["from"] = new_from
@@ -100,7 +100,7 @@ async def process(
# Fetch source, mark as deleted (modified) and save
# We do this, as we can't edit the source easily, so we mark it as off-limits instead.
- source = await plugins.mbox.get_source(session, permalink=email["id"], raw=True)
+ source = await plugins.messages.get_source(session, permalink=email["id"], raw=True)
if source:
source = source["_source"]
source["deleted"] = True
diff --git a/server/endpoints/source.py b/server/endpoints/source.py
index 9f6a736..d99fdd9 100644
--- a/server/endpoints/source.py
+++ b/server/endpoints/source.py
@@ -19,7 +19,7 @@
import plugins.server
import plugins.session
-import plugins.mbox
+import plugins.messages
import aiohttp.web
import plugins.aaa
@@ -28,15 +28,15 @@ async def process(
server: plugins.server.BaseServer, session: plugins.session.SessionObject, indata: dict,
) -> aiohttp.web.Response:
# First, assume permalink and look up the email based on that
- email = await plugins.mbox.get_email(session, permalink=indata.get("id"))
+ email = await plugins.messages.get_email(session, permalink=indata.get("id"))
# If not found via permalink, it might be message-id instead, so try that
if email is None:
- email = await plugins.mbox.get_email(session, messageid=indata.get("id"))
+ email = await plugins.messages.get_email(session, messageid=indata.get("id"))
if email and isinstance(email, dict) and not email.get("deleted"):
if plugins.aaa.can_access_email(session, email):
- source = await plugins.mbox.get_source(session, permalink=email["dbid"])
+ source = await plugins.messages.get_source(session, permalink=email["dbid"])
if source and not source["_source"].get("deleted"):
return aiohttp.web.Response(
headers={"Content-Type": "text/plain"}, status=200, text=source["_source"]["source"],
diff --git a/server/endpoints/stats.py b/server/endpoints/stats.py
index 7a35af3..675f655 100644
--- a/server/endpoints/stats.py
+++ b/server/endpoints/stats.py
@@ -19,7 +19,7 @@
""" THIS ONLY DEALS WITH PUBLIC EMAILS FOR NOW - AAA IS BEING WORKED ON"""
import plugins.server
import plugins.session
-import plugins.mbox
+import plugins.messages
import plugins.defuzzer
import plugins.offloader
import re
@@ -32,19 +32,19 @@ async def process(server: plugins.server.BaseServer, session: plugins.session.Se
query_defuzzed = plugins.defuzzer.defuzz(indata)
query_defuzzed_nodate = plugins.defuzzer.defuzz(indata, nodate=True)
- results = await plugins.mbox.query(
+ results = await plugins.messages.query(
session, query_defuzzed, query_limit=server.config.database.max_hits, shorten=True,
)
for msg in results:
- msg["gravatar"] = plugins.mbox.gravatar(msg)
+ msg["gravatar"] = plugins.messages.gravatar(msg)
wordcloud = None
if server.config.ui.wordcloud:
- wordcloud = await plugins.mbox.wordcloud(session, query_defuzzed)
- first_year, last_year, first_month, last_month = await plugins.mbox.get_years(session, query_defuzzed_nodate)
+ wordcloud = await plugins.messages.wordcloud(session, query_defuzzed)
+ first_year, last_year, first_month, last_month = await plugins.messages.get_years(session, query_defuzzed_nodate)
- threads = plugins.mbox.ThreadConstructor(results)
+ threads = plugins.messages.ThreadConstructor(results)
tstruct, authors = await server.runners.run(threads.construct)
xlist = indata.get("list", "*")
xdomain = indata.get("domain", "*")
@@ -54,12 +54,12 @@ async def process(server: plugins.server.BaseServer, session: plugins.session.Se
for author, count in all_authors[:10]:
name, address = email.utils.parseaddr(author)
top10_authors.append(
- {"email": address, "name": name, "count": count, "gravatar": plugins.mbox.gravatar(author),}
+ {"email": address, "name": name, "count": count, "gravatar": plugins.messages.gravatar(author),}
)
# Trim email data so as to reduce download sizes
for msg in results:
- plugins.mbox.trim_email(msg, external=True)
+ plugins.messages.trim_email(msg, external=True)
return {
"firstYear": first_year,
diff --git a/server/endpoints/thread.py b/server/endpoints/thread.py
index b583bbe..5e4799b 100644
--- a/server/endpoints/thread.py
+++ b/server/endpoints/thread.py
@@ -19,7 +19,7 @@
import plugins.server
import plugins.session
-import plugins.mbox
+import plugins.messages
import plugins.defuzzer
import typing
@@ -27,18 +27,18 @@ import typing
async def process(
server: plugins.server.BaseServer, session: plugins.session.SessionObject, indata: dict,
) -> typing.Optional[dict]:
- email = await plugins.mbox.get_email(session, permalink=indata.get("id"))
+ email = await plugins.messages.get_email(session, permalink=indata.get("id"))
if not email:
- email = await plugins.mbox.get_email(session, messageid=indata.get("id"))
+ email = await plugins.messages.get_email(session, messageid=indata.get("id"))
if email and isinstance(email, dict):
- thread, emails, pdocs = await plugins.mbox.fetch_children(session, email, short=True)
+ thread, emails, pdocs = await plugins.messages.fetch_children(session, email, short=True)
else:
return None
email["children"] = thread
emails.append(email)
for email in emails:
- plugins.mbox.trim_email(email, external=True)
+ plugins.messages.trim_email(email, external=True)
return {
"thread": email,
"emails": emails,
diff --git a/server/plugins/mbox.py b/server/plugins/messages.py
similarity index 100%
rename from server/plugins/mbox.py
rename to server/plugins/messages.py