Drop gravatar

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index d6a31eba1d7b4117acdd1060ddbea5509bd422af..dff71a7c042c099f44e86ceaa1982508170e5e69 100644 (file)
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -3,7 +3,6 @@
 
 import PIL
 import io
-import hashlib
 import ldap
 import logging
 import urllib.parse
@@ -320,8 +319,6 @@ class Account(Object):
 
                return url
 
-       gravatar_icon = avatar_url
-
        def get_avatar(self, size=None):
                avatar = self._get_first_attribute("jpegPhoto")
                if not avatar:
@@ -350,19 +347,6 @@ class Account(Object):
 
                return f.getvalue()
 
-       def get_gravatar_url(self, size=128):
-               try:
-                       gravatar_email = self.email.lower()
-               except:
-                       gravatar_email = "nobody@ipfire.org"
-
-               # construct the url
-               gravatar_url = "https://www.gravatar.com/avatar/" + \
-                       hashlib.md5(gravatar_email).hexdigest() + "?"
-               gravatar_url += urllib.parse.urlencode({'d': "mm", 's': str(size)})
-
-               return gravatar_url
-
 
 if __name__ == "__main__":
        a = Accounts()

diff --git a/src/templates/blog/author.html b/src/templates/blog/author.html
index 46ed84cf552bc4e82061c1b760fcc27664deb4dc..8ed4d01d09653786ae793357193ec8b6ee5440f8 100644 (file)
--- a/src/templates/blog/author.html
+++ b/src/templates/blog/author.html
@@ -14,7 +14,7 @@
 
 {% block right %}
        <div class="col-md-3 text-center">
-               <img class="img-fluid rounded-circle mb-4" src="{{ author.gravatar_icon(160) }}" alt="{{ author.name }}" />
+               <img class="img-fluid rounded-circle mb-4" src="{{ author.avatar_url(160) }}" alt="{{ author.name }}" />
 
                <p>{{ author.name }}</p>
 

diff --git a/src/templates/nopaste/view.html b/src/templates/nopaste/view.html
index 68e2c48cfd40424e99c5615d9ca6fce0e488133a..04e00f0a49d9502f9a0ee594439346fedf1ebcd5 100644 (file)
--- a/src/templates/nopaste/view.html
+++ b/src/templates/nopaste/view.html
@@ -39,7 +39,7 @@
                                        {% if entry.account %}
                                                <dt>{{ _("Uploaded by") }}</dt>
                                                <dd>
-                                                       <img src="{{ entry.account.gravatar_icon(14) }}" alt="{{ entry.account.name }}">
+                                                       <img src="{{ entry.account.avatar_url(14) }}" alt="{{ entry.account.name }}">
                                                        {{ entry.account.name }}
                                                </dd>
                                        {% elif current_user and entry.address %}

diff --git a/src/templates/talk/base.html b/src/templates/talk/base.html
index f0ec67f2fdefbe23ac920419d5ce2d79ecad31ff..b19936433379869df8ad47d89ce8d0fee88db51c 100644 (file)
--- a/src/templates/talk/base.html
+++ b/src/templates/talk/base.html
@@ -22,7 +22,7 @@
                </div>
 
                <div class="col-md-3 text-center">
-                       <img class="img-fluid rounded-circle mb-4" src="{{ current_user.gravatar_icon(160) }}" alt="{{ current_user }}" />
+                       <img class="img-fluid rounded-circle mb-4" src="{{ current_user.avatar_url(160) }}" alt="{{ current_user }}" />
                
                        <p>{{ current_user.name }}</p>
                

diff --git a/src/templates/talk/conferences.html b/src/templates/talk/conferences.html
index 58c52e21d4767df78d6e0e3d8c422207a6bef2c6..1f8a35ec2f93baa7c5ff5ef40247e9f414dfe071 100644 (file)
--- a/src/templates/talk/conferences.html
+++ b/src/templates/talk/conferences.html
@@ -22,7 +22,7 @@
                                        {% for p in [p for p in conf.invitees if not current_user == p] %}
                                                <li>
                                                        <a href="/conferences/{{ conf.sip_id }}/invite/{{ p.sip_id }}">
-                                                               <img src="{{ p.gravatar_icon(13) }}" alt="{{ p.name }}"> {{ p.name }}
+                                                               <img src="{{ p.avatar_url(13) }}" alt="{{ p.name }}"> {{ p.name }}
                                                        </a>
                                                </li>
                                        {% end %}
@@ -40,7 +40,7 @@
                                        {% for p in conf.participants %}
                                                <li>
                                                        {% if p.caller_account %}
-                                                               <img src="{{ p.caller_account.gravatar_icon(32) }}" alt="{{ p.caller_account.name }}" class="img-thumbnail">
+                                                               <img src="{{ p.caller_account.avatar_url(32) }}" alt="{{ p.caller_account.name }}" class="img-thumbnail">
                                                                <a href="/phonebook/{{ p.caller_account.uid }}">{{ p.caller_account.name }}</a>
                                                        {% else %}
                                                                {{ p.caller }}

diff --git a/src/templates/talk/phonebook-contact.html b/src/templates/talk/phonebook-contact.html
index 79856b322ec6de1f9404c3e759cc13bcf1fc9052..1b7b2ee5737364b77e2fdcdde73e100fc94949e1 100644 (file)
--- a/src/templates/talk/phonebook-contact.html
+++ b/src/templates/talk/phonebook-contact.html
@@ -9,7 +9,7 @@
                
                <div class="row mb-6">
                        <div class="col-3">
-                               <img src="{{ account.gravatar_icon(243) }}" alt="{{ account.name }}" class="img-thumbnail">
+                               <img src="{{ account.avatar_url(243) }}" alt="{{ account.name }}" class="img-thumbnail">
                        </div>
                        <div class="col">
                                {% if account.sip_id %}

diff --git a/src/templates/talk/phonebook.html b/src/templates/talk/phonebook.html
index 18716f9bf884a40f1e4c0a1ec904402c8044b02a..ef099d955f30acf9604b705893fa3d7d19703e04 100644 (file)
--- a/src/templates/talk/phonebook.html
+++ b/src/templates/talk/phonebook.html
@@ -16,7 +16,7 @@
                                                        <th scope="col">Name</th>
                                                        <th scope="col">eMail</th>
                                                        <th scope="col">Phone</th>
-                                                       <th scope="col">Gravatar</th>
+                                                       <th scope="col">Avatar</th>
                                                </tr>
                                        </thead>
                                        <tbody>
@@ -37,7 +37,7 @@
                                                                                {% end %}
                                                                        {% end %}
                                                                </td>
-                                                               <td><a href="/phonebook/{{ e.uid }}"><img src="{{ e.gravatar_icon(64) }}" alt="{{ e.name }}"></a></td>
+                                                               <td><a href="/phonebook/{{ e.uid }}"><img src="{{ e.avatar_url(64) }}" alt="{{ e.name }}"></a></td>
                                                        </tr>
                                                {% end %}
                                        </tbody>

diff --git a/src/web/handlers_accounts.py b/src/web/handlers_accounts.py
index d1dd7fb8b2580a3a94e12cafb2389f0414965917..2c74078546594fc0426c368c8e639ead7b4d5fbf 100644 (file)
--- a/src/web/handlers_accounts.py
+++ b/src/web/handlers_accounts.py
@@ -32,12 +32,9 @@ class AccountsAvatarHandler(BaseHandler):
                        if avatar:
                                self.memcached.set(cache_handle, avatar, 6 * 3600)
 
-                       # Otherwise redirect to gravatar
+                       # Otherwise raise 404 (XXX should send a default image)
                        else:
-                               avatar = account.get_gravatar_url(size)
-
-                               if avatar.startswith("http://") or avatar.startswith("https://"):
-                                       return self.redirect(avatar)
+                               raise tornado.web.HTTPError(404, "No avatar set for %s" % account)
 
                self.set_header("Cache-Control", "public,max-age=300")
                self.set_header("Content-Disposition", "inline; filename=\"%s.jpg\"" % who)