Merge branch 'fix-account-show' into pu

aurweb/routers/accounts.py

@@ -451,6 +451,13 @@ async def account(request: Request, username: str):
     k = user.PGPKey or str()
     context["pgp_key"] = " ".join([k[i:i + 4] for i in range(0, len(k), 4)])
 
+    login_ts = None
+    session = db.query(models.Session).filter(
+        models.Session.UsersID == user.ID).first()
+    if session:
+        login_ts = user.session.LastUpdateTS
+    context["login_ts"] = login_ts
+
     # Render the template.
     return render_template(request, "account/show.html", context)
 

templates/account/show.html

@@ -50,7 +50,17 @@
                                     </tr>
                                     <tr>
                                         <th>{% trans %}Status{% endtrans %}:</th>
-                                        <td>{{ "Active" if not user.Suspended else "Suspended" | tr }}</td>
+                                        {% if not user.InactivityTS %}
+                                            <td>{{ "Active" | tr }}</td>
+                                        {% else %}
+                                            {% set inactive_ds = user.InactivityTS | dt | as_timezone(timezone) %}
+                                            <td>
+                                                {{
+                                                    "Inactive since %s" | tr
+                                                    | format(inactive_ds.strftime("%Y-%m-%d %H:%M"))
+                                                }}
+                                            </td>
+                                        {% endif %}
                                     </tr>
                                     <tr>
                                         <th>{% trans %}Registration date{% endtrans %}:</th>
@@ -58,6 +68,13 @@
                                             {{ user.RegistrationTS.strftime("%Y-%m-%d") }}
                                         </td>
                                     </tr>
+                                    {% if login_ts %}
+                                        <tr>
+                                            <th>{% trans %}Last Login{% endtrans %}:</th>
+                                            {% set login_ds = login_ts | dt | as_timezone(timezone) %}
+                                            <td>{{ login_ds.strftime("%Y-%m-%d") }}</td>
+                                        </tr>
+                                    {% endif %}
                                     <tr>
                                         <th>{% trans %}Links{% endtrans %}:</th>
                                         <td>