Change format_datetime to be a Jinja2 filter

3 files changed, 4 insertions, 5 deletions

diff --git a/main.py b/main.py
index ae15acf..f5def41 100755
--- a/main.py
+++ b/main.py
@@ -53,6 +53,8 @@ def display_time(seconds, granularity=2):
             result.append("{}{}".format(int(value), name))
     return ' '.join(result[:granularity])
 
+app.jinja_env.filters['display_time'] = display_time
+
 def grepSteamids(text):
     steamids = []
     SteamIDfromText = re.findall(r'STEAM_\d:(\d):(\d+)', text)
@@ -131,7 +133,6 @@ def lobby():
         serverinfo = serverinfo,
         gamelist = gamelist,
         states = ['Offline', 'Online', 'Busy', 'Away', 'Snooze', 'Looking to trade', 'Looking to play'],
-        display_time = display_time,
         current_time = time.time())
 
 @app.route("/premadefinder", methods=['GET', 'POST'])
@@ -166,7 +167,6 @@ def premades():
     return render_template('premades_html.jinja',
             steamids=steamids,
             profiles=premadedata,
-            display_time=display_time,
             current_time = time.time(),
             connections=connections
             )
@@ -204,7 +204,6 @@ def server():
 
     return render_template('server_html.jinja',
             servers=servers,
-            display_time = display_time
             )
 
 if __name__ == '__main__':
diff --git a/templates/lobby_html.jinja b/templates/lobby_html.jinja
index ae0000e..468a2fa 100644
--- a/templates/lobby_html.jinja
+++ b/templates/lobby_html.jinja
@@ -78,7 +78,7 @@
           <span class="info">(non-steam)</span>
           {% else %}
           {% if profile['personastate'] == 0 %}
-          <span class="{{ state }}">Offline since {{ display_time(current_time - profile['lastlogoff']) }}</span>
+          <span class="{{ state }}">Offline since {{ (current_time - profile['lastlogoff']) | display_time }}</span>
           {% else %}
           <span class="{{ state }}">{{ states[profile['personastate']] }}</span>
           {% endif %}
diff --git a/templates/premades_html.jinja b/templates/premades_html.jinja
index c9ad464..7a45492 100644
--- a/templates/premades_html.jinja
+++ b/templates/premades_html.jinja
@@ -138,7 +138,7 @@
         <img src="{{ profiles[steamid]['avatarmedium'] }}"><br />
         {{ profiles[steamid]['personaname']|e }}
         {% if 'timecreated' in profiles[steamid] %}
-          <br />{{ display_time(current_time - profiles[steamid]['timecreated']) }}
+          <br />{{ (current_time - profiles[steamid]['timecreated']) | display_time }}
         {% endif %}
       </a>
     </div>