From e9d6969015d01cec5998e17c6acc01389c4bbe49 Mon Sep 17 00:00:00 2001 From: zignis Date: Tue, 15 Apr 2025 22:25:22 +0530 Subject: [PATCH 1/2] fix onboarding route --- ...3ee2884bfec08d5ee6bec44c79167492f2114cda0568b39f1408.json} | 4 ++-- queries/me/onboarding/writers.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename .sqlx/{query-d9afc8f219156159f88c413d671c87d6e62e1374613ac024cc553aabe44362f4.json => query-9054fb21cd583ee2884bfec08d5ee6bec44c79167492f2114cda0568b39f1408.json} (92%) diff --git a/.sqlx/query-d9afc8f219156159f88c413d671c87d6e62e1374613ac024cc553aabe44362f4.json b/.sqlx/query-9054fb21cd583ee2884bfec08d5ee6bec44c79167492f2114cda0568b39f1408.json similarity index 92% rename from .sqlx/query-d9afc8f219156159f88c413d671c87d6e62e1374613ac024cc553aabe44362f4.json rename to .sqlx/query-9054fb21cd583ee2884bfec08d5ee6bec44c79167492f2114cda0568b39f1408.json index aa18bea..7d224d1 100644 --- a/.sqlx/query-d9afc8f219156159f88c413d671c87d6e62e1374613ac024cc553aabe44362f4.json +++ b/.sqlx/query-9054fb21cd583ee2884bfec08d5ee6bec44c79167492f2114cda0568b39f1408.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id, name, username, avatar_id, avatar_hex, public_flags, rendered_bio AS \"rendered_bio!\"\nFROM (SELECT DISTINCT u.id,\n u.name,\n u.username,\n u.avatar_id,\n u.avatar_hex,\n u.public_flags,\n u.rendered_bio,\n u.follower_count\n FROM users u\n -- Join stories\n INNER JOIN stories AS \"u->story\"\n ON \"u->story\".user_id = u.id\n AND \"u->story\".deleted_at IS NULL\n AND \"u->story\".published_at IS NOT NULL\n WHERE \"u->story\".category::TEXT = ANY ($1)\n ORDER BY\n u.follower_count DESC\n LIMIT 25)", + "query": "SELECT id, name, username, avatar_id, avatar_hex, public_flags, rendered_bio AS \"rendered_bio!\"\nFROM (SELECT DISTINCT u.id,\n u.name,\n u.username,\n u.avatar_id,\n u.avatar_hex,\n u.public_flags,\n u.rendered_bio,\n u.follower_count\n FROM users u\n -- Join stories\n INNER JOIN stories AS \"u->story\"\n ON \"u->story\".user_id = u.id\n AND \"u->story\".deleted_at IS NULL\n AND \"u->story\".published_at IS NOT NULL\n WHERE \"u->story\".category::TEXT = ANY ($1)\n ORDER BY\n u.follower_count DESC\n LIMIT 25) AS data", "describe": { "columns": [ { @@ -54,5 +54,5 @@ true ] }, - "hash": "d9afc8f219156159f88c413d671c87d6e62e1374613ac024cc553aabe44362f4" + "hash": "9054fb21cd583ee2884bfec08d5ee6bec44c79167492f2114cda0568b39f1408" } diff --git a/queries/me/onboarding/writers.sql b/queries/me/onboarding/writers.sql index 97e55fc..ca39780 100644 --- a/queries/me/onboarding/writers.sql +++ b/queries/me/onboarding/writers.sql @@ -16,4 +16,4 @@ FROM (SELECT DISTINCT u.id, WHERE "u->story".category::TEXT = ANY ($1) ORDER BY u.follower_count DESC - LIMIT 25) \ No newline at end of file + LIMIT 25) AS data \ No newline at end of file From cf2028f8ff01b3aba2a04a386ad2acc592108f86 Mon Sep 17 00:00:00 2001 From: zignis Date: Wed, 16 Apr 2025 18:30:16 +0530 Subject: [PATCH 2/2] increase per_page results to 30 for gallery --- src/routes/v1/me/assets/get.rs | 10 +++++----- src/routes/v1/me/gallery/get.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/routes/v1/me/assets/get.rs b/src/routes/v1/me/assets/get.rs index a7f19e3..1be40fd 100644 --- a/src/routes/v1/me/assets/get.rs +++ b/src/routes/v1/me/assets/get.rs @@ -1,12 +1,12 @@ use crate::{ + AppState, error::AppError, middlewares::identity::identity::Identity, - AppState, }; use actix_web::{ + HttpResponse, get, web, - HttpResponse, }; use actix_web_validator::QsQuery; use serde::{ @@ -82,9 +82,9 @@ LIMIT $2 OFFSET $3 "#, ) .bind(user_id) - // This route returns 15 items per call. - .bind(15_i16) - .bind((page * 15) as i16) + // This route returns 30 items per call. + .bind(30_i16) + .bind((page * 30) as i16) .fetch_all(&data.db_pool) .await?; diff --git a/src/routes/v1/me/gallery/get.rs b/src/routes/v1/me/gallery/get.rs index 4240c84..1e04490 100644 --- a/src/routes/v1/me/gallery/get.rs +++ b/src/routes/v1/me/gallery/get.rs @@ -1,14 +1,14 @@ use crate::{ + AppState, constants::pexels::PEXELS_API_URL, error::AppError, middlewares::identity::identity::Identity, models::photo::PexelsResponse, - AppState, }; use actix_web::{ + HttpResponse, get, web, - HttpResponse, }; use actix_web_validator::QsQuery; use serde::{ @@ -60,7 +60,7 @@ async fn get( "v1/curated" } )) - .query(&[("per_page", 15), ("page", page)]) + .query(&[("per_page", 30), ("page", page)]) .query(&[("query", search_query)]) .header(reqwest::header::AUTHORIZATION, pexels_api_key) .send()