Merge branch 'main' of https://github.com/doggybootsy/vx

doggybootsy · doggybootsy · commit a65de56565e4 · 2024-10-21T21:49:47.000-07:00
diff --git a/packages/mod/src/api/modals/code.tsx b/packages/mod/src/api/modals/code.tsx
@@ -6,7 +6,7 @@ export function openCodeModal(options: Omit<CodeBlockProps, "canOpenInModal">) {
   return openModal((props) => (
     <ModalComponents.Root 
       transitionState={props.transitionState} 
-      size={ModalComponents.Size.MEDIUM}
+      size={ModalComponents.Size.DYNAMIC}
       className="vx-codeblock-modal"
     >
       <CodeBlock
diff --git a/packages/mod/src/api/quick-actions/hmba.tsx b/packages/mod/src/api/quick-actions/hmba.tsx
@@ -1,14 +1,14 @@
 import {MenuComponents, openMenu} from "../menu";
 import {closeAllModals} from "../modals";
-import {addPlainTextPatch} from "@webpack";
+import {addPlainTextPatch, getProxy} from "@webpack";
 
 addPlainTextPatch({
     match: "Messages.DISCODO_DISABLED",
     find: /.tutorialContainer,/,
     replace: '$&onContextMenu:$vxi.HMBA?.openContextMenu,'
 })
 
-export default class HomeButtonContextMenuApi {
+export class HomeButtonContextMenuApi {
     items: Map<string, React.ReactElement | (() => React.ReactElement)>;
     constructor() {
         this.items = new Map();
@@ -40,4 +40,4 @@ export default class HomeButtonContextMenuApi {
     }
 }
 
-export const HMBA = __self__.HMBA = new HomeButtonContextMenuApi();
+export const HMBA = __self__.HMBA = new HomeButtonContextMenuApi();
diff --git a/packages/mod/src/api/quick-actions/slate-toolbar.tsx b/packages/mod/src/api/quick-actions/slate-toolbar.tsx
@@ -0,0 +1,62 @@
+import {Tooltip} from "../../components";
+import {addPlainTextPatch} from "@webpack";
+import {React} from "../../../../../types";
+
+addPlainTextPatch(
+    {
+        match: "markdownSyntax:",
+        find: /(\((\w+),.{10,20}markdownSyntax:"spoiler".{75,100})]/,
+        replace: `$1,$vxi.STAPI.renderButtons($2)]`
+    },
+    {
+        match: /\w+.\w+.edges\(\w+.selection\)/,
+        find: /(onClick:\s*\(\)\s*=>\s*\{)(\s*)(null\s*!=\s*(\w+)\s*&&\s*\w+\.\w+\.withSingleEntry\([^)]+\))/,
+        replace: "$1if(arguments[0]?.onClick){arguments[0].onClick?.()}else if(null!=$4)$3"
+    }
+)
+
+interface ButtonConfig {
+    label: string;
+    icon: React.Component;
+    onClick: () => void;
+    tooltip?: string;
+}
+
+class DynamicButtonAPI {
+    private buttonConfigs: ButtonConfig[];
+
+    constructor() {
+         this.buttonConfigs = [];
+    }
+
+    renderButtons(T?: any) {
+        return this.buttonConfigs.map((config, index) => (
+            <Tooltip key={index} text={config.tooltip || config.label}>
+                {(props) => {
+                    const ButtonWrapper = T || 'div';
+                    return (
+                        <ButtonWrapper>
+                            <div
+                                {...props}
+                                style={{
+                                    display: "flex",
+                                    justifyContent: "center",
+                                    alignItems: "center",
+                                    height: "100%"
+                                }}
+                                onClick={config.onClick}>
+                                {config.icon}
+                            </div>
+                        </ButtonWrapper>
+                    );
+                }}
+            </Tooltip>
+        ));
+    }
+
+    addButton(config: ButtonConfig) {
+        this.buttonConfigs.push(config);
+    }
+}
+
+export const SlateToolbarAPI = __self__.STAPI = new DynamicButtonAPI();
diff --git a/packages/mod/src/plugins/github-in-discord/githubModal.tsx b/packages/mod/src/plugins/github-in-discord/githubModal.tsx
@@ -1,4 +1,4 @@
-import {useEffect, useState} from 'react';
+import {Component, useEffect, useState} from 'react';
 import {ModalComponents, openCodeModal, openImageModal, openModal, openVideoModal} from '../../api/modals';
 import {Button, Flex, Icons, Markdown, SystemDesign} from "../../components";
 import {settings} from "./index";
@@ -256,6 +256,16 @@ export class GitHubService {
             return await this.fetchFromGitHub(`${endpoint}?ref=${repoDetails.default_branch}`);
         }
     }
+
+    async getCommitsForPullRequest(user: string, repo: string, pullNumber: number) {
+        const endpoint = `/repos/${user}/${repo}/pulls/${pullNumber}/commits`;
+        return this.fetchFromGitHub(endpoint);
+    }
+
+    async getCommitDetails(user: string, repo: string, commitSha: string) {
+        const endpoint = `/repos/${user}/${repo}/commits/${commitSha}`;
+        return this.fetchFromGitHub(endpoint);
+    }
 }
 
 interface GitHubModalProps {
@@ -429,6 +439,16 @@ function format(size: number) {
     return `${size.toPrecision(3)} ${[ "", "K", "M", "G", "T", "P" ][count]}B`;
 }
 
+class ArchivedBanner extends Component<{created_at: string}> {
+    render() {
+        return <div className="vx-gm-archived-banner">
+            <span>
+                This repo has been archived since {new Date(this.props.created_at).toLocaleString()}
+            </span>
+        </div>;
+    }
+}
+
 const ControlBar: React.FC<{
     forksList: any[];
     branches: any[];
@@ -523,7 +543,44 @@ const IssueList: React.FC<{ issues: any[]; setCurrentPage: (page: 'files' | 'rel
     );
 };
 
-const PullRequestList: React.FC<{ pullRequests: any[]; setCurrentPage: (page: 'files' | 'releases' | 'pullRequests' | 'issues') => void }> = ({ pullRequests, setCurrentPage }) => {
+const PullRequestList: React.FC<{
+    pullRequests: any[];
+    setCurrentPage: (page: 'files' | 'releases' | 'pullRequests' | 'issues') => void
+}> = ({ pullRequests, setCurrentPage }) => {
+    const [commits, setCommits] = useState<any[]>([]);
+
+    useEffect(() => {
+        const fetchCommits = async () => {
+            const allCommits = await Promise.all(pullRequests.map(async (pr) => {
+                const commits = await githubService.getCommitsForPullRequest(pr.base.repo.owner.login, pr.base.repo.name, pr.number);
+                const commitDetails = await Promise.all(commits.map(async (commit) => {
+                    const details = await githubService.getCommitDetails(pr.base.repo.owner.login, pr.base.repo.name, commit.sha);
+                    return { ...commit, files: details.files, pr };
+                }));
+                return commitDetails;
+            }));
+            setCommits(allCommits.flat());
+        };
+        fetchCommits();
+    }, [pullRequests]);
+
+    const handleCommitClick = async (commit: any) => {
+        const commitDetails = await githubService.getCommitDetails(commit.pr.base.repo.owner.login, commit.pr.base.repo.name, commit.sha);
+        openCodeModal({
+            content: commitDetails.commit.message,
+            language: 'markdown',
+            title: commit.commit.message
+        });
+    };
+
+    const handleFileClick = (file: any) => {
+        openCodeModal({
+            content: file.patch,
+            language: 'diff',
+            title: file.filename
+        });
+    };
+
     return (
         <div className="vx-gm-pull-requests-container">
             {pullRequests.map((pr: any) => (
@@ -537,6 +594,26 @@ const PullRequestList: React.FC<{ pullRequests: any[]; setCurrentPage: (page: 'f
                         rel="noopener noreferrer">
                         View on GitHub
                     </a>
+                    <div className="vx-gm-commits-container">
+                        {commits.filter((commit) => commit.pr.id === pr.id).map((commit) => (
+                            <div key={commit.sha} className="vx-gm-commit-item">
+                                <div onClick={() => handleCommitClick(commit)}>
+                                    <span>{commit.commit.message}</span>
+                                </div>
+                                <Flex direction={Flex.Direction.HORIZONTAL} className="vx-gm-commit-files">
+                                    {commit.files && commit.files.map((file: any) => (
+                                        <Button
+                                            key={file.filename}
+                                            onClick={() => handleFileClick(file)}
+                                            className="vx-gm-file-button"
+                                        >
+                                            {file.filename}
+                                        </Button>
+                                    ))}
+                                </Flex>
+                            </div>
+                        ))}
+                    </div>
                 </div>
             ))}
             <Button
@@ -867,7 +944,7 @@ const GitHubModal: React.FC<GitHubModalProps> = ({ url, onClose, props }) => {
             setRepoInfo(fullRepoInfo);
 
             setRepoArchived(repoArchiveDetails)
-            
+
             const [forks, branchesData, contributorsData, releasesData, pullRequestsData, issuesData] = await Promise.all([
                 githubService.getForks(fullRepoInfo.user, fullRepoInfo.repo),
                 githubService.getBranches(fullRepoInfo.user, fullRepoInfo.repo),
diff --git a/packages/mod/src/plugins/github-in-discord/index.css b/packages/mod/src/plugins/github-in-discord/index.css
@@ -420,10 +420,10 @@
     padding: 8px 12px;
     cursor: pointer;
     border-radius: 6px;
-    color: var(--vx-text-default, #1F2328);
+    color: var(--vx-text-default);
+    background-color: var(--vx-background-default, #1F2328);
     text-decoration: none;
     font-size: 14px;
-    background: transparent;
     border: none;
 }
 
@@ -569,18 +569,18 @@
 .vx-gm-pull-requests-container {
     margin-top: 20px;
     padding: 16px;
-    border-top: 1px solid #e1e4e8;
+    border-top: 1px solid var(--vx-border-default);
 }
 
 .vx-gm-pull-requests-container h3 {
-    font-size: 18px;
+    font-size: 20px;
     font-weight: 600;
     margin-bottom: 16px;
     color: var(--vx-text-default);
 }
 
 .vx-gm-pr-item {
-    border: 1px solid #e1e4e8;
+    border: 1px solid var(--vx-border-default);
     border-radius: 6px;
     padding: 16px;
     margin-bottom: 16px;
@@ -594,7 +594,7 @@
     color: var(--vx-text-default);
 }
 
-.vx-gm-pr-item p {
+.vx-gm-pr-item .vx-gm-markdown {
     font-size: 14px;
     margin: 0 0 16px;
     color: var(--vx-text-default);
@@ -604,7 +604,7 @@
 .vx-gm-pr-item .vx-gm-pr-link {
     display: inline-block;
     margin-right: 16px;
-    color: #0366d6;
+    color: var(--vx-accent-primary);
     text-decoration: none;
     font-size: 14px;
 }
@@ -789,4 +789,69 @@
 
 .vx-gm-json-viewer span {
     cursor: pointer;
+}
+
+
+.vx-gm-pr-item {
+    border: 1px solid var(--vx-border-default);
+    border-radius: 6px;
+    padding: 16px;
+    margin-bottom: 16px;
+    background-color: var(--vx-background-secondary);
+}
+
+.vx-gm-pr-item .vx-gm-pr-title {
+    font-size: 16px;
+    font-weight: 600;
+    margin: 0 0 8px;
+    color: var(--vx-text-default);
+}
+
+.vx-gm-pr-item .vx-gm-markdown {
+    font-size: 14px;
+    margin: 0 0 16px;
+    color: var(--vx-text-default);
+    line-height: 1.5;
+}
+
+.vx-gm-pr-item .vx-gm-pr-link {
+    display: inline-block;
+    margin-right: 16px;
+    color: var(--vx-accent-primary);
+    text-decoration: none;
+    font-size: 14px;
+}
+
+.vx-gm-pr-item .vx-gm-pr-link:hover {
+    text-decoration: underline;
+}
+
+.vx-gm-commits-container {
+    margin-top: 16px;
+    border-top: 1px solid var(--vx-border-default);
+    padding-top: 16px;
+}
+
+.vx-gm-commit-item {
+    margin-bottom: 16px;
+    padding: 8px;
+    background-color: var(--vx-background-default);
+    border: 1px solid var(--vx-border-default);
+    border-radius: 6px;
+}
+
+.vx-gm-commit-message {
+    font-size: 14px;
+    color: var(--vx-text-default);
+    cursor: pointer;
+    padding: 8px;
+    border-bottom: 1px solid var(--vx-border-default);
+}
+
+.vx-gm-commit-message:hover {
+    background-color: var(--vx-background-tertiary);
+}
+
+.vx-gm-commit-files {
+    margin-top: 8px;
 }
diff --git a/packages/mod/src/plugins/slate-toolbar/index.tsx b/packages/mod/src/plugins/slate-toolbar/index.tsx
@@ -0,0 +1,31 @@
+import { definePlugin } from "vx:plugins";
+import { Developers } from "../../constants";
+import { Icons } from "../../components";
+
+import { TextAreaInput } from "@webpack/common";
+import {SlateToolbarAPI} from "../../api/quick-actions/slate-toolbar";
+
+const insertMaskedLink = (selectedText: string | null) => {
+    if (selectedText) {
+        TextAreaInput.insertText(`[dummy text](${selectedText})`);
+    }
+};
+
+export default definePlugin({
+    authors: [Developers.kaan],
+    requiresRestart: false,
+    start(signal: AbortSignal) {
+        SlateToolbarAPI.addButton(
+            {
+                label: "Mask List",
+                icon: Icons.Plus,
+                onClick: () => {
+                    const selectedText = getSelection()?.toString();
+                    if (!selectedText) return
+                    insertMaskedLink(selectedText)
+                },
+                tooltip: "Mask List"
+            }
+        )
+    },
+});
diff --git a/packages/mod/src/plugins/webhook-messenger/index.css b/packages/mod/src/plugins/webhook-messenger/index.css
@@ -56,15 +56,6 @@
     margin: 0;
 }
 
-.vx-gm-file-item {
-    background-color: #40444b;
-    color: #dcddde;
-    padding: 8px 12px;
-    border-radius: 3px;
-    margin-bottom: 8px;
-    font-size: 14px;
-}
-
 .vx-gm-section-title {
     color: #ffffff;
     font-weight: 600;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export function openCodeModal(options: Omit<CodeBlockProps, "canOpenInModal">) {`
`6`	`6`	`return openModal((props) => (`
`7`	`7`	`<ModalComponents.Root`
`8`	`8`	`transitionState={props.transitionState}`
`9`		`- size={ModalComponents.Size.MEDIUM}`
	`9`	`+ size={ModalComponents.Size.DYNAMIC}`
`10`	`10`	`className="vx-codeblock-modal"`
`11`	`11`	`>`
`12`	`12`	`<CodeBlock`