Code review improvements

src/database/models/creator_follows.rs

@@ -54,21 +54,6 @@ macro_rules! impl_follow {
                 Ok(())
             }
 
-            pub async fn get_followers(
-                target_id: $target_id_type,
-                exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
-            ) -> Result<Vec<$target_struct>, DatabaseError> {
-                let res = sqlx::query_as!(
-                    FollowQuery,
-                    "SELECT follower_id, target_id FROM " + $table_name + " WHERE target_id=$1",
-                    target_id.0
-                )
-                .fetch_all(exec)
-                .await?;
-
-                Ok(res.into_iter().map(|r| r.into()).collect_vec())
-            }
-
             pub async fn get_follows_by_follower(
                 follower_user_id: UserId,
                 exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,

src/database/models/event_item.rs

@@ -190,10 +190,10 @@ impl Event {
                 created
             FROM events e
             WHERE 
-                (target_id, target_id_type, event_type) 
+                (target_id, target_id_type, event_type)
                 = ANY(SELECT * FROM UNNEST ($1::bigint[], $2::text[], $3::text[]))
             OR
-                (triggerer_id, triggerer_id_type, event_type) 
+                (triggerer_id, triggerer_id_type, event_type)
                 = ANY(SELECT * FROM UNNEST ($4::bigint[], $5::text[], $6::text[]))
             ORDER BY created DESC
             "#,

src/models/ids.rs

@@ -1,7 +1,7 @@
 use thiserror::Error;
 
 pub use super::collections::CollectionId;
-pub use super::feed_item::FeedItemId;
+pub use super::feeds::FeedItemId;
 pub use super::images::ImageId;
 pub use super::notifications::NotificationId;
 pub use super::oauth_clients::OAuthClientAuthorizationId;

src/models/mod.rs

@@ -1,7 +1,7 @@
 pub mod analytics;
 pub mod collections;
 pub mod error;
-pub mod feed_item;
+pub mod feeds;
 pub mod ids;
 pub mod images;
 pub mod notifications;

src/routes/v3/users.rs

@@ -8,7 +8,7 @@ use crate::{
         redis::RedisPool,
     },
     models::{
-        feed_item::{FeedItem, FeedItemBody},
+        feeds::{FeedItem, FeedItemBody},
         ids::ProjectId,
         pats::Scopes,
         projects::Project,

tests/common/api_v3/user.rs

@@ -3,7 +3,7 @@ use actix_web::{
     dev::ServiceResponse,
     test::{self, TestRequest},
 };
-use labrinth::models::feed_item::FeedItem;
+use labrinth::models::feeds::FeedItem;
 
 use crate::common::{actix::TestRequestExtensions, asserts::assert_status};
 

tests/common/asserts.rs

@@ -1,6 +1,6 @@
 #![allow(dead_code)]
 
-use labrinth::models::feed_item::{FeedItem, FeedItemBody};
+use labrinth::models::feeds::{FeedItem, FeedItemBody};
 
 pub fn assert_status(response: &actix_web::dev::ServiceResponse, status: actix_http::StatusCode) {
     assert_eq!(response.status(), status, "{:#?}", response.response());

tests/feed.rs

@@ -4,7 +4,7 @@ use common::{
     database::{FRIEND_USER_PAT, USER_USER_ID, USER_USER_PAT},
     environment::with_test_environment,
 };
-use labrinth::models::feed_item::FeedItemBody;
+use labrinth::models::feeds::FeedItemBody;
 
 mod common;