Add date field

Add default media object to template
Fix subject template
2024-09-19 20:11:36 +03:00 · 2024-09-03 13:20:58 +03:00 · 2024-08-30 19:42:41 +03:00 · 2024-08-10 18:03:31 +03:00 · 2024-08-04 20:01:21 +03:00 · 2024-08-04 09:06:48 +03:00
5 changed files with 134 additions and 91 deletions
--- a/README.md
+++ b/README.md
@ -48,6 +48,8 @@ Customize the templates (if you know HTML, CSS and Jinja2) and run the command.
    -P, --mail-pass TEXT            User password for SMTP Mail server to send
                                    emails.
    -p, --mail-server-port INTEGER  SMTP Mail server port to send emails.
+    -t, --subjet-template TEXT      Jinja2 template for the subject of the
+                                  emails.
    -l, --log-file TEXT             File to store all debug messages.
    --config FILE                   Read configuration from FILE.
    --help                          Show this message and exit.
--- a/mastodon_email_bridge/mastodon_email_bridge.py
+++ b/mastodon_email_bridge/mastodon_email_bridge.py
@ -18,7 +18,8 @@ import sqlite3
 import click
 import click_config_file
 import requests
-from jinja2 import Environment, PackageLoader, select_autoescape, FileSystemLoader
+from jinja2 import Environment, select_autoescape, FileSystemLoader
+import importlib

 class MastodonEmailBridge:
    '''CLass to redirect the Mastodon home timeline to email'''
@ -170,19 +171,19 @@ class MastodonEmailBridge:
        sender = self._str_template(self.config['sender'], data)
        recipient = self._str_template(self.config['recipient'], data)
        msg = MIMEMultipart('alternative')
-        if data['in_reply_to_id']:
-            msg['Subject'] = f"FediReply from {data['account']['display_name']} ({data['account']['username']})"
-        else:
-            msg['Subject'] = f"FediPost from {data['account']['display_name']} ({data['account']['username']})"
+        msg['Subject'] = self._str_template(self.config['subjet_template'], data)
        msg['From'] = sender
+        msg['Date'] = time.strftime('%a, %d %b %Y %H:%M:%S %z')
        msg['To'] = recipient
        html_template = self.j2env.get_template("new_post.html.j2")
        html_source = html_template.render(
+            imp0rt = importlib.import_module,
            data=data,
            json_raw=json.dumps(data, indent=2)
        )
        txt_template = self.j2env.get_template("new_post.txt.j2")
        txt_source = txt_template.render(
+            imp0rt = importlib.import_module,
            data=data,
            json_raw=json.dumps(data, indent=2)
        )
@ -321,6 +322,12 @@ class MastodonEmailBridge:
    default=465,
    help='SMTP Mail server port to send emails.'
 )
+@click.option(
+    '--subjet-template',
+    '-t',
+    default='{{ data["account"]["display_name"] }} ({{ data["account"]["username"] }}) {% if data["in_reply_to_id"] %}replied {% else %}posted{% endif %}{% for tag in data["tags"] %} #{{ tag["name"] }}{% endfor %}',
+    help='Jinja2 template for the subject of the emails.'
+)
@click.option('--log-file', '-l', help="File to store all debug messages.")
 # @click.option("--dummy","-n", is_flag=True,
 # help="Don't do anything, just show what would be done.")
--- a/pyproject.toml
+++ b/pyproject.toml
@ -7,7 +7,7 @@ Homepage = "https://codeberg.org/adelgado/mastodon_email_bridge"

 [project]
 name = "mastodon_email_bridge"
-version = "0.0.6"
+version = "1.0.0"
 description = "Redirect your Mastodon Home timeline to your email"
 readme = "README.md"
 authors = [{ name = "Antonio J. Delgado", email = "ad@susurrando.com" }]
--- a/setup.cfg
+++ b/setup.cfg
@ -1,6 +1,6 @@
 [metadata]
 name = mastodon_email_bridge
-version = 0.0.6
+version = 1.0.0

 [options]
 packages = mastodon_email_bridge
--- a/templates/new_post.html.j2
+++ b/templates/new_post.html.j2
@ -1,3 +1,4 @@
+{% set time = imp0rt( 'time' ) %}
 <!doctype html>
 <html lang="{{ data['language'] }}">
    <head>
@ -6,7 +7,10 @@
    <style>
        body { background-color: black; color: #999;}
        p { }
-        div { margin: 1%; }
+        div {
+            margin: 1%;
+            {# border-style: dashed; #}
+        }
        /* unvisited link */
        a:link {
        color: blueviolet;
@ -27,114 +31,143 @@
 <BODY>
    {% if data['url'] != "" %}
    <!-- URL -->
-    <DIV>
-        <A TARGET="_blank" HREF="{{ data['url'] }}">Post original page</A>
-    </DIV>
+    <A TARGET="_blank" HREF="{{ data['url'] }}">Post original page</A>
    {% endif %}
+    <!-- creation_date -->
+    <P STYLE='font-size: 12px;'>
+        {% set created_date = time.strptime(data['created_at'], '%Y-%m-%dT%H:%M:%S.%fZ') %}
+        {{ time.strftime('%Y-%m-%d %H:%M:%S %zUTC', created_date) }}
+    </P>

    <!-- account bloc -->
-    <DIV>
-        <A HREF="{{ data['account']['url'] }}" TARGET="_blank"></A>
-            <IMG ALT="{{ data['account']['display_name'] }} avatar image" SRC="{{ data['account']['avatar_static'] }}" STYLE="width:64px;height:64px;margin:1%;float: left;">
-            <B>{{ data['account']['display_name'] }} ({{ data['account']['username'] }})</B>
-        </A>
-    </DIV>
-    <!-- creation_date -->
-    <DIV STYLE='font-size: 0.75em;'>
-        {{ data['created_at'] }}
-    </DIV>
+    <TABLE>
+        <TR>
+            <TD>
+                <A HREF="{{ data['account']['url'] }}" TARGET="_blank">
+                    <IMG ALT="{{ data['account']['display_name'] }} avatar image" SRC="{{ data['account']['avatar_static'] }}" STYLE="width:64px;height:64px;margin:1%;float: left;">
+                </A>
+            </TD>
+            <TD>
+                <A HREF="{{ data['account']['url'] }}" TARGET="_blank">
+                    <B>{{ data['account']['display_name'] }} ({{ data['account']['acct'] }})</B>
+                </A>
+            </TD>
+        </TR>
+    </TABLE>
    <!-- content block -->
-    <DIV STYLE='font-size: 1.5em;'>
+    <DIV STYLE='font-size: 24px;'>
+        {% if data['spoiler'] != "" and data['spoiler'] != null %}
        <!-- spoiler -->
        <DIV CLASS='item-spoiler'>
            {{ data['spoiler'] }}
        </DIV>
+        {% endif %}
        <!-- item-content -->
-        <DIV CLASS='item-content' STYLE="margin:5%;">
+        <DIV CLASS='item-content' STYLE="margin:0.5%;background-color:#111;padding:0.5%;">
            {{ data['content'] }}
            <!-- media -->
            {% if data['media_attachments'] %}
-            {% for media in data['media_attachments'] %}
-            <DIV  STYLE="margin:2%;">
-                {% if media['type'] == 'image' %}
-                <IMG SRC="{{ media['preview_url'] }}" ALT="{{ media['description'] }}">
-                {% elif media['type'] == 'video' or media['type'] == 'gifv' %}
-                <video controls width="100%">
-                    <source src="{{ media['url'] }}" type="video/webm" />
-                    <A HREF="{{ media['url'] }}">Download video</A>
-                </video>
-                {% elif media['type'] == 'audio' %}
-                <audio controls src="{{ media['url'] }}"></audio>
-                <A HREF="{{ media['url'] }}">Download audio</A>
-                {% endif %}
-            </DIV>
-            {% endfor %}
-            {% endif %}
-            {% if data['reply'] %}
-            <!-- reply -->
-            <DIV STYLE="margin:5%;">
-                <DIV>
-                    <A TARGET="_blank" HREF="{{ data['reply']['url'] }}">Reply original page</A>
-                </DIV>
-                <!-- reply-account -->
-                <DIV>
-                    <A HREF="{{ data['reply']['account']['url'] }}" TARGET="_blank"></A>
-                        <IMG ALT="{{ data['reply']['account']['display_name'] }} avatar image" SRC="{{ data['reply']['account']['avatar_static'] }}" STYLE='width:64px;height:64px;margin:1%;float: left;'>
-                        <B>{{ data['reply']['account']['display_name'] }} ({{ data['reply']['account']['username'] }})</B>
-                    </A>
-                </DIV>
-                <!-- reply_creation_date -->
-                <DIV STYLE='font-size: 0.75em;'>
-                    {{ data['reply']['created_at'] }}
-                </DIV>
-                <!-- reply_content_bloc -->
-                <DIV STYLE='font-size: 1.5em;'>
-                    <!-- reply_spoiler -->
-                    <DIV CLASS='reply-spoiler'>
-                        {{ data['reply']['spoiler'] }}
-                    </DIV>
-                    <!-- reply_content -->
-                    <DIV CLASS='reply-content'>
-                        {{ data['reply']['content'] }}
-                        <!-- media -->
-                        {% if data['reply']['media_attachments'] %}
-                        {% for media in data['reply']['media_attachments'] %}
-                        {% if media['type'] == 'image' %}
+                {% for media in data['media_attachments'] %}
+                    {% if media['type'] == 'image' -%}
                        <IMG SRC="{{ media['preview_url'] }}" ALT="{{ media['description'] }}">
-                        {% elif media['type'] == 'video' %}
-                        <video controls width="100%">
+                    {% elif media['type'] == 'video' or media['type'] == 'gifv' -%}
+                        <video controls height="50%">
                            <source src="{{ media['url'] }}" type="video/webm" />
                            <A HREF="{{ media['url'] }}">Download video</A>
                        </video>
-                        {% elif media['type'] == 'audio' %}
+                    {% elif media['type'] == 'audio' -%}
                        <audio controls src="{{ media['url'] }}"></audio>
                        <A HREF="{{ media['url'] }}">Download audio</A>
-                        {% endif %}
-                        {% endfor %}
+                    {% else %}
+                        <object data="{{ media['url'] }}"></object>
+                    {%- endif %}
+                {% endfor %}
+            {% endif %}
+            {% if data['meb_reply_to'] %}
+            {% for reply in data['meb_reply_to'] %}
+            <!-- reply -->
+            <A TARGET="_blank" HREF="{{ reply['url'] }}">Reply original page</A>
+            <!-- creation_date -->
+            <P STYLE='font-size: 12px;'>
+                {% set reply_created_date = time.strptime(reply['created_at'], '%Y-%m-%dT%H:%M:%S.%fZ') %}
+                {{ time.strftime('%Y-%m-%d %H:%M:%S %zUTC', reply_created_date) }}
+            </P>
+
+            <DIV STYLE="margin:1%;">
+                <!-- reply-account -->
+                <TABLE>
+                    <TR>
+                        <TD>
+                            <A HREF="{{ reply['account']['url'] }}" TARGET="_blank">
+                                <IMG ALT="{{ reply['account']['display_name'] }} avatar image" SRC="{{ reply['account']['avatar_static'] }}" STYLE="width:64px;height:64px;margin:1%;float: left;">
+                            </A>
+                        </TD>
+                        <TD>
+                            <A HREF="{{ reply['account']['url'] }}" TARGET="_blank">
+                                <B>{{ reply['account']['display_name'] }} ({{ reply['account']['acct'] }})</B>
+                            </A>
+                        </TD>
+                    </TR>
+                </TABLE>
+                <!-- reply_content_bloc -->
+                <DIV STYLE='font-size: 24px;'>
+                    <!-- reply_spoiler -->
+                    <DIV CLASS='reply-spoiler'>
+                        {{ reply['spoiler'] }}
+                    </DIV>
+                    <!-- reply_content -->
+                    <DIV CLASS='reply-content'>
+                        {{ reply['content'] }}
+                        <!-- media -->
+                        {% if reply['media_attachments'] %}
+                            {% for media in reply['media_attachments'] %}
+                                {% if media['type'] == 'image' %}
+                                    <IMG SRC="{{ media['preview_url'] }}" ALT="{{ media['description'] }}">
+                                {% elif media['type'] == 'video' %}
+                                    <video controls width="100%">
+                                        <source src="{{ media['url'] }}" type="video/webm" />
+                                        <A HREF="{{ media['url'] }}">Download video</A>
+                                    </video>
+                                {% elif media['type'] == 'audio' %}
+                                    <audio controls src="{{ media['url'] }}"></audio>
+                                    <A HREF="{{ media['url'] }}">Download audio</A>
+                                {% else %}
+                                    <object data="{{ media['url'] }}"></object>
+                                {% endif %}
+                            {% endfor %}
                        {% endif %}
                    </DIV>
                </DIV>
            </DIV>
+            {% endfor %}
            {% endif %}
            {% if data['reblog'] %}
            <!-- reblog -->
-            <DIV STYLE="margin:5%;">
-                <DIV>
-                    <A TARGET="_blank" HREF="{{ data['reblog']['url'] }}">Reply original page</A>
-                </DIV>
+            <DIV STYLE="margin:1%;">
+                <!-- reply -->
+                <A TARGET="_blank" HREF="{{ data['reblog']['url'] }}">Reply original page</A>
+                <!-- creation_date -->
+                <P STYLE='font-size: 12px;'>
+                    {% set reblog_created_date = time.strptime(data['reblog']['created_at'], '%Y-%m-%dT%H:%M:%S.%fZ') %}
+                    {{ time.strftime('%Y-%m-%d %H:%M:%S %zUTC', reblog_created_date) }}
+                </P>
                <!-- reblog-account -->
-                <DIV>
-                    <A HREF="{{ data['reblog']['account']['url'] }}" TARGET="_blank"></A>
-                        <IMG ALT="{{ data['reblog']['account']['display_name'] }} avatar image" SRC="{{ data['reblog']['account']['avatar_static'] }}" STYLE='width:64px;height:64px;margin:1%;float: left;'>
-                        <B>{{ data['reblog']['account']['display_name'] }} ({{ data['reblog']['account']['username'] }})</B>
-                    </A>
-                </DIV>
-                <!-- reblog_creation_date -->
-                <DIV STYLE='font-size: 0.75em;'>
-                    {{ data['reblog']['created_at'] }}
-                </DIV>
+                <TABLE>
+                    <TR>
+                        <TD>
+                            <A HREF="{{ data['reblog']['account']['url'] }}" TARGET="_blank">
+                                <IMG ALT="{{ data['reblog']['account']['display_name'] }} avatar image" SRC="{{ data['reblog']['account']['avatar_static'] }}" STYLE="width:64px;height:64px;margin:1%;float: left;">
+                            </A>
+                        </TD>
+                        <TD>
+                            <A HREF="{{ data['reblog']['account']['url'] }}" TARGET="_blank">
+                                <B>{{ data['reblog']['account']['display_name'] }} ({{ data['reblog']['account']['acct'] }})</B>
+                            </A>
+                        </TD>
+                    </TR>
+                </TABLE>
                <!-- reblog_content_bloc -->
-                <DIV STYLE='font-size: 1.5em;'>
+                <DIV STYLE='font-size: 24px;'>
                    <!-- reblog_spoiler -->
                    <DIV CLASS='reblog-spoiler'>
                        {{ data['reblog']['spoiler'] }}
@ -165,9 +198,10 @@
        </DIV>
    </DIV>
    {# <!-- card -->{{ data['card'] }} #}
-    <!-- Raw JSON data -->
-    <DIV STYLE="margin-top:15%;font-size:0.75em;">
+    <!-- Raw JSON data
+    <DIV STYLE="margin-top:15%;font-size: 12px;">
        Raw JSON data:
        <PRE>{{ json_raw }}</PRE>
    </DIV>
+    -->
 </BODY>
Author	SHA1	Message	Date
Antonio J. Delgado	273200f8a4	Add date field	2024-09-19 20:11:36 +03:00
Antonio J. Delgado	e3aaba8483	Add default media object to template	2024-09-03 13:20:58 +03:00
Antonio J. Delgado	a6ec889b11	Fix subject template	2024-08-30 19:42:41 +03:00
Antonio J. Delgado	92c40adcd7	Add template subject	2024-08-10 18:03:31 +03:00
Antonio J. Delgado	83c23ffe69	Fix replies template	2024-08-04 20:01:21 +03:00
Antonio J. Delgado	0b8fae74e4	Increase version	2024-08-04 09:06:48 +03:00
Antonio J. Delgado	5ed3568436	Format date	2024-08-04 09:06:35 +03:00
Antonio J. Delgado	e453127ddb	Add import in jinja2	2024-08-04 08:52:38 +03:00
Antonio J. Delgado	f5a3021d81	update template	2024-08-04 08:25:59 +03:00
Antonio J. Delgado	fbe512d549	Adjust video	2024-08-03 23:11:34 +03:00