From 338953c7db12cb910ff5cf6a7840e6354fc879cb Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 8 May 2024 13:09:29 +0100
Subject: [PATCH] Update phone list

---
 announce.py |  2 ++
 city.py     | 30 ++++++++++++++++--------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/announce.py b/announce.py
index 4db28392b..57f783833 100644
--- a/announce.py
+++ b/announce.py
@@ -1,3 +1,5 @@
+""" ActivityPub Announce (aka retweet/boost) """
+
 __filename__ = "announce.py"
 __author__ = "Bob Mottram"
 __license__ = "AGPL3+"
diff --git a/city.py b/city.py
index 49821789e..9219f9fa2 100644
--- a/city.py
+++ b/city.py
@@ -1,3 +1,5 @@
+""" Spoof location metadata """
+
 __filename__ = "city.py"
 __author__ = "Bob Mottram"
 __license__ = "AGPL3+"
@@ -32,7 +34,6 @@ def _get_decoy_camera(decoy_seed: int) -> (str, str, int):
     cameras = [
         ["Apple", "iPhone SE"],
         ["Apple", "iPhone XR"],
-        ["Apple", "iPhone 7"],
         ["Apple", "iPhone 8"],
         ["Apple", "iPhone 11"],
         ["Apple", "iPhone 11 Pro"],
@@ -44,6 +45,17 @@ def _get_decoy_camera(decoy_seed: int) -> (str, str, int):
         ["Apple", "iPhone 13 Pro"],
         ["Apple", "iPhone 14"],
         ["Apple", "iPhone 14 Pro"],
+        ["Apple", "iPhone 15"],
+        ["Apple", "iPhone 15 Pro"],
+        ["Samsung", "Galaxy S24 Ultra"],
+        ["Samsung", "Galaxy S24 Plus"],
+        ["Samsung", "Galaxy S24"],
+        ["Samsung", "Galaxy S23 Plus"],
+        ["Samsung", "Galaxy S23"],
+        ["Samsung", "Galaxy S22 Plus"],
+        ["Samsung", "Galaxy S22"],
+        ["Samsung", "Galaxy S21 Ultra"],
+        ["Samsung", "Galaxy S21"],
         ["Samsung", "Galaxy Note 20 Ultra"],
         ["Samsung", "Galaxy S20 Plus"],
         ["Samsung", "Galaxy S20 FE 5G"],
@@ -51,15 +63,9 @@ def _get_decoy_camera(decoy_seed: int) -> (str, str, int):
         ["Samsung", "Galaxy S12 Plus"],
         ["Samsung", "Galaxy S12"],
         ["Samsung", "Galaxy S11 Plus"],
-        ["Samsung", "Galaxy S10 Plus"],
-        ["Samsung", "Galaxy S10e"],
         ["Samsung", "Galaxy Z Flip"],
         ["Samsung", "Galaxy A54"],
         ["Samsung", "Galaxy A51"],
-        ["Samsung", "Galaxy S10"],
-        ["Samsung", "Galaxy S10 Plus"],
-        ["Samsung", "Galaxy S10e"],
-        ["Samsung", "Galaxy S10 5G"],
         ["Samsung", "Galaxy A60"],
         ["Samsung", "Note 13"],
         ["Samsung", "Note 13 Plus"],
@@ -69,18 +75,14 @@ def _get_decoy_camera(decoy_seed: int) -> (str, str, int):
         ["Samsung", "Note 11 Plus"],
         ["Samsung", "Note 10"],
         ["Samsung", "Note 10 Plus"],
-        ["Samsung", "Galaxy S23 Ultra"],
-        ["Samsung", "Galaxy S23"],
-        ["Samsung", "Galaxy S22 Ultra"],
-        ["Samsung", "Galaxy S22"],
-        ["Samsung", "Galaxy S21 Ultra"],
         ["Samsung", "Galaxy Note 20 Ultra"],
-        ["Samsung", "Galaxy S21"],
-        ["Samsung", "Galaxy S21 Plus"],
         ["Samsung", "Galaxy S20 FE"],
         ["Samsung", "Galaxy Z Fold 2"],
         ["Samsung", "Galaxy A52 5G"],
         ["Samsung", "Galaxy A71 5G"],
+        ["Google", "Pixel 8 Pro"],
+        ["Google", "Pixel 8a"],
+        ["Google", "Pixel 8"],
         ["Google", "Pixel 7 Pro"],
         ["Google", "Pixel 7"],
         ["Google", "Pixel 6 Pro"],