chore: fix ttl unresolved for ra

2278535805 · Feb 7, 2025 · c64f644 · c64f644
1 parent cbffc51
commit c64f644
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/phira/src/charts_view.rs b/phira/src/charts_view.rs
@@ -5,6 +5,7 @@ use crate::{
     page::{ChartItem, ChartType, Fader, Illustration},
     save_data,
     scene::{render_release_to_refresh, SongScene, MP_PANEL},
+    ttl,
 };
 use anyhow::Result;
 use macroquad::prelude::*;

diff --git a/phira/src/client/model.rs b/phira/src/client/model.rs
@@ -20,6 +20,7 @@ use super::{basic_client_builder, Client, API_URL, CLIENT_TOKEN};
 use crate::{
     dir, get_data,
     images::{THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH},
+    ttl,
 };
 use anyhow::{bail, Result};
 use bytes::Bytes;

diff --git a/phira/src/page/event.rs b/phira/src/page/event.rs
@@ -3,6 +3,7 @@ use crate::{
     client::{Client, Event},
     icons::Icons,
     scene::EventScene,
+    ttl,
 };
 use anyhow::Result;
 use macroquad::prelude::*;

diff --git a/phira/src/page/home.rs b/phira/src/page/home.rs
@@ -14,8 +14,8 @@ use crate::{
     scene::{check_read_tos_and_policy, ProfileScene, JUST_LOADED_TOS},
     sync_data,
     threed::ThreeD,
+    ttl,
 };
-use prpr_l10n::LANG_IDENTS;
 use ::rand::{random, thread_rng, Rng};
 use anyhow::{bail, Context, Result};
 use chrono::NaiveDate;
@@ -29,6 +29,7 @@ use prpr::{
     task::Task,
     ui::{button_hit_large, clip_rounded_rect, ClipType, DRectButton, Dialog, FontArc, RectButton, Scroll, Ui},
 };
+use prpr_l10n::LANG_IDENTS;
 use reqwest::StatusCode;
 use serde::Deserialize;
 use std::{

diff --git a/phira/src/page/library.rs b/phira/src/page/library.rs
@@ -11,6 +11,7 @@ use crate::{
     scene::{check_read_tos_and_policy, ChartOrder, JUST_LOADED_TOS, ORDERS},
     tabs::{Tabs, TitleFn},
     tags::TagsDialog,
+    ttl,
 };
 use anyhow::{anyhow, Result};
 use macroquad::prelude::*;
@@ -242,11 +243,13 @@ impl LibraryPage {
             let search = self.search_str.clone();
             let mut charts = Vec::new();
             charts.push(ChartDisplayItem::new(None, None));
-            charts.append(&mut s.charts_local
-                .iter()
-                .filter(|it| it.info.name.contains(&search))
-                .map(|it| ChartDisplayItem::new(Some(it.clone()), None))
-                .collect::<Vec<ChartDisplayItem>>()
+            charts.append(
+                &mut s
+                    .charts_local
+                    .iter()
+                    .filter(|it| it.info.name.contains(&search))
+                    .map(|it| ChartDisplayItem::new(Some(it.clone()), None))
+                    .collect::<Vec<ChartDisplayItem>>(),
             );
             list.view.set(s.t, charts);
         }
@@ -504,12 +507,7 @@ impl Page for LibraryPage {
                     self.import_btn.render_shadow(ui, r, t, |ui, path| {
                         ui.fill_path(&path, semi_black(0.4));
                     });
-                    ui.text(tl!("import"))
-                        .pos(ct.x, ct.y)
-                        .anchor(0.5, 0.5)
-                        .no_baseline()
-                        .size(0.6)
-                        .draw();
+                    ui.text(tl!("import")).pos(ct.x, ct.y).anchor(0.5, 0.5).no_baseline().size(0.6).draw();
                 } else {
                     self.order_btn.render_shadow(ui, r, t, |ui, path| {
                         ui.fill_path(&path, semi_black(0.4));

diff --git a/phira/src/page/settings.rs b/phira/src/page/settings.rs
@@ -8,6 +8,7 @@ use crate::{
     scene::BGM_VOLUME_UPDATED,
     sync_data,
     tabs::{Tabs, TitleFn},
+    ttl,
 };
 use anyhow::Result;
 use bytesize::ByteSize;

diff --git a/phira/src/scene/profile.rs b/phira/src/scene/profile.rs
@@ -6,7 +6,7 @@ use crate::{
     client::{recv_raw, Client, Record, User, UserManager},
     get_data, get_data_mut,
     page::{Fader, Illustration, SFader},
-    save_data, sync_data,
+    save_data, sync_data, ttl,
 };
 use anyhow::Result;
 use chrono::Local;

diff --git a/phira/src/scene/song.rs b/phira/src/scene/song.rs
@@ -16,6 +16,7 @@ use crate::{
     rate::RateDialog,
     save_data,
     tags::TagsDialog,
+    ttl,
 };
 use ::rand::{thread_rng, Rng};
 use anyhow::{anyhow, bail, Context, Result};
@@ -917,8 +918,8 @@ impl SongScene {
                 {
                     warn!("this build does not support unlock video.");
                     LoadingScene::new(mode, info, config, fs, player, upload_fn, update_fn, Some(preload))
-                    .await
-                    .map(|it| NextScene::Overlay(Box::new(it)))
+                        .await
+                        .map(|it| NextScene::Overlay(Box::new(it)))
                 }
                 #[cfg(feature = "video")]
                 {