完善首页布局、侧栏和个人主页

electron/profile.ts

@@ -28,14 +28,81 @@ export function parseUserProfile(html: string, username: string): UserProfile {
     const solvedMatch = text.match(/解决\s*(\d+)/);
     const solvedTotal = solvedMatch ? Number.parseInt(solvedMatch[1], 10) : null;
     const problems = parseSolvedProblems(html);
+    const rows = root.querySelectorAll('#statics tr').map((row) => row.querySelectorAll('td'));
+    const stats = rows
+        .filter((cells) => cells.length > 1 &&
+            !/^(解决|solved)/i.test(normaliseText(cells[0].textContent)) &&
+            cells[1].querySelector('a[href*="jresult="]'))
+        .map((cells) => ({
+            label: normaliseText(cells[0].textContent),
+            count: parseCount(cells[1].textContent),
+            result: Number(cells[1].querySelector('a[href*="jresult="]')?.getAttribute('href')?.match(/[?&]jresult=(\d+)/)?.[1]),
+        }))
+        .filter((entry) => Number.isFinite(entry.result) && entry.count !== null);
+    const resultStats = stats.map(({ label, count }) => ({ label, count: count ?? 0 }));
+    const submissionTotal = findCount(rows, /^(提交|提交次数|submissions?)$/i);
+    const acceptedTotal = findCount(rows, /^(正确|通过|accepted)$/i);
+    const solved = solvedTotal ?? problems.length;
+    const failures = stats
+        .filter((entry) => entry.result >= 5 && entry.result <= 10)
+        .reduce((total, entry) => total + (entry.count ?? 0), 0);
+    const activity = parseActivity(root);
     return {
         username,
         nick,
-        solvedTotal: solvedTotal ?? problems.length,
+        solvedTotal: solved,
+        submissionTotal: submissionTotal ?? 0,
+        acceptedTotal: acceptedTotal ?? 0,
+        rating: calculateRating(solved, failures, activity),
+        resultStats,
+        activity,
         problems,
         profileUrl: `${XMOJ_ORIGIN}/userinfo.php?user=${encodeURIComponent(username)}`,
     };
 }
+function parseCount(value: string): number | null {
+    const match = normaliseText(value).replace(/,/g, '').match(/\d+/);
+    return match ? Number.parseInt(match[0], 10) : null;
+}
+function findCount(rows: ReturnType<ReturnType<typeof parse>['querySelectorAll']>[], label: RegExp): number | null {
+    for (const cells of rows) {
+        if (cells.length > 1 && label.test(normaliseText(cells[0].textContent)))
+            return parseCount(cells[1].textContent);
+    }
+    return null;
+}
+function parseActivity(root: ReturnType<typeof parse>): UserProfile['activity'] {
+    const script = root.querySelectorAll('script').find((node) =>
+        /\$\.plot\s*\(/.test(node.textContent) && /["']#submission["']/.test(node.textContent));
+    if (!script)
+        return [];
+    const series = [new Map<number, number>(), new Map<number, number>()];
+    for (const match of script.textContent.matchAll(/\bd([12])\.push\(\s*\[\s*(\d+)\s*,\s*(\d+)\s*\]\s*\)\s*;?/g)) {
+        const timestamp = Number(match[2]);
+        const count = Number(match[3]);
+        if (!Number.isSafeInteger(timestamp) || timestamp <= 0 || timestamp > 8640000000000000 || !Number.isSafeInteger(count))
+            continue;
+        series[Number(match[1]) - 1].set(timestamp, count);
+    }
+    const timestamps = new Set([...series[0].keys(), ...series[1].keys()]);
+    return [...timestamps].sort((a, b) => a - b).map((timestamp) => ({
+        timestamp,
+        submissions: series[0].get(timestamp) ?? 0,
+        accepted: series[1].get(timestamp) ?? 0,
+    }));
+}
+function calculateRating(
+    solved: number,
+    failures: number,
+    activity: UserProfile['activity'],
+): number {
+    if (solved === 0)
+        return 0;
+    const solveProgress = Math.min(1, Math.log1p(solved) / Math.log1p(2000));
+    const successRate = (solved + 4) / (solved + failures + 10);
+    const activityProgress = Math.min(1, activity.length / 365);
+    return Math.round(3000 * (0.7 * solveProgress + 0.2 * successRate + 0.1 * activityProgress));
+}
 function escapeRegExp(value: string): string {
     return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }

electron/sources.ts

@@ -21,7 +21,10 @@ export async function fetchSource(http: HttpClient, solutionId: number): Promise
     const text = response.body;
     if (/<html|<body|<!DOCTYPE/i.test(text))
         return null;
-    return text;
+    const source = text.replace(/\r?\n[ \t]*not-cached[ \t]*\s*$/i, '');
+    if (/^not-cached$/i.test(source.trim()))
+        return null;
+    return source;
 }
 export function extensionForLanguage(language: string): string {
     const value = language.toLowerCase();

src/components/AppSidebar.vue

@@ -1,16 +1,18 @@
 <script setup lang="ts">import { computed, ref } from 'vue';
-import { BookText, CalendarDays, ChartNoAxesColumn, ChartPie, ChevronsUpDown, Download, FolderDown, House, Info, Loader2, LogIn, LogOut, Mail, MessagesSquare, RefreshCw, Settings, User, } from '@lucide/vue';
+import { BookText, CalendarDays, ChartNoAxesColumn, ChartPie, ChevronsUpDown, Download, FolderDown, House, Info, Loader2, LogIn, LogOut, Mail, MessagesSquare, Pin, RefreshCw, Settings, User, } from '@lucide/vue';
 import UserAvatar from '@/components/UserAvatar.vue';
 import { Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupContent, SidebarHeader, SidebarMenu, SidebarMenuButton, SidebarMenuItem, } from '@/components/ui/sidebar';
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger, } from '@/components/ui/dropdown-menu';
 import { useSession } from '@/stores/session';
 import { useNavigation, type ViewId } from '@/stores/navigation';
 import { usePanel } from '@/stores/panel';
 import { useToasts } from '@/stores/toasts';
+import { useSidebar } from '@/components/ui/sidebar/utils';
 import { checkAppUpdate, showAboutDialog, showUpdateDialog } from '@/services/update';
 const session = useSession();
 const navigation = useNavigation();
 const panel = usePanel();
+const sidebar = useSidebar();
 const mainItems = [
     { id: 'home' as ViewId, title: '首页', icon: House },
     { id: 'problemset' as ViewId, title: '题库', icon: BookText },
@@ -54,6 +56,9 @@ async function handleLogout(): Promise<void> {
 function handleSignIn(): void {
     navigation.navigate('problemset');
 }
+function togglePinnedSidebar(): void {
+    sidebar.setOpen(!sidebar.pinnedOpen.value);
+}
 </script>
 
 <template>
@@ -122,6 +127,13 @@ function handleSignIn(): void {
               </DropdownMenuLabel>
               <DropdownMenuSeparator />
 
+              <DropdownMenuItem @select="togglePinnedSidebar">
+                <Pin />
+                {{ sidebar.pinnedOpen.value ? '取消侧栏常驻' : '侧栏常驻' }}
+              </DropdownMenuItem>
+
+              <DropdownMenuSeparator />
+
               <!-- The less-used views live here rather than in the main list. -->
               <DropdownMenuItem
                 v-for="item in footerItems"

src/components/NotificationToasts.vue

@@ -36,7 +36,7 @@ function dismiss(notice: CommunityNotification): void {
 }
 function open(notice: CommunityNotification): void {
     if (notice.kind === 'bbs') {
-        navigation.navigate('discussion');
+        navigation.openDiscussion(notice.postId, notice.pageNumber);
     }
     else {
         navigation.navigate('mail');

src/components/ui/sidebar/Sidebar.vue

@@ -15,7 +15,7 @@ const props = withDefaults(defineProps<SidebarProps>(), {
     variant: "sidebar",
     collapsible: "offcanvas",
 });
-const { isMobile, state, openMobile, setOpenMobile, setOpen } = useSidebar();
+const { isMobile, state, openMobile, pinnedOpen, setOpenMobile, setOpen } = useSidebar();
 let closeTimer: number | undefined;
 const pinned = ref(0);
 const pointerInside = ref(false);
@@ -45,7 +45,7 @@ function onMouseEnter(event?: MouseEvent): void {
 }
 function onMouseLeave(event?: MouseEvent): void {
     pointerInside.value = false;
-    if (pinned.value > 0)
+    if (pinned.value > 0 || pinnedOpen.value)
         return;
     if (isPointerOverSidebar(event ? { x: event.clientX, y: event.clientY } : undefined))
         return;
@@ -54,11 +54,11 @@ function onMouseLeave(event?: MouseEvent): void {
 function scheduleClose(delay = 160): void {
     cancelClose();
     closeTimer = window.setTimeout(() => {
-        if (pinned.value > 0)
+        if (pinned.value > 0 || pinnedOpen.value)
             return;
         if (isPointerOverSidebar(lastPointer) || pointerInside.value)
             return;
-        setOpen(false);
+        setOpen(false, false);
     }, delay);
 }
 function pin(): void {
@@ -81,13 +81,13 @@ function onDocumentPointerDown(event: PointerEvent): void {
     const closest = (target as HTMLElement).closest?.('[data-slot="dropdown-menu-content"], [data-slot="tooltip-content"]');
     if (closest)
         return;
-    if (pinned.value > 0 && pointerInside.value)
+    if (pinnedOpen.value || (pinned.value > 0 && pointerInside.value))
         return;
-    setOpen(false);
+    setOpen(false, false);
 }
 function onKeydown(event: KeyboardEvent): void {
-    if (event.key === 'Escape')
-        setOpen(false);
+    if (event.key === 'Escape' && !pinnedOpen.value)
+        setOpen(false, false);
 }
 const panelRef = ref<HTMLElement | null>(null);
 let lastPointer: { x: number; y: number } | undefined;
@@ -120,6 +120,8 @@ onBeforeUnmount(() => {
     document.removeEventListener('mousemove', trackPointer, true);
 });
 onMounted(() => {
+    if (pinnedOpen.value)
+        setOpen(true, false);
     document.addEventListener('pointerdown', onDocumentPointerDown, true);
     document.addEventListener('keydown', onKeydown);
     document.addEventListener('mousemove', trackPointer, true);
@@ -191,7 +193,7 @@ onMounted(() => {
         'bg-sidebar text-sidebar-foreground border-sidebar-border',
         // Only the visible width animates; the panel's left edge and its inner
         // layout stay put, so nothing inside it jumps during the transition.
-        'transition-[width] duration-300 ease-in-out',
+        'transition-[width] duration-150 ease-out',
         side === 'left' ? 'left-0 border-r' : 'right-0 border-l',
         state === 'collapsed'
           ? 'w-(--sidebar-width-icon)'

src/components/ui/sidebar/SidebarProvider.vue

@@ -19,12 +19,31 @@ const emits = defineEmits<{
 }>();
 const isMobile = useMediaQuery("(max-width: 768px)");
 const openMobile = ref(false);
+const SIDEBAR_OPEN_KEY = "xmoj.sidebar.open.v1";
+function initialOpen(): boolean {
+    try {
+        const saved = localStorage.getItem(SIDEBAR_OPEN_KEY);
+        return saved === null ? props.defaultOpen : saved === "true";
+    }
+    catch {
+        return props.defaultOpen;
+    }
+}
 const open = useVModel(props, "open", emits, {
-    defaultValue: props.defaultOpen ?? false,
+    defaultValue: initialOpen(),
     passive: (props.open === undefined) as false,
 }) as Ref<boolean>;
-function setOpen(value: boolean, _persist = true) {
+const pinnedOpen = ref(initialOpen());
+function setOpen(value: boolean, persist = true) {
     open.value = value;
+    if (persist) {
+        pinnedOpen.value = value;
+        try {
+            localStorage.setItem(SIDEBAR_OPEN_KEY, String(value));
+        }
+        catch {
+        }
+    }
 }
 function setOpenMobile(value: boolean) {
     openMobile.value = value;
@@ -42,6 +61,7 @@ const state = computed(() => open.value ? "expanded" : "collapsed");
 provideSidebarContext({
     state,
     open,
+    pinnedOpen,
     setOpen,
     isMobile,
     openMobile,

src/components/ui/sidebar/utils.ts

@@ -7,6 +7,7 @@ export const SIDEBAR_KEYBOARD_SHORTCUT = "b";
 export const [useSidebar, provideSidebarContext] = createContext<{
     state: ComputedRef<"expanded" | "collapsed">;
     open: Ref<boolean>;
+    pinnedOpen: Ref<boolean>;
     setOpen: (value: boolean, persist?: boolean) => void;
     isMobile: Ref<boolean>;
     openMobile: Ref<boolean>;

src/pages/Discussion.vue

@@ -9,8 +9,10 @@ import AnnouncementBody from '@/components/AnnouncementBody.vue';
 import UserChip from '@/components/UserChip.vue';
 import { createPost, createReply, fetchBoards, fetchPost, fetchPosts } from '@/services/api';
 import { useSession } from '@/stores/session';
+import { useNavigation } from '@/stores/navigation';
 import type { BbsBoard, BbsPost, BbsPostDetail } from '@/shared/community';
 const session = useSession();
+const navigation = useNavigation();
 const boards = ref<BbsBoard[]>([]);
 const selectedBoard = ref(-1);
 const posts = ref<BbsPost[]>([]);
@@ -212,7 +214,11 @@ function formatTime(value?: number): string {
 const replies = computed(() => thread.value?.Reply ?? []);
 onMounted(async () => {
     await loadBoards(true);
-    await loadPosts();
+    const target = navigation.consumeDiscussionTarget();
+    if (target)
+        await openThread(target.postId, target.page);
+    else
+        await loadPosts();
 });
 </script>