# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2019-12-07 04:20:58
# Node ID b84f495d82ce9ea0807813efaf10b331d5d8c58e
# Parent  d2319cb2ba9b8e068af5d7a45cfa5fc746cc5a7a

journal: don't include email in author name - avoid double data

In journal RSS feed, report author as:
    <author>name@example.com (User Name)</author>
instead of double email due to:
    <author>name@example.com (User Name &lt;name@example.com&gt;)</author>

In the journal ATOM feed, report author as:
    <author>
      <name>user Name</name>
      <email>test_admin@example.com</email>
    </author>
instead of using double email due to:
      <name>name@example.com (User Name &lt;name@example.com&gt;)</name>

diff --git a/kallithea/controllers/journal.py b/kallithea/controllers/journal.py
--- a/kallithea/controllers/journal.py
+++ b/kallithea/controllers/journal.py
@@ -134,7 +134,7 @@ class JournalController(BaseController):
                           pubdate=entry.action_date,
                           link=_url or h.canonical_url(''),
                           author_email=user.email,
-                          author_name=user.full_contact,
+                          author_name=user.full_name_or_username,
                           description=action_extra())
 
         response.content_type = feed.mime_type