From a315e0b5ea29ba2908525ab0eb75f7fea47fbf6f Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Sun, 25 Aug 2019 15:53:22 -0400
Subject: [PATCH 1/3] Using freshmen gravitar images

---
 packet/context_processors.py         | 16 +++++++++++++++-
 packet/templates/active_packets.html |  2 +-
 packet/templates/packet.html         |  2 +-
 packet/templates/upperclassman.html  |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packet/context_processors.py b/packet/context_processors.py
index 52347203..87f752ec 100644
--- a/packet/context_processors.py
+++ b/packet/context_processors.py
@@ -1,7 +1,8 @@
 """
 Context processors used by the jinja templates
 """
-
+import hashlib
+import urllib
 from functools import lru_cache
 from datetime import datetime
 
@@ -18,6 +19,7 @@ def get_csh_name(username):
     except:
         return username
 
+
 def get_roles(sig):
     """
     Converts a signature's role fields to a dict for ease of access.
@@ -49,6 +51,18 @@ def get_rit_name(username):
         return username
 
 
+@lru_cache(maxsize=128)
+def get_rit_image(username):
+    if username:
+        addresses = [username + "@rit.edu", username + "@g.rit.edu"]
+        for addr in addresses:
+            url = "https://gravatar.com/avatar/" + hashlib.md5(addr.encode('utf8')).hexdigest() + ".jpg?d=404&s=250"
+            gravatar = urllib.request.urlopen(url)
+            if gravatar.getcode() == 200:
+                return url
+    return "https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+
+
 def log_time(label):
     """
     Used during debugging to log timestamps while rendering templates
diff --git a/packet/templates/active_packets.html b/packet/templates/active_packets.html
index fd5fdf20..ad3c9889 100644
--- a/packet/templates/active_packets.html
+++ b/packet/templates/active_packets.html
@@ -42,7 +42,7 @@ <h4 class="page-title">Active Packets</h4>
                                                 <a href="{{ url_for('freshman_packet', packet_id=packet.id) }}">
                                                     <img class="eval-user-img"
                                                          alt="{{ get_rit_name(packet.freshman_username) }}"
-                                                         src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+                                                         src="{{ get_rit_image(packet.freshman_username) }}"
                                                          width="25"
                                                          height="25"/> {{ get_rit_name(packet.freshman_username) }}
                                                 </a>
diff --git a/packet/templates/packet.html b/packet/templates/packet.html
index 5d1a1e5d..17b6c73b 100644
--- a/packet/templates/packet.html
+++ b/packet/templates/packet.html
@@ -110,7 +110,7 @@ <h5>Upperclassmen Score - {{ '%0.2f' % upper_score }}%</h5>
                                     <tr {% if sig.signed %}style="background-color: #4caf505e" {% endif %}>
                                         <td>
                                             <img class="eval-user-img" alt="{{ sig.freshman_username }}"
-                                                 src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+                                                 src="{{ get_rit_image(packet.freshman_username) }}"
                                                  width="25" height="25"/>
                                             {{ get_rit_name(sig.freshman_username) }}
                                         </td>
diff --git a/packet/templates/upperclassman.html b/packet/templates/upperclassman.html
index 4dc40e1c..07268c5b 100644
--- a/packet/templates/upperclassman.html
+++ b/packet/templates/upperclassman.html
@@ -33,7 +33,7 @@ <h3 class="page-title">
                                             <a href="{{ url_for('freshman_packet', packet_id=packet.id) }}">
                                                 <img class="eval-user-img"
                                                      alt="{{ get_rit_name(packet.freshman_username) }}"
-                                                     src="https://www.gravatar.com/avatar/freshmen?d=mp&f=y"
+                                                     src="{{ get_rit_image(packet.freshman_username) }}"
                                                      width="25"
                                                      height="25"/>
                                                 {{ get_rit_name(packet.freshman_username) }}

From d0c9e53afc087f1cd7572bf61c56aab9ef6a7014 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Sun, 25 Aug 2019 16:10:24 -0400
Subject: [PATCH 2/3] Fixing username reference

---
 packet/templates/packet.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packet/templates/packet.html b/packet/templates/packet.html
index 17b6c73b..62708a74 100644
--- a/packet/templates/packet.html
+++ b/packet/templates/packet.html
@@ -110,7 +110,7 @@ <h5>Upperclassmen Score - {{ '%0.2f' % upper_score }}%</h5>
                                     <tr {% if sig.signed %}style="background-color: #4caf505e" {% endif %}>
                                         <td>
                                             <img class="eval-user-img" alt="{{ sig.freshman_username }}"
-                                                 src="{{ get_rit_image(packet.freshman_username) }}"
+                                                 src="{{ get_rit_image(sig.freshman_username) }}"
                                                  width="25" height="25"/>
                                             {{ get_rit_name(sig.freshman_username) }}
                                         </td>

From 971c24b3a7520c65d9934f4acf41cc28bf7005d3 Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Tue, 27 Aug 2019 10:44:35 -0400
Subject: [PATCH 3/3] Fixing quotes

---
 packet/context_processors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packet/context_processors.py b/packet/context_processors.py
index 87f752ec..06733448 100644
--- a/packet/context_processors.py
+++ b/packet/context_processors.py
@@ -56,7 +56,7 @@ def get_rit_image(username):
     if username:
         addresses = [username + "@rit.edu", username + "@g.rit.edu"]
         for addr in addresses:
-            url = "https://gravatar.com/avatar/" + hashlib.md5(addr.encode('utf8')).hexdigest() + ".jpg?d=404&s=250"
+            url = "https://gravatar.com/avatar/" + hashlib.md5(addr.encode("utf8")).hexdigest() + ".jpg?d=404&s=250"
             gravatar = urllib.request.urlopen(url)
             if gravatar.getcode() == 200:
                 return url