Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename parameters for consistency

Browse source
This commit is contained in:
Joscha 2022-07-31 19:57:55 +02:00
parent ae8ec70e5e
commit 297d62d173
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/logger.rs
View file

@ -67,23 +67,23 @@ impl MsgStore<LogMsg> for Logger {
Path::new(vec![*id]) Path::new(vec![*id])
} }
async fn tree(&self, root: &usize) -> Tree<LogMsg> { async fn tree(&self, tree_id: &usize) -> Tree<LogMsg> {
let msgs = self let msgs = self
.messages .messages
.lock() .lock()
.get(*root) .get(*tree_id)
.map(|msg| vec![msg.clone()]) .map(|msg| vec![msg.clone()])
.unwrap_or_default(); .unwrap_or_default();
Tree::new(*root, msgs) Tree::new(*tree_id, msgs)
} }
async fn prev_tree_id(&self, tree: &usize) -> Option<usize> { async fn prev_tree_id(&self, tree_id: &usize) -> Option<usize> {
tree.checked_sub(1) tree_id.checked_sub(1)
} }
async fn next_tree_id(&self, tree: &usize) -> Option<usize> { async fn next_tree_id(&self, tree_id: &usize) -> Option<usize> {
let len = self.messages.lock().len(); let len = self.messages.lock().len();
tree.checked_add(1).filter(|t| *t < len) tree_id.checked_add(1).filter(|t| *t < len)
} }
async fn first_tree_id(&self) -> Option<usize> { async fn first_tree_id(&self) -> Option<usize> {

6
src/store.rs
View file

@ -141,9 +141,9 @@ impl<M: Msg> Tree<M> {
#[async_trait] #[async_trait]
pub trait MsgStore<M: Msg> { pub trait MsgStore<M: Msg> {
async fn path(&self, id: &M::Id) -> Path<M::Id>; async fn path(&self, id: &M::Id) -> Path<M::Id>;
async fn tree(&self, root: &M::Id) -> Tree<M>; async fn tree(&self, tree_id: &M::Id) -> Tree<M>;
async fn prev_tree_id(&self, tree: &M::Id) -> Option<M::Id>; async fn prev_tree_id(&self, tree_id: &M::Id) -> Option<M::Id>;
async fn next_tree_id(&self, tree: &M::Id) -> Option<M::Id>; async fn next_tree_id(&self, tree_id: &M::Id) -> Option<M::Id>;
async fn first_tree_id(&self) -> Option<M::Id>; async fn first_tree_id(&self) -> Option<M::Id>;
async fn last_tree_id(&self) -> Option<M::Id>; async fn last_tree_id(&self) -> Option<M::Id>;
} }

12
src/vault/euph.rs
View file

@ -181,36 +181,36 @@ impl MsgStore<EuphMsg> for EuphVault {
rx.await.unwrap() rx.await.unwrap()
} }
async fn tree(&self, root: &Snowflake) -> Tree<EuphMsg> { async fn tree(&self, tree_id: &Snowflake) -> Tree<EuphMsg> {
// TODO vault::Error // TODO vault::Error
let (tx, rx) = oneshot::channel(); let (tx, rx) = oneshot::channel();
let request = EuphRequest::GetTree { let request = EuphRequest::GetTree {
room: self.room.clone(), room: self.room.clone(),
root: *root, root: *tree_id,
result: tx, result: tx,
}; };
let _ = self.vault.tx.send(request.into()); let _ = self.vault.tx.send(request.into());
rx.await.unwrap() rx.await.unwrap()
} }
async fn prev_tree_id(&self, root: &Snowflake) -> Option<Snowflake> { async fn prev_tree_id(&self, tree_id: &Snowflake) -> Option<Snowflake> {
// TODO vault::Error // TODO vault::Error
let (tx, rx) = oneshot::channel(); let (tx, rx) = oneshot::channel();
let request = EuphRequest::GetPrevTreeId { let request = EuphRequest::GetPrevTreeId {
room: self.room.clone(), room: self.room.clone(),
root: *root, root: *tree_id,
result: tx, result: tx,
}; };
let _ = self.vault.tx.send(request.into()); let _ = self.vault.tx.send(request.into());
rx.await.unwrap() rx.await.unwrap()
} }
async fn next_tree_id(&self, root: &Snowflake) -> Option<Snowflake> { async fn next_tree_id(&self, tree_id: &Snowflake) -> Option<Snowflake> {
// TODO vault::Error // TODO vault::Error
let (tx, rx) = oneshot::channel(); let (tx, rx) = oneshot::channel();
let request = EuphRequest::GetNextTreeId { let request = EuphRequest::GetNextTreeId {
room: self.room.clone(), room: self.room.clone(),
root: *root, root: *tree_id,
result: tx, result: tx,
}; };
let _ = self.vault.tx.send(request.into()); let _ = self.vault.tx.send(request.into());