Cleanup

GeekGene · Jul 1, 2023 · fbaf77e · fbaf77e
1 parent 4bc84b7
commit fbaf77e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dnas/mewsfeed/zomes/coordinator/follows/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/follows/Cargo.toml
@@ -14,5 +14,7 @@ serde = { workspace = true }
 follows_integrity = { workspace = true }
 hc_link_pagination = { workspace = true }
 follows_types = { workspace = true }
+mews_types = { workspace = true }
+hc_call_utils = { workspace = true }
 trust_atom_types = {git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom_types"}
 # trust_atom_types = { path= "/Users/knight/code/trustgraph/trustgraph-holochain/zomes/trust_atom_types"}
diff --git a/dnas/mewsfeed/zomes/coordinator/follows/src/follower_to_creators.rs b/dnas/mewsfeed/zomes/coordinator/follows/src/follower_to_creators.rs
@@ -1,7 +1,5 @@
-use follows_integrity::*;
 use follows_types::*;
 use hc_call_utils::call_local_zome;
-use hc_link_pagination::paginate_by_agentpubkey;
 use hdk::prelude::*;
 use mews_types::FOLLOW_TOPIC;
 use trust_atom_types::{QueryInput, TrustAtom, TrustAtomInput};

diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/all_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/all_mews.rs
@@ -1,10 +1,8 @@
 use crate::hashtag_to_mews::*;
-use hc_call_utils::call_local_zome;
-// use crate::mew::get_mew_with_context;
 use crate::mew_with_context::get_batch_mews_with_context;
+use hc_call_utils::call_local_zome;
 use hdk::prelude::*;
 use mews_integrity::*;
-use mews_types::FOLLOW_TOPIC;
 use trust_atom_types::{QueryMineInput, TrustAtom};
 
 #[hdk_extern]
@@ -39,7 +37,7 @@ pub fn get_trusted_mews_with_context(input: RecommendedInput) -> ExternResult<Ve
             target: None,
             content_full: None,
             content_starts_with: None,
-            content_not_starts_with: Some(String::from("__")),
+            // content_not_starts_with: Some(String::from("__")),  // TODO use this or manually filter
             value_starts_with: None,
         },
     )?;

diff --git a/dnas/mewsfeed/zomes/coordinator/mews/src/hashtag_to_mews.rs b/dnas/mewsfeed/zomes/coordinator/mews/src/hashtag_to_mews.rs
@@ -1,6 +1,6 @@
+use crate::mew_with_context::get_mew_with_context;
 use crate::tag_to_mews::*;
 use hc_link_pagination::HashPagination;
-use crate::{mew_with_context::get_mew_with_context, tag_to_mews::*};
 use hdk::prelude::*;
 use mews_integrity::*;
 
@@ -24,7 +24,7 @@ pub fn add_hashtag_for_mew(input: AddHashtagForMewInput) -> ExternResult<()> {
         LinkTypes::HashtagToMews,
         LinkTag(input.base_hashtag.as_bytes().to_vec()),
     )?;
-\
+
     add_hashtag_by_author_for_mew(input)?;
 
     Ok(())
@@ -88,9 +88,9 @@ pub fn get_mews_for_hashtag_with_context(
     // OLD: get_mews_for_tag_with_context(input.hashtag, LinkTypes::HashtagToMews, input.page)
 
     // Get links from hashtag to mew
-    let tag = make_hashtag_text(hashtag.clone());
+    let tag = make_hashtag_text(input.hashtag.clone());
     let prefix_index = make_tag_prefix_index()?;
-    let result_path: Path = prefix_index.make_result_path(tag, Some(hashtag))?;
+    let result_path: Path = prefix_index.make_result_path(tag, Some(input.hashtag))?;
 
     let links = get_links(
         result_path.path_entry_hash()?,

diff --git a/dnas/mewsfeed/zomes/coordinator/trust_atom/Cargo.toml b/dnas/mewsfeed/zomes/coordinator/trust_atom/Cargo.toml
@@ -8,8 +8,8 @@ crate-type = ["cdylib", "rlib"]
 name = "trust_atom_zome"
 
 [dependencies]
-# trust_atom = {git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom"}
-trust_atom = { path= "/Users/knight/code/trustgraph/trustgraph-holochain/zomes/trust_atom"}
+trust_atom = {git = "https://github.com/trustgraph/trustgraph-holochain.git", package = "trust_atom"}
+# trust_atom = { path= "/Users/knight/code/trustgraph/trustgraph-holochain/zomes/trust_atom"}
 
 hdk = { workspace = true }
 serde = { workspace = true }