Skip to content

Commit b7d6e3b

Browse files
committed
only deserialize first route in each column
Signed-off-by: kernelkind <[email protected]>
1 parent d560e84 commit b7d6e3b

File tree

1 file changed

+12
-16
lines changed
  • crates/notedeck_columns/src/storage

1 file changed

+12
-16
lines changed

crates/notedeck_columns/src/storage/decks.rs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -319,26 +319,22 @@ fn deserialize_columns(
319319
) -> Columns {
320320
let mut cols = Columns::new();
321321
for column in columns {
322-
let mut cur_routes = Vec::new();
322+
let Some(route) = column.first() else {
323+
continue;
324+
};
323325

324-
for route in column {
325-
let tokens: Vec<&str> = route.split(":").collect();
326-
let mut parser = TokenParser::new(&tokens);
326+
let tokens: Vec<&str> = route.split(":").collect();
327+
let mut parser = TokenParser::new(&tokens);
327328

328-
match CleanIntermediaryRoute::parse(&mut parser, deck_user) {
329-
Ok(route_intermediary) => {
330-
if let Some(ir) = route_intermediary.into_intermediary_route(ndb) {
331-
cur_routes.push(ir);
332-
}
333-
}
334-
Err(err) => {
335-
error!("could not turn tokens to RouteIntermediary: {:?}", err);
329+
match CleanIntermediaryRoute::parse(&mut parser, deck_user) {
330+
Ok(route_intermediary) => {
331+
if let Some(ir) = route_intermediary.into_intermediary_route(ndb) {
332+
cols.insert_intermediary_routes(timeline_cache, vec![ir]);
336333
}
337334
}
338-
}
339-
340-
if !cur_routes.is_empty() {
341-
cols.insert_intermediary_routes(timeline_cache, cur_routes);
335+
Err(err) => {
336+
error!("could not turn tokens to RouteIntermediary: {:?}", err);
337+
}
342338
}
343339
}
344340

0 commit comments

Comments
 (0)