wassname/Open-Assistant
1
0
Fork 0
mirror of https://github.com/wassname/Open-Assistant.git synced 2026-07-05 17:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

When loading recent messages, filter by the user's stored language. (#1292)

Browse Source 
A simple short term fix. Applies to #962. To fully fix a small backend change is needed.
This commit is contained in:
Keith Stevens
2023-02-09 19:29:11 +09:00
committed by GitHub
parent 3f30e1f3ce
commit 7b16ee9a75
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/public/locales/en/message.json
+1 -1
View File
@@ -8,7 +8,7 @@
"open_new_tab_action": "Open in new tab",
"parent": "Parent",
"reactions": "Reactions",
"recent_messages": "Recent Messages",
"recent_messages": "Recent Messages in {{language}}",
"report_action": "Report",
"report_placeholder": "Why should this message be reviewed?",
"report_title": "Report",
website/src/lib/oasst_api_client.ts
+2 -2
View File
@@ -314,8 +314,8 @@ export class OasstApiClient {
return this.get<Message[]>(`/api/v1/messages?${params}`);
}
fetch_recent_messages() {
return this.get<Message[]>(`/api/v1/messages`);
fetch_recent_messages(lang: string) {
return this.get<Message[]>(`/api/v1/messages`, { lang });
}
fetch_message_children(messageId: string) {
website/src/pages/api/messages/index.ts
+3 -1
View File
@@ -1,9 +1,11 @@
import { withoutRole } from "src/lib/auth";
import { createApiClient } from "src/lib/oasst_client_factory";
import { getUserLanguage } from "src/lib/users";
const handler = withoutRole("banned", async (req, res, token) => {
const client = await createApiClient(token);
const messages = await client.fetch_recent_messages();
const userLanguage = getUserLanguage(req);
const messages = await client.fetch_recent_messages(userLanguage);
res.status(200).json(messages);
});
website/src/pages/messages/index.tsx
+6 -1
View File
@@ -1,6 +1,7 @@
import { Box, CircularProgress, SimpleGrid, Text, useColorModeValue } from "@chakra-ui/react";
import Head from "next/head";
import { useTranslation } from "next-i18next";
import { useCookies } from "react-cookie";
import { getDashboardLayout } from "src/components/Layout";
import { MessageTable } from "src/components/Messages/MessageTable";
import { get } from "src/lib/api";
@@ -15,6 +16,8 @@ const MessagesDashboard = () => {
const { data: messages } = useSWRImmutable("/api/messages", get, { revalidateOnMount: true });
const { data: userMessages } = useSWRImmutable(`/api/messages/user`, get, { revalidateOnMount: true });
const [cookies] = useCookies(["NEXT_LOCALE"]);
const currentLanguage = cookies["NEXT_LOCALE"] || "en";
return (
<>
<Head>
@@ -24,7 +27,9 @@ const MessagesDashboard = () => {
<SimpleGrid columns={[1, 1, 1, 1, 1, 2]} gap={4}>
<Box>
<Text className="text-2xl font-bold" pb="4">
{t("recent_messages")}
{t("recent_messages", {
language: new Intl.DisplayNames([currentLanguage], { type: "language" }).of(currentLanguage),
})}
</Text>
<Box
backgroundColor={boxBgColor}