feat: OkuNet tags

.github/old-workflows/main.yml → .github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Checkout codebase
         uses: actions/checkout@v4
       - name: Generate documentation
-        run: time cargo doc --no-deps -Zrustdoc-map --release --quiet
+        run: time cargo doc --no-deps
       - name: Fix permissions
         run: |
           chmod -c -R +rX "target/doc/" | while read line; do
@@ -60,7 +60,7 @@ jobs:
     - name: Apply compiler suggestions
       run: |
         cargo fix --edition --edition-idioms --allow-dirty
-        cargo clippy --fix -Z unstable-options --allow-dirty
+        cargo clippy --fix --allow-dirty
     - name: Commit changes to code, if any
       run: |
         git config user.name github-actions

src/config.rs

@@ -51,11 +51,7 @@ impl OkuFsConfig {
 
     /// The home replica of the node.
     pub fn home_replica(&self) -> miette::Result<Option<NamespaceId>> {
-        Ok(self
-            .home_replica
-            .try_lock()
-            .map_err(|e| miette!("{}", e))?
-            .clone())
+        Ok(*self.home_replica.try_lock().map_err(|e| miette!("{}", e))?)
     }
 
     /// Sets the home replica of the node.

src/database.rs

@@ -119,7 +119,7 @@ pub struct OkuIdentity {
     pub blocked: HashSet<AuthorId>,
 }
 
-#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[native_model(id = 2, version = 1)]
 #[native_db(
     primary_key(primary_key -> (Vec<u8>, Vec<u8>))
@@ -132,6 +132,18 @@ pub struct OkuPost {
     pub note: OkuNote,
 }
 
+impl PartialEq for OkuPost {
+    fn eq(&self, other: &Self) -> bool {
+        self.primary_key() == other.primary_key()
+    }
+}
+impl Eq for OkuPost {}
+impl Hash for OkuPost {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.primary_key().hash(state);
+    }
+}
+
 impl From<OkuPost> for TantivyDocument {
     fn from(value: OkuPost) -> Self {
         let post_key: [Vec<u8>; 2] = value.primary_key().into();
@@ -276,7 +288,7 @@ impl OkuDatabase {
     ) -> miette::Result<Vec<OkuPost>> {
         let searcher = POST_INDEX_READER.searcher();
         let query_parser = QueryParser::for_index(
-            &*POST_INDEX,
+            &POST_INDEX,
             vec![
                 POST_SCHEMA.1["author_id"],
                 POST_SCHEMA.1["path"],
@@ -422,13 +434,13 @@ impl OkuDatabase {
     /// A list of all known OkuNet posts.
     pub fn get_posts(&self) -> miette::Result<Vec<OkuPost>> {
         let r = self.database.r_transaction().into_diagnostic()?;
-        Ok(r.scan()
+        r.scan()
             .primary()
             .into_diagnostic()?
             .all()
             .into_diagnostic()?
             .collect::<Result<Vec<_>, _>>()
-            .into_diagnostic()?)
+            .into_diagnostic()
     }
 
     /// Retrieves all known OkuNet posts by a given author.
@@ -495,7 +507,7 @@ impl OkuDatabase {
             author_id.as_bytes().to_vec(),
             path_to_entry_key(path).to_vec(),
         );
-        Ok(r.get().primary(entry_key).into_diagnostic()?)
+        r.get().primary(entry_key).into_diagnostic()
     }
 
     /// Insert or update an OkuNet user.
@@ -629,13 +641,13 @@ impl OkuDatabase {
     /// The OkuNet content of all users known to this node.
     pub fn get_users(&self) -> miette::Result<Vec<OkuUser>> {
         let r = self.database.r_transaction().into_diagnostic()?;
-        Ok(r.scan()
+        r.scan()
             .primary()
             .into_diagnostic()?
             .all()
             .into_diagnostic()?
             .collect::<Result<Vec<_>, _>>()
-            .into_diagnostic()?)
+            .into_diagnostic()
     }
 
     /// Gets an OkuNet user's content by their content authorship ID.
@@ -649,8 +661,8 @@ impl OkuDatabase {
     /// An OkuNet user's content.
     pub fn get_user(&self, author_id: AuthorId) -> miette::Result<Option<OkuUser>> {
         let r = self.database.r_transaction().into_diagnostic()?;
-        Ok(r.get()
+        r.get()
             .primary(author_id.as_bytes().to_vec())
-            .into_diagnostic()?)
+            .into_diagnostic()
     }
 }

src/discovery.rs

@@ -20,7 +20,7 @@ impl OkuFs {
     /// * `namespace_id` - The ID of the replica to announce.
     pub async fn announce_replica(&self, namespace_id: NamespaceId) -> miette::Result<()> {
         let ticket = mainline::Bytes::from(
-            self.create_document_ticket(namespace_id.clone(), ShareMode::Read)
+            self.create_document_ticket(namespace_id, ShareMode::Read)
                 .await?
                 .to_bytes(),
         );
@@ -29,7 +29,7 @@ impl OkuFs {
             .await? as i64;
         let replica_private_key = mainline::SigningKey::from_bytes(
             &self
-                .create_document_ticket(namespace_id.clone(), ShareMode::Write)
+                .create_document_ticket(namespace_id, ShareMode::Write)
                 .await?
                 .capability
                 .secret_key()
@@ -58,7 +58,7 @@ impl OkuFs {
             .await
             .ok_or(miette::miette!("No home replica set … "))?;
         let ticket = mainline::Bytes::from(
-            self.create_document_ticket(home_replica.clone(), ShareMode::Read)
+            self.create_document_ticket(home_replica, ShareMode::Read)
                 .await?
                 .to_bytes(),
         );

src/fs/core.rs

@@ -34,15 +34,14 @@ impl OkuFs {
     /// The private key of the node's authorship credentials.
     pub async fn get_author(&self) -> anyhow::Result<Author> {
         let default_author_id = self.node.authors().default().await?;
-        Ok(self
-            .node
+        self.node
             .authors()
             .export(default_author_id)
             .await?
             .ok_or(anyhow!(
                 "Missing private key for default author ({}).",
                 default_author_id.fmt_short()
-            ))?)
+            ))
     }
 
     /// Starts an instance of an Oku file system.

src/fs/directory.rs

@@ -152,11 +152,9 @@ impl OkuFs {
             entries_deleted += document
                 .del(
                     file.author(),
-                    format!(
-                        "{}",
-                        std::str::from_utf8(&path_to_entry_prefix(entry_key_to_path(file.key())?))
-                            .into_diagnostic()?
-                    ),
+                    (std::str::from_utf8(&path_to_entry_prefix(entry_key_to_path(file.key())?))
+                        .into_diagnostic()?)
+                    .to_string(),
                 )
                 .await
                 .map_err(|e| {
@@ -261,9 +259,8 @@ impl OkuFs {
         let replica = self
             .fetch_replica_by_ticket(ticket, Some(path.clone()))
             .await?;
-        Ok(self
-            .read_directory_from_replica_handle(replica, path)
+        self.read_directory_from_replica_handle(replica, path)
             .await
-            .map_err(|e| anyhow!("{}", e))?)
+            .map_err(|e| anyhow!("{}", e))
     }
 }

src/fs/file.rs

@@ -330,7 +330,7 @@ impl OkuFs {
         namespace_id: NamespaceId,
         path: PathBuf,
     ) -> anyhow::Result<Bytes> {
-        match self.resolve_namespace_id(namespace_id.clone()).await {
+        match self.resolve_namespace_id(namespace_id).await {
             Ok(ticket) => match self.fetch_file_with_ticket(&ticket, path.clone()).await {
                 Ok(bytes) => Ok(bytes),
                 Err(e) => {
@@ -391,9 +391,8 @@ impl OkuFs {
                 break;
             }
         }
-        Ok(self
-            .read_file(namespace_id, path)
+        self.read_file(namespace_id, path)
             .await
-            .map_err(|e| anyhow!("{}", e))?)
+            .map_err(|e| anyhow!("{}", e))
     }
 }