diff options
Diffstat (limited to 'service/pixelated/user_agent.py')
| -rw-r--r-- | service/pixelated/user_agent.py | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/service/pixelated/user_agent.py b/service/pixelated/user_agent.py index 4c257925..7adff10b 100644 --- a/service/pixelated/user_agent.py +++ b/service/pixelated/user_agent.py @@ -78,33 +78,21 @@ def update_draft(): @app.route('/mails') def mails(): - # query = search_query.compile(request.args.get("q")) if request.args.get("q") else {'tags': {}} - # - # mails = mail_service.mails(query) - # - # if "inbox" in query['tags']: - # mails = [mail for mail in mails if not mail.has_tag('trash')] - query = search_query.compile(request.args.get("q")) if request.args.get("q") else {'tags': {}} - fdocs_chash = [(fdoc, fdoc.content['chash']) for fdoc in soledad.get_from_index('by-type', 'flags')] - fdocs_hdocs = [(f[0], soledad.get_from_index('by-type-and-contenthash', 'head', f[1])[0]) for f in fdocs_chash] - fdocs_hdocs_phash = [(f[0], f[1], f[1].content.get('body')) for f in fdocs_hdocs] - fdocs_hdocs_bdocs = [(f[0], f[1], soledad.get_from_index('by-type-and-payloadhash', 'cnt', f[2])[0]) for f in fdocs_hdocs_phash] - - - all_mails = [PixelatedMail(*raw_mail) for raw_mail in fdocs_hdocs_bdocs] + mails = mail_service.mails(query) - filtered_mails = [_mail for _mail in all_mails if set(query['tags']).intersection(_mail.tags)] + if "inbox" in query['tags']: + mails = [mail for mail in mails if not mail.has_tag('trash')] response = { "stats": { - "total": len(filtered_mails), + "total": len(mails), "read": 0, "starred": 0, "replied": 0 }, - "mails": [pixelated_mail.as_dict() for pixelated_mail in filtered_mails] + "mails": [mail.as_dict() for mail in mails] } return respond_json(response) @@ -183,9 +171,7 @@ def start_user_agent(debug_enabled): pixelated_mail_sender = PixelatedMailSender(leap_session.account_email()) global mail_service - #mail_service = MailService(pixelated_mailboxes, pixelated_mail_sender) - global soledad - soledad = leap_session.soledad_session.soledad + mail_service = MailService(pixelated_mailboxes, pixelated_mail_sender) app.run(host=app.config['HOST'], debug=debug_enabled, port=app.config['PORT'], use_reloader=False) |