modules and routes renames, move routes and sidebar

Author: Kevin Souza

README.md

@@ -61,7 +61,7 @@ Logs are stored in the following locations:
 ## TODO
 
 - Maybe cache users/emotes/feeds in the AppState, also maybe return them when possible in the same request instead of emitting an update event.
-- Add Youtube as a frontend, needs:
+- Add YouTube as a frontend, needs:
   - Fully working multi window support.
   - Finish reworking the UI.
   - Reintroduce features removed since the rework to allow for more than one window and frontend.

src-tauri/src/feeds.rs src-tauri/src/feed.rssrc-tauri/src/feeds.rs renamed to src-tauri/src/feed.rs

@@ -5,7 +5,7 @@ use tauri::{async_runtime::Mutex, AppHandle, Emitter, State};
 
 use crate::{
     twitch::{self, stream::LiveNow},
-    users::Platform,
+    user::Platform,
     AppState,
 };
 

src-tauri/src/lib.rs

@@ -6,12 +6,12 @@ use tauri::{
     Manager,
 };
 use tauri_plugin_deep_link::DeepLinkExt;
-use tauri_plugin_sql::{Migration, MigrationKind};
 
-mod feeds;
+mod feed;
+mod migration;
 mod twitch;
-mod users;
-mod utils;
+mod user;
+mod util;
 mod window;
 
 pub struct AppState {
@@ -43,9 +43,9 @@ pub fn run() {
     builder = builder
         .plugin(
             tauri_plugin_sql::Builder::new()
-                .add_migrations("sqlite:users.db", users_migrations())
-                .add_migrations("sqlite:feeds.db", feeds_migrations())
-                .add_migrations("sqlite:emotes.db", emotes_migrations())
+                .add_migrations("sqlite:users.db", migration::users_migrations())
+                .add_migrations("sqlite:feeds.db", migration::feeds_migrations())
+                .add_migrations("sqlite:emotes.db", migration::emotes_migrations())
                 .build(),
         )
         .plugin(tauri_plugin_http::init())
@@ -108,11 +108,11 @@ pub fn run() {
 
     builder
         .invoke_handler(tauri::generate_handler![
-            users::get_users,
-            users::add_user,
-            users::remove_user,
-            feeds::get_feed,
-            feeds::refresh_feed,
+            user::get_users,
+            user::add_user,
+            user::remove_user,
+            feed::get_feed,
+            feed::refresh_feed,
             window::open_new_window,
             twitch::stream::fetch_stream_playback,
             twitch::proxy::proxy_stream,
@@ -121,50 +121,3 @@ pub fn run() {
         .run(tauri::generate_context!())
         .expect("while running tauri application");
 }
-
-fn users_migrations() -> Vec<Migration> {
-    vec![Migration {
-        version: 1,
-        description: "create_users_table",
-        sql: r"
-                CREATE TABLE IF NOT EXISTS twitch (
-                    id TEXT,
-                    username TEXT NOT NULL PRIMARY KEY,
-                    avatar BLOB
-                );
-            ",
-        kind: MigrationKind::Up,
-    }]
-}
-
-fn feeds_migrations() -> Vec<Migration> {
-    vec![Migration {
-        version: 1,
-        description: "create_feeds_table",
-        sql: r"
-                CREATE TABLE IF NOT EXISTS twitch (
-                    username TEXT NOT NULL PRIMARY KEY,
-                    started_at TEXT
-                );
-            ",
-        kind: MigrationKind::Up,
-    }]
-}
-
-fn emotes_migrations() -> Vec<Migration> {
-    vec![Migration {
-        version: 1,
-        description: "create_emotes_table",
-        sql: r"
-                CREATE TABLE IF NOT EXISTS twitch (
-                    username TEXT NOT NULL,
-                    name TEXT NOT NULL,
-                    url TEXT,
-                    width INTEGER,
-                    height INTEGER,
-                    PRIMARY KEY (username, name)
-                );
-            ",
-        kind: MigrationKind::Up,
-    }]
-}

src-tauri/src/migration.rs

@@ -0,0 +1,48 @@
+use tauri_plugin_sql::{Migration, MigrationKind};
+
+pub fn users_migrations() -> Vec<Migration> {
+    vec![Migration {
+        version: 1,
+        description: "create_users_table",
+        sql: r"
+                CREATE TABLE IF NOT EXISTS twitch (
+                    id TEXT,
+                    username TEXT NOT NULL PRIMARY KEY,
+                    avatar BLOB
+                );
+            ",
+        kind: MigrationKind::Up,
+    }]
+}
+
+pub fn feeds_migrations() -> Vec<Migration> {
+    vec![Migration {
+        version: 1,
+        description: "create_feeds_table",
+        sql: r"
+                CREATE TABLE IF NOT EXISTS twitch (
+                    username TEXT NOT NULL PRIMARY KEY,
+                    started_at TEXT
+                );
+            ",
+        kind: MigrationKind::Up,
+    }]
+}
+
+pub fn emotes_migrations() -> Vec<Migration> {
+    vec![Migration {
+        version: 1,
+        description: "create_emotes_table",
+        sql: r"
+                CREATE TABLE IF NOT EXISTS twitch (
+                    username TEXT NOT NULL,
+                    name TEXT NOT NULL,
+                    url TEXT,
+                    width INTEGER,
+                    height INTEGER,
+                    PRIMARY KEY (username, name)
+                );
+            ",
+        kind: MigrationKind::Up,
+    }]
+}

src-tauri/src/twitch/chat.rs

@@ -20,7 +20,7 @@ use tauri::{
 };
 use tokio_tungstenite::tungstenite::Message;
 
-use crate::{twitch::emote, utils, AppState};
+use crate::{twitch::emote, util, AppState};
 
 use super::emote::Emote;
 
@@ -98,7 +98,7 @@ pub async fn join_chat(
         return Err(format!("Failed to send PASS: {err}"));
     }
 
-    let random_number = utils::random_number(10_000, 99_999);
+    let random_number = util::random_number(10_000, 99_999);
 
     if let Err(err) = ws_stream
         .send(format!("NICK justinfan{random_number}").into())

src-tauri/src/twitch/mod.rs

@@ -1,7 +1,7 @@
 pub mod chat;
 pub mod emote;
-pub mod stream;
 pub mod main;
 pub mod proxy;
-pub mod queries;
+pub mod query;
+pub mod stream;
 pub mod user;

src-tauri/src/twitch/queries.rs src-tauri/src/twitch/query.rssrc-tauri/src/twitch/queries.rs renamed to src-tauri/src/twitch/query.rs

@@ -3,11 +3,11 @@ use std::collections::HashMap;
 use anyhow::{anyhow, Result};
 use serde::Serialize;
 
-use crate::utils;
+use crate::util;
 
 use super::{
     main,
-    queries::{GraphQLQuery, GraphQLResponse, UseLiveQuery, UseLiveResponse},
+    query::{GraphQLQuery, GraphQLResponse, UseLiveQuery, UseLiveResponse},
 };
 
 const USHER_API: &str = "https://usher.ttvnw.net/api/channel/hls";
@@ -107,7 +107,7 @@ pub async fn fetch_stream_playback(username: &str, backup: bool) -> Result<Strin
 fn playlist_url(username: &str, backup: bool, signature: &str, token: &str) -> String {
     let mut url = format!("{USHER_API}/{username}.m3u8");
 
-    let random_number = utils::random_number(1_000_000, 10_000_000);
+    let random_number = util::random_number(1_000_000, 10_000_000);
 
     if backup {
         url.push_str(&format!("?platform=ios&supported_codecs=h264&player=twitchweb&fast_bread=true&p={random_number}&sig={signature}&token={token}"));

src-tauri/src/twitch/stream.rs

@@ -6,7 +6,7 @@ use log::error;
 use super::{
     emote::{self, Emote, TWITCH_EMOTES_CDN},
     main,
-    queries::{GraphQLQuery, GraphQLResponse},
+    query::{GraphQLQuery, GraphQLResponse},
 };
 
 pub struct TwitchUser {

src-tauri/src/twitch/user.rs

@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use sqlx::{prelude::Type, Pool, Row, Sqlite};
 use tauri::{async_runtime::Mutex, AppHandle, Emitter, State};
 
-use crate::{twitch, utils, AppState};
+use crate::{twitch, util, AppState};
 
 #[derive(Serialize, Deserialize)]
 pub struct User {
@@ -20,15 +20,15 @@ pub struct User {
 #[derive(Serialize, Deserialize, Clone, PartialEq, Type)]
 pub enum Platform {
     #[serde(rename = "youtube")]
-    Youtube,
+    YouTube,
     #[serde(rename = "twitch")]
     Twitch,
 }
 
 impl Display for Platform {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            Platform::Youtube => write!(f, "youtube"),
+            Platform::YouTube => write!(f, "youtube"),
             Platform::Twitch => write!(f, "twitch"),
         }
     }
@@ -45,7 +45,7 @@ pub async fn get_users(
     let users = match platform {
         Some(platform) => get_users_for_platform(users_db, platform).await,
         None => {
-            // TODO: Merge users from all platforms when adding Youtube
+            // TODO: Merge users from all platforms when adding YouTube
             get_users_for_platform(users_db, Platform::Twitch).await
         }
     };
@@ -81,7 +81,7 @@ pub async fn add_user(
             error!("Failed to save emotes for user '{username}': {err}");
         }
 
-        let avatar = match utils::download_image(&user.avatar).await {
+        let avatar = match util::download_image(&user.avatar).await {
             Ok(bytes) => bytes,
             Err(err) => {
                 return Err(format!(