Fix/pictique search#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coodos merged 3 commits into from
Aug 27, 2025
Merged

Fix/pictique search #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acb06a5
fix: search
coodos Aug 27, 2025
0893dea
chore: data formats
coodos Aug 27, 2025
277a41e
Merge branch 'main' into fix/pictique-search
coodos Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 40 additions & 28 deletions platforms/pictique-api/src/controllers/UserController.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,34 +65,8 @@ export class UserController {
// Validate sort parameter
const validSortOptions = ["relevance", "name", "verified", "newest"];
const sortOption = validSortOptions.includes(sort as string) ? sort as string : "relevance";

// Get users and count in parallel
const [users, total] = await Promise.all([
this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption),
this.userService.getSearchUsersCount(q, verifiedOnly)
]);

// Calculate pagination metadata
const totalPages = Math.ceil(total / limitNum);
const hasNextPage = pageNum < totalPages;
const hasPrevPage = pageNum > 1;

res.json({
users,
pagination: {
page: pageNum,
limit: limitNum,
total,
totalPages,
hasNextPage,
hasPrevPage
},
searchInfo: {
query: q,
verifiedOnly,
sortBy: sortOption
}
});
const users = await this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption);
res.json(users);
} catch (error) {
console.error("Error searching users:", error);
res.status(500).json({ error: "Internal server error" });
Expand DownExpand Up@@ -135,6 +109,44 @@ export class UserController {
}
};

searchByEnameOrName = async (req: Request, res: Response) => {
try {
const { q, page = "1", limit = "10", verified } = req.query;

if (!q || typeof q !== "string") {
return res
.status(400)
.json({ error: "Search query is required" });
}

// Validate search query length
if (q.trim().length < 2) {
return res
.status(400)
.json({ error: "Search query must be at least 2 characters long" });
}

// Parse and validate pagination parameters
const pageNum = parseInt(page as string) || 1;
const limitNum = Math.min(parseInt(limit as string) || 10, 50); // Cap at 50 results

if (pageNum < 1 || limitNum < 1) {
return res
.status(400)
.json({ error: "Invalid pagination parameters" });
}

// Parse verified filter
const verifiedOnly = verified === "true";

const users = await this.userService.searchUsersByEnameOrName(q, pageNum, limitNum, verifiedOnly);
res.json(users);
} catch (error) {
console.error("Error searching users by ename or name:", error);
res.status(500).json({ error: "Internal server error" });
}
};

follow = async (req: Request, res: Response) => {
try {
const followerId = req.user?.id;
Expand Down
1 change: 1 addition & 0 deletions platforms/pictique-api/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -128,6 +128,7 @@ app.get(
// User routes
app.get("/api/users", userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/search/ename-name", userController.searchByEnameOrName);
app.get("/api/users/suggestions", userController.getSearchSuggestions);
app.get("/api/users/popular", userController.getPopularSearches);
app.post("/api/users/:id/follow", authGuard, userController.follow);
Expand Down
159 changes: 149 additions & 10 deletions platforms/pictique-api/src/services/UserService.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,21 +58,37 @@ export class UserService {
return [];
}

// Use query builder for more complex queries
// Use query builder for more complex queries with relevance scoring
const queryBuilder = this.userRepository
.createQueryBuilder("user")
.select([
"user.id",
"user.handle",
"user.name",
"user.ename",
"user.description",
"user.avatarUrl",
"user.isVerified"
])
.addSelect(`
CASE
WHEN user.ename ILIKE :exactQuery THEN 100
WHEN user.name ILIKE :exactQuery THEN 90
WHEN user.handle ILIKE :exactQuery THEN 80
WHEN user.ename ILIKE :query THEN 70
WHEN user.name ILIKE :query THEN 60
WHEN user.handle ILIKE :query THEN 50
WHEN user.description ILIKE :query THEN 30
WHEN user.ename ILIKE :fuzzyQuery THEN 40
WHEN user.name ILIKE :fuzzyQuery THEN 35
WHEN user.handle ILIKE :fuzzyQuery THEN 30
ELSE 0
END`, 'relevance_score')
.where(
"user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
"user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
{
query: `%${searchQuery}%`,
exactQuery: searchQuery, // Exact match for highest priority
fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
}
);
Expand All@@ -98,8 +114,10 @@ export class UserService {
break;
case "relevance":
default:
// Default relevance sorting: verified first, then by name
queryBuilder.orderBy("user.isVerified", "DESC").addOrderBy("user.name", "ASC");
// Default relevance sorting: relevance score first, then verified status, then by name
queryBuilder.orderBy("relevance_score", "DESC")
.addOrderBy("user.isVerified", "DESC")
.addOrderBy("user.name", "ASC");
break;
}

Expand All@@ -121,13 +139,14 @@ export class UserService {
return 0;
}

// Use query builder for count
// Use query builder for count with same search logic
const queryBuilder = this.userRepository
.createQueryBuilder("user")
.where(
"user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
"user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
{
query: `%${searchQuery}%`,
exactQuery: searchQuery, // Exact match for highest priority
fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
}
);
Expand All@@ -152,7 +171,7 @@ export class UserService {
return [];
}

// Use query builder for suggestions
// Use query builder for suggestions with relevance scoring
const queryBuilder = this.userRepository
.createQueryBuilder("user")
.select([
Expand All@@ -161,18 +180,138 @@ export class UserService {
"user.name",
"user.ename"
])
.addSelect(`
CASE
WHEN user.ename ILIKE :exactQuery THEN 100
WHEN user.name ILIKE :exactQuery THEN 90
WHEN user.ename ILIKE :query THEN 70
WHEN user.name ILIKE :query THEN 60
WHEN user.handle ILIKE :query THEN 50
WHEN user.ename ILIKE :fuzzyQuery THEN 40
WHEN user.name ILIKE :fuzzyQuery THEN 35
WHEN user.handle ILIKE :fuzzyQuery THEN 30
ELSE 0
END`, 'relevance_score')
.where(
"user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query",
{ query: `%${searchQuery}%` }
"user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
{
query: `%${searchQuery}%`,
exactQuery: searchQuery, // Exact match for highest priority
fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
}
)
.andWhere("user.isArchived = :archived", { archived: false })
.orderBy("user.isVerified", "DESC")
.orderBy("relevance_score", "DESC")
.addOrderBy("user.isVerified", "DESC")
.addOrderBy("user.name", "ASC")
.take(limit);

return queryBuilder.getMany();
};

searchUsersByEnameOrName = async (
query: string,
page: number = 1,
limit: number = 10,
verifiedOnly: boolean = false
) => {
// Sanitize and trim the search query
const searchQuery = query.trim();

// Return empty array if query is too short or empty
if (searchQuery.length < 2) {
return [];
}

// Validate pagination parameters
if (page < 1 || limit < 1 || limit > 100) {
return [];
}

// Specialized search focusing only on ename and name with high priority
const queryBuilder = this.userRepository
.createQueryBuilder("user")
.select([
"user.id",
"user.handle",
"user.name",
"user.ename",
"user.description",
"user.avatarUrl",
"user.isVerified"
])
.addSelect(`
CASE
WHEN user.ename ILIKE :exactQuery THEN 100
WHEN user.name ILIKE :exactQuery THEN 95
WHEN user.ename ILIKE :query THEN 80
WHEN user.name ILIKE :query THEN 75
WHEN user.ename ILIKE :fuzzyQuery THEN 60
WHEN user.name ILIKE :fuzzyQuery THEN 55
ELSE 0
END`, 'relevance_score')
.where(
"user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
{
query: `%${searchQuery}%`,
exactQuery: searchQuery, // Exact match for highest priority
fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
}
);

// Add verified filter if requested
if (verifiedOnly) {
queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
}

// Add additional filters for better results
queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

// Order by relevance score (ename and name matches first)
return queryBuilder
.orderBy("relevance_score", "DESC")
.addOrderBy("user.isVerified", "DESC")
.addOrderBy("user.name", "ASC")
.skip((page - 1) * limit)
.take(limit)
.getMany();
};

getSearchUsersByEnameOrNameCount = async (
query: string,
verifiedOnly: boolean = false
) => {
// Sanitize and trim the search query
const searchQuery = query.trim();

// Return 0 if query is too short or empty
if (searchQuery.length < 2) {
return 0;
}

// Use query builder for count with same specialized search logic
const queryBuilder = this.userRepository
.createQueryBuilder("user")
.where(
"user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
{
query: `%${searchQuery}%`,
exactQuery: searchQuery, // Exact match for highest priority
fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
}
);

// Add verified filter if requested
if (verifiedOnly) {
queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
}

// Add additional filters for consistency
queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

return queryBuilder.getCount();
};

getPopularSearches = async (limit: number = 10) => {
// This could be enhanced with actual search analytics in the future
// For now, return some sample popular searches based on verified users
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix/pictique search#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

coodos
merged 3 commits into

from

Aug 27, 2025
 Merged


Fix/pictique search
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
acb06a5

fix: search


coodos Aug 27, 2025
0893dea

chore: data formats


coodos Aug 27, 2025
277a41e

Merge branch 'main' into fix/pictique-search


coodos Aug 27, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
platforms/pictique-api/src/controllers/UserController.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,34 +65,8 @@ export class UserController {
 // Validate sort parameter
 const validSortOptions = ["relevance", "name", "verified", "newest"];
 const sortOption = validSortOptions.includes(sort as string) ? sort as string : "relevance";

 // Get users and count in parallel
 const [users, total] = await Promise.all([
 this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption),
 this.userService.getSearchUsersCount(q, verifiedOnly)
 ]);

 // Calculate pagination metadata
 const totalPages = Math.ceil(total / limitNum);
 const hasNextPage = pageNum < totalPages;
 const hasPrevPage = pageNum > 1;

 res.json({
 users,
 pagination: {
 page: pageNum,
 limit: limitNum,
 total,
 totalPages,
 hasNextPage,
 hasPrevPage
 },
 searchInfo: {
 query: q,
 verifiedOnly,
 sortBy: sortOption
 }
 });
 const users = await this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption);
 res.json(users);
 } catch (error) {
 console.error("Error searching users:", error);
 res.status(500).json({ error: "Internal server error" });
Expand DownExpand Up@@ -135,6 +109,44 @@ export class UserController {
 }
 };

 searchByEnameOrName = async (req: Request, res: Response) => {
 try {
 const { q, page = "1", limit = "10", verified } = req.query;

 if (!q || typeof q !== "string") {
 return res
 .status(400)
 .json({ error: "Search query is required" });
 }

 // Validate search query length
 if (q.trim().length < 2) {
 return res
 .status(400)
 .json({ error: "Search query must be at least 2 characters long" });
 }

 // Parse and validate pagination parameters
 const pageNum = parseInt(page as string) || 1;
 const limitNum = Math.min(parseInt(limit as string) || 10, 50); // Cap at 50 results

 if (pageNum < 1 || limitNum < 1) {
 return res
 .status(400)
 .json({ error: "Invalid pagination parameters" });
 }

 // Parse verified filter
 const verifiedOnly = verified === "true";

 const users = await this.userService.searchUsersByEnameOrName(q, pageNum, limitNum, verifiedOnly);
 res.json(users);
 } catch (error) {
 console.error("Error searching users by ename or name:", error);
 res.status(500).json({ error: "Internal server error" });
 }
 };

 follow = async (req: Request, res: Response) => {
 try {
 const followerId = req.user?.id;
Expand Down

1 change: 1 addition & 0 deletions
platforms/pictique-api/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,6 +128,7 @@ app.get(
// User routes
app.get("/api/users", userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/search/ename-name", userController.searchByEnameOrName);
app.get("/api/users/suggestions", userController.getSearchSuggestions);
app.get("/api/users/popular", userController.getPopularSearches);
app.post("/api/users/:id/follow", authGuard, userController.follow);
Expand Down

159 changes: 149 additions & 10 deletions
platforms/pictique-api/src/services/UserService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,21 +58,37 @@ export class UserService {
 return [];
 }

 // Use query builder for more complex queries
 // Use query builder for more complex queries with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.handle ILIKE :exactQuery THEN 80
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.description ILIKE :query THEN 30
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -98,8 +114,10 @@ export class UserService {
 break;
 case "relevance":
 default:
 // Default relevance sorting: verified first, then by name
 queryBuilder.orderBy("user.isVerified", "DESC").addOrderBy("user.name", "ASC");
 // Default relevance sorting: relevance score first, then verified status, then by name
 queryBuilder.orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC");
 break;
 }

Expand All@@ -121,13 +139,14 @@ export class UserService {
 return 0;
 }

 // Use query builder for count
 // Use query builder for count with same search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -152,7 +171,7 @@ export class UserService {
 return [];
 }

 // Use query builder for suggestions
 // Use query builder for suggestions with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
Expand All@@ -161,18 +180,138 @@ export class UserService {
 "user.name",
 "user.ename"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query",
 { query: `%${searchQuery}%` }
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 )
 .andWhere("user.isArchived = :archived", { archived: false })
 .orderBy("user.isVerified", "DESC")
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .take(limit);

 return queryBuilder.getMany();
 };

 searchUsersByEnameOrName = async (
 query: string,
 page: number = 1,
 limit: number = 10,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return empty array if query is too short or empty
 if (searchQuery.length < 2) {
 return [];
 }

 // Validate pagination parameters
 if (page < 1 || limit < 1 || limit > 100) {
 return [];
 }

 // Specialized search focusing only on ename and name with high priority
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 95
 WHEN user.ename ILIKE :query THEN 80
 WHEN user.name ILIKE :query THEN 75
 WHEN user.ename ILIKE :fuzzyQuery THEN 60
 WHEN user.name ILIKE :fuzzyQuery THEN 55
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for better results
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 // Order by relevance score (ename and name matches first)
 return queryBuilder
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .skip((page - 1) * limit)
 .take(limit)
 .getMany();
 };

 getSearchUsersByEnameOrNameCount = async (
 query: string,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return 0 if query is too short or empty
 if (searchQuery.length < 2) {
 return 0;
 }

 // Use query builder for count with same specialized search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for consistency
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 return queryBuilder.getCount();
 };

 getPopularSearches = async (limit: number = 10) => {
 // This could be enhanced with actual search analytics in the future
 // For now, return some sample popular searches based on verified users
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix/pictique search#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

coodos
merged 3 commits into

from

Aug 27, 2025
 Merged


Fix/pictique search
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
acb06a5

fix: search


coodos Aug 27, 2025
0893dea

chore: data formats


coodos Aug 27, 2025
277a41e

Merge branch 'main' into fix/pictique-search


coodos Aug 27, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
platforms/pictique-api/src/controllers/UserController.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,34 +65,8 @@ export class UserController {
 // Validate sort parameter
 const validSortOptions = ["relevance", "name", "verified", "newest"];
 const sortOption = validSortOptions.includes(sort as string) ? sort as string : "relevance";

 // Get users and count in parallel
 const [users, total] = await Promise.all([
 this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption),
 this.userService.getSearchUsersCount(q, verifiedOnly)
 ]);

 // Calculate pagination metadata
 const totalPages = Math.ceil(total / limitNum);
 const hasNextPage = pageNum < totalPages;
 const hasPrevPage = pageNum > 1;

 res.json({
 users,
 pagination: {
 page: pageNum,
 limit: limitNum,
 total,
 totalPages,
 hasNextPage,
 hasPrevPage
 },
 searchInfo: {
 query: q,
 verifiedOnly,
 sortBy: sortOption
 }
 });
 const users = await this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption);
 res.json(users);
 } catch (error) {
 console.error("Error searching users:", error);
 res.status(500).json({ error: "Internal server error" });
Expand DownExpand Up@@ -135,6 +109,44 @@ export class UserController {
 }
 };

 searchByEnameOrName = async (req: Request, res: Response) => {
 try {
 const { q, page = "1", limit = "10", verified } = req.query;

 if (!q || typeof q !== "string") {
 return res
 .status(400)
 .json({ error: "Search query is required" });
 }

 // Validate search query length
 if (q.trim().length < 2) {
 return res
 .status(400)
 .json({ error: "Search query must be at least 2 characters long" });
 }

 // Parse and validate pagination parameters
 const pageNum = parseInt(page as string) || 1;
 const limitNum = Math.min(parseInt(limit as string) || 10, 50); // Cap at 50 results

 if (pageNum < 1 || limitNum < 1) {
 return res
 .status(400)
 .json({ error: "Invalid pagination parameters" });
 }

 // Parse verified filter
 const verifiedOnly = verified === "true";

 const users = await this.userService.searchUsersByEnameOrName(q, pageNum, limitNum, verifiedOnly);
 res.json(users);
 } catch (error) {
 console.error("Error searching users by ename or name:", error);
 res.status(500).json({ error: "Internal server error" });
 }
 };

 follow = async (req: Request, res: Response) => {
 try {
 const followerId = req.user?.id;
Expand Down

1 change: 1 addition & 0 deletions
platforms/pictique-api/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,6 +128,7 @@ app.get(
// User routes
app.get("/api/users", userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/search/ename-name", userController.searchByEnameOrName);
app.get("/api/users/suggestions", userController.getSearchSuggestions);
app.get("/api/users/popular", userController.getPopularSearches);
app.post("/api/users/:id/follow", authGuard, userController.follow);
Expand Down

159 changes: 149 additions & 10 deletions
platforms/pictique-api/src/services/UserService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,21 +58,37 @@ export class UserService {
 return [];
 }

 // Use query builder for more complex queries
 // Use query builder for more complex queries with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.handle ILIKE :exactQuery THEN 80
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.description ILIKE :query THEN 30
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -98,8 +114,10 @@ export class UserService {
 break;
 case "relevance":
 default:
 // Default relevance sorting: verified first, then by name
 queryBuilder.orderBy("user.isVerified", "DESC").addOrderBy("user.name", "ASC");
 // Default relevance sorting: relevance score first, then verified status, then by name
 queryBuilder.orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC");
 break;
 }

Expand All@@ -121,13 +139,14 @@ export class UserService {
 return 0;
 }

 // Use query builder for count
 // Use query builder for count with same search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -152,7 +171,7 @@ export class UserService {
 return [];
 }

 // Use query builder for suggestions
 // Use query builder for suggestions with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
Expand All@@ -161,18 +180,138 @@ export class UserService {
 "user.name",
 "user.ename"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query",
 { query: `%${searchQuery}%` }
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 )
 .andWhere("user.isArchived = :archived", { archived: false })
 .orderBy("user.isVerified", "DESC")
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .take(limit);

 return queryBuilder.getMany();
 };

 searchUsersByEnameOrName = async (
 query: string,
 page: number = 1,
 limit: number = 10,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return empty array if query is too short or empty
 if (searchQuery.length < 2) {
 return [];
 }

 // Validate pagination parameters
 if (page < 1 || limit < 1 || limit > 100) {
 return [];
 }

 // Specialized search focusing only on ename and name with high priority
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 95
 WHEN user.ename ILIKE :query THEN 80
 WHEN user.name ILIKE :query THEN 75
 WHEN user.ename ILIKE :fuzzyQuery THEN 60
 WHEN user.name ILIKE :fuzzyQuery THEN 55
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for better results
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 // Order by relevance score (ename and name matches first)
 return queryBuilder
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .skip((page - 1) * limit)
 .take(limit)
 .getMany();
 };

 getSearchUsersByEnameOrNameCount = async (
 query: string,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return 0 if query is too short or empty
 if (searchQuery.length < 2) {
 return 0;
 }

 // Use query builder for count with same specialized search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for consistency
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 return queryBuilder.getCount();
 };

 getPopularSearches = async (limit: number = 10) => {
 // This could be enhanced with actual search analytics in the future
 // For now, return some sample popular searches based on verified users
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix/pictique search#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

coodos
merged 3 commits into

from

Aug 27, 2025
 Merged


Fix/pictique search
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
acb06a5

fix: search


coodos Aug 27, 2025
0893dea

chore: data formats


coodos Aug 27, 2025
277a41e

Merge branch 'main' into fix/pictique-search


coodos Aug 27, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
platforms/pictique-api/src/controllers/UserController.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,34 +65,8 @@ export class UserController {
 // Validate sort parameter
 const validSortOptions = ["relevance", "name", "verified", "newest"];
 const sortOption = validSortOptions.includes(sort as string) ? sort as string : "relevance";

 // Get users and count in parallel
 const [users, total] = await Promise.all([
 this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption),
 this.userService.getSearchUsersCount(q, verifiedOnly)
 ]);

 // Calculate pagination metadata
 const totalPages = Math.ceil(total / limitNum);
 const hasNextPage = pageNum < totalPages;
 const hasPrevPage = pageNum > 1;

 res.json({
 users,
 pagination: {
 page: pageNum,
 limit: limitNum,
 total,
 totalPages,
 hasNextPage,
 hasPrevPage
 },
 searchInfo: {
 query: q,
 verifiedOnly,
 sortBy: sortOption
 }
 });
 const users = await this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption);
 res.json(users);
 } catch (error) {
 console.error("Error searching users:", error);
 res.status(500).json({ error: "Internal server error" });
Expand DownExpand Up@@ -135,6 +109,44 @@ export class UserController {
 }
 };

 searchByEnameOrName = async (req: Request, res: Response) => {
 try {
 const { q, page = "1", limit = "10", verified } = req.query;

 if (!q || typeof q !== "string") {
 return res
 .status(400)
 .json({ error: "Search query is required" });
 }

 // Validate search query length
 if (q.trim().length < 2) {
 return res
 .status(400)
 .json({ error: "Search query must be at least 2 characters long" });
 }

 // Parse and validate pagination parameters
 const pageNum = parseInt(page as string) || 1;
 const limitNum = Math.min(parseInt(limit as string) || 10, 50); // Cap at 50 results

 if (pageNum < 1 || limitNum < 1) {
 return res
 .status(400)
 .json({ error: "Invalid pagination parameters" });
 }

 // Parse verified filter
 const verifiedOnly = verified === "true";

 const users = await this.userService.searchUsersByEnameOrName(q, pageNum, limitNum, verifiedOnly);
 res.json(users);
 } catch (error) {
 console.error("Error searching users by ename or name:", error);
 res.status(500).json({ error: "Internal server error" });
 }
 };

 follow = async (req: Request, res: Response) => {
 try {
 const followerId = req.user?.id;
Expand Down

1 change: 1 addition & 0 deletions
platforms/pictique-api/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,6 +128,7 @@ app.get(
// User routes
app.get("/api/users", userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/search/ename-name", userController.searchByEnameOrName);
app.get("/api/users/suggestions", userController.getSearchSuggestions);
app.get("/api/users/popular", userController.getPopularSearches);
app.post("/api/users/:id/follow", authGuard, userController.follow);
Expand Down

159 changes: 149 additions & 10 deletions
platforms/pictique-api/src/services/UserService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,21 +58,37 @@ export class UserService {
 return [];
 }

 // Use query builder for more complex queries
 // Use query builder for more complex queries with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.handle ILIKE :exactQuery THEN 80
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.description ILIKE :query THEN 30
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -98,8 +114,10 @@ export class UserService {
 break;
 case "relevance":
 default:
 // Default relevance sorting: verified first, then by name
 queryBuilder.orderBy("user.isVerified", "DESC").addOrderBy("user.name", "ASC");
 // Default relevance sorting: relevance score first, then verified status, then by name
 queryBuilder.orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC");
 break;
 }

Expand All@@ -121,13 +139,14 @@ export class UserService {
 return 0;
 }

 // Use query builder for count
 // Use query builder for count with same search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -152,7 +171,7 @@ export class UserService {
 return [];
 }

 // Use query builder for suggestions
 // Use query builder for suggestions with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
Expand All@@ -161,18 +180,138 @@ export class UserService {
 "user.name",
 "user.ename"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query",
 { query: `%${searchQuery}%` }
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 )
 .andWhere("user.isArchived = :archived", { archived: false })
 .orderBy("user.isVerified", "DESC")
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .take(limit);

 return queryBuilder.getMany();
 };

 searchUsersByEnameOrName = async (
 query: string,
 page: number = 1,
 limit: number = 10,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return empty array if query is too short or empty
 if (searchQuery.length < 2) {
 return [];
 }

 // Validate pagination parameters
 if (page < 1 || limit < 1 || limit > 100) {
 return [];
 }

 // Specialized search focusing only on ename and name with high priority
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 95
 WHEN user.ename ILIKE :query THEN 80
 WHEN user.name ILIKE :query THEN 75
 WHEN user.ename ILIKE :fuzzyQuery THEN 60
 WHEN user.name ILIKE :fuzzyQuery THEN 55
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for better results
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 // Order by relevance score (ename and name matches first)
 return queryBuilder
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .skip((page - 1) * limit)
 .take(limit)
 .getMany();
 };

 getSearchUsersByEnameOrNameCount = async (
 query: string,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return 0 if query is too short or empty
 if (searchQuery.length < 2) {
 return 0;
 }

 // Use query builder for count with same specialized search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for consistency
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 return queryBuilder.getCount();
 };

 getPopularSearches = async (limit: number = 10) => {
 // This could be enhanced with actual search analytics in the future
 // For now, return some sample popular searches based on verified users
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix/pictique search#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

coodos
merged 3 commits into

from

Aug 27, 2025
 Merged


Fix/pictique search
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
acb06a5

fix: search


coodos Aug 27, 2025
0893dea

chore: data formats


coodos Aug 27, 2025
277a41e

Merge branch 'main' into fix/pictique-search


coodos Aug 27, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
platforms/pictique-api/src/controllers/UserController.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,34 +65,8 @@ export class UserController {
 // Validate sort parameter
 const validSortOptions = ["relevance", "name", "verified", "newest"];
 const sortOption = validSortOptions.includes(sort as string) ? sort as string : "relevance";

 // Get users and count in parallel
 const [users, total] = await Promise.all([
 this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption),
 this.userService.getSearchUsersCount(q, verifiedOnly)
 ]);

 // Calculate pagination metadata
 const totalPages = Math.ceil(total / limitNum);
 const hasNextPage = pageNum < totalPages;
 const hasPrevPage = pageNum > 1;

 res.json({
 users,
 pagination: {
 page: pageNum,
 limit: limitNum,
 total,
 totalPages,
 hasNextPage,
 hasPrevPage
 },
 searchInfo: {
 query: q,
 verifiedOnly,
 sortBy: sortOption
 }
 });
 const users = await this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption);
 res.json(users);
 } catch (error) {
 console.error("Error searching users:", error);
 res.status(500).json({ error: "Internal server error" });
Expand DownExpand Up@@ -135,6 +109,44 @@ export class UserController {
 }
 };

 searchByEnameOrName = async (req: Request, res: Response) => {
 try {
 const { q, page = "1", limit = "10", verified } = req.query;

 if (!q || typeof q !== "string") {
 return res
 .status(400)
 .json({ error: "Search query is required" });
 }

 // Validate search query length
 if (q.trim().length < 2) {
 return res
 .status(400)
 .json({ error: "Search query must be at least 2 characters long" });
 }

 // Parse and validate pagination parameters
 const pageNum = parseInt(page as string) || 1;
 const limitNum = Math.min(parseInt(limit as string) || 10, 50); // Cap at 50 results

 if (pageNum < 1 || limitNum < 1) {
 return res
 .status(400)
 .json({ error: "Invalid pagination parameters" });
 }

 // Parse verified filter
 const verifiedOnly = verified === "true";

 const users = await this.userService.searchUsersByEnameOrName(q, pageNum, limitNum, verifiedOnly);
 res.json(users);
 } catch (error) {
 console.error("Error searching users by ename or name:", error);
 res.status(500).json({ error: "Internal server error" });
 }
 };

 follow = async (req: Request, res: Response) => {
 try {
 const followerId = req.user?.id;
Expand Down

1 change: 1 addition & 0 deletions
platforms/pictique-api/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,6 +128,7 @@ app.get(
// User routes
app.get("/api/users", userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/search/ename-name", userController.searchByEnameOrName);
app.get("/api/users/suggestions", userController.getSearchSuggestions);
app.get("/api/users/popular", userController.getPopularSearches);
app.post("/api/users/:id/follow", authGuard, userController.follow);
Expand Down

159 changes: 149 additions & 10 deletions
platforms/pictique-api/src/services/UserService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,21 +58,37 @@ export class UserService {
 return [];
 }

 // Use query builder for more complex queries
 // Use query builder for more complex queries with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.handle ILIKE :exactQuery THEN 80
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.description ILIKE :query THEN 30
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -98,8 +114,10 @@ export class UserService {
 break;
 case "relevance":
 default:
 // Default relevance sorting: verified first, then by name
 queryBuilder.orderBy("user.isVerified", "DESC").addOrderBy("user.name", "ASC");
 // Default relevance sorting: relevance score first, then verified status, then by name
 queryBuilder.orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC");
 break;
 }

Expand All@@ -121,13 +139,14 @@ export class UserService {
 return 0;
 }

 // Use query builder for count
 // Use query builder for count with same search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -152,7 +171,7 @@ export class UserService {
 return [];
 }

 // Use query builder for suggestions
 // Use query builder for suggestions with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
Expand All@@ -161,18 +180,138 @@ export class UserService {
 "user.name",
 "user.ename"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query",
 { query: `%${searchQuery}%` }
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 )
 .andWhere("user.isArchived = :archived", { archived: false })
 .orderBy("user.isVerified", "DESC")
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .take(limit);

 return queryBuilder.getMany();
 };

 searchUsersByEnameOrName = async (
 query: string,
 page: number = 1,
 limit: number = 10,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return empty array if query is too short or empty
 if (searchQuery.length < 2) {
 return [];
 }

 // Validate pagination parameters
 if (page < 1 || limit < 1 || limit > 100) {
 return [];
 }

 // Specialized search focusing only on ename and name with high priority
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 95
 WHEN user.ename ILIKE :query THEN 80
 WHEN user.name ILIKE :query THEN 75
 WHEN user.ename ILIKE :fuzzyQuery THEN 60
 WHEN user.name ILIKE :fuzzyQuery THEN 55
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for better results
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 // Order by relevance score (ename and name matches first)
 return queryBuilder
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .skip((page - 1) * limit)
 .take(limit)
 .getMany();
 };

 getSearchUsersByEnameOrNameCount = async (
 query: string,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return 0 if query is too short or empty
 if (searchQuery.length < 2) {
 return 0;
 }

 // Use query builder for count with same specialized search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for consistency
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 return queryBuilder.getCount();
 };

 getPopularSearches = async (limit: number = 10) => {
 // This could be enhanced with actual search analytics in the future
 // For now, return some sample popular searches based on verified users
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix/pictique search#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

coodos
merged 3 commits into

from

Aug 27, 2025
 Merged


Fix/pictique search
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
acb06a5

fix: search


coodos Aug 27, 2025
0893dea

chore: data formats


coodos Aug 27, 2025
277a41e

Merge branch 'main' into fix/pictique-search


coodos Aug 27, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
platforms/pictique-api/src/controllers/UserController.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,34 +65,8 @@ export class UserController {
 // Validate sort parameter
 const validSortOptions = ["relevance", "name", "verified", "newest"];
 const sortOption = validSortOptions.includes(sort as string) ? sort as string : "relevance";

 // Get users and count in parallel
 const [users, total] = await Promise.all([
 this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption),
 this.userService.getSearchUsersCount(q, verifiedOnly)
 ]);

 // Calculate pagination metadata
 const totalPages = Math.ceil(total / limitNum);
 const hasNextPage = pageNum < totalPages;
 const hasPrevPage = pageNum > 1;

 res.json({
 users,
 pagination: {
 page: pageNum,
 limit: limitNum,
 total,
 totalPages,
 hasNextPage,
 hasPrevPage
 },
 searchInfo: {
 query: q,
 verifiedOnly,
 sortBy: sortOption
 }
 });
 const users = await this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption);
 res.json(users);
 } catch (error) {
 console.error("Error searching users:", error);
 res.status(500).json({ error: "Internal server error" });
Expand DownExpand Up@@ -135,6 +109,44 @@ export class UserController {
 }
 };

 searchByEnameOrName = async (req: Request, res: Response) => {
 try {
 const { q, page = "1", limit = "10", verified } = req.query;

 if (!q || typeof q !== "string") {
 return res
 .status(400)
 .json({ error: "Search query is required" });
 }

 // Validate search query length
 if (q.trim().length < 2) {
 return res
 .status(400)
 .json({ error: "Search query must be at least 2 characters long" });
 }

 // Parse and validate pagination parameters
 const pageNum = parseInt(page as string) || 1;
 const limitNum = Math.min(parseInt(limit as string) || 10, 50); // Cap at 50 results

 if (pageNum < 1 || limitNum < 1) {
 return res
 .status(400)
 .json({ error: "Invalid pagination parameters" });
 }

 // Parse verified filter
 const verifiedOnly = verified === "true";

 const users = await this.userService.searchUsersByEnameOrName(q, pageNum, limitNum, verifiedOnly);
 res.json(users);
 } catch (error) {
 console.error("Error searching users by ename or name:", error);
 res.status(500).json({ error: "Internal server error" });
 }
 };

 follow = async (req: Request, res: Response) => {
 try {
 const followerId = req.user?.id;
Expand Down

1 change: 1 addition & 0 deletions
platforms/pictique-api/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,6 +128,7 @@ app.get(
// User routes
app.get("/api/users", userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/search/ename-name", userController.searchByEnameOrName);
app.get("/api/users/suggestions", userController.getSearchSuggestions);
app.get("/api/users/popular", userController.getPopularSearches);
app.post("/api/users/:id/follow", authGuard, userController.follow);
Expand Down

159 changes: 149 additions & 10 deletions
platforms/pictique-api/src/services/UserService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,21 +58,37 @@ export class UserService {
 return [];
 }

 // Use query builder for more complex queries
 // Use query builder for more complex queries with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.handle ILIKE :exactQuery THEN 80
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.description ILIKE :query THEN 30
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -98,8 +114,10 @@ export class UserService {
 break;
 case "relevance":
 default:
 // Default relevance sorting: verified first, then by name
 queryBuilder.orderBy("user.isVerified", "DESC").addOrderBy("user.name", "ASC");
 // Default relevance sorting: relevance score first, then verified status, then by name
 queryBuilder.orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC");
 break;
 }

Expand All@@ -121,13 +139,14 @@ export class UserService {
 return 0;
 }

 // Use query builder for count
 // Use query builder for count with same search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -152,7 +171,7 @@ export class UserService {
 return [];
 }

 // Use query builder for suggestions
 // Use query builder for suggestions with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
Expand All@@ -161,18 +180,138 @@ export class UserService {
 "user.name",
 "user.ename"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query",
 { query: `%${searchQuery}%` }
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 )
 .andWhere("user.isArchived = :archived", { archived: false })
 .orderBy("user.isVerified", "DESC")
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .take(limit);

 return queryBuilder.getMany();
 };

 searchUsersByEnameOrName = async (
 query: string,
 page: number = 1,
 limit: number = 10,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return empty array if query is too short or empty
 if (searchQuery.length < 2) {
 return [];
 }

 // Validate pagination parameters
 if (page < 1 || limit < 1 || limit > 100) {
 return [];
 }

 // Specialized search focusing only on ename and name with high priority
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 95
 WHEN user.ename ILIKE :query THEN 80
 WHEN user.name ILIKE :query THEN 75
 WHEN user.ename ILIKE :fuzzyQuery THEN 60
 WHEN user.name ILIKE :fuzzyQuery THEN 55
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for better results
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 // Order by relevance score (ename and name matches first)
 return queryBuilder
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .skip((page - 1) * limit)
 .take(limit)
 .getMany();
 };

 getSearchUsersByEnameOrNameCount = async (
 query: string,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return 0 if query is too short or empty
 if (searchQuery.length < 2) {
 return 0;
 }

 // Use query builder for count with same specialized search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for consistency
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 return queryBuilder.getCount();
 };

 getPopularSearches = async (limit: number = 10) => {
 // This could be enhanced with actual search analytics in the future
 // For now, return some sample popular searches based on verified users
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix/pictique search#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

coodos
merged 3 commits into

from

Aug 27, 2025
 Merged


Fix/pictique search
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
acb06a5

fix: search


coodos Aug 27, 2025
0893dea

chore: data formats


coodos Aug 27, 2025
277a41e

Merge branch 'main' into fix/pictique-search


coodos Aug 27, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
platforms/pictique-api/src/controllers/UserController.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,34 +65,8 @@ export class UserController {
 // Validate sort parameter
 const validSortOptions = ["relevance", "name", "verified", "newest"];
 const sortOption = validSortOptions.includes(sort as string) ? sort as string : "relevance";

 // Get users and count in parallel
 const [users, total] = await Promise.all([
 this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption),
 this.userService.getSearchUsersCount(q, verifiedOnly)
 ]);

 // Calculate pagination metadata
 const totalPages = Math.ceil(total / limitNum);
 const hasNextPage = pageNum < totalPages;
 const hasPrevPage = pageNum > 1;

 res.json({
 users,
 pagination: {
 page: pageNum,
 limit: limitNum,
 total,
 totalPages,
 hasNextPage,
 hasPrevPage
 },
 searchInfo: {
 query: q,
 verifiedOnly,
 sortBy: sortOption
 }
 });
 const users = await this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption);
 res.json(users);
 } catch (error) {
 console.error("Error searching users:", error);
 res.status(500).json({ error: "Internal server error" });
Expand DownExpand Up@@ -135,6 +109,44 @@ export class UserController {
 }
 };

 searchByEnameOrName = async (req: Request, res: Response) => {
 try {
 const { q, page = "1", limit = "10", verified } = req.query;

 if (!q || typeof q !== "string") {
 return res
 .status(400)
 .json({ error: "Search query is required" });
 }

 // Validate search query length
 if (q.trim().length < 2) {
 return res
 .status(400)
 .json({ error: "Search query must be at least 2 characters long" });
 }

 // Parse and validate pagination parameters
 const pageNum = parseInt(page as string) || 1;
 const limitNum = Math.min(parseInt(limit as string) || 10, 50); // Cap at 50 results

 if (pageNum < 1 || limitNum < 1) {
 return res
 .status(400)
 .json({ error: "Invalid pagination parameters" });
 }

 // Parse verified filter
 const verifiedOnly = verified === "true";

 const users = await this.userService.searchUsersByEnameOrName(q, pageNum, limitNum, verifiedOnly);
 res.json(users);
 } catch (error) {
 console.error("Error searching users by ename or name:", error);
 res.status(500).json({ error: "Internal server error" });
 }
 };

 follow = async (req: Request, res: Response) => {
 try {
 const followerId = req.user?.id;
Expand Down

1 change: 1 addition & 0 deletions
platforms/pictique-api/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,6 +128,7 @@ app.get(
// User routes
app.get("/api/users", userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/search/ename-name", userController.searchByEnameOrName);
app.get("/api/users/suggestions", userController.getSearchSuggestions);
app.get("/api/users/popular", userController.getPopularSearches);
app.post("/api/users/:id/follow", authGuard, userController.follow);
Expand Down

159 changes: 149 additions & 10 deletions
platforms/pictique-api/src/services/UserService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,21 +58,37 @@ export class UserService {
 return [];
 }

 // Use query builder for more complex queries
 // Use query builder for more complex queries with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.handle ILIKE :exactQuery THEN 80
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.description ILIKE :query THEN 30
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -98,8 +114,10 @@ export class UserService {
 break;
 case "relevance":
 default:
 // Default relevance sorting: verified first, then by name
 queryBuilder.orderBy("user.isVerified", "DESC").addOrderBy("user.name", "ASC");
 // Default relevance sorting: relevance score first, then verified status, then by name
 queryBuilder.orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC");
 break;
 }

Expand All@@ -121,13 +139,14 @@ export class UserService {
 return 0;
 }

 // Use query builder for count
 // Use query builder for count with same search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -152,7 +171,7 @@ export class UserService {
 return [];
 }

 // Use query builder for suggestions
 // Use query builder for suggestions with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
Expand All@@ -161,18 +180,138 @@ export class UserService {
 "user.name",
 "user.ename"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query",
 { query: `%${searchQuery}%` }
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 )
 .andWhere("user.isArchived = :archived", { archived: false })
 .orderBy("user.isVerified", "DESC")
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .take(limit);

 return queryBuilder.getMany();
 };

 searchUsersByEnameOrName = async (
 query: string,
 page: number = 1,
 limit: number = 10,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return empty array if query is too short or empty
 if (searchQuery.length < 2) {
 return [];
 }

 // Validate pagination parameters
 if (page < 1 || limit < 1 || limit > 100) {
 return [];
 }

 // Specialized search focusing only on ename and name with high priority
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 95
 WHEN user.ename ILIKE :query THEN 80
 WHEN user.name ILIKE :query THEN 75
 WHEN user.ename ILIKE :fuzzyQuery THEN 60
 WHEN user.name ILIKE :fuzzyQuery THEN 55
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for better results
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 // Order by relevance score (ename and name matches first)
 return queryBuilder
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .skip((page - 1) * limit)
 .take(limit)
 .getMany();
 };

 getSearchUsersByEnameOrNameCount = async (
 query: string,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return 0 if query is too short or empty
 if (searchQuery.length < 2) {
 return 0;
 }

 // Use query builder for count with same specialized search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for consistency
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 return queryBuilder.getCount();
 };

 getPopularSearches = async (limit: number = 10) => {
 // This could be enhanced with actual search analytics in the future
 // For now, return some sample popular searches based on verified users
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix/pictique search#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

coodos
merged 3 commits into

from

Aug 27, 2025
 Merged


Fix/pictique search
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
acb06a5

fix: search


coodos Aug 27, 2025
0893dea

chore: data formats


coodos Aug 27, 2025
277a41e

Merge branch 'main' into fix/pictique-search


coodos Aug 27, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
platforms/pictique-api/src/controllers/UserController.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,34 +65,8 @@ export class UserController {
 // Validate sort parameter
 const validSortOptions = ["relevance", "name", "verified", "newest"];
 const sortOption = validSortOptions.includes(sort as string) ? sort as string : "relevance";

 // Get users and count in parallel
 const [users, total] = await Promise.all([
 this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption),
 this.userService.getSearchUsersCount(q, verifiedOnly)
 ]);

 // Calculate pagination metadata
 const totalPages = Math.ceil(total / limitNum);
 const hasNextPage = pageNum < totalPages;
 const hasPrevPage = pageNum > 1;

 res.json({
 users,
 pagination: {
 page: pageNum,
 limit: limitNum,
 total,
 totalPages,
 hasNextPage,
 hasPrevPage
 },
 searchInfo: {
 query: q,
 verifiedOnly,
 sortBy: sortOption
 }
 });
 const users = await this.userService.searchUsers(q, pageNum, limitNum, verifiedOnly, sortOption);
 res.json(users);
 } catch (error) {
 console.error("Error searching users:", error);
 res.status(500).json({ error: "Internal server error" });
Expand DownExpand Up@@ -135,6 +109,44 @@ export class UserController {
 }
 };

 searchByEnameOrName = async (req: Request, res: Response) => {
 try {
 const { q, page = "1", limit = "10", verified } = req.query;

 if (!q || typeof q !== "string") {
 return res
 .status(400)
 .json({ error: "Search query is required" });
 }

 // Validate search query length
 if (q.trim().length < 2) {
 return res
 .status(400)
 .json({ error: "Search query must be at least 2 characters long" });
 }

 // Parse and validate pagination parameters
 const pageNum = parseInt(page as string) || 1;
 const limitNum = Math.min(parseInt(limit as string) || 10, 50); // Cap at 50 results

 if (pageNum < 1 || limitNum < 1) {
 return res
 .status(400)
 .json({ error: "Invalid pagination parameters" });
 }

 // Parse verified filter
 const verifiedOnly = verified === "true";

 const users = await this.userService.searchUsersByEnameOrName(q, pageNum, limitNum, verifiedOnly);
 res.json(users);
 } catch (error) {
 console.error("Error searching users by ename or name:", error);
 res.status(500).json({ error: "Internal server error" });
 }
 };

 follow = async (req: Request, res: Response) => {
 try {
 const followerId = req.user?.id;
Expand Down

1 change: 1 addition & 0 deletions
platforms/pictique-api/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -128,6 +128,7 @@ app.get(
// User routes
app.get("/api/users", userController.currentUser);
app.get("/api/users/search", userController.search);
app.get("/api/users/search/ename-name", userController.searchByEnameOrName);
app.get("/api/users/suggestions", userController.getSearchSuggestions);
app.get("/api/users/popular", userController.getPopularSearches);
app.post("/api/users/:id/follow", authGuard, userController.follow);
Expand Down

159 changes: 149 additions & 10 deletions
platforms/pictique-api/src/services/UserService.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,21 +58,37 @@ export class UserService {
 return [];
 }

 // Use query builder for more complex queries
 // Use query builder for more complex queries with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.handle ILIKE :exactQuery THEN 80
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.description ILIKE :query THEN 30
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -98,8 +114,10 @@ export class UserService {
 break;
 case "relevance":
 default:
 // Default relevance sorting: verified first, then by name
 queryBuilder.orderBy("user.isVerified", "DESC").addOrderBy("user.name", "ASC");
 // Default relevance sorting: relevance score first, then verified status, then by name
 queryBuilder.orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC");
 break;
 }

Expand All@@ -121,13 +139,14 @@ export class UserService {
 return 0;
 }

 // Use query builder for count
 // Use query builder for count with same search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.name ILIKE :fuzzyQuery OR user.ename ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.description ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );
Expand All@@ -152,7 +171,7 @@ export class UserService {
 return [];
 }

 // Use query builder for suggestions
 // Use query builder for suggestions with relevance scoring
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
Expand All@@ -161,18 +180,138 @@ export class UserService {
 "user.name",
 "user.ename"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 90
 WHEN user.ename ILIKE :query THEN 70
 WHEN user.name ILIKE :query THEN 60
 WHEN user.handle ILIKE :query THEN 50
 WHEN user.ename ILIKE :fuzzyQuery THEN 40
 WHEN user.name ILIKE :fuzzyQuery THEN 35
 WHEN user.handle ILIKE :fuzzyQuery THEN 30
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query",
 { query: `%${searchQuery}%` }
 "user.name ILIKE :query OR user.ename ILIKE :query OR user.handle ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery OR user.handle ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 )
 .andWhere("user.isArchived = :archived", { archived: false })
 .orderBy("user.isVerified", "DESC")
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .take(limit);

 return queryBuilder.getMany();
 };

 searchUsersByEnameOrName = async (
 query: string,
 page: number = 1,
 limit: number = 10,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return empty array if query is too short or empty
 if (searchQuery.length < 2) {
 return [];
 }

 // Validate pagination parameters
 if (page < 1 || limit < 1 || limit > 100) {
 return [];
 }

 // Specialized search focusing only on ename and name with high priority
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .select([
 "user.id",
 "user.handle",
 "user.name", 
 "user.ename",
 "user.description",
 "user.avatarUrl",
 "user.isVerified"
 ])
 .addSelect(`
 CASE 
 WHEN user.ename ILIKE :exactQuery THEN 100
 WHEN user.name ILIKE :exactQuery THEN 95
 WHEN user.ename ILIKE :query THEN 80
 WHEN user.name ILIKE :query THEN 75
 WHEN user.ename ILIKE :fuzzyQuery THEN 60
 WHEN user.name ILIKE :fuzzyQuery THEN 55
 ELSE 0
 END`, 'relevance_score')
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for better results
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 // Order by relevance score (ename and name matches first)
 return queryBuilder
 .orderBy("relevance_score", "DESC")
 .addOrderBy("user.isVerified", "DESC")
 .addOrderBy("user.name", "ASC")
 .skip((page - 1) * limit)
 .take(limit)
 .getMany();
 };

 getSearchUsersByEnameOrNameCount = async (
 query: string,
 verifiedOnly: boolean = false
 ) => {
 // Sanitize and trim the search query
 const searchQuery = query.trim();

 // Return 0 if query is too short or empty
 if (searchQuery.length < 2) {
 return 0;
 }

 // Use query builder for count with same specialized search logic
 const queryBuilder = this.userRepository
 .createQueryBuilder("user")
 .where(
 "user.ename ILIKE :query OR user.name ILIKE :query OR user.ename ILIKE :fuzzyQuery OR user.name ILIKE :fuzzyQuery",
 { 
 query: `%${searchQuery}%`,
 exactQuery: searchQuery, // Exact match for highest priority
 fuzzyQuery: `%${searchQuery.split('').join('%')}%` // Fuzzy search with wildcards between characters
 }
 );

 // Add verified filter if requested
 if (verifiedOnly) {
 queryBuilder.andWhere("user.isVerified = :verified", { verified: true });
 }

 // Add additional filters for consistency
 queryBuilder.andWhere("user.isArchived = :archived", { archived: false });

 return queryBuilder.getCount();
 };

 getPopularSearches = async (limit: number = 10) => {
 // This could be enhanced with actual search analytics in the future
 // For now, return some sample popular searches based on verified users
Expand Down
Loading