hunter/worker: use url not uri as key (same as in activitypub)

cave/src/activitypub/mod.rs

@@ -106,7 +106,7 @@ impl Post {
             .map(|s| s.to_string());
         super::feed::Post {
             created_at: self.published,
-            uri: self.url.unwrap_or(self.id),
+            url: self.url.unwrap_or(self.id),
             content: self.content,
             account: super::feed::Account {
                 username: actor.preferred_username,

cave/src/feed.rs

@@ -64,7 +64,7 @@ pub struct MediaAttachment {
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct Post {
     pub created_at: String,
-    pub uri: String,
+    pub url: String,
     #[serde(default = "String::new")]
     pub content: String,
     pub account: Account,
@@ -82,17 +82,17 @@ pub struct Post {
 }
 
 impl Post {
-    pub fn uri_host(&self) -> Option<String> {
-        reqwest::Url::parse(&self.uri)
+    pub fn url_host(&self) -> Option<String> {
+        reqwest::Url::parse(&self.url)
             .ok()
-            .and_then(|uri| uri.domain()
+            .and_then(|url| url.domain()
                       .map(|host| host.to_owned())
             )
     }
 
     pub fn user_id(&self) -> Option<String> {
         let username = self.account.username.to_lowercase();
-        let host = self.uri_host()?;
+        let host = self.url_host()?;
         Some(format!("{}@{}", username, host))
     }
 

cave/src/store.rs

@@ -118,7 +118,7 @@ impl Store {
     }
 
     pub async fn save_post(&mut self, mut post: EncodablePost) -> Result<bool, RedisError> {
-        let post_key = format!("p:{}", post.uri);
+        let post_key = format!("p:{}", post.url);
         let check = redis::pipe()
             .getset(&post_key, "1")
             .expire(post_key, POST_EXPIRE)
@@ -132,7 +132,7 @@ impl Store {
 
         tracing::info!("New post ({}{} tags): {}",
                    if post.account.bot { "bot, " } else { "" },
-                   post.tags.len(), post.uri);
+                   post.tags.len(), post.url);
 
         match post.encode() {
             Ok(encoded_post) => {
@@ -160,10 +160,10 @@ impl Store {
             return;
         }
 
-        let host = match post.uri_host() {
+        let host = match post.url_host() {
             Some(host) => host,
             None => {
-                tracing::warn!("no uri_host");
+                tracing::warn!("no url_host");
                 return;
             },
         };

hunter/src/worker.rs

@@ -230,7 +230,7 @@ async fn process_posts(
         posts_len += 1;
 
         // potentially save a round-trip to redis with an in-process cache
-        if ! posts_cache.insert(post.uri.clone()) {
+        if ! posts_cache.insert(post.url.clone()) {
             let t1 = Instant::now();
 
             scan_for_hosts(&mut introduce_hosts, &post);