From 6fd13bc07168d89466d5539ae65208cacf3bcb0f Mon Sep 17 00:00:00 2001 From: Hugo Levy-Falk Date: Tue, 1 Sep 2020 21:44:48 +0100 Subject: [PATCH] Reduce API usage --- main.py | 2 +- templates/virtual_mailbox.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index 0b35d87..c2f53f2 100644 --- a/main.py +++ b/main.py @@ -37,7 +37,7 @@ def main(config_dir, dry_run, keep): use_tls=config["Re2o"]["use_TLS"], ) users_emails = re2o_client.list("localemail/users") - users = filter(lambda x: x["local_email_enabled"], re2o_client.list("users/user/")) + users = set(map(lambda x: x['email_address'][0]['user'], users_emails)) local_email_domain = re2o_client.view("preferences/optionaluser/")["local_email_domain"] env = Environment(loader=FileSystemLoader(str(config_dir))) diff --git a/templates/virtual_mailbox.j2 b/templates/virtual_mailbox.j2 index b811e7c..32441df 100644 --- a/templates/virtual_mailbox.j2 +++ b/templates/virtual_mailbox.j2 @@ -1,5 +1,5 @@ # List of virtual mailboxes. Do not edit as it is generated by re2o. {% for user in users %} -{{user.pseudo}}{{local_email_domain}} whatever +{{user}}{{local_email_domain}} whatever {% endfor %}