From c7fe7568a397994b3e17c4acb89fadc48e0f12c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 18 Apr 2024 12:23:45 +0200
Subject: [PATCH] Drop people's websites and bios
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 tahrir/templates/admin.mak   |  8 --------
 tahrir/templates/explore.mak |  2 +-
 tahrir/templates/user.mak    | 19 +++----------------
 tahrir/views.py              |  7 +------
 4 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/tahrir/templates/admin.mak b/tahrir/templates/admin.mak
index aa066729..0ead6b2a 100644
--- a/tahrir/templates/admin.mak
+++ b/tahrir/templates/admin.mak
@@ -26,14 +26,6 @@
           <td><label for="person-nickname">Nickname <span class="sublabel">Optional.</span></label></td>
           <td><input name="person-nickname" placeholder="Badger"/></td>
         </tr>
-        <tr>
-          <td><label for="person-website">Website <span class="sublabel">Optional.</span></label></td>
-          <td><input name="person-website" placeholder="asite.tld"/></td>
-        </tr>
-        <tr>
-          <td><label for="person-bio">Bio <span class="sublabel">Optional.</span></label></td>
-          <td><input name="person-bio" placeholder="Just badgin' around"/></td>
-        </tr>
         <tr>
           <td></td><td>
             <input name="add-person" type="submit" value="Add Person" />
diff --git a/tahrir/templates/explore.mak b/tahrir/templates/explore.mak
index 0d4467ca..4cdd41bc 100644
--- a/tahrir/templates/explore.mak
+++ b/tahrir/templates/explore.mak
@@ -87,7 +87,7 @@
                 <label for="person-query">
                   Keyword
                   <span class="sublabel">
-                    Search through person names and bios.</span>
+                    Search through person names.</span>
                 </label>
               </td>
               <td><input name="person-query" required="required" /></td>
diff --git a/tahrir/templates/user.mak b/tahrir/templates/user.mak
index 9afce890..7a31ef94 100644
--- a/tahrir/templates/user.mak
+++ b/tahrir/templates/user.mak
@@ -18,11 +18,9 @@
         </div>
         <span property="foaf:account" content="${user.nickname}${request.registry.settings['tahrir.email_domain']}" />
 
-        % if user.bio:
-          <div class="grid-100">
-            <p class="description">${user.bio}</p>
-          </div>
-        % endif
+        <div class="grid-100">
+          <p>Go to <a href="https://accounts.fedoraproject.org/user/${user.nickname}/">${user.nickname}'s Fedora Account</a>
+        </div>
 
         <div class="metadata grid-60">
           <p>Arrived on ${user.created_on.strftime('%Y-%m-%d')}.</p>
@@ -39,17 +37,6 @@
             <p>Not ranked yet.</p>
           % endif
 
-          % if user.website:
-            <p>
-              Website:
-              % if user.website.startswith('http'):
-                <a property="foaf:homepage" href="${user.website}">${user.website}</a>
-              % else:
-                <a property="foaf:homepage" href="http://${user.website}">${user.website}</a>
-              % endif
-            </p>
-          % endif
-
           <p>
             View user as:
             <a href="${request.route_url('user_json', id=user.nickname or user.id)}">JSON</a>,
diff --git a/tahrir/views.py b/tahrir/views.py
index 48ba01a9..a7d80216 100644
--- a/tahrir/views.py
+++ b/tahrir/views.py
@@ -258,8 +258,6 @@ def admin(request):
                 request.db.add_person(
                     email,
                     nickname=request.POST.get("person-nickname"),
-                    website=request.POST.get("person-website"),
-                    bio=request.POST.get("person-bio"),
                 )
                 request.session.flash(
                     "You added a person with email %s" % request.POST.get("person-email")
@@ -612,10 +610,7 @@ def explore(request):
             matching_results = (
                 request.db.get_all_persons()
                 .filter(
-                    (
-                        (m.Person.nickname.like("%" + search_query + "%"))
-                        | (m.Person.bio.like("%" + search_query + "%"))
-                    )
+                    (m.Person.nickname.like("%" + search_query + "%"))
                     & (m.Person.opt_out.is_(False))
                 )
                 .all()