fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2025-01-19 04:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Adding strum and simplifying imports."

Browse source 
This reverts commit 15f1671107.
This commit is contained in:
Dessalines 2025-01-10 12:31:04 -05:00
parent 4b71bc6701
commit 45e312f020
4 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2742,7 +2742,6 @@ dependencies = [
"serde",
"serde_with",
"serial_test",
"strum",
"tokio",
"ts-rs",
]

1
crates/db_views_moderator/Cargo.toml
View file

@ -40,7 +40,6 @@ diesel-async = { workspace = true, features = [
serde = { workspace = true }
serde_with = { workspace = true }
ts-rs = { workspace = true, optional = true }
strum = { workspace = true }
[dev-dependencies]
serial_test = { workspace = true }

51
crates/db_views_moderator/src/modlog_combined_view.rs
View file

@ -70,29 +70,38 @@ use lemmy_utils::error::LemmyResult;
impl ModlogCombinedPaginationCursor {
// get cursor for page that starts immediately after the given post
pub fn after_post(view: &ModlogCombinedView) -> ModlogCombinedPaginationCursor {
let id = match view {
ModlogCombinedView::AdminAllowInstance(v) => v.admin_allow_instance.id.0,
ModlogCombinedView::AdminBlockInstance(v) => v.admin_block_instance.id.0,
ModlogCombinedView::AdminPurgeComment(v) => v.admin_purge_comment.id.0,
ModlogCombinedView::AdminPurgeCommunity(v) => v.admin_purge_community.id.0,
ModlogCombinedView::AdminPurgePerson(v) => v.admin_purge_person.id.0,
ModlogCombinedView::AdminPurgePost(v) => v.admin_purge_post.id.0,
ModlogCombinedView::ModAdd(v) => v.mod_add.id.0,
ModlogCombinedView::ModAddCommunity(v) => v.mod_add_community.id.0,
ModlogCombinedView::ModBan(v) => v.mod_ban.id.0,
ModlogCombinedView::ModBanFromCommunity(v) => v.mod_ban_from_community.id.0,
ModlogCombinedView::ModFeaturePost(v) => v.mod_feature_post.id.0,
ModlogCombinedView::ModHideCommunity(v) => v.mod_hide_community.id.0,
ModlogCombinedView::ModLockPost(v) => v.mod_lock_post.id.0,
ModlogCombinedView::ModRemoveComment(v) => v.mod_remove_comment.id.0,
ModlogCombinedView::ModRemoveCommunity(v) => v.mod_remove_community.id.0,
ModlogCombinedView::ModRemovePost(v) => v.mod_remove_post.id.0,
ModlogCombinedView::ModTransferCommunity(v) => v.mod_transfer_community.id.0,
let (prefix, id) = match view {
ModlogCombinedView::AdminAllowInstance(v) => {
("AdminAllowInstance", v.admin_allow_instance.id.0)
}
ModlogCombinedView::AdminBlockInstance(v) => {
("AdminBlockInstance", v.admin_block_instance.id.0)
}
ModlogCombinedView::AdminPurgeComment(v) => ("AdminPurgeComment", v.admin_purge_comment.id.0),
ModlogCombinedView::AdminPurgeCommunity(v) => {
("AdminPurgeCommunity", v.admin_purge_community.id.0)
}
ModlogCombinedView::AdminPurgePerson(v) => ("AdminPurgePerson", v.admin_purge_person.id.0),
ModlogCombinedView::AdminPurgePost(v) => ("AdminPurgePost", v.admin_purge_post.id.0),
ModlogCombinedView::ModAdd(v) => ("ModAdd", v.mod_add.id.0),
ModlogCombinedView::ModAddCommunity(v) => ("ModAddCommunity", v.mod_add_community.id.0),
ModlogCombinedView::ModBan(v) => ("ModBan", v.mod_ban.id.0),
ModlogCombinedView::ModBanFromCommunity(v) => {
("ModBanFromCommunity", v.mod_ban_from_community.id.0)
}
ModlogCombinedView::ModFeaturePost(v) => ("ModFeaturePost", v.mod_feature_post.id.0),
ModlogCombinedView::ModHideCommunity(v) => ("ModHideCommunity", v.mod_hide_community.id.0),
ModlogCombinedView::ModLockPost(v) => ("ModLockPost", v.mod_lock_post.id.0),
ModlogCombinedView::ModRemoveComment(v) => ("ModRemoveComment", v.mod_remove_comment.id.0),
ModlogCombinedView::ModRemoveCommunity(v) => {
("ModRemoveCommunity", v.mod_remove_community.id.0)
}
ModlogCombinedView::ModRemovePost(v) => ("ModRemovePost", v.mod_remove_post.id.0),
ModlogCombinedView::ModTransferCommunity(v) => {
("ModTransferCommunity", v.mod_transfer_community.id.0)
}
};
// hex encoding to prevent ossification
let prefix = view.as_ref();
ModlogCombinedPaginationCursor(format!("{prefix}-{id:x}"))
}

3
crates/db_views_moderator/src/structs.rs
View file

@ -32,7 +32,6 @@ use lemmy_db_schema::source::{
};
use serde::{Deserialize, Serialize};
use serde_with::skip_serializing_none;
use strum::AsRefStr;
#[cfg(feature = "full")]
use ts_rs::TS;
@ -307,7 +306,7 @@ pub struct ModlogCombinedViewInternal {
pub comment: Option<Comment>,
}
#[derive(AsRefStr, Debug, PartialEq, Serialize, Deserialize, Clone)]
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
#[cfg_attr(feature = "full", derive(TS))]
#[cfg_attr(feature = "full", ts(export))]
// Use serde's internal tagging, to work easier with javascript libraries