Skip to content

feat(statusline): honor user-configured location over IP geolocation (#843) #1309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rpriven wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −2
Open

feat(statusline): honor user-configured location over IP geolocation (#843) #1309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions Releases/v5.0.0/.claude/PAI/statusline-command.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ else
"work_count=" + (.counts.work // 0 | tostring) + "\n" +
"sessions_count=" + (.counts.sessions // 0 | tostring) + "\n" +
"research_count=" + (.counts.research // 0 | tostring) + "\n" +
"ratings_count=" + (.counts.ratings // 0 | tostring)
"ratings_count=" + (.counts.ratings // 0 | tostring) + "\n" +
"LOC_CITY=" + (.location.city? // "" | @sh) + "\n" +
"LOC_REGION=" + (.location.regionName? // "" | @sh) + "\n" +
"LOC_LAT=" + (.location.lat? // "" | tostring | @sh) + "\n" +
"LOC_LON=" + (.location.lon? // "" | tostring | @sh) + "\n" +
"LOC_CC=" + (.location.countryCode? // "" | @sh)
' "$SETTINGS_FILE" 2>/dev/null > "$_SETTINGS_CACHE"
# shellcheck disable=SC1090
source "$_SETTINGS_CACHE"
Expand Down Expand Up @@ -531,7 +536,19 @@ if [ "$MODE" = "mini" ] || [ "$MODE" = "normal" ]; then
cache_age=999999
[ -f "$LOCATION_CACHE" ] && cache_age=$((NOW_EPOCH - $(get_mtime "$LOCATION_CACHE")))

if [ "$cache_age" -gt "$LOCATION_CACHE_TTL" ]; then
if [ -n "${LOC_CITY:-}" ]; then
# User-configured location (settings.json .location) is authoritative.
# Skip ip-api.com entirely — correct for VPN/proxy/corporate-network users
# whose exit node is in a different city, AND one fewer third-party request
# exposing the user's IP. IP geolocation remains the fallback when unset. (#843)
jq -n --arg city "$LOC_CITY" --arg region "${LOC_REGION:-}" \
--arg cc "${LOC_CC:-}" \
--arg lat "${LOC_LAT:-}" --arg lon "${LOC_LON:-}" \
'{city:$city, regionName:$region, countryCode:$cc,
lat:($lat | if . == "" then null else tonumber end),
lon:($lon | if . == "" then null else tonumber end)}' \
> "$LOCATION_CACHE" 2>/dev/null
elif [ "$cache_age" -gt "$LOCATION_CACHE_TTL" ]; then
loc_data=$(curl -s --max-time 2 "http://ip-api.com/json/?fields=city,region,regionName,country,countryCode,lat,lon" 2>/dev/null)
if [ -n "$loc_data" ] && echo "$loc_data" | jq -e '.city' >/dev/null 2>&1; then
echo "$loc_data" > "$LOCATION_CACHE"
Expand Down