From b5b180e67262140198f4f104c8b5cf1aae49fb56 Mon Sep 17 00:00:00 2001
From: Ansh Goyal <anshg1214@gmail.com>
Date: Tue, 1 Mar 2022 00:48:52 +0530
Subject: [PATCH 1/5] Removed avatar from html

---
 critiquebrainz/frontend/templates/artist/entity.html   |  2 +-
 critiquebrainz/frontend/templates/event/entity.html    |  2 +-
 critiquebrainz/frontend/templates/index/index.html     |  4 ++--
 critiquebrainz/frontend/templates/label/entity.html    |  2 +-
 critiquebrainz/frontend/templates/macros.html          | 10 ++++------
 .../frontend/templates/moderators/moderators.html      |  1 -
 critiquebrainz/frontend/templates/place/entity.html    |  2 +-
 .../frontend/templates/recording/entity.html           |  2 +-
 .../frontend/templates/release_group/entity.html       |  2 +-
 critiquebrainz/frontend/templates/review/browse.html   |  2 +-
 .../frontend/templates/review/entity/base.html         |  2 +-
 .../frontend/templates/review/entity/comments.html     |  2 +-
 .../frontend/templates/review/revisions.html           |  3 +--
 critiquebrainz/frontend/templates/user/base.html       |  2 +-
 critiquebrainz/frontend/templates/work/entity.html     |  2 +-
 15 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/critiquebrainz/frontend/templates/artist/entity.html b/critiquebrainz/frontend/templates/artist/entity.html
index a23ab811c..97c17b08a 100644
--- a/critiquebrainz/frontend/templates/artist/entity.html
+++ b/critiquebrainz/frontend/templates/artist/entity.html
@@ -80,7 +80,7 @@ <h4 style="margin-bottom:0;">{{ _('Reviews') }}</h4>
             <tr data-review-id="{{ review.id }}">
               <td>
                 <a href="{{ url_for('review.entity', id=review.id) }}">
-                  {{ _('by %(reviewer)s', reviewer='<img class="avatar" src="%s&s=16" /> '|safe % review.user.avatar + review.user.display_name) }}
+                  {{ _('by %(reviewer)s', reviewer=review.user.display_name) }}
                 </a>
               </td>
               <td>{{ review.published_on | date }}</td>
diff --git a/critiquebrainz/frontend/templates/event/entity.html b/critiquebrainz/frontend/templates/event/entity.html
index a35cae728..6490f174d 100644
--- a/critiquebrainz/frontend/templates/event/entity.html
+++ b/critiquebrainz/frontend/templates/event/entity.html
@@ -77,7 +77,7 @@ <h4 style="margin-bottom:0;">{{ _('Reviews') }}</h4>
               <tr data-review-id="{{ review.id }}">
                 <td>
                   <a href="{{ url_for('review.entity', id=review.id) }}">
-                    {{ _('by %(reviewer)s', reviewer='<img class="avatar" src="%s&s=16" /> '|safe % review.user.avatar + review.user.display_name) }}
+                    {{ _('by %(reviewer)s', reviewer=review.user.display_name) }}
                   </a>
                 </td>
                 <td>{{ review.published_on | date }}</td>
diff --git a/critiquebrainz/frontend/templates/index/index.html b/critiquebrainz/frontend/templates/index/index.html
index 593fca21f..ed5a57ac5 100644
--- a/critiquebrainz/frontend/templates/index/index.html
+++ b/critiquebrainz/frontend/templates/index/index.html
@@ -62,7 +62,7 @@ <h3 style="margin-bottom:-5px;margin-top:0px;">{{ _('Popular reviews') }}</h3>
             {% set entity = review.entity_id | entity_details(type=review.entity_type) %}
             <div class="album">{% include 'entity_review.html' %}</div>
             <div class="reviewer">
-              <p>{{ review_credit(review, user_picture_size=16) }}</p>
+              <p>{{ review_credit(review) }}</p>
             </div>
             <div class="preview">{{ review.preview[:250] }}{% if review.preview|length > 250 %}...{% endif %}</div>
           </div>
@@ -89,7 +89,7 @@ <h4>{{ _('Recent reviews') }}</h4>
             {% set entity = review.entity_id | entity_details(type=review.entity_type) %}
             <div class="album">{% include 'entity_review.html' %}</div>
             <div class="reviewer">
-              <p>{{ review_credit(review, user_picture_size=16) }}</p>
+              <p>{{ review_credit(review) }}</p>
             </div>
           </div>
         {% endfor %}
diff --git a/critiquebrainz/frontend/templates/label/entity.html b/critiquebrainz/frontend/templates/label/entity.html
index bde80bab2..ddba333c2 100644
--- a/critiquebrainz/frontend/templates/label/entity.html
+++ b/critiquebrainz/frontend/templates/label/entity.html
@@ -45,7 +45,7 @@ <h4 style="margin-bottom:0;">{{ _('Reviews') }}</h4>
             <tr data-review-id="{{ review.id }}">
               <td>
                 <a href="{{ url_for('review.entity', id=review.id) }}">
-                  {{ _('by %(reviewer)s', reviewer='<img class="avatar" src="%s&s=16" /> '|safe % review.user.avatar + review.user.display_name) }}
+                  {{ _('by %(reviewer)s', reviewer=review.user.display_name) }}
                 </a>
               </td>
               <td>{{ review.published_on | date }}</td>
diff --git a/critiquebrainz/frontend/templates/macros.html b/critiquebrainz/frontend/templates/macros.html
index c2ea433fd..3f0df94f5 100644
--- a/critiquebrainz/frontend/templates/macros.html
+++ b/critiquebrainz/frontend/templates/macros.html
@@ -105,9 +105,8 @@
   {% endif %}
 {% endmacro %}
 
-{% macro review_credit(review, user_picture_size) %}
-  {% set user_string = '<img class="avatar" src="%s&s=%d" /> '|safe % (review.user.avatar, user_picture_size)
-              + '<a href="%s">%s</a>'|safe % (url_for('user.reviews', user_id=review.user.id), review.user.display_name) %}
+{% macro review_credit(review) %}
+  {% set user_string = '<a href="%s">%s</a>'|safe % (url_for('user.reviews', user_id=review.user.id), review.user.display_name) %}
   {{ _('Review by %(user)s', user=user_string) }}
 {% endmacro %}
 
@@ -181,9 +180,8 @@
   <span style="font-size: 16px;">{{ rating }}</span><em class="text-muted">/5 {{ ngettext('based on %(num)s rating', 'based on %(num)s ratings', count) }}</em>
 {% endmacro %}
 
-{% macro comment_credit(comment, user_picture_size) %}
-  {% set user_string = '<img class="avatar" src="%s&s=%d" /> '|safe % (comment.user.avatar, user_picture_size)
-              + '<a href="%s">%s</a>'|safe % (url_for('user.reviews', user_id=comment.user.id), comment.user.display_name) %}
+{% macro comment_credit(comment) %}
+  {% set user_string = '<a href="%s">%s</a>'|safe % (url_for('user.reviews', user_id=comment.user.id), comment.user.display_name) %}
   {{ _('%(user)s', user=user_string) }}
 {% endmacro %}
 
diff --git a/critiquebrainz/frontend/templates/moderators/moderators.html b/critiquebrainz/frontend/templates/moderators/moderators.html
index 76c3edd0b..d10edd80e 100644
--- a/critiquebrainz/frontend/templates/moderators/moderators.html
+++ b/critiquebrainz/frontend/templates/moderators/moderators.html
@@ -9,7 +9,6 @@ <h2>{{ _('Moderators') }}</h2>
     <ul>
     {% for mod in moderators %}
       <li>
-        <img src="{{ mod['avatar_url'] }}" class="avatar" />
         {% if mod['critiquebrainz_id'] %}
           <a href="{{ url_for('user.info', user_id=mod['critiquebrainz_id']) }}">
             {{ mod['musicbrainz_username'] }}
diff --git a/critiquebrainz/frontend/templates/place/entity.html b/critiquebrainz/frontend/templates/place/entity.html
index b4cbd4257..379908792 100644
--- a/critiquebrainz/frontend/templates/place/entity.html
+++ b/critiquebrainz/frontend/templates/place/entity.html
@@ -68,7 +68,7 @@ <h4 style="margin-bottom:0;">{{ _('Reviews') }}</h4>
               <tr data-review-id="{{ review.id }}">
                 <td>
                   <a href="{{ url_for('review.entity', id=review.id) }}">
-                    {{ _('by %(reviewer)s', reviewer='<img class="avatar" src="%s&s=16" /> '|safe % review.user.avatar + review.user.display_name) }}
+                    {{ _('by %(reviewer)s', reviewer=review.user.display_name) }}
                   </a>
                 </td>
                 <td>{{ review.published_on | date }}</td>
diff --git a/critiquebrainz/frontend/templates/recording/entity.html b/critiquebrainz/frontend/templates/recording/entity.html
index 225a235dc..ec29ba42d 100644
--- a/critiquebrainz/frontend/templates/recording/entity.html
+++ b/critiquebrainz/frontend/templates/recording/entity.html
@@ -52,7 +52,7 @@ <h4 style="margin-bottom:0;">{{ _('Reviews') }}</h4>
             <tr data-review-id="{{ review.id }}">
               <td>
                 <a href="{{ url_for('review.entity', id=review.id) }}">
-                    {{ _('by') }} <img class="avatar" src="{{ review.user.avatar + review.user.display_name }}&s=16" />
+                    {{ _('by %(reviewer)', reviewer=review.user.display_name) }}
                 </a>
               </td>
               <td>{{ review.published_on | date }}</td>
diff --git a/critiquebrainz/frontend/templates/release_group/entity.html b/critiquebrainz/frontend/templates/release_group/entity.html
index f7ab9c901..a1af4904f 100644
--- a/critiquebrainz/frontend/templates/release_group/entity.html
+++ b/critiquebrainz/frontend/templates/release_group/entity.html
@@ -67,7 +67,7 @@ <h4 style="margin-bottom:0;">{{ _('Reviews') }}</h4>
             <tr data-review-id="{{ review.id }}">
               <td>
                 <a href="{{ url_for('review.entity', id=review.id) }}">
-                  {{ _('by %(reviewer)s', reviewer='<img class="avatar" src="%s&s=16" /> '|safe % review.user.avatar + review.user.display_name) }}
+                  {{ _('by %(reviewer)s', reviewer=review.user.display_name) }}
                 </a>
               </td>
               <td>{{ review.published_on | date }}</td>
diff --git a/critiquebrainz/frontend/templates/review/browse.html b/critiquebrainz/frontend/templates/review/browse.html
index 6b113359a..cda8a99df 100644
--- a/critiquebrainz/frontend/templates/review/browse.html
+++ b/critiquebrainz/frontend/templates/review/browse.html
@@ -40,7 +40,7 @@ <h2>{{ _('Reviews') }}</h2>
       <div class="album">{% include 'entity_review.html' %}</div>
       <div class="reviewer">
         <p>
-          {{ review_credit(review, user_picture_size=16) }}
+          {{ review_credit(review) }}
           <br/>
           {{ review.published_on | date }}
         </p>
diff --git a/critiquebrainz/frontend/templates/review/entity/base.html b/critiquebrainz/frontend/templates/review/entity/base.html
index b44ff3c97..9a0e09ff5 100644
--- a/critiquebrainz/frontend/templates/review/entity/base.html
+++ b/critiquebrainz/frontend/templates/review/entity/base.html
@@ -12,7 +12,7 @@
     {% block sidebar %}{% endblock %}
 
     <div class="col-md-{% if sidebar_visible %}9{% else %}12{% endif %}">
-      <h3>{{ review_credit(review, user_picture_size=24) }}</h3>
+      <h3>{{ review_credit(review) }}</h3>
 
       {% if review.is_draft %}
         <div class="alert alert-warning" role="alert">{{ _('<b>This review has not been published yet!</b> Only you can see it.') }}</div>
diff --git a/critiquebrainz/frontend/templates/review/entity/comments.html b/critiquebrainz/frontend/templates/review/entity/comments.html
index 0f2e8ed24..4ce44c7e1 100644
--- a/critiquebrainz/frontend/templates/review/entity/comments.html
+++ b/critiquebrainz/frontend/templates/review/entity/comments.html
@@ -4,7 +4,7 @@
       <hr/>
       <div id="{{ comment.id }}" class="comment-container">
         <div class="comment-header">
-          {{ comment_credit(comment, user_picture_size=24) }}
+          {{ comment_credit(comment) }}
           {% if current_user.is_authenticated and current_user == comment.user %}
             <a href="{{ url_for('comment.delete', id=comment.id) }}"
                class="btn btn-danger btn-xs"
diff --git a/critiquebrainz/frontend/templates/review/revisions.html b/critiquebrainz/frontend/templates/review/revisions.html
index 263cd5776..282b676f5 100644
--- a/critiquebrainz/frontend/templates/review/revisions.html
+++ b/critiquebrainz/frontend/templates/review/revisions.html
@@ -13,8 +13,7 @@
 {% endblock %}
 
 {% block content %}
-  <h3> {{ _('Revisions of Review by %(user)s', user = ('<img class="avatar" src="%s&s=24" /> '|safe % review.user.avatar)
-  + ('<a href="%s">'|safe % url_for('user.reviews', user_id=review.user.id)) + review.user.display_name + '</a>'|safe) }} </h3>
+  <h3> {{ _('Revisions of Review by %(user)s', user = ('<a href="%s">'|safe % url_for('user.reviews', user_id=review.user.id)) + review.user.display_name + '</a>'|safe) }} </h3>
 
   <div style="margin-top: 50px;">
     <form id="review-compare" action="{{ url_for('review.compare', id=review.id) }}" method="GET">
diff --git a/critiquebrainz/frontend/templates/user/base.html b/critiquebrainz/frontend/templates/user/base.html
index dede0afc0..a3b080ded 100644
--- a/critiquebrainz/frontend/templates/user/base.html
+++ b/critiquebrainz/frontend/templates/user/base.html
@@ -5,7 +5,7 @@
 {% block content %}
   <div id="user-profile">
     <div class="clearfix">
-      <h2 class="pull-left"><img class="avatar" src="{{ user.avatar }}&s=32" /> {{ user.display_name }}</h2>
+      <h2 class="pull-left">{{ user.display_name }}</h2>
       {% if current_user.is_authenticated %}
         {% if current_user == user %}
           <a href="{{ url_for('profile_details.edit') }}"
diff --git a/critiquebrainz/frontend/templates/work/entity.html b/critiquebrainz/frontend/templates/work/entity.html
index 60ea32ba6..e994943b1 100644
--- a/critiquebrainz/frontend/templates/work/entity.html
+++ b/critiquebrainz/frontend/templates/work/entity.html
@@ -45,7 +45,7 @@ <h4 style="margin-bottom:0;">{{ _('Reviews') }}</h4>
             <tr data-review-id="{{ review.id }}">
               <td>
                 <a href="{{ url_for('review.entity', id=review.id) }}">
-                  {{ _('by %(reviewer)s', reviewer='<img class="avatar" src="%s&s=16" /> '|safe % review.user.avatar + review.user.display_name) }}
+                  {{ _('by %(reviewer)s', reviewer=review.user.display_name) }}
                 </a>
               </td>
               <td>{{ review.published_on | date }}</td>

From 3ef26cbd28b3cec1bb32869fbf1db8d9243dc78e Mon Sep 17 00:00:00 2001
From: Ansh Goyal <anshg1214@gmail.com>
Date: Tue, 1 Mar 2022 00:50:02 +0530
Subject: [PATCH 2/5] Removed Gravatar

---
 critiquebrainz/db/test/users_test.py        |  8 +---
 critiquebrainz/db/user.py                   |  8 ----
 critiquebrainz/db/users.py                  | 41 +--------------------
 critiquebrainz/frontend/views/moderators.py |  3 --
 critiquebrainz/ws/user/views.py             |  3 +-
 5 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/critiquebrainz/db/test/users_test.py b/critiquebrainz/db/test/users_test.py
index 02f3ed517..0647a6924 100644
--- a/critiquebrainz/db/test/users_test.py
+++ b/critiquebrainz/db/test/users_test.py
@@ -11,7 +11,7 @@
 import critiquebrainz.db.vote as db_vote
 from critiquebrainz.data.testing import DataTestCase
 from critiquebrainz.db.user import User
-from critiquebrainz.db.users import gravatar_url, get_many_by_mb_username
+from critiquebrainz.db.users import get_many_by_mb_username
 
 
 class UserTestCase(DataTestCase):
@@ -51,12 +51,6 @@ def test_get_many_by_mb_username(self):
         self.assertEqual(users, dbresults)
         self.assertEqual(get_many_by_mb_username([]), [])
 
-    def test_avatar(self):
-        self.assertEqual(
-            gravatar_url("test2"),
-            "https://gravatar.com/avatar/ad0234829205b9033196ba818f7a872b?d=identicon&r=pg"
-        )
-
     def test_get_by_id(self):
         user = db_users.get_by_id(self.user1.id)
         self.assertEqual(user['display_name'], "test")
diff --git a/critiquebrainz/db/user.py b/critiquebrainz/db/user.py
index 531bfd114..ea2eeabdf 100644
--- a/critiquebrainz/db/user.py
+++ b/critiquebrainz/db/user.py
@@ -20,13 +20,6 @@ def __init__(self, user):
         self.license_choice = user.get('license_choice', None)
         self.musicbrainz_row_id = user.get('musicbrainz_row_id', None)
 
-    @property
-    def avatar(self):
-        """Link to user's avatar image."""
-        if self.show_gravatar and self.email:
-            return db_users.gravatar_url(self.email)
-        return db_users.gravatar_url(self.id)
-
     @property
     def is_vote_limit_exceeded(self):
         return self.votes_today_count() >= self.user_type.votes_per_day
@@ -125,7 +118,6 @@ def to_dict(self, includes=None, confidential=False):
         if confidential is True:
             response.update(dict(
                 email=self.email,
-                avatar=self.avatar,
                 show_gravatar=self.show_gravatar,
                 musicbrainz_username=self.musicbrainz_username,
                 license_choice=self.license_choice,
diff --git a/critiquebrainz/db/users.py b/critiquebrainz/db/users.py
index ce0e2507b..ffc121424 100644
--- a/critiquebrainz/db/users.py
+++ b/critiquebrainz/db/users.py
@@ -8,37 +8,6 @@
 from critiquebrainz.db import revision as db_revision
 
 
-def gravatar_url(source, default="identicon", rating="pg"):
-    """Generates Gravatar URL from a source ID.
-
-    Source string is hashed using the MD5 algorithm and included into a
-    resulting URL. User's privacy should be considered when using this. For
-    example, if using an email address, make sure that user explicitly allowed
-    that.
-
-    See https://en.gravatar.com/site/implement/images/ for implementation
-    details.
-
-    Args:
-        source (str): String to be hashed and used as an avatar ID with the
-            Gravatar service. Can be email, MusicBrainz username, or any other
-            unique identifier.
-        default (str): Default image to use if image for specified source is
-            not found. Can be one of defaults provided by Gravatar (referenced
-            by a keyword) or a publicly available image (as a full URL).
-        rating (string): One of predefined audience rating values. Current
-            default is recommended.
-
-    Returns:
-        URL to the Gravatar image.
-    """
-    return "https://gravatar.com/avatar/{hash}?d={default}&r={rating}".format(
-        hash=md5(source.encode('utf-8')).hexdigest(),
-        default=default,
-        rating=rating,
-    )
-
-
 USER_GET_COLUMNS = [
     'id',
     'display_name',
@@ -59,8 +28,7 @@ def get_many_by_mb_username(usernames):
         usernames (list): A list of MusicBrainz usernames. This lookup is case-insensetive.
 
     Returns:
-        All columns of 'user' table (list of dictionaries)
-        and avatar_url (Gravatar url).
+        All columns of 'user' table (list of dictionaries).
         If the 'usernames' variable is an empty list function returns it back.
     """
     if not usernames:
@@ -76,13 +44,6 @@ def get_many_by_mb_username(usernames):
         })
         row = result.fetchall()
         users = [dict(r) for r in row]
-        for user in users:
-            default_gravatar_src = "%s@cb" % user["id"]
-            user["musicbrainz_username"] = user.pop("musicbrainz_id")
-            if user["show_gravatar"]:
-                user["avatar_url"] = gravatar_url(user.get("email") or default_gravatar_src)
-            else:
-                user["avatar_url"] = gravatar_url(default_gravatar_src)
         return users
 
 
diff --git a/critiquebrainz/frontend/views/moderators.py b/critiquebrainz/frontend/views/moderators.py
index 986d14f1a..318fbe3ee 100644
--- a/critiquebrainz/frontend/views/moderators.py
+++ b/critiquebrainz/frontend/views/moderators.py
@@ -2,7 +2,6 @@
 from flask import current_app
 
 from critiquebrainz.db import users as db_users
-from critiquebrainz.db.users import gravatar_url
 
 moderators_bp = Blueprint('moderators', __name__)
 
@@ -19,12 +18,10 @@ def mods_list():
         mods.append({
             'critiquebrainz_id': mod_data["id"],
             'musicbrainz_username': mod_data["musicbrainz_username"],
-            'avatar_url': mod_data["avatar_url"],
         })
     for mod_username in mod_usernames:  # The rest
         mods.append({
             'musicbrainz_username': mod_username,
-            'avatar_url': gravatar_url(mod_username, default="mm"),
         })
     mods = sorted(mods, key=lambda k: k['musicbrainz_username'].lower())
     return render_template('moderators/moderators.html', moderators=mods)
diff --git a/critiquebrainz/ws/user/views.py b/critiquebrainz/ws/user/views.py
index 6fe14517b..99645ffbc 100644
--- a/critiquebrainz/ws/user/views.py
+++ b/critiquebrainz/ws/user/views.py
@@ -37,8 +37,7 @@ def user_me_handler(user):
             "email": "your_email_id",
             "karma": 0,
             "musicbrainz_username": "username/id associated with musicbrainz",
-            "id": "your-unique-user-id",
-            "avatar": "https://gravatar.com/your-gravatar-link"
+            "id": "your-unique-user-id"
           }
         }
 

From eff3086a58b842b237ca3109fc3d7587634b40b0 Mon Sep 17 00:00:00 2001
From: Ansh Goyal <anshg1214@gmail.com>
Date: Tue, 1 Mar 2022 19:39:01 +0000
Subject: [PATCH 3/5] Removed show_gravatar

---
 admin/schema_changes/20.sql                     |  5 +++++
 admin/sql/create_tables.sql                     |  1 -
 critiquebrainz/data/dump_manager.py             |  1 -
 critiquebrainz/db/comment.py                    |  4 ----
 critiquebrainz/db/review.py                     |  4 ----
 critiquebrainz/db/user.py                       |  2 --
 critiquebrainz/db/users.py                      | 17 ++---------------
 critiquebrainz/frontend/forms/profile.py        |  1 -
 critiquebrainz/frontend/static/styles/main.less | 15 ---------------
 .../frontend/templates/profile/edit.html        |  7 -------
 critiquebrainz/frontend/views/profile.py        |  2 --
 .../frontend/views/test/test_profile.py         |  1 -
 critiquebrainz/ws/user/views.py                 |  9 +++------
 13 files changed, 10 insertions(+), 59 deletions(-)
 create mode 100644 admin/schema_changes/20.sql

diff --git a/admin/schema_changes/20.sql b/admin/schema_changes/20.sql
new file mode 100644
index 000000000..07ae854b5
--- /dev/null
+++ b/admin/schema_changes/20.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE "user" DROP COLUMN "show_gravatar";
+
+COMMIT;
diff --git a/admin/sql/create_tables.sql b/admin/sql/create_tables.sql
index fe16d930a..ea2aeb7ef 100644
--- a/admin/sql/create_tables.sql
+++ b/admin/sql/create_tables.sql
@@ -114,7 +114,6 @@ CREATE TABLE "user" (
     created             TIMESTAMP   NOT NULL,
     musicbrainz_id      VARCHAR,
     musicbrainz_row_id  INTEGER,
-    show_gravatar       BOOLEAN     NOT NULL DEFAULT False,
     is_blocked          BOOLEAN     NOT NULL DEFAULT False,
     license_choice      VARCHAR
 );
diff --git a/critiquebrainz/data/dump_manager.py b/critiquebrainz/data/dump_manager.py
index b31e65818..0e318c18f 100644
--- a/critiquebrainz/data/dump_manager.py
+++ b/critiquebrainz/data/dump_manager.py
@@ -53,7 +53,6 @@
         "email",
         "created",
         "musicbrainz_id",
-        "show_gravatar",
         "is_blocked",
         "license_choice",
         "spam_reports",
diff --git a/critiquebrainz/db/comment.py b/critiquebrainz/db/comment.py
index f39ca562f..612b327e0 100644
--- a/critiquebrainz/db/comment.py
+++ b/critiquebrainz/db/comment.py
@@ -87,7 +87,6 @@ def get_by_id(comment_id):
                    "user".email,
                    "user".created as user_created,
                    "user".display_name,
-                   "user".show_gravatar,
                    "user".musicbrainz_id,
                    "user".is_blocked
               FROM comment c
@@ -115,7 +114,6 @@ def get_by_id(comment_id):
             'display_name': comment.pop('display_name'),
             'email': comment.pop('email'),
             'created': comment.pop('user_created'),
-            'show_gravatar': comment.pop('show_gravatar'),
             'musicbrainz_username': comment.pop('musicbrainz_id'),
             'is_blocked': comment.pop('is_blocked')
         })
@@ -168,7 +166,6 @@ def list_comments(*, review_id=None, user_id=None, limit=20, offset=0, inc_hidde
                    "user".email,
                    "user".created as user_created,
                    "user".display_name,
-                   "user".show_gravatar,
                    "user".musicbrainz_id,
                    "user".is_blocked,
                    MIN(comment_revision.timestamp) as created,
@@ -209,7 +206,6 @@ def list_comments(*, review_id=None, user_id=None, limit=20, offset=0, inc_hidde
             row['user'] = User({
                 'id': row['user_id'],
                 'display_name': row.pop('display_name'),
-                'show_gravatar': row.pop('show_gravatar'),
                 'is_blocked': row.pop('is_blocked'),
                 'musicbrainz_username': row.pop('musicbrainz_id'),
                 'email': row.pop('email'),
diff --git a/critiquebrainz/db/review.py b/critiquebrainz/db/review.py
index 2e1e8fd7d..08287c6e8 100644
--- a/critiquebrainz/db/review.py
+++ b/critiquebrainz/db/review.py
@@ -101,7 +101,6 @@ def get_by_id(review_id):
                    "user".email,
                    "user".created as user_created,
                    "user".display_name,
-                   "user".show_gravatar,
                    "user".musicbrainz_id,
                    "user".is_blocked,
                    license.full_name,
@@ -133,7 +132,6 @@ def get_by_id(review_id):
             "id": review["user_id"],
             "display_name": review.pop("display_name", None),
             "is_blocked": review.pop("is_blocked", False),
-            "show_gravatar": review.pop("show_gravatar", False),
             "musicbrainz_username": review.pop("musicbrainz_id"),
             "email": review.pop("email"),
             "created": review.pop("user_created"),
@@ -438,7 +436,6 @@ def get_reviews_list(connection, *, inc_drafts=False, inc_hidden=False, entity_i
                review.source_url,
                review.user_id,
                "user".display_name,
-               "user".show_gravatar,
                "user".is_blocked,
                "user".email,
                "user".created as user_created,
@@ -495,7 +492,6 @@ def get_reviews_list(connection, *, inc_drafts=False, inc_hidden=False, entity_i
             row["user"] = User({
                 "id": row["user_id"],
                 "display_name": row.pop("display_name"),
-                "show_gravatar": row.pop("show_gravatar"),
                 "is_blocked": row.pop("is_blocked"),
                 "musicbrainz_username": row.pop("musicbrainz_id"),
                 "email": row.pop("email"),
diff --git a/critiquebrainz/db/user.py b/critiquebrainz/db/user.py
index ea2eeabdf..11a5c0eb7 100644
--- a/critiquebrainz/db/user.py
+++ b/critiquebrainz/db/user.py
@@ -15,7 +15,6 @@ def __init__(self, user):
         self.email = user.get('email')
         self.created = user.get('created')
         self.musicbrainz_username = user.get('musicbrainz_username')
-        self.show_gravatar = user.get('show_gravatar', False)
         self.is_blocked = user.get('is_blocked', False)
         self.license_choice = user.get('license_choice', None)
         self.musicbrainz_row_id = user.get('musicbrainz_row_id', None)
@@ -118,7 +117,6 @@ def to_dict(self, includes=None, confidential=False):
         if confidential is True:
             response.update(dict(
                 email=self.email,
-                show_gravatar=self.show_gravatar,
                 musicbrainz_username=self.musicbrainz_username,
                 license_choice=self.license_choice,
             ))
diff --git a/critiquebrainz/db/users.py b/critiquebrainz/db/users.py
index ffc121424..697b24f4e 100644
--- a/critiquebrainz/db/users.py
+++ b/critiquebrainz/db/users.py
@@ -15,7 +15,6 @@
     'created',
     'musicbrainz_id',
     'musicbrainz_row_id',
-    'show_gravatar',
     'license_choice',
     'is_blocked',
 ]
@@ -83,7 +82,6 @@ def get_by_id(user_id):
             "email": (str),
             "created": (datetime),
             "musicbrainz_username": (str),
-            "show_gravatar": (bool),
             "is_blocked": (bool),
             "license_choice": (str)
         }
@@ -100,7 +98,6 @@ def create(**user_data):
         musicbrainz_username(str, optional): musicbrainz username of user.
         musicbrainz_row_id (int): the MusicBrainz row ID of the user,
         email(str, optional): email of the user.
-        show_gravatar(bool, optional): whether to show gravatar(default: false).
         is_blocked(bool, optional): whether user is blocked(default: false).
         license_choice(str, optional): preferred license for reviews by the user
 
@@ -112,7 +109,6 @@ def create(**user_data):
             "email": (str),
             "created": (datetime),
             "musicbrainz_username": (str),
-            "show_gravatar": (bool),
             "is_blocked": (bool),
             "license_choice": (str)
         }
@@ -120,7 +116,6 @@ def create(**user_data):
     display_name = user_data.pop('display_name')
     musicbrainz_username = user_data.pop('musicbrainz_username', None)
     email = user_data.pop('email', None)
-    show_gravatar = user_data.pop('show_gravatar', False)
     is_blocked = user_data.pop('is_blocked', False)
     license_choice = user_data.pop('license_choice', None)
     musicbrainz_row_id = user_data.pop('musicbrainz_row_id', None)
@@ -129,9 +124,9 @@ def create(**user_data):
 
     with db.engine.connect() as connection:
         result = connection.execute(sqlalchemy.text("""
-            INSERT INTO "user" (id, display_name, email, created, musicbrainz_id, show_gravatar,
+            INSERT INTO "user" (id, display_name, email, created, musicbrainz_id,
                                 is_blocked, license_choice, musicbrainz_row_id)
-                 VALUES (:id, :display_name, :email, :created, :musicbrainz_id, :show_gravatar,
+                 VALUES (:id, :display_name, :email, :created, :musicbrainz_id,
                         :is_blocked, :license_choice, :musicbrainz_row_id)
               RETURNING id
         """), {
@@ -140,7 +135,6 @@ def create(**user_data):
             "email": email,
             "created": datetime.now(),
             "musicbrainz_id": musicbrainz_username,
-            "show_gravatar": show_gravatar,
             "is_blocked": is_blocked,
             "license_choice": license_choice,
             "musicbrainz_row_id": musicbrainz_row_id,
@@ -163,7 +157,6 @@ def get_by_mbid(musicbrainz_username):
             "email": (str),
             "created": (datetime),
             "musicbrainz_username": (str),
-            "show_gravatar": (bool),
             "is_blocked": (bool),
             "license_choice": (str)
         }
@@ -195,7 +188,6 @@ def get_or_create(musicbrainz_row_id, musicbrainz_username, new_user_data):
         {
             "display_name": Display name of the user.
             "email": email of the user(optional).
-            "show_gravatar": whether to show gravatar(default: false, optional).
             "is_blocked": whether user is blocked(default: false, optional).
             "license_choice": preferred license for reviews by the user(optional)
         }
@@ -208,7 +200,6 @@ def get_or_create(musicbrainz_row_id, musicbrainz_username, new_user_data):
             "email": (str),
             "created": (datetime),
             "musicbrainz_username": (str),
-            "show_gravatar": (bool),
             "is_blocked": (bool),
             "license_choice": (str)
         }
@@ -255,7 +246,6 @@ def list_users(limit=None, offset=0):
             "email": (str),
             "created": (datetime),
             "musicbrainz_username": (str),
-            "show_gravatar": (bool),
             "is_blocked": (bool),
             "license_choice": (str),
             "musicbrainz_row_id": (int),
@@ -548,7 +538,6 @@ def update(user_id, user_new_info):
         user_new_info: Dictionary containing the new information for the user
         {
             "display_name": (str),
-            "show_gravatar": (bool),
             "email": (str)
             "license_choice": (str)
         }
@@ -556,8 +545,6 @@ def update(user_id, user_new_info):
     updates = []
     if "display_name" in user_new_info:
         updates.append("display_name = :display_name")
-    if "show_gravatar" in user_new_info:
-        updates.append("show_gravatar = :show_gravatar")
     if "email" in user_new_info:
         updates.append("email = :email")
     if "license_choice" in user_new_info:
diff --git a/critiquebrainz/frontend/forms/profile.py b/critiquebrainz/frontend/forms/profile.py
index e1e4f6b5c..67f5de326 100644
--- a/critiquebrainz/frontend/forms/profile.py
+++ b/critiquebrainz/frontend/forms/profile.py
@@ -12,7 +12,6 @@ class ProfileEditForm(FlaskForm):
     email = EmailField(lazy_gettext("Email"), [
         validators.Optional(strip_whitespace=False),
         validators.Email(message=lazy_gettext("Email field is not a valid email address."))])
-    show_gravatar = BooleanField(lazy_gettext("Show my Gravatar"))
     license_choice = RadioField(lazy_gettext("Preferred License Choice"), choices=[
         ('CC BY-SA 3.0', lazy_gettext('Allow commercial use of my reviews (<a href="https://creativecommons.org/licenses/by-sa/3.0/" target="_blank">CC BY-SA 3.0 license</a>)')),  # noqa: E501
         ('CC BY-NC-SA 3.0', lazy_gettext('Do not allow commercial use of my reviews, unless approved by MetaBrainz Foundation (<a href="https://creativecommons.org/licenses/by-nc-sa/3.0/" target="_blank">CC BY-NC-SA 3.0 license</a>)')),  # noqa: E501
diff --git a/critiquebrainz/frontend/static/styles/main.less b/critiquebrainz/frontend/static/styles/main.less
index 79aaca11d..8edc569d3 100644
--- a/critiquebrainz/frontend/static/styles/main.less
+++ b/critiquebrainz/frontend/static/styles/main.less
@@ -72,14 +72,6 @@ body {
   }
 }
 
-img.avatar {
-  display: inline;
-  vertical-align: bottom;
-  border: 1px solid #ddd;
-  padding: 1px;
-  background: #fff;
-}
-
 img.cover-art {
   max-width: 250px;
 }
@@ -577,13 +569,6 @@ a#edit-review { margin-top: 20px; }
 
 
 // Moderators list page
-#moderators-list {
-  img.avatar {
-    margin-top: 2px;
-    height: 20px;
-  }
-}
-
 nav {
   .glyphicon {
     padding-right: 5px;
diff --git a/critiquebrainz/frontend/templates/profile/edit.html b/critiquebrainz/frontend/templates/profile/edit.html
index 1a1959298..70edc81b0 100644
--- a/critiquebrainz/frontend/templates/profile/edit.html
+++ b/critiquebrainz/frontend/templates/profile/edit.html
@@ -23,13 +23,6 @@ <h2>{{ _('Edit profile') }}</h2>
         <label class="col-sm-2 control-label">{{ form.email.label.text }}</label>
         <div class="col-sm-4">{{ form.email(class="form-control") }}</div>
       </div>
-      <div class="form-group">
-        <div class="col-sm-offset-2 col-sm-10">
-          <div class="checkbox">
-            <label>{{ form.show_gravatar }} {{ form.show_gravatar.label.text }}</label>
-          </div>
-        </div>
-      </div>
       <div class="form-group">
         <label class="col-sm-2 control-label">{{ form.license_choice.label.text }}</label>
         <div class="col-sm-6">
diff --git a/critiquebrainz/frontend/views/profile.py b/critiquebrainz/frontend/views/profile.py
index 1787e1cb0..f50b92d4e 100644
--- a/critiquebrainz/frontend/views/profile.py
+++ b/critiquebrainz/frontend/views/profile.py
@@ -17,7 +17,6 @@ def edit():
         db_users.update(current_user.id, user_new_info={
             "display_name": form.display_name.data,
             "email": form.email.data,
-            "show_gravatar": form.show_gravatar.data,
             "license_choice": form.license_choice.data,
         })
         flash.success(gettext("Profile updated."))
@@ -25,7 +24,6 @@ def edit():
 
     form.display_name.data = current_user.display_name
     form.email.data = current_user.email
-    form.show_gravatar.data = current_user.show_gravatar
     form.license_choice.data = current_user.license_choice
     return render_template('profile/edit.html', form=form)
 
diff --git a/critiquebrainz/frontend/views/test/test_profile.py b/critiquebrainz/frontend/views/test/test_profile.py
index f1cce7d76..dddd30477 100644
--- a/critiquebrainz/frontend/views/test/test_profile.py
+++ b/critiquebrainz/frontend/views/test/test_profile.py
@@ -20,7 +20,6 @@ def test_edit(self):
         data = dict(
             display_name="Some User",
             email='someuser@somesite.com',
-            show_gravatar='True',
             license_choice=self.license["id"]
         )
 
diff --git a/critiquebrainz/ws/user/views.py b/critiquebrainz/ws/user/views.py
index 99645ffbc..ef8ceb9c7 100644
--- a/critiquebrainz/ws/user/views.py
+++ b/critiquebrainz/ws/user/views.py
@@ -32,7 +32,6 @@ def user_me_handler(user):
           "user": {
             "display_name": "your_display_name",
             "created": "Fri, 02 Dec 2016 19:02:47 GMT",
-            "show_gravatar": true,
             "user_type": "Noob",
             "email": "your_email_id",
             "karma": 0,
@@ -152,7 +151,6 @@ def user_modify_handler(user):
 
     :json string display_name: Display name **(optional)**
     :json string email: Email address **(optional)**
-    :json boolean show_gravatar: Show gravatar **(optional)**
 
     :resheader Content-Type: *application/json*
     """
@@ -160,11 +158,10 @@ def user_modify_handler(user):
     def fetch_params():
         display_name = Parser.string('json', 'display_name', optional=True)
         email = Parser.email('json', 'email', optional=True)
-        show_gravatar = Parser.bool('json', 'show_gravatar', optional=True)
-        return display_name, email, show_gravatar
+        return display_name, email
 
-    display_name, email, show_gravatar = fetch_params()
-    user.update(display_name, email, show_gravatar)
+    display_name, email = fetch_params()
+    user.update(display_name, email)
     return jsonify(message='Request processed successfully')
 
 

From 92ce919b23984c318232db420b9b110c02041ae7 Mon Sep 17 00:00:00 2001
From: Alastair Porter <alastair@metabrainz.org>
Date: Tue, 8 Mar 2022 16:58:13 +0100
Subject: [PATCH 4/5] Rename musicbrainz_id field during sql query instead of
 after

---
 critiquebrainz/db/users.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/critiquebrainz/db/users.py b/critiquebrainz/db/users.py
index 697b24f4e..d689501fa 100644
--- a/critiquebrainz/db/users.py
+++ b/critiquebrainz/db/users.py
@@ -13,7 +13,7 @@
     'display_name',
     'email',
     'created',
-    'musicbrainz_id',
+    'musicbrainz_id as musicbrainz_username',
     'musicbrainz_row_id',
     'license_choice',
     'is_blocked',
@@ -64,7 +64,6 @@ def get_user_by_id(connection, user_id):
     if not row:
         return None
     row = dict(row)
-    row['musicbrainz_username'] = row.pop('musicbrainz_id')
     return row
 
 
@@ -173,7 +172,6 @@ def get_by_mbid(musicbrainz_username):
         if not row:
             return None
         row = dict(row)
-        row['musicbrainz_username'] = row.pop('musicbrainz_id')
     return row
 
 
@@ -263,8 +261,6 @@ def list_users(limit=None, offset=0):
         })
         rows = result.fetchall()
         rows = [dict(row) for row in rows]
-        for row in rows:
-            row['musicbrainz_username'] = row.pop('musicbrainz_id')
     return rows
 
 

From 3ebeedb36b645c73d642722eac475aece7b42255 Mon Sep 17 00:00:00 2001
From: Alastair Porter <alastair@metabrainz.org>
Date: Tue, 8 Mar 2022 17:00:34 +0100
Subject: [PATCH 5/5] Fix string interpolation

---
 critiquebrainz/frontend/templates/recording/entity.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/critiquebrainz/frontend/templates/recording/entity.html b/critiquebrainz/frontend/templates/recording/entity.html
index ec29ba42d..d40c57488 100644
--- a/critiquebrainz/frontend/templates/recording/entity.html
+++ b/critiquebrainz/frontend/templates/recording/entity.html
@@ -52,7 +52,7 @@ <h4 style="margin-bottom:0;">{{ _('Reviews') }}</h4>
             <tr data-review-id="{{ review.id }}">
               <td>
                 <a href="{{ url_for('review.entity', id=review.id) }}">
-                    {{ _('by %(reviewer)', reviewer=review.user.display_name) }}
+                    {{ _('by %(reviewer)s', reviewer=review.user.display_name) }}
                 </a>
               </td>
               <td>{{ review.published_on | date }}</td>