fix rate limit async issue, kill old code
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
import { createSignal, Show, createEffect } from "solid-js";
|
||||
import { PageHead } from "~/components/PageHead";
|
||||
import { useNavigate, redirect, query, createAsync } from "@solidjs/router";
|
||||
import { getEvent } from "vinxi/http";
|
||||
import XCircle from "~/components/icons/XCircle";
|
||||
import GoogleLogo from "~/components/icons/GoogleLogo";
|
||||
import GitHub from "~/components/icons/GitHub";
|
||||
@@ -22,14 +21,16 @@ import PasswordStrengthMeter from "~/components/PasswordStrengthMeter";
|
||||
|
||||
const getUserProfile = query(async (): Promise<UserProfile | null> => {
|
||||
"use server";
|
||||
const { getUserID, ConnectionFactory } = await import("~/server/utils");
|
||||
const event = getEvent()!;
|
||||
const { getUserState } = await import("~/lib/auth-query");
|
||||
const { ConnectionFactory } = await import("~/server/utils");
|
||||
|
||||
const userId = await getUserID(event);
|
||||
if (!userId) {
|
||||
const userState = await getUserState();
|
||||
if (!userState.isAuthenticated || !userState.userId) {
|
||||
throw redirect("/login");
|
||||
}
|
||||
|
||||
const userId = userState.userId;
|
||||
|
||||
const conn = ConnectionFactory();
|
||||
try {
|
||||
const res = await conn.execute({
|
||||
|
||||
@@ -27,14 +27,15 @@ const getPostByTitle = query(
|
||||
sortBy: "newest" | "oldest" | "highest_rated" | "hot" = "newest"
|
||||
) => {
|
||||
"use server";
|
||||
const { ConnectionFactory, getUserID, getPrivilegeLevel } =
|
||||
await import("~/server/utils");
|
||||
const { getUserState } = await import("~/lib/auth-query");
|
||||
const { ConnectionFactory } = await import("~/server/utils");
|
||||
const { parseConditionals, getSafeEnvVariables } =
|
||||
await import("~/server/conditional-parser");
|
||||
const { getFeatureFlags } = await import("~/server/feature-flags");
|
||||
const event = getRequestEvent()!;
|
||||
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
||||
const userID = await getUserID(event.nativeEvent);
|
||||
const userState = await getUserState();
|
||||
const privilegeLevel = userState.privilegeLevel;
|
||||
const userID = userState.userId;
|
||||
const conn = ConnectionFactory();
|
||||
|
||||
if (title === "by-id") {
|
||||
|
||||
@@ -2,7 +2,6 @@ import { Show } from "solid-js";
|
||||
import { useSearchParams, A, query } from "@solidjs/router";
|
||||
import { PageHead } from "~/components/PageHead";
|
||||
import { createAsync } from "@solidjs/router";
|
||||
import { getRequestEvent } from "solid-js/web";
|
||||
import PostSortingSelect from "~/components/blog/PostSortingSelect";
|
||||
import TagSelector from "~/components/blog/TagSelector";
|
||||
import PostSorting from "~/components/blog/PostSorting";
|
||||
@@ -12,11 +11,11 @@ import { CACHE_CONFIG } from "~/config";
|
||||
|
||||
const getPosts = query(async () => {
|
||||
"use server";
|
||||
const { ConnectionFactory, getPrivilegeLevel } =
|
||||
await import("~/server/utils");
|
||||
const { getUserState } = await import("~/lib/auth-query");
|
||||
const { ConnectionFactory } = await import("~/server/utils");
|
||||
const { withCache } = await import("~/server/cache");
|
||||
const event = getRequestEvent()!;
|
||||
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
||||
const userState = await getUserState();
|
||||
const privilegeLevel = userState.privilegeLevel;
|
||||
|
||||
return withCache(
|
||||
`posts-${privilegeLevel}`,
|
||||
|
||||
Reference in New Issue
Block a user