chore: move IngCommentEntry

Author: Thaumy

src/api/ing/get_comment_list.rs

@@ -1,10 +1,33 @@
-use crate::api::ing::get_list::IngCommentEntry;
 use crate::api::ing::Ing;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::json;
 use crate::infra::result::IntoResult;
 use crate::openapi;
 use anyhow::Result;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct IngCommentEntry {
+    #[serde(rename = "Id")]
+    pub id: usize,
+    #[serde(rename = "Content")]
+    pub content: String,
+    #[serde(rename = "DateAdded")]
+    pub create_time: String,
+    #[serde(rename = "StatusId")]
+    pub status_id: usize,
+    #[serde(rename = "UserAlias")]
+    pub user_alias: String,
+    #[serde(rename = "UserDisplayName")]
+    pub user_name: String,
+    #[serde(rename = "UserIconUrl")]
+    pub user_icon_url: String,
+    #[serde(rename = "UserId")]
+    pub user_id: usize,
+    #[serde(rename = "UserGuid")]
+    pub user_guid: String,
+}
+
 
 impl Ing {
     pub async fn get_comment_list(&self, ing_id: usize) -> Result<Vec<IngCommentEntry>> {

src/api/ing/get_list.rs

@@ -8,6 +8,7 @@ use crate::openapi;
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::ops::ControlFlow;
+use crate::api::ing::get_comment_list::IngCommentEntry;
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct IngEntry {
@@ -39,28 +40,6 @@ pub struct IngEntry {
     pub icons: String,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct IngCommentEntry {
-    #[serde(rename = "Id")]
-    pub id: usize,
-    #[serde(rename = "Content")]
-    pub content: String,
-    #[serde(rename = "DateAdded")]
-    pub create_time: String,
-    #[serde(rename = "StatusId")]
-    pub status_id: usize,
-    #[serde(rename = "UserAlias")]
-    pub user_alias: String,
-    #[serde(rename = "UserDisplayName")]
-    pub user_name: String,
-    #[serde(rename = "UserIconUrl")]
-    pub user_icon_url: String,
-    #[serde(rename = "UserId")]
-    pub user_id: usize,
-    #[serde(rename = "UserGuid")]
-    pub user_guid: String,
-}
-
 type IngEntryWithComment = (IngEntry, Vec<IngCommentEntry>);
 
 impl Ing {

src/display/colorful.rs

@@ -1,4 +1,4 @@
-use crate::api::ing::get_list::{IngCommentEntry, IngEntry};
+use crate::api::ing::get_list::{ IngEntry};
 use crate::api::ing::{
     fmt_content, get_ing_at_user_tag_text, ing_star_tag_to_text, rm_ing_at_user_tag, IngSendFrom,
 };
@@ -15,6 +15,7 @@ use std::fmt::Display;
 use std::ops::Not;
 use std::path::PathBuf;
 use unicode_width::UnicodeWidthStr;
+use crate::api::ing::get_comment_list::IngCommentEntry;
 
 pub fn login(cfg_path: &Result<PathBuf>) {
     match cfg_path {

src/display/json.rs

@@ -1,4 +1,4 @@
-use crate::api::ing::get_list::{IngCommentEntry, IngEntry};
+use crate::api::ing::get_list::{ IngEntry};
 use crate::api::news::get_list::NewsEntry;
 use crate::api::post::get_one::PostEntry;
 use crate::api::user::info::UserInfo;
@@ -8,6 +8,7 @@ use anyhow::Result;
 use serde::Serialize;
 use serde_json::json;
 use std::path::PathBuf;
+use crate::api::ing::get_comment_list::IngCommentEntry;
 
 pub fn login(cfg_path: &Result<PathBuf>) {
     let json = cfg_path.as_ref().map(|pb| json!({"cfg_path":pb}));

src/display/mod.rs

@@ -1,10 +1,11 @@
-use crate::api::ing::get_list::{IngCommentEntry, IngEntry};
+use crate::api::ing::get_list::{IngEntry};
 use crate::api::news::get_list::NewsEntry;
 use crate::api::post::get_one::PostEntry;
 use crate::api::user::info::UserInfo;
 use crate::args::Style;
 use anyhow::Result;
 use std::path::PathBuf;
+use crate::api::ing::get_comment_list::IngCommentEntry;
 
 mod colorful;
 mod json;

src/display/normal.rs

@@ -1,4 +1,4 @@
-use crate::api::ing::get_list::{IngCommentEntry, IngEntry};
+use crate::api::ing::get_list::{ IngEntry};
 use crate::api::ing::{
     fmt_content, get_ing_at_user_tag_text, ing_star_tag_to_text, rm_ing_at_user_tag, IngSendFrom,
 };
@@ -15,6 +15,7 @@ use std::fmt::Display;
 use std::ops::Not;
 use std::path::PathBuf;
 use unicode_width::UnicodeWidthStr;
+use crate::api::ing::get_comment_list::IngCommentEntry;
 
 pub fn login(cfg_path: &Result<PathBuf>) {
     match cfg_path {