Skip to content

Commit aea4457

Browse files
committed
Convert even more endpoints to the read-only follower database
1 parent ac91dcd commit aea4457

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

src/controllers/category.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn index(req: &mut dyn RequestExt) -> EndpointResult {
1515
let offset = options.offset().unwrap_or_default();
1616
let sort = query.get("sort").map_or("alpha", String::as_str);
1717

18-
let conn = req.db_conn()?;
18+
let conn = req.db_read_only()?;
1919
let categories =
2020
Category::toplevel(&conn, sort, i64::from(options.per_page), i64::from(offset))?;
2121
let categories = categories.into_iter().map(Category::encodable).collect();
@@ -42,7 +42,7 @@ pub fn index(req: &mut dyn RequestExt) -> EndpointResult {
4242
/// Handles the `GET /categories/:category_id` route.
4343
pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
4444
let slug = &req.params()["category_id"];
45-
let conn = req.db_conn()?;
45+
let conn = req.db_read_only()?;
4646
let cat: Category = Category::by_slug(slug).first(&*conn)?;
4747
let subcats = cat
4848
.subcategories(&conn)?
@@ -78,7 +78,7 @@ pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
7878

7979
/// Handles the `GET /category_slugs` route.
8080
pub fn slugs(req: &mut dyn RequestExt) -> EndpointResult {
81-
let conn = req.db_conn()?;
81+
let conn = req.db_read_only()?;
8282
let slugs = categories::table
8383
.select((categories::slug, categories::slug, categories::description))
8484
.order(categories::slug)

src/controllers/crate_owner_invitation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::views::{EncodableCrateOwnerInvitation, InvitationResponse};
77
/// Handles the `GET /me/crate_owner_invitations` route.
88
pub fn list(req: &mut dyn RequestExt) -> EndpointResult {
99
let user_id = req.authenticate()?.user_id();
10-
let conn = &*req.db_conn()?;
10+
let conn = &*req.db_read_only()?;
1111

1212
let crate_owner_invitations: Vec<CrateOwnerInvitation> = crate_owner_invitations::table
1313
.filter(crate_owner_invitations::invited_user_id.eq(user_id))

src/controllers/keyword.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub fn index(req: &mut dyn RequestExt) -> EndpointResult {
2020
}
2121

2222
let query = query.paginate(req)?;
23-
let conn = req.db_conn()?;
23+
let conn = req.db_read_only()?;
2424
let data: Paginated<Keyword> = query.load(&*conn)?;
2525
let total = data.total();
2626
let kws = data.into_iter().map(Keyword::encodable).collect::<Vec<_>>();
@@ -44,7 +44,7 @@ pub fn index(req: &mut dyn RequestExt) -> EndpointResult {
4444
/// Handles the `GET /keywords/:keyword_id` route.
4545
pub fn show(req: &mut dyn RequestExt) -> EndpointResult {
4646
let name = &req.params()["keyword_id"];
47-
let conn = req.db_conn()?;
47+
let conn = req.db_read_only()?;
4848

4949
let kw = Keyword::find_by_keyword(&conn, name)?;
5050

src/controllers/krate/follow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub fn following(req: &mut dyn RequestExt) -> EndpointResult {
4747
use diesel::dsl::exists;
4848

4949
let user_id = req.authenticate()?.user_id();
50-
let conn = req.db_conn()?;
50+
let conn = req.db_read_only()?;
5151
let follow = follow_target(req, &conn, user_id)?;
5252
let following = diesel::select(exists(follows::table.find(follow.id()))).get_result(&*conn)?;
5353

src/controllers/krate/owners.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::views::EncodableOwner;
77
/// Handles the `GET /crates/:crate_id/owners` route.
88
pub fn owners(req: &mut dyn RequestExt) -> EndpointResult {
99
let crate_name = &req.params()["crate_id"];
10-
let conn = req.db_conn()?;
10+
let conn = req.db_read_only()?;
1111
let krate: Crate = Crate::by_name(crate_name).first(&*conn)?;
1212
let owners = krate
1313
.owners(&conn)?
@@ -25,7 +25,7 @@ pub fn owners(req: &mut dyn RequestExt) -> EndpointResult {
2525
/// Handles the `GET /crates/:crate_id/owner_team` route.
2626
pub fn owner_team(req: &mut dyn RequestExt) -> EndpointResult {
2727
let crate_name = &req.params()["crate_id"];
28-
let conn = req.db_conn()?;
28+
let conn = req.db_read_only()?;
2929
let krate: Crate = Crate::by_name(crate_name).first(&*conn)?;
3030
let owners = Team::owning(&krate, &conn)?
3131
.into_iter()
@@ -42,7 +42,7 @@ pub fn owner_team(req: &mut dyn RequestExt) -> EndpointResult {
4242
/// Handles the `GET /crates/:crate_id/owner_user` route.
4343
pub fn owner_user(req: &mut dyn RequestExt) -> EndpointResult {
4444
let crate_name = &req.params()["crate_id"];
45-
let conn = req.db_conn()?;
45+
let conn = req.db_read_only()?;
4646
let krate: Crate = Crate::by_name(crate_name).first(&*conn)?;
4747
let owners = User::owning(&krate, &conn)?
4848
.into_iter()

src/controllers/team.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub fn show_team(req: &mut dyn RequestExt) -> EndpointResult {
99
use self::teams::dsl::{login, teams};
1010

1111
let name = &req.params()["team_id"];
12-
let conn = req.db_conn()?;
12+
let conn = req.db_read_only()?;
1313
let team: Team = teams.filter(login.eq(name)).first(&*conn)?;
1414

1515
#[derive(Serialize)]

src/controllers/version/deprecated.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::views::EncodableVersion;
1414
/// Handles the `GET /versions` route.
1515
pub fn index(req: &mut dyn RequestExt) -> EndpointResult {
1616
use diesel::dsl::any;
17-
let conn = req.db_conn()?;
17+
let conn = req.db_read_only()?;
1818

1919
// Extract all ids requested.
2020
let query = url::form_urlencoded::parse(req.query_string().unwrap_or("").as_bytes());
@@ -58,7 +58,7 @@ pub fn index(req: &mut dyn RequestExt) -> EndpointResult {
5858
pub fn show_by_id(req: &mut dyn RequestExt) -> EndpointResult {
5959
let id = &req.params()["version_id"];
6060
let id = id.parse().unwrap_or(0);
61-
let conn = req.db_conn()?;
61+
let conn = req.db_read_only()?;
6262
let (version, krate, published_by): (Version, Crate, Option<User>) = versions::table
6363
.find(id)
6464
.inner_join(crates::table)

0 commit comments

Comments
 (0)