3 files changed, 58 insertions, 34 deletions

diff --git a/bot/bot.py b/bot.py
index 2710184..efde56f 100644
--- a/bot/bot.py
+++ b/bot.py
@@ -5,9 +5,23 @@
 import logging
 import io
 import telegram.constants
+from telegram import __version__ as TG_VER
+
+try:
+    from telegram import __version_info__
+except ImportError:
+    __version_info__ = (0, 0, 0, 0, 0)  # type: ignore[assignment]
+
+if __version_info__ < (20, 0, 0, "alpha", 1):
+    raise RuntimeError(
+        f"This example is not compatible with your current PTB version {TG_VER}. To view the "
+        f"{TG_VER} version of this example, "
+        f"visit https://docs.python-telegram-bot.org/en/v{TG_VER}/examples.html"
+    )
+
 from telegram import InlineKeyboardButton, InlineKeyboardMarkup, Update, ReplyKeyboardMarkup, KeyboardButton
 from telegram.ext import Application, CallbackQueryHandler, CommandHandler, ContextTypes, MessageHandler, filters, ConversationHandler, CallbackContext
-from ..config import BOT_TOKEN
+from config import BOT_TOKEN
 from foursquare.poi import query_poi
 from dbstore.dbm_store import get_loc
 from toot import mastodon_client
@@ -16,7 +30,7 @@ from typing import TypedDict, List, cast
 scheduler = None
 PRIVACY, TOOT = map(chr, range(8, 10))
 
-WAIT_LOC, LOCATION, PHOTO, PROCESS_PHOTO, FINAL, SETTING = range(6)
+WAIT_LOC, LOCATION, LOCATION_SEARCH, PHOTO, PROCESS_PHOTO, FINAL, SETTING = range(7)
 
 # Enable logging
 logging.basicConfig(
@@ -39,7 +53,7 @@ SETTING_MENU = ReplyKeyboardMarkup(
 )
 
 
-async def start(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+async def start(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
     hello = "Hello, this is `checkin.bot`. \n\n" \
             "This is a Telegram bot with functionality similar to Foursquare Swarm, " \
             "but check in and post your location to the Fediverse (Mastodon/Pleroma) instead of Twitter.\n\n" \
@@ -53,21 +67,15 @@ async def start(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     return LOCATION
 
 
-async def checkin(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    keyboard = []
+async def checkin(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
+    context.user_data["latitude"] = update.message.location.latitude
+    context.user_data["longitude"] = update.message.location.longitude
+    await update.message.reply_text("You can input location search keywords or press skip", reply_markup=SKIP_MENU)
 
-    for poi in query_poi(update.message.location.latitude, update.message.location.longitude):
-        keyboard.append([
-            InlineKeyboardButton(poi["name"], callback_data=poi["fsq_id"]),
-        ])
+    return LOCATION_SEARCH
 
-    reply_markup = InlineKeyboardMarkup(keyboard)
-    await update.message.reply_text("Where are you?", reply_markup=reply_markup)
 
-    return WAIT_LOC
-
-
-async def process_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+async def process_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
     query = update.callback_query
     await query.answer()
     print(query.data)
@@ -97,6 +105,29 @@ async def process_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -
     return PHOTO
 
 
+async def location_search_callback(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
+    location_search = update.effective_message.text
+    latitude = context.user_data["latitude"]
+    longitude = context.user_data["longitude"]
+
+    keyboard = []
+
+    for poi in query_poi(location_search, latitude, longitude):
+        keyboard.append([
+            InlineKeyboardButton(poi["name"], callback_data=poi["fsq_id"]),
+        ])
+
+    reply_markup = InlineKeyboardMarkup(keyboard)
+    context.user_data["location_search"] = location_search
+    await update.message.reply_text("Where are you? ", reply_markup=reply_markup)
+
+    return WAIT_LOC
+
+
+async def skip_location_search(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    return WAIT_LOC
+
+
 async def tos(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     await update.message.reply_text("TOS", reply_markup=MAIN_MENU)
 
@@ -268,6 +299,10 @@ def main() -> None:
                 MessageHandler(filters.LOCATION, checkin),
             ],
             WAIT_LOC: [CallbackQueryHandler(process_callback)],
+            LOCATION_SEARCH: [
+                MessageHandler(filters.TEXT, location_search_callback),
+                CommandHandler("skip", skip_location_search),
+            ],
             PHOTO: [MessageHandler(filters.PHOTO, photo),
                     CommandHandler("skip", skip_photo)],
         },
diff --git a/bot/__init__.py b/bot/__init__.py
deleted file mode 100644
index 5e3c341..0000000
--- a/bot/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from telegram import __version__ as TG_VER
-
-try:
-    from telegram import __version_info__
-except ImportError:
-    __version_info__ = (0, 0, 0, 0, 0)  # type: ignore[assignment]
-
-if __version_info__ < (20, 0, 0, "alpha", 1):
-    raise RuntimeError(
-        f"This example is not compatible with your current PTB version {TG_VER}. To view the "
-        f"{TG_VER} version of this example, "
-        f"visit https://docs.python-telegram-bot.org/en/v{TG_VER}/examples.html"
-    )
diff --git a/foursquare/poi.py b/foursquare/poi.py
index 722dbb7..5e67d1c 100644
--- a/foursquare/poi.py
+++ b/foursquare/poi.py
@@ -5,7 +5,8 @@ import requests
 from config import FSQ_API_KEY
 from dbstore.dbm_store import store_loc
 
-POI_API_ENDPOINT = "https://api.foursquare.com/v3/places/nearby?ll={}%2C{}"
+POI_API_ENDPOINT = "https://api.foursquare.com/v3/places/nearby?ll={}%2C{}&limit=10"
+POI_SEARCH_API_ENDPOINT = "https://api.foursquare.com/v3/places/search?query={}&ll={}%2C{}&radius=2000&limit=10"
 POI_PHOTO_ENDPOINT = "https://api.foursquare.com/v3/places/{}/photos?sort=POPULAR&limit=10"
 OSM_ENDPOINT = "https://www.openstreetmap.org/?mlat={}&mlon={}&zoom=15&layers=M"
 headers = {
@@ -14,24 +15,25 @@ headers = {
 }
 
 
-def query_poi(latitude, longitude):
+def query_poi(search, latitude, longitude):
     locations = list()
 
-    url = POI_API_ENDPOINT.format(latitude, longitude)
-
+    url = POI_SEARCH_API_ENDPOINT.format(search, latitude, longitude)
+    print(url)
     response = requests.get(url, headers=headers)
 
     for poi in json.loads(response.text)["results"]:
         loc = {
             "fsq_id": poi["fsq_id"],
             "name": poi["name"],
-            "locality": poi["location"]["locality"],
-            "region": poi["location"]["region"],
+            "locality": poi["location"]["locality"] if "locality" in poi["location"] else "",
+            "region": poi["location"]["region"] if "region" in poi["location"] else "",
             "latitude": poi["geocodes"]["main"]["latitude"],
             "longitude": poi["geocodes"]["main"]["longitude"],
             "osm_url": OSM_ENDPOINT.format(poi["geocodes"]["main"]["latitude"], poi["geocodes"]["main"]["longitude"])
         }
         locations.append(loc)
+        print(loc)
         store_loc(loc)
 
     return locations