Merge pull request #12 from jeremiah-k/main

Cleaning the slate, getting ready for a plugin system

.gitignore

@@ -2,4 +2,4 @@
 .vscode
 config.yaml
 meshtastic.sqlite
-__pycache__
+./plugins/__pycache__

main.py

@@ -264,61 +264,10 @@ def truncate_message(
 
 # Callback for new messages in Matrix room
 async def on_room_message(
-    room: MatrixRoom, event: Union[RoomMessageText, RoomMessageNotice]
-) -> None:
-    if event.server_timestamp < bot_start_time:
-        return
-
-    body = event.body.strip()
-    match = re.match(r"^.*: !ping$", body.strip())
-    if match:
-        # Respond to the command
-        await matrix_client.room_send(
-            room.room_id, "m.room.message", {"msgtype": "m.text", "body": "pong!"}
-        )
-        return
-    pattern = r"^.*:(?: !map(?: zoom=(\d+))?(?: size=(\d+),(\d+))?)?$"
-    match = re.match(pattern, body.strip())
-    if match:
-        zoom = match.group(1)
-        image_size = match.group(2, 3)
-
-        try:
-            zoom = int(zoom)
-        except:
-            zoom = 8
-
-        if zoom < 0 or zoom > 30:
-            zoom = 8
-
-        try:
-            image_size = (int(image_size[0]), int(image_size[1]))
-        except:
-            image_size = (1000, 1000)
-
-        if image_size[0] > 1000 or image_size[1] > 1000:
-            image_size = (1000, 1000)
-
-        from map import get_map
-
-        locations = []
-        for node, info in meshtastic_interface.nodes.items():
-            if "position" in info and "latitude" in info["position"]:
-                locations.append(
-                    {
-                        "lat": info["position"]["latitude"],
-                        "lon": info["position"]["longitude"],
-                    }
-                )
-
-        pillow_image = get_map(locations=locations, zoom=zoom, image_size=image_size)
-
-        from matrix import send_image
-
-        await send_image(matrix_client, room.room_id, pillow_image)
-        return
+    room: MatrixRoom, event: Union[RoomMessageText, RoomMessageNotice]) -> None:
 
     full_display_name = "Unknown user"
+    
     if event.sender != bot_user_id:
         message_timestamp = event.server_timestamp
 
@@ -429,4 +378,4 @@ async def main():
         await asyncio.sleep(60)  # Update longnames every 60 seconds
 
 
-asyncio.run(main())
+asyncio.run(main())

map.py

@@ -1,41 +0,0 @@
-import staticmaps  # pip install py-staticmaps
-import math
-import random
-
-
-def anonymize_location(lat, lon, radius=1000):
-    # Generate random offsets for latitude and longitude
-    lat_offset = random.uniform(-radius / 111320, radius / 111320)
-    lon_offset = random.uniform(
-        -radius / (111320 * math.cos(lat)), radius / (111320 * math.cos(lat))
-    )
-
-    # Apply the offsets to the location coordinates
-    new_lat = lat + lat_offset
-    new_lon = lon + lon_offset
-
-    return new_lat, new_lon
-
-
-def get_map(locations, zoom=None, image_size=None, radius=10000):
-    """
-    Anonymize a location to 10km by default
-    """
-    context = staticmaps.Context()
-    context.set_tile_provider(staticmaps.tile_provider_OSM)
-    context.set_zoom(zoom)
-
-    for location in locations:
-        new_location = anonymize_location(
-            lat=float(location["lat"]),
-            lon=float(location["lon"]),
-            radius=radius,
-        )
-        radio = staticmaps.create_latlng(new_location[0], new_location[1])
-        context.add_object(staticmaps.Marker(radio, size=10))
-
-    # render non-anti-aliased png
-    if image_size:
-        return context.render_pillow(image_size[0], image_size[1])
-    else:
-        return context.render_pillow(1000, 1000)

matrix.py

@@ -1,36 +0,0 @@
-import os
-import io
-import aiofiles.os
-from PIL import Image
-from nio import AsyncClient, UploadResponse
-import base64
-
-
-async def upload_image(client: AsyncClient, image: Image.Image) -> UploadResponse:
-    buffer = io.BytesIO()
-    image.save(buffer, format="PNG")
-    image_data = buffer.getvalue()
-
-    response, maybe_keys = await client.upload(
-        io.BytesIO(image_data),
-        content_type="image/png",
-        filename="location.png",
-        filesize=len(image_data),
-    )
-
-    return response
-
-
-async def send_room_image(
-    client: AsyncClient, room_id: str, upload_response: UploadResponse
-):
-    response = await client.room_send(
-        room_id=room_id,
-        message_type="m.room.message",
-        content={"msgtype": "m.image", "url": upload_response.content_uri, "body": ""},
-    )
-
-
-async def send_image(client: AsyncClient, room_id: str, image: Image.Image):
-    response = await upload_image(client=client, image=image)
-    await send_room_image(client, room_id, upload_response=response)

requirements.txt

@@ -1,3 +1,2 @@
 meshtastic==2.1.6
-matrix-nio==0.20.2
-py-staticmaps==0.4.0
+matrix-nio==0.20.2