huskies: merge 891
This commit is contained in:
@@ -19,10 +19,10 @@ pub(super) fn read_story_front_matter_agent(
|
||||
story_id: &str,
|
||||
) -> Option<String> {
|
||||
if let Some(view) = crate::crdt_state::read_item(story_id)
|
||||
&& let Some(agent) = view.agent.as_ref()
|
||||
&& let Some(agent) = view.agent()
|
||||
&& !agent.is_empty()
|
||||
{
|
||||
return Some(agent.clone());
|
||||
return Some(agent.to_string());
|
||||
}
|
||||
use crate::db::yaml_legacy::parse_front_matter;
|
||||
let contents = read_story_contents(project_root, story_id)?;
|
||||
@@ -101,7 +101,7 @@ pub(super) fn has_mergemaster_attempted(
|
||||
story_id: &str,
|
||||
) -> bool {
|
||||
crate::crdt_state::read_item(story_id)
|
||||
.and_then(|view| view.mergemaster_attempted)
|
||||
.map(|view| view.mergemaster_attempted())
|
||||
.unwrap_or(false)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user