clean up

Cargo.lock

···
  "async-trait",
  "atproto_api",
  "atrium-api",
- "bsky-sdk",
  "chromiumoxide",
  "dotenv",
  "env_logger",
- "futures-util",
- "handlebars",
  "log",
  "logic",
  "reqwest",
  "rocketman",
- "rust-embed",
  "serde",
  "serde_json",
  "slingshot",
···
  "thiserror 1.0.69",
  "trait-variant",
  "unicode-segmentation",
-]
-
-[[package]]
-name = "bstr"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
-dependencies = [
- "memchr",
- "serde",
 ]
 
 [[package]]
···
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
-name = "globset"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
-dependencies = [
- "aho-corasick",
- "bstr",
- "log",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
 name = "gloo-timers"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
-name = "handlebars"
-version = "6.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759e2d5aea3287cb1190c8ec394f42866cb5bf74fcbf213f354e3c856ea26098"
-dependencies = [
- "derive_builder",
- "log",
- "num-order",
- "pest",
- "pest_derive",
- "rust-embed",
- "serde",
- "serde_json",
- "thiserror 2.0.12",
-]
-
-[[package]]
 name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
-name = "num-modular"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f"
-
-[[package]]
-name = "num-order"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6"
-dependencies = [
- "num-modular",
-]
-
-[[package]]
 name = "num-traits"
 version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
-name = "pest"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e0a3a33733faeaf8651dfee72dd0f388f0c8e5ad496a3478fa5a922f49cfa8"
-dependencies = [
- "memchr",
- "thiserror 2.0.12",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc58706f770acb1dbd0973e6530a3cff4746fb721207feb3a8a6064cd0b6c663"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d4f36811dfe07f7b8573462465d5cb8965fffc2e71ae377a33aecf14c2c9a2f"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42919b05089acbd0a5dcd5405fb304d17d1053847b81163d09c4ad18ce8e8420"
-dependencies = [
- "pest",
- "sha2",
-]
-
-[[package]]
 name = "pin-project-lite"
 version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
-name = "rust-embed"
-version = "8.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025908b8682a26ba8d12f6f2d66b987584a4a87bc024abc5bbc12553a8cd178a"
-dependencies = [
- "rust-embed-impl",
- "rust-embed-utils",
- "walkdir",
-]
-
-[[package]]
-name = "rust-embed-impl"
-version = "8.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6065f1a4392b71819ec1ea1df1120673418bf386f50de1d6f54204d836d4349c"
-dependencies = [
- "proc-macro2",
- "quote",
- "rust-embed-utils",
- "syn 2.0.101",
- "walkdir",
-]
-
-[[package]]
-name = "rust-embed-utils"
-version = "8.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6cc0c81648b20b70c491ff8cce00c1c3b223bb8ed2b5d41f0e54c6c4c0a3594"
-dependencies = [
- "globset",
- "sha2",
- "walkdir",
-]
-
-[[package]]
 name = "rustc-demangle"
 version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
 
 [[package]]
 name = "schannel"
···
 checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 
 [[package]]
-name = "ucd-trie"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
-
-[[package]]
 name = "unicode-bidi"
 version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
 
 [[package]]
 name = "want"
···
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
-dependencies = [
- "windows-sys 0.61.0",
-]
 
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"

bot/Cargo.toml

···
 [dependencies]
 anyhow = "1.0.98"
 atproto_api.workspace = true
-bsky-sdk.workspace = true
 chromiumoxide = { version = "0.7", features = ["tokio-runtime"] }
-handlebars = { version = "6.3.2", features = ["rust-embed"] }
-rust-embed = { version = "8.7.2", features = ["include-exclude"] }
 rocketman.workspace = true
 reqwest.workspace = true
 atrium-api.workspace = true
···
 logic.workspace = true
 slingshot.workspace = true
 urlencoding = "2.1.3"
-futures-util = "0.3.31"

bot/src/main.rs

···
-mod constellation;
-
 extern crate dotenv;
-
 use crate::constellation::fetch_constellation_count;
-use atrium_api::app::bsky::embed::defs::AspectRatioData;
 use atrium_api::app::bsky::feed::post::RecordEmbedRefs;
 use atrium_api::app::bsky::richtext::facet::{ByteSliceData, LinkData, MainFeaturesItem};
 use atrium_api::types::string::Language;
 use atrium_api::types::{Collection, Union};
-use bsky_sdk::rich_text::RichText;
-use chromiumoxide::browser::{Browser, BrowserConfig, HeadlessMode};
-use chromiumoxide::cdp::browser_protocol::page::{
-    CaptureScreenshotFormat, CaptureScreenshotParams, Viewport,
-};
 use dotenv::dotenv;
-use futures_util::stream::StreamExt;
-use handlebars::Handlebars;
-use log::error;
 use logic::BotApi;
 use rocketman::{
     connection::JetstreamConnection, handler, ingestion::LexiconIngestor,
     options::JetstreamOptions, types::event::Operation,
 };
-use rust_embed::Embed;
 use serde::Serialize;
 use slingshot::Slingshot;
 use sqlx::sqlite::{SqliteConnectOptions, SqlitePool};
···
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
-#[derive(Embed)]
-#[folder = "templates/"]
-#[include = "*.hbs"]
-pub struct Templates;
+mod constellation;
 
 #[derive(Debug)]
-struct Record {
+struct ParsedRecord {
     did: String,
     collection: String,
     rkey: String,
 }
 
-fn parse_uri(uri: &str) -> anyhow::Result<Record> {
+struct StarIngestor {
+    pool: SqlitePool,
+    bot: Arc<BotApi>,
+    sling_shot: Arc<Slingshot>,
+    timeframe_hours: i64,
+    star_threshold: i64,
+    post_window_hours: i64,
+}
+
+#[derive(Serialize)]
+struct RepoPreview {
+    repo: String,
+    stars: u64,
+    description: String,
+}
+
+fn parse_uri(uri: &str) -> anyhow::Result<ParsedRecord> {
     let parts: Vec<&str> = uri.trim_start_matches("at://").split('/').collect();
     if parts.len() != 3 {
         return Err(anyhow::anyhow!("Invalid URI format"));
     }
-    Ok(Record {
+    Ok(ParsedRecord {
         did: parts[0].to_string(),
         collection: parts[1].to_string(),
         rkey: parts[2].to_string(),
···
     let bot_api = BotApi::new_logged_in(bot_username, bot_password, bot_pds_url).await?;
     let sling_shot = Arc::new(Slingshot::new("https://slingshot.microcosm.blue")?);
 
-    // setup handlebars
-    let mut hbs = Handlebars::new();
-    let _ = hbs.register_embed_templates::<Templates>();
-
-    // Initialize a long-running Chromium browser
-    let cfg = BrowserConfig::builder()
-        .headless_mode(HeadlessMode::New)
-        .no_sandbox()
-        .build()
-        .map_err(|e| anyhow::anyhow!(e))
-        .expect("build browser config");
-
-    let (browser, mut browser_handler) = Browser::launch(cfg).await.expect("launch browser");
-    // Drive the browser handler for the lifetime of the program
-    tokio::spawn(async move { while let Some(_evt) = browser_handler.next().await {} });
-    let browser = Arc::new(browser);
-
     // Ingestor for the star collection
     let mut ingestors: HashMap<String, Box<dyn LexiconIngestor + Send + Sync>> = HashMap::new();
     ingestors.insert(
···
             pool: pool.clone(),
             bot: Arc::new(bot_api),
             sling_shot: sling_shot.clone(),
-            browser: browser.clone(),
-            hbs: Arc::new(hbs),
             timeframe_hours,
             star_threshold,
             post_window_hours,
···
         .map_err(|e| anyhow::anyhow!(e.to_string()))
 }
 
-struct StarIngestor {
-    pool: SqlitePool,
-    bot: Arc<BotApi>,
-    sling_shot: Arc<Slingshot>,
-    browser: Arc<Browser>,
-    hbs: Arc<Handlebars<'static>>,
-    timeframe_hours: i64,
-    star_threshold: i64,
-    post_window_hours: i64,
-}
-
 #[async_trait::async_trait]
 impl LexiconIngestor for StarIngestor {
     /// Asynchronously processes an incoming event message related to "stars" and performs database operations and other actions based on the event type.
···
 
                             if count_in_window >= self.star_threshold {
                                 log::info!(
-                                    "Star threshold met: {} stars in the last {} hour(s) (threshold: {})",
+                                    "Star threshold met: {} stars in the last {} hour(s) (threshold: {}), checking to see if it should be posted",
                                     count_in_window,
                                     self.timeframe_hours,
                                     self.star_threshold
···
 
                                     let handle_and_repo = format!("{handle}/{repo_name}");
 
-                                    let ctx = RepoPreview {
+                                    let _ctx = RepoPreview {
                                         repo: handle_and_repo.clone(),
                                         stars: stars as u64,
                                         description: description.clone(),
                                     };
 
-                                    let html = &self.hbs.render("repo_header.hbs", &ctx)?;
-
-                                    let bytes = render_with_chromiumoxide(
-                                        self.browser.as_ref(),
-                                        &html,
-                                        336,
-                                        114,
-                                    )
-                                    .await?;
+                                    // Fetch the pre-rendered image from the external service instead of rendering via Chromium
+                                    let encoded_subject = urlencoding::encode(&repo_subject);
+                                    let url = format!(
+                                        "https://tangled-search.bigmoves.deno.net/repo-image/{}",
+                                        encoded_subject
+                                    );
+                                    let bytes = reqwest::get(url).await?.bytes().await?.to_vec();
 
                                     let blob_upload = &self
                                         .bot
···
                                         ),
                                         aspect_ratio: Some(
                                             atrium_api::app::bsky::embed::defs::AspectRatioData {
-                                                height: NonZeroU64::try_from(114_u64)?,
-                                                width: NonZeroU64::try_from(336_u64)?,
+                                                height: NonZeroU64::try_from(400_u64)?,
+                                                width: NonZeroU64::try_from(800_u64)?,
                                             }
                                             .into(),
                                         ),
···
                                         tags: None,
                                         text: post_text,
                                     };
-
+                                    log::info!(
+                                        "Threshold met and allowed to be posted, total stars: {stars}"
+                                    );
                                     match self.bot.agent.create_record(post).await {
-                                        Ok(err) => {
+                                        Ok(_) => {
                                             log::info!("NEW POST MADE")
                                         }
                                         Err(err) => {
                                             log::error!("{err}")
                                         }
                                     }
-                                    log::info!(
-                                        "Threshold met and allowed to be posted, stars: {stars}"
-                                    );
                                 }
                             }
                         }
···
         Ok(())
     }
 }
-
-#[derive(Serialize)]
-struct RepoPreview {
-    repo: String,
-    stars: u64,
-    description: String,
-}
-
-async fn render_with_chromiumoxide(
-    browser: &Browser,
-    html: &str,
-    width: u32,
-    height: u32,
-) -> Result<Vec<u8>, anyhow::Error> {
-    // Use the long-running browser to render a page and capture a screenshot
-    let page = browser.new_page("about:blank").await?;
-
-    // Load the provided HTML as a data URL to avoid external fetches
-    let data_url = format!("data:text/html;charset=utf-8,{}", urlencoding::encode(html));
-    page.goto(data_url).await?;
-
-    // Wait for navigation to settle
-    page.wait_for_navigation().await.ok();
-
-    // Screenshot: clip to desired viewport size regardless of page layout
-    let params = CaptureScreenshotParams::builder()
-        .format(CaptureScreenshotFormat::Png)
-        .clip(Viewport {
-            x: 0.0,
-            y: 0.0,
-            width: width as f64,
-            height: height as f64,
-            scale: 1.0,
-        })
-        .from_surface(true)
-        .build();
-    let png_bytes = page.screenshot(params).await?;
-
-    // Close just the page; keep the browser alive
-    page.close().await.ok();
-
-    Ok(png_bytes)
-}

bot/templates/repo_header.hbs

···
-<html lang="en" class="dark:bg-gray-900">
-<head>
-    <link rel="preload" href="https://tangled.sh/static/fonts/InterVariable.woff2" as="font" type="font/woff2"
-          crossorigin/>
-    <link rel="stylesheet" href="https://tangled.sh/static/tw.css?6a194d26" type="text/css"/>
-    <title>timeline · tangled</title>
-</head>
-<body>
-
-<div class="flex-none h-full border border-gray-200 dark:border-gray-700 rounded-sm w-96">
-    <div class="py-4 px-6 gap-1 flex flex-col drop-shadow-sm rounded bg-white dark:bg-gray-800 min-h-32">
-        <div class="font-medium dark:text-white flex items-center">
-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
-                 stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
-                 class="w-4 h-4 mr-1.5 shrink-0">
-                <path d="M10 2v8l3-3 3 3V2"></path>
-                <path d="M4 19.5v-15A2.5 2.5 0 0 1 6.5 2H19a1 1 0 0 1 1 1v18a1 1 0 0 1-1 1H6.5a1 1 0 0 1 0-5H20"></path>
-            </svg>
-            <a href="/{{repo}}" class="truncate">{{repo}}</a></div>
-
-        <div class="text-gray-600 dark:text-gray-300 text-sm line-clamp-2">
-            {{description}}
-
-        </div>
-
-
-        <div class="text-gray-400 text-sm font-mono inline-flex gap-4 mt-auto">
-            <div class="flex gap-1 items-center text-sm">
-                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
-                     stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
-                     class="w-3 h-3 fill-current">
-                    <path d="M11.525 2.295a.53.53 0 0 1 .95 0l2.31 4.679a2.123 2.123 0 0 0 1.595 1.16l5.166.756a.53.53 0 0 1 .294.904l-3.736 3.638a2.123 2.123 0 0 0-.611 1.878l.882 5.14a.53.53 0 0 1-.771.56l-4.618-2.428a2.122 2.122 0 0 0-1.973 0L6.396 21.01a.53.53 0 0 1-.77-.56l.881-5.139a2.122 2.122 0 0 0-.611-1.879L2.16 9.795a.53.53 0 0 1 .294-.906l5.165-.755a2.122 2.122 0 0 0 1.597-1.16z"></path>
-                </svg>
-
-                <span>{{stars}}</span>
-            </div>
-
-        </div>
-
-    </div>
-
-</div>
-
-</body>
-</html>

logic/src/lib.rs

···
 mod resolver;
 use crate::resolver::ApiDNSTxtResolver;
-use atrium_api::agent::atp_agent::store::MemorySessionStore;
-use atrium_api::agent::atp_agent::{AtpSession, CredentialSession};
-use atrium_api::agent::{Agent, Configure};
-use atrium_api::did_doc::DidDocument;
-use atrium_api::types::string::{Datetime, Did, Handle};
-use atrium_api::types::{Collection, LimitedNonZeroU8};
+use atrium_api::agent::Configure;
+use atrium_api::types::string::{Did, Handle};
 use atrium_common::resolver::Resolver;
-use atrium_common::store::memory::MemoryStore;
 use atrium_identity::did::{CommonDidResolver, CommonDidResolverConfig, DEFAULT_PLC_DIRECTORY_URL};
 use atrium_identity::handle::{AtprotoHandleResolver, AtprotoHandleResolverConfig};
 use atrium_oauth::DefaultHttpClient;
-use atrium_xrpc_client::reqwest::ReqwestClient;
 use bsky_sdk::BskyAgent;
-use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use thiserror::Error;
 
···
     pub agent: Arc<BskyAgent>,
     handle_resolver: Arc<AtprotoHandleResolver<ApiDNSTxtResolver, DefaultHttpClient>>,
     did_resolver: Arc<CommonDidResolver<DefaultHttpClient>>,
-    authenticated: bool,
-}
-
-fn get_new_session(
-    pds_url: String,
-) -> CredentialSession<MemoryStore<(), AtpSession>, ReqwestClient> {
-    CredentialSession::new(
-        ReqwestClient::new(pds_url.as_str()),
-        MemorySessionStore::default(),
-    )
-}
-
-/// Parses the PDS url from the DidDocument
-fn get_pds_from_doc<'a>(doc: DidDocument) -> Result<String, Error> {
-    Ok(doc
-        .service
-        .as_ref()
-        .and_then(|services| {
-            services
-                .iter()
-                .find(|service| service.r#type == "AtprotoPersonalDataServer")
-                .map(|service| service.service_endpoint.clone())
-        })
-        .ok_or_else(|| Error::ParseError("No valid PDS URL found for this DID".to_string()))?)
 }
 
 impl BotApi {
···
             agent: Arc::new(agent),
             handle_resolver: Arc::new(handle_resolver),
             did_resolver: Arc::new(did_resolver),
-            authenticated: true,
         })
     }