Organize platform source files into their respective directories

src/source/bilibili_live.rs → src/source/bilibili/live.rs

@@ -4,23 +4,18 @@ use anyhow::{anyhow, bail};
 use serde::Deserialize;
 use serde_json::{self as json, json};
 
-use super::{
-    FetcherTrait, LiveStatus, SourcePlatformName, Status, StatusKind, StatusSource,
-    StatusSourceUser,
+use super::Response;
+use crate::{
+    config::SourcePlatformBilibiliLive,
+    source::{
+        FetcherTrait, LiveStatus, SourcePlatformName, Status, StatusKind, StatusSource,
+        StatusSourceUser,
+    },
 };
-use crate::config::SourcePlatformBilibiliLive;
 
 const BILIBILI_LIVE_API: &str =
     "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids";
 
-#[derive(Deserialize)]
-pub(crate) struct Response<T> {
-    pub(crate) code: i32,
-    #[allow(dead_code)]
-    pub(crate) message: String,
-    pub(crate) data: Option<T>,
-}
-
 #[derive(Deserialize)]
 struct ResponseDataRoom {
     title: String,

src/source/bilibili/mod.rs

@@ -0,0 +1,12 @@
+pub(super) mod live;
+pub(super) mod space;
+
+use serde::Deserialize;
+
+#[derive(Deserialize)]
+struct Response<T> {
+    pub(crate) code: i32,
+    #[allow(dead_code)]
+    pub(crate) message: String,
+    pub(crate) data: Option<T>,
+}

src/source/bilibili_space.rs → src/source/bilibili/space.rs

@@ -9,13 +9,13 @@ use spdlog::prelude::*;
 use tap::prelude::*;
 use tokio::sync::{Mutex, OnceCell};
 
-use super::{
-    bilibili_live::Response, FetcherTrait, Notification, NotificationKind, Post, PostAttachment,
-    PostAttachmentImage, Posts, SourcePlatformName, Status, StatusKind, StatusSource, User,
-};
+use super::Response;
 use crate::{
     config::SourcePlatformBilibiliSpace,
-    source::{PostsRef, RepostFrom},
+    source::{
+        FetcherTrait, Notification, NotificationKind, Post, PostAttachment, PostAttachmentImage,
+        Posts, PostsRef, RepostFrom, SourcePlatformName, Status, StatusKind, StatusSource, User,
+    },
 };
 
 mod data {

src/source/mod.rs

@@ -1,5 +1,4 @@
-mod bilibili_live;
-mod bilibili_space;
+mod bilibili;
 mod twitter;
 
 use std::{
@@ -241,8 +240,8 @@ pub trait FetcherTrait: Display + Send + Sync {
 
 pub fn fetcher(platform: &SourcePlatform) -> Box<dyn FetcherTrait> {
     match platform {
-        SourcePlatform::BilibiliLive(p) => Box::new(bilibili_live::Fetcher::new(p.clone())),
-        SourcePlatform::BilibiliSpace(p) => Box::new(bilibili_space::Fetcher::new(p.clone())),
+        SourcePlatform::BilibiliLive(p) => Box::new(bilibili::live::Fetcher::new(p.clone())),
+        SourcePlatform::BilibiliSpace(p) => Box::new(bilibili::space::Fetcher::new(p.clone())),
         SourcePlatform::Twitter(p) => Box::new(twitter::Fetcher::new(p.clone())),
     }
 }