From: Ant Zucaro <azucaro@gmail.com>
Date: Sun, 6 Nov 2016 00:17:50 +0000 (-0400)
Subject: Get rid of joined_pretty_date in favor of the mixin.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmodels-refactor;p=xonotic%2Fxonstat.git

Get rid of joined_pretty_date in favor of the mixin.
---

diff --git a/xonstat/models/player.py b/xonstat/models/player.py
index 5b7f97b..d9df075 100644
--- a/xonstat/models/player.py
+++ b/xonstat/models/player.py
@@ -8,7 +8,7 @@ from xonstat.models.mixins import FuzzyDateMixin, EpochMixin, NickColorsMixin
 from xonstat.util import strip_colors, pretty_date, qfont_decode
 
 
-class Player(EpochMixin, NickColorsMixin):
+class Player(EpochMixin, NickColorsMixin, FuzzyDateMixin):
     """
     A player, which can represent either a human or a bot.
     """
@@ -19,10 +19,6 @@ class Player(EpochMixin, NickColorsMixin):
         else:
             return strip_colors(self.nick)
 
-    # TODO: use FuzzyDateMixin instead, but change the method calls
-    def joined_pretty_date(self):
-        return pretty_date(self.create_dt)
-
     def __repr__(self):
         return "<Player({}, {})>".format(self.player_id, self.nick.encode('utf-8'))
 
diff --git a/xonstat/templates/player_index.mako b/xonstat/templates/player_index.mako
index 6ef400f..c991f70 100644
--- a/xonstat/templates/player_index.mako
+++ b/xonstat/templates/player_index.mako
@@ -42,7 +42,7 @@
         <tr>
           <td>${player.player_id}</th>
           <td class="no-stretch"><a href="${request.route_url("player_info", id=player.player_id)}" title="Go to this player's info page">${player.nick_html_colors()|n}</a></th>
-          <td><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${player.joined_pretty_date()}</span></th>
+          <td><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${player.fuzzy_date()}</span></th>
           <td class="text-center">
             <a href="${request.route_url("player_game_index", player_id=player.player_id, page=1)}" title="View recent games by this player">
               <i class="fa fa-list"></i>
diff --git a/xonstat/templates/player_info.mako b/xonstat/templates/player_info.mako
index 2d39e10..956d335 100644
--- a/xonstat/templates/player_info.mako
+++ b/xonstat/templates/player_info.mako
@@ -66,7 +66,7 @@
     </h2>
 
     <h5>
-      <i><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">Joined ${player.joined_pretty_date()}</span> (player #${player.player_id})</i>
+      <i><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">Joined ${player.fuzzy_date()}</span> (player #${player.player_id})</i>
       % if cake_day:
         <img src="/static/images/icons/24x24/cake.png" title="Happy cake day!" />
       % endif
diff --git a/xonstat/templates/search.mako b/xonstat/templates/search.mako
index 45bf794..69013b0 100644
--- a/xonstat/templates/search.mako
+++ b/xonstat/templates/search.mako
@@ -110,7 +110,7 @@
             <tr>
               <td>${player.player_id}</th>
               <td class="no-stretch"><a href="${request.route_url("player_info", id=player.player_id)}" title="Go to this player's info page">${player.nick_html_colors()|n}</a></th>
-              <td><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${player.joined_pretty_date()}</span></th>
+              <td><span class="abstime" data-epoch="${player.epoch()}" title="${player.create_dt.strftime('%a, %d %b %Y %H:%M:%S UTC')}">${player.fuzzy_date()}</span></th>
               <td class="text-center">
                 <a href="${request.route_url("player_game_index", player_id=player.player_id, page=1)}" title="View recent games by this player">
                   <i class="fa fa-list"></i>