Skip to content
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

Jump to bottom

Add Filters JSON #5

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Filters JSON #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 2 additions & 16 deletions app/api/autocompleteUsers/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,12 @@
const { MongoClient } = require("mongodb");
import { type NextRequest } from "next/server";
// @ts-ignore
import { get, set } from 'lodash';
import rateLimiterMiddleware from "../utils/rateLimiterMiddleware";
const rateLimit = 20; // Number of allowed requests per minute

const rateLimiter = {};

const rateLimiterMiddleware = (ip: any) => {
const now = Date.now();
const windowStart = now - 60 * 1000; // 1 minute ago

const requestTimestamps = get(rateLimiter, ip, []).filter((timestamp: any) => timestamp > windowStart);
requestTimestamps.push(now);

set(rateLimiter, ip, requestTimestamps);

return requestTimestamps.length <= rateLimit;
};
export async function GET(request: NextRequest) {
const ip : any = request.headers.get('x-real-ip') || request.ip;

if (!rateLimiterMiddleware(ip)) {
if (!rateLimiterMiddleware(ip, rateLimit)) {
return Response.json({ error: 'Rate Limited' }, { status: 429 })
// return Response.status(429).json({ message: 'Too Many Requests' });
}
Expand Down
50 changes: 5 additions & 45 deletions app/api/filterPosts/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import { type NextRequest, type NextResponse } from "next/server";
import { getData, getRecordCount } from "./getdata";

import { isGreaterThan, isLessThan, greaterThanOrEqualTo, lessThanOrEqualTo, equalTo, notEqualTo } from "../utils";
// @ts-ignore
import { get, set } from 'lodash';
import { AnyBulkWriteOperation } from "mongodb";
import { parse } from "path";

import rateLimiterMiddleware from "../utils/rateLimiterMiddleware";
import { getPagination } from "../utils/pagination";
const rateLimit = 20; // Number of allowed requests per minute

async function getQuery(filters: any) {
let fullquery: any = {};
Expand Down Expand Up @@ -69,28 +65,11 @@ async function getQuery(filters: any) {
return fullquery;
}

const rateLimit = 20; // Number of allowed requests per minute

const rateLimiter = {};

const rateLimiterMiddleware = (ip: any) => {
const now = Date.now();
const windowStart = now - 60 * 1000; // 1 minute ago

const requestTimestamps = get(rateLimiter, ip, []).filter((timestamp: any) => timestamp > windowStart);
requestTimestamps.push(now);

set(rateLimiter, ip, requestTimestamps);

return requestTimestamps.length <= rateLimit;
};


export async function GET(request: NextRequest) {
console.log('request')
const ip : any = request.headers.get('x-real-ip') || request.ip;

if (!rateLimiterMiddleware(ip)) {
if (!rateLimiterMiddleware(ip, rateLimit)) {
return Response.json({ error: 'Rate Limited' }, { status: 429 })
// return Response.status(429).json({ message: 'Too Many Requests' });
}
Expand All @@ -106,26 +85,7 @@ export async function GET(request: NextRequest) {
const filteredposts = await getData(user, page, query, sort, searchtext);
const recordCount = await getRecordCount(user, query, searchtext);

const pageCount = Math.ceil(recordCount / 15);
const pages = Array.from({ length: pageCount }, (x, i) => i).map((page) =>
(page + 1).toString()
);

if (pageCount > 6) {
// console.log("page", parseInt(page), (parseInt(pages[pages.length-1]) -1), parseInt(pages[Math.floor(pages.length/2)]) )
if (parseInt(page)< (parseInt(pages[pages.length-1]) -1) && parseInt(page)> parseInt(pages[Math.floor(pages.length/2)])) {
// console.log('tail end')
// console.log(parseInt(page)+2, pages.length - (parseInt(page)+2)+1)
pages.splice(parseInt(page)+1, pages.length - (parseInt(page)+2)+1)
// console.log(pages)
} else if (parseInt(page)> 2 && parseInt(page)< parseInt(pages[Math.ceil(pages.length/2)])) {
// console.log('begin end')
pages.splice(0, parseInt(page)-2)
// console.log(pages)
}
pages.splice(3, pages.length-6, "...");
}
const displaypages = pages;
const [displaypages, pageCount] = await getPagination(recordCount, page);

return Response.json({
posts: filteredposts,
Expand Down
47 changes: 6 additions & 41 deletions app/api/filterUsers/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { type NextRequest } from "next/server";
// @ts-ignore
import { get, set } from 'lodash';
import rateLimiterMiddleware from "../utils/rateLimiterMiddleware";
import { getPagination } from "../utils/pagination";

const rateLimit = 20; // Number of allowed requests per minute

import { getData, getRecordCount } from "./getdata";

Expand Down Expand Up @@ -63,27 +65,10 @@ async function getQuery(filters: any) {
return fullquery;
}


const rateLimit = 20; // Number of allowed requests per minute

const rateLimiter = {};

const rateLimiterMiddleware = (ip: any) => {
const now = Date.now();
const windowStart = now - 60 * 1000; // 1 minute ago

const requestTimestamps = get(rateLimiter, ip, []).filter((timestamp: any) => timestamp > windowStart);
requestTimestamps.push(now);

set(rateLimiter, ip, requestTimestamps);

return requestTimestamps.length <= rateLimit;
};

export async function GET(request: NextRequest) {
const ip : any = request.headers.get('x-real-ip') || request.ip;

if (!rateLimiterMiddleware(ip)) {
if (!rateLimiterMiddleware(ip, rateLimit)) {
return Response.json({ error: 'Rate Limited' }, { status: 429 })
// return Response.status(429).json({ message: 'Too Many Requests' });
}
Expand All @@ -98,27 +83,7 @@ export async function GET(request: NextRequest) {
const filteredposts = await getData(page, query, sort, search);
const recordCount = await getRecordCount(query, search);

const pageCount = Math.ceil(recordCount / 15);

const pages = Array.from({ length: pageCount }, (x, i) => i).map((page) =>
(page + 1).toString()
);

if (pageCount > 6) {
// console.log("page", parseInt(page), (parseInt(pages[pages.length-1]) -1), parseInt(pages[Math.floor(pages.length/2)]) )
if (parseInt(page)< (parseInt(pages[pages.length-1]) -1) && parseInt(page)> parseInt(pages[Math.floor(pages.length/2)])) {
// console.log('tail end')
// console.log(parseInt(page)+2, pages.length - (parseInt(page)+2)+1)
pages.splice(parseInt(page)+1, pages.length - (parseInt(page)+2)+1)
// console.log(pages)
} else if (parseInt(page)> 2 && parseInt(page)< parseInt(pages[Math.ceil(pages.length/2)])) {
// console.log('begin end')
pages.splice(0, parseInt(page)-2)
// console.log(pages)
}
pages.splice(3, pages.length-6, "...");
}
const displaypages = pages;
const [displaypages, pageCount] = await getPagination(recordCount, page);

return Response.json({
posts: filteredposts,
Expand Down
50 changes: 6 additions & 44 deletions app/api/getMedia/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
const { MongoClient } = require("mongodb");
import { type NextRequest } from "next/server";
// @ts-ignore
import { get, set } from 'lodash';
const rateLimit = 20; // Number of allowed requests per minute

const rateLimiter = {};

const rateLimiterMiddleware = (ip: any) => {
const now = Date.now();
const windowStart = now - 60 * 1000; // 1 minute ago
const { MongoClient } = require("mongodb");

const requestTimestamps = get(rateLimiter, ip, []).filter((timestamp: any) => timestamp > windowStart);
requestTimestamps.push(now);
import rateLimiterMiddleware from "../utils/rateLimiterMiddleware";
import { getPagination } from "../utils/pagination";

set(rateLimiter, ip, requestTimestamps);
const rateLimit = 20; // Number of allowed requests per minute

return requestTimestamps.length <= rateLimit;
};
async function getQuery(filters: any) {
let fullquery: any = {};
for (let step = 0; step < filters.length; step++) {
Expand Down Expand Up @@ -77,7 +67,7 @@ async function getQuery(filters: any) {
export async function GET(request: NextRequest) {
const ip : any = request.headers.get('x-real-ip') || request.ip;

if (!rateLimiterMiddleware(ip)) {
if (!rateLimiterMiddleware(ip, rateLimit)) {
return Response.json({ error: 'Rate Limited' }, { status: 429 })
// return Response.status(429).json({ message: 'Too Many Requests' });
}
Expand Down Expand Up @@ -212,36 +202,8 @@ export async function GET(request: NextRequest) {
// }
console.log(counts);
const recordCount = counts[0].numberOfImages;
const pageCount = Math.ceil(recordCount / 15);

const pages = Array.from({ length: pageCount }, (x, i) => i).map((page) =>
(page + 1).toString()
);
const [displaypages, pageCount] = await getPagination(recordCount, page);

if (pageCount > 6) {
// console.log("page", parseInt(page), (parseInt(pages[pages.length-1]) -1), parseInt(pages[Math.floor(pages.length/2)]) )
if (
parseInt(page) < parseInt(pages[pages.length - 1]) - 1 &&
parseInt(page) > parseInt(pages[Math.floor(pages.length / 2)])
) {
// console.log('tail end')
// console.log(parseInt(page)+2, pages.length - (parseInt(page)+2)+1)
pages.splice(
parseInt(page) + 1,
pages.length - (parseInt(page) + 2) + 1
);
// console.log(pages)
} else if (
parseInt(page) > 2 &&
parseInt(page) < parseInt(pages[Math.ceil(pages.length / 2)])
) {
// console.log('begin end')
pages.splice(0, parseInt(page) - 2);
// console.log(pages)
}
pages.splice(3, pages.length - 6, "...");
}
const displaypages = pages;
return Response.json({
posts: pictures,
pagination: { pages: displaypages, pageCount: pageCount },
Expand Down
28 changes: 0 additions & 28 deletions app/api/utils.ts
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions app/api/utils/logicOperators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

function isGreaterThan(x: any, y: any) {
return x > y;
}
function isLessThan(x: any, y: any) {
return x < y;
}

function greaterThanOrEqualTo(x: any, y: any) {
return x >= y;
}
function lessThanOrEqualTo(x: any, y: any) {
return x <= y;
}
function equalTo(x: any, y: any) {
return x == y;
}
function notEqualTo(x: any, y: any) {
return x != y;
}


export {
isGreaterThan,
isLessThan,
greaterThanOrEqualTo,
lessThanOrEqualTo,
equalTo,
notEqualTo
};

24 changes: 24 additions & 0 deletions app/api/utils/pagination.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

export function getPagination(recordCount: number, page: string) {
const pageCount = Math.ceil(recordCount / 15);
const pages = Array.from({ length: pageCount }, (x, i) => i).map((page) =>
(page + 1).toString()
);

if (pageCount > 6) {
// console.log("page", parseInt(page), (parseInt(pages[pages.length-1]) -1), parseInt(pages[Math.floor(pages.length/2)]) )
if (parseInt(page)< (parseInt(pages[pages.length-1]) -1) && parseInt(page)> parseInt(pages[Math.floor(pages.length/2)])) {
// console.log('tail end')
// console.log(parseInt(page)+2, pages.length - (parseInt(page)+2)+1)
pages.splice(parseInt(page)+1, pages.length - (parseInt(page)+2)+1)
// console.log(pages)
} else if (parseInt(page)> 2 && parseInt(page)< parseInt(pages[Math.ceil(pages.length/2)])) {
// console.log('begin end')
pages.splice(0, parseInt(page)-2)
// console.log(pages)
}
pages.splice(3, pages.length-6, "...");
}
const displaypages = pages;
return [displaypages, pageCount]
}
19 changes: 19 additions & 0 deletions app/api/utils/rateLimiterMiddleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// @ts-ignore
import { get, set } from "lodash";
const rateLimiter = {};

const rateLimiterMiddleware = (ip: any, rateLimit: number) => {
const now = Date.now();
const windowStart = now - 60 * 1000; // 1 minute ago

const requestTimestamps = get(rateLimiter, ip, []).filter(
(timestamp: any) => timestamp > windowStart
);
requestTimestamps.push(now);

set(rateLimiter, ip, requestTimestamps);

return requestTimestamps.length <= rateLimit;
};

export default rateLimiterMiddleware;
4 changes: 1 addition & 3 deletions app/components/PostList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ import CardOverflow from "@mui/joy/CardOverflow";
import HomeRoundedIcon from "@mui/icons-material/HomeRounded";
import ChevronRightRoundedIcon from "@mui/icons-material/ChevronRightRounded";

import EmptyState from "./EmptyState";
import EmptyState from "./utils/EmptyState";

import FolderIcon from "@mui/icons-material/Folder";
import ChatBubbleOutlineOutlinedIcon from "@mui/icons-material/ChatBubbleOutlineOutlined";
import LoopIcon from "@mui/icons-material/Loop";
import FavoriteBorderIcon from "@mui/icons-material/FavoriteBorder";
Expand All @@ -51,7 +50,6 @@ import WestOutlinedIcon from "@mui/icons-material/WestOutlined";
import EastOutlinedIcon from "@mui/icons-material/EastOutlined";
import formatTime from "../utils/formatTime";
import Image from "next/image";
import type { ChangeEvent } from "react";

import styles from "./post.module.css";

Expand Down
10 changes: 1 addition & 9 deletions app/components/UserList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,12 @@ import Link from "@mui/joy/Link";
import Card from "@mui/joy/Card";
import CardActions from "@mui/joy/CardActions";
import CardOverflow from "@mui/joy/CardOverflow";
import CircularProgress from "@mui/joy/CircularProgress";

import HomeRoundedIcon from "@mui/icons-material/HomeRounded";
import ChevronRightRoundedIcon from "@mui/icons-material/ChevronRightRounded";

import EmptyState from "./EmptyState";

import FolderIcon from "@mui/icons-material/Folder";
import ChatBubbleOutlineOutlinedIcon from "@mui/icons-material/ChatBubbleOutlineOutlined";
import LoopIcon from "@mui/icons-material/Loop";
import EmptyState from "./utils/EmptyState";
import formatTime from "../utils/formatTime";

import FavoriteBorderIcon from "@mui/icons-material/FavoriteBorder";
import EditNoteOutlinedIcon from "@mui/icons-material/EditNoteOutlined";
import QueryBuilderOutlinedIcon from "@mui/icons-material/QueryBuilderOutlined";

import Select from "@mui/joy/Select";
Expand Down
Loading