From 9d4b21b5aeadd9bbff5cfda831b9b1fe2277e34d Mon Sep 17 00:00:00 2001
From: Simon Cloutier <simon@qic.ca>
Date: Tue, 1 Apr 2025 13:34:47 -0400
Subject: [PATCH] fix tz

---
 app/__pycache__/app.cpython-39.pyc            | Bin 1431 -> 1453 bytes
 app/__pycache__/config.cpython-39.pyc         | Bin 1484 -> 1748 bytes
 app/app.py                                    |   6 ++++-
 app/config.py                                 |  11 +++++---
 .../__pycache__/index_views.cpython-39.pyc    | Bin 5320 -> 5547 bytes
 app/views/index_views.py                      |  25 ++++++++++++------
 6 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/app/__pycache__/app.cpython-39.pyc b/app/__pycache__/app.cpython-39.pyc
index b8a27782512f7b047ac8c45674b4a6c4843ac6ee..c266257b1b049d1e63b57cebae1ed04144522761 100644
GIT binary patch
delta 389
zcmYk2!A`<J5Qe*3g-W}$r7RREXhBSfcb~y0@URy{n332NG;mT6nBbKI>A}QP`v9Ii
z`9>bRc=n(}1IFF#%s=11ncd8@`D%)x5G9S)OYd|1z7}nEu|7Rt2&RDsg}6Mim7VKi
z>?ns=F?N+p*@!C>PkBs3vDB1>4693~B+AH4YiMPR92@0wlQ*mm2N|1vY;_6Dj4L1A
zs6nThw$RTQSRhuM?t2ULp$s-SD_sQ`q-}JfPTo>Rhv^XpfBK)3hFIA05Djplk~fo4
zh$ZlLRoaCrJtd*`q|t|aD2ddG_|VA7F%i29O+qaQa@2pjXOE19$v0oHe)6EtDgzqX
zoNorlXEln0ljKLg71roxdUZX%9L2-=Jelr&1!rXX%-U`4FiS6RgK9%h?)E#s?B-cn

delta 367
zcmYk2%}&BV5XU>qSLrupX-f+TDhK1$chIBfy_w8}q$!E14*&+Q#E>4iwh!RRH}dSk
zM{wGJaW}j3|Nmw)vzZU`XxdM<ZD_pi{qNQ4U{B%kaQm>aKtm0?nZ0(D)97C2DwkO=
z^OVO?&jxE>`JfTda0g0~OwDpcRt3x)lDj(AEWmyR`PWGsXjVdn<fRdxaT!xs0a|G9
z1;6(xL<ijsdi$12C@Cl8rqiaROlRc<C4c%~rkqpv#OI{r0R5(zOy^|a@a)P3N^Uj6
z;7#KXUy@`}H;-`KkgJBoO!^5<8g%`+g)P9efYt^U#cM0~mprT&QIAaI0pB;vqSJmZ
YcI}_|j%@_ic?%CLp|jIP@!pyJ0(6j2AOHXW

diff --git a/app/__pycache__/config.cpython-39.pyc b/app/__pycache__/config.cpython-39.pyc
index 0dae9ccc95e62ade716097f46b16e74fabfe1103..b5018759d98e10fc8d544dbbbabb41c543c9404a 100644
GIT binary patch
delta 848
zcmbVKJ#W)M7`_k3agF1+O&Tb4K(rLR(2WTpRZ&2Q5-OS^bjvC7U86u^TW1%kQK}5>
zj1=V$Bw}LbZ!j|5#KOieVB$Ro5S2P{*87~Fd%qsNcVDi3t@zza#YM1gZ~f@)+f#p&
zF<=4-JV0!@V}_q1K?J=(f}RsbfLWphtR%@fWfZtA%D~G7w<MaEgtNe6<sDJ4q{Zym
zl9bug@eckl{dm@3t8(pajn&1Ps9hkoF6xIUT%T>@?-NarI?V_hNxv6?-2!WZWp@B_
zG{*u9vLI)8jK_$RoX)K=UYP%qKv0XewYPV0z&p=gwAjmbOI08*v^7aGZTDm@<M+yk
zBW<Op`A9o?e<(*uEcF}GVIk30CI`p5oR4_i9m-EgH6Zw>zuQgI-6)BV`@IM0sdhN;
z$Nil1>)_370E9hk<59J_jQQhlhmDy>I<BfhhzbB^1M={wkf2t9YI>4Ks%E@5448KR
zfT^#{94J_J6Trb%@p-h4J?cT*00-2<Hu?OGRPkiPWSBs83qY4S7fHmq+B8RhRj4gP
zw+-Aiuw&q=-e&A3HS++Ly-iOKE8~g4E-gBXt$cDt@pkB{%hJ?6$ovmQ_aV&)&&=yJ
zirnH;=A5lO+21=%pYvAxwRTgLh?6MqCvjL_HZl`0##yK@Qi@B_F5E9)-tSdo(9WYF
W)Edag=6x2k2#CKCIDzBC<bMHoHk?NQ

delta 556
zcmb7>ze~eF6vyvJlBO|<X)S2A>Lzrto0Aj-Q4s0SI%p6=>BZu&rd(7I6o+<k4EYCi
z6#o?`amw!I;M~dgE+7b9%#jcIzRSJud+$D+w;8wVI2M8DoqYAXdg9jFZBT*;dO>`$
zO9T^qOavb>pMuha4oVN{i2Dq*Aqt=iO7oCBX~KM_qIk~aUdVlYpoPrWlkpn8OJ47_
z4yl*ZCjI2CdMTZ-13P0;oEiP_DjeLThkRrEg~)mESD3hs?r_-XMT3*m{`&A%GT7np
z#ub1`HMMMBp*FXvO+Bjq=q06U%Czq@2NSu7SwL0@0ul9sKzbM|Bjyl`h$Tb~v5few
zA^%#ySQUT=VjGaVqpMA2H9giJAExAK)h+qA3b}%*{%^ht$FRm2FAL2rwIs&<;?Dk7
wClyBd$jDRUpj5qTU$vQ8Fv}pH<+S!PbMrD1*B4=vqK)d2xt?cwrb`X>0}{htBLDyZ

diff --git a/app/app.py b/app/app.py
index 55a4b2b..7582ba2 100644
--- a/app/app.py
+++ b/app/app.py
@@ -2,16 +2,20 @@ from flask import Flask, redirect, url_for, render_template
 from views.index_views import index
 from views.user_views import user
 from views.group_views import group
-from config import app_config
+from config import app_config as config_class
 from database import init_app
 
 import logging, os
 from logging.handlers import RotatingFileHandler
 
+# Instantiate config class
+app_config = config_class()
+
 app = Flask(__name__)
 app.config.from_object(app_config)
 init_app(app)
 
+# Logging
 if app.config.get('LOG_TO_FILE'):
     log_file = app.config.get('LOG_FILE_PATH', '/app/logs/app.log')
     os.makedirs(os.path.dirname(log_file), exist_ok=True)
diff --git a/app/config.py b/app/config.py
index d42f9d7..9a68f39 100644
--- a/app/config.py
+++ b/app/config.py
@@ -16,9 +16,14 @@ class Config:
     OUI_API_LIMIT_PER_SEC = int(os.getenv('OUI_API_LIMIT_PER_SEC', '2'))
     OUI_API_DAILY_LIMIT = int(os.getenv('OUI_API_DAILY_LIMIT', '10000')) 
 
-    # Timezone
-    APP_TIMEZONE = os.getenv('APP_TIMEZONE', 'UTC')
-    TZ = pytz.timezone(APP_TIMEZONE)
+    # These get set in __init__
+    APP_TIMEZONE = 'UTC'
+    TZ = pytz.utc
+
+    def __init__(self):
+        tz_name = os.getenv('APP_TIMEZONE', 'UTC')
+        self.APP_TIMEZONE = tz_name
+        self.TZ = pytz.timezone(tz_name)
 
 class DevelopmentConfig(Config):
     """Development configuration."""
diff --git a/app/views/__pycache__/index_views.cpython-39.pyc b/app/views/__pycache__/index_views.cpython-39.pyc
index 8b2c79df718e3a4baa2bb3bf04a9ebf320861d5a..3b3f96747b5a1153adbbfde304acaaf0679c85df 100644
GIT binary patch
delta 1403
zcmZ8gO>7%Q6rP#=@p{*PaYBgNv>|~ewbD37APzK&9F??`&_9w$)k?uyJY(0c?KQJ&
zek@x#G#4a_WbFkBRoD_BRUCb!hh9M3xNur=<j9F57kF=-mddu~n{U4N&6}Awv%ltk
zTu(X4q)Fg+^y**L56=uzi}Z)V`sF$&Ty4bdxS(7U<^yJ1T(=X?R378T39*wr&Q0i3
z!WyQzHKIJhlPBZ>wKI{D0wv8ekuoE!dYaGhY?boahm6nhmm)noc>3kB4jWLRU4iEP
z0nj6!!RbEnNu3TEXIvSvK0O_&zEW3V%zC7*and1j8<>tN*B;V7%pS&iYy`|VhVh6g
zJ*7t$NMH5Mo;tKfu*tsG)3|=0$j^>@+Bby99<hA_k^$1!7&=2hjU$^!7JH;daTDTC
z&=<umWb@?Iop|PnVo8XZ5Sutt7~^E0<kC00N^8@x6FawWmkzGqSlG31-P{e8!-Fd}
zJFs&!)ctO)RdIvAX}*{Ut#U_7(eg`9yB+Ffw^gZCL!~PGP;GzicSEJ)mnGg}7?Yyi
zaLOVy9nY^dMb~YKV3{oy^pJ7ij``hE%V`SRXt-skQS!TT9;VqUuT?5x%oC8Cdyk1c
z8yvBV8wtFQ6#zn2s<IT#C?-uoGpWH6)WDuDKwD(;-1s|oL9s4?S*{|i1;1;{8_&m~
zCZu$wT!&ark<WE`356Ls2VJnLU)AIcvXAwmiD_WlAIW_1lYV}64Tn_7v(Qgq5tU@a
zb?<lDrB6hQyYgc2uf9Wz!A|TSx-#A}{$$5_^lu^*&~H?PU%uxw8uA=!Zy_iExtP3+
z{2Ic$2)hVZ5imulNcYp}#f^JzQ?#9`cpn@d<|0hTVnqd0X@Z%-x7I4%8~<W`Md?a#
zm^@j>13YFS%NOK(K&Nw>TaB9Mm)&N2`-`!fO3~tZbS)vgf`Dt~SX42&fx-=hsj`?`
zyjGrM8H_(jze$(wpld1>)>PtGC*K)=pBd4;|BH1URlJqS8bxGSu~2KvTFZZ-aK@x?
z`{+18I7G+?gY3&|c)-wXxw7drYF)vnx2bu)<9q$!x9lByH&~wSSa0Lx=&+Z9(d_0e
zd=4SlWUVbVj1>WLR7Sq(L!Z8drc?eIT%G|ySQaiL!{iapn+=xc3de5%m05t$C`BJc
zsU*=WUq^`EMG>Q#bUVI~d#K(;z#K0eAzD6qg~nFX<(-Durr_{UTA&H|XP8M<#bCyw
O@fv(D1!&h&l>P^9OELcd

delta 1160
zcmZ8g&ubGw6rP#g?QXZpnkH$Dr9aSWYN+%FiXhfnwN_ADDFqL?NX$%YH0g%7TSZL~
zu}2l^fF49>y@|)@|KQP+hxO8fH~#@q1mD|KE6MV{o&COV-n@C4c|ZE8;FXd|m*Ma3
zkMApAa+_X1f4Mn&x~RCcROb^>bY(}eOWM-eV8w*&lrFxL%H8s0*EW|4ncQGccyV9M
zc*yLNshCMA_qHdyWqO6n%rhagvM1)dH$OjpWa5Gp7chbs2qD|z+iaaTc!TBGx(G!>
zY#G~_dfjLklHXx4)-YZ(Dc*=BhKzyC0x5kAS(8S+G!k#jShr9I^2K@wje6Ox+aCFA
zibV%S3&obTlQhYeSixP;AjY_<cf`<u83`Fe5=$+bva-A!*?}tit1@`UAg#xZqeIli
zAdA4bgHHm(#mHgw3&=J%j3Y)@KguvbFsMIt9Gv|39a##%2RMXU!GM1}3=`2E*`Vsx
zQdwzX&smYNqC!1y&$yHdE4vAK{mLH957H-Bkj8flGQ=dSzJF(}e&eoMl|JP3SNj}4
zr3aj!{6I6;`As~^lYfNZDEXab6_#(6s#T!<z&L?{P_W?yjb{kX5lj=DC7=|M0sg)A
z#hqJzP1Q>)Y6=~}NdzW3xY>Gy$rHlW4-<Jl+kBgN&iMg7>1~YC2HuHCj7<QYk@lSK
zRJ9U>WxrORzTe#OJU-Jyu3m!u1Q!ts0uIyo2*DgdTU*>ISt+-&JZ_GqPVk}2<Z4Sr
zJq4;A&NLr)Z}TgA%{ou)-WsRqlR6ezb*QX{|258OHSQ`o<_Q)E^17DUKSCRf+*KcH
zrE2AYlI>+$L0Afdntq>I<cs=uX07WuO^!D^tk<*S*N#yJv_Yi~7HL#TfkW(T-}LTT
zsFlhe(G@rdOr-JeNC~)3^V0fPc7l)U$)1cVAkjJmlrplwUkeq?61zx16aK3=UMoIw
j&Q#5pYgIMP(Gm0^<nT)1r4TMR4aaj1<Mo)pxa9Fa;VbM3

diff --git a/app/views/index_views.py b/app/views/index_views.py
index 345589a..0ad67d8 100644
--- a/app/views/index_views.py
+++ b/app/views/index_views.py
@@ -1,23 +1,31 @@
 from flask import Blueprint, render_template, request, jsonify
 from database import get_db
-from pytz import timezone
 from datetime import datetime
-import requests
+import requests, pytz
 
 index = Blueprint('index', __name__)
 OUI_API_URL = 'https://api.maclookup.app/v2/macs/{}'
 
 
+import pytz  # make sure it's imported if not already
+
 def time_ago(dt):
-    from config import LOCAL_TZ
+    if not dt:
+        return "n/a"
+
+    tz_name = current_app.config.get('APP_TIMEZONE', 'UTC')
+    local_tz = current_app.config.get('TZ', pytz.utc)
+
+    # Only assign UTC tzinfo if naive
     if dt.tzinfo is None:
-        dt = dt.replace(tzinfo=pytz.UTC)
-    local_dt = dt.astimezone(LOCAL_TZ)
+        dt = dt.replace(tzinfo=pytz.utc)
+
+    # Convert to app timezone
+    dt = dt.astimezone(local_tz)
+    now = datetime.now(local_tz)
+    diff = now - dt
 
-    now = datetime.now(LOCAL_TZ)
-    diff = now - local_dt
     seconds = int(diff.total_seconds())
-
     if seconds < 60:
         return f"{seconds}s ago"
     elif seconds < 3600:
@@ -28,6 +36,7 @@ def time_ago(dt):
         return f"{seconds//86400}d{(seconds%86400)//3600}h ago"
 
 
+
 def lookup_vendor(mac):
     prefix = mac.replace(":", "").replace("-", "").upper()[:6]
     db = get_db()