fix: saving off code
This commit is contained in:
Kevin Nadro
@ -1,21 +1,21 @@
|
||||
import type { systemIOMachine } from '@src/machines/systemIO/systemIOMachine'
|
||||
import type { ActorRefFrom } from 'xstate'
|
||||
import type { Command, CommandArgumentOption } from '@src/lib/commandTypes'
|
||||
import type { RequestedKCLFile } from '@src/machines/systemIO/utils'
|
||||
import { SystemIOMachineEvents } from '@src/machines/systemIO/utils'
|
||||
import { isDesktop } from '@src/lib/isDesktop'
|
||||
import type { systemIOMachine } from "@src/machines/systemIO/systemIOMachine";
|
||||
import type { ActorRefFrom } from "xstate";
|
||||
import type { Command, CommandArgumentOption } from "@src/lib/commandTypes";
|
||||
import type { RequestedKCLFile } from "@src/machines/systemIO/utils";
|
||||
import { SystemIOMachineEvents } from "@src/machines/systemIO/utils";
|
||||
import { isDesktop } from "@src/lib/isDesktop";
|
||||
import {
|
||||
everyKclSample,
|
||||
findKclSample,
|
||||
kclSamplesManifestWithNoMultipleFiles,
|
||||
} from '@src/lib/kclSamples'
|
||||
import { getUniqueProjectName } from '@src/lib/desktopFS'
|
||||
import { IS_ML_EXPERIMENTAL, PROJECT_ENTRYPOINT } from '@src/lib/constants'
|
||||
import toast from 'react-hot-toast'
|
||||
import { reportRejection } from '@src/lib/trap'
|
||||
import { relevantFileExtensions } from '@src/lang/wasmUtils'
|
||||
import { getStringAfterLastSeparator, webSafePathSplit } from '@src/lib/paths'
|
||||
import { FILE_EXT } from '@src/lib/constants'
|
||||
} from "@src/lib/kclSamples";
|
||||
import { getUniqueProjectName } from "@src/lib/desktopFS";
|
||||
import { IS_ML_EXPERIMENTAL, PROJECT_ENTRYPOINT } from "@src/lib/constants";
|
||||
import toast from "react-hot-toast";
|
||||
import { reportRejection } from "@src/lib/trap";
|
||||
import { relevantFileExtensions } from "@src/lang/wasmUtils";
|
||||
import { getStringAfterLastSeparator, webSafePathSplit } from "@src/lib/paths";
|
||||
import { FILE_EXT } from "@src/lib/constants";
|
||||
|
||||
function onSubmitKCLSampleCreation({
|
||||
sample,
|
||||
@ -24,60 +24,62 @@ function onSubmitKCLSampleCreation({
|
||||
systemIOActor,
|
||||
isProjectNew,
|
||||
}: {
|
||||
sample: any
|
||||
kclSample: ReturnType<typeof findKclSample>
|
||||
uniqueNameIfNeeded: any
|
||||
systemIOActor: ActorRefFrom<typeof systemIOMachine>
|
||||
isProjectNew: boolean
|
||||
sample: any;
|
||||
kclSample: ReturnType<typeof findKclSample>;
|
||||
uniqueNameIfNeeded: any;
|
||||
systemIOActor: ActorRefFrom<typeof systemIOMachine>;
|
||||
isProjectNew: boolean;
|
||||
}) {
|
||||
if (!kclSample) {
|
||||
toast.error('The command could not be submitted, unable to find Zoo sample')
|
||||
return
|
||||
toast.error(
|
||||
"The command could not be submitted, unable to find Zoo sample",
|
||||
);
|
||||
return;
|
||||
}
|
||||
const pathParts = webSafePathSplit(sample)
|
||||
const projectPathPart = pathParts[0]
|
||||
const files = kclSample.files
|
||||
const pathParts = webSafePathSplit(sample);
|
||||
const projectPathPart = pathParts[0];
|
||||
const files = kclSample.files;
|
||||
|
||||
const filePromises = files.map((file) => {
|
||||
const sampleCodeUrl =
|
||||
(isDesktop() ? '.' : '') +
|
||||
(isDesktop() ? "." : "") +
|
||||
`/kcl-samples/${encodeURIComponent(
|
||||
projectPathPart
|
||||
)}/${encodeURIComponent(file)}`
|
||||
projectPathPart,
|
||||
)}/${encodeURIComponent(file)}`;
|
||||
return fetch(sampleCodeUrl).then((response) => {
|
||||
return {
|
||||
response,
|
||||
file,
|
||||
projectName: projectPathPart,
|
||||
}
|
||||
})
|
||||
})
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
const requestedFiles: RequestedKCLFile[] = []
|
||||
const requestedFiles: RequestedKCLFile[] = [];
|
||||
// If any fetches fail from the KCL Code download we will instantly reject
|
||||
// No cleanup required since the fetch response is in memory
|
||||
// TODO: Try to catch if there is a failure then delete the root folder and show error
|
||||
Promise.all(filePromises)
|
||||
.then(async (responses) => {
|
||||
for (let i = 0; i < responses.length; i++) {
|
||||
const response = responses[i]
|
||||
const code = await response.response.text()
|
||||
const response = responses[i];
|
||||
const code = await response.response.text();
|
||||
requestedFiles.push({
|
||||
requestedCode: code,
|
||||
requestedFileName: response.file,
|
||||
requestedProjectName: uniqueNameIfNeeded,
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
if (requestedFiles.length === 1) {
|
||||
/**
|
||||
* Navigates to the single file that could be renamed on disk for duplicates
|
||||
*/
|
||||
const folderNameBecomesKCLFileName = projectPathPart + FILE_EXT
|
||||
const folderNameBecomesKCLFileName = projectPathPart + FILE_EXT;
|
||||
// If the project is new create the single file as main.kcl
|
||||
const requestedFileNameWithExtension = isProjectNew
|
||||
? PROJECT_ENTRYPOINT
|
||||
: folderNameBecomesKCLFileName
|
||||
: folderNameBecomesKCLFileName;
|
||||
systemIOActor.send({
|
||||
type: SystemIOMachineEvents.importFileFromURL,
|
||||
data: {
|
||||
@ -85,7 +87,7 @@ function onSubmitKCLSampleCreation({
|
||||
requestedFileNameWithExtension: requestedFileNameWithExtension,
|
||||
requestedCode: requestedFiles[0].requestedCode,
|
||||
},
|
||||
})
|
||||
});
|
||||
} else {
|
||||
/**
|
||||
* Bulk create the assembly and navigate to the project
|
||||
@ -96,97 +98,98 @@ function onSubmitKCLSampleCreation({
|
||||
files: requestedFiles,
|
||||
requestedProjectName: uniqueNameIfNeeded,
|
||||
},
|
||||
})
|
||||
});
|
||||
}
|
||||
})
|
||||
.catch(reportError)
|
||||
.catch(reportError);
|
||||
}
|
||||
|
||||
export function createApplicationCommands({
|
||||
systemIOActor,
|
||||
}: {
|
||||
systemIOActor: ActorRefFrom<typeof systemIOMachine>
|
||||
systemIOActor: ActorRefFrom<typeof systemIOMachine>;
|
||||
}) {
|
||||
const textToCADCommand: Command = {
|
||||
name: 'Text-to-CAD',
|
||||
description: 'Generate parts from text prompts.',
|
||||
displayName: 'Text-to-CAD Create',
|
||||
groupId: 'application',
|
||||
name: "Text-to-CAD",
|
||||
description: "Generate parts from text prompts.",
|
||||
displayName: "Text-to-CAD Create",
|
||||
groupId: "application",
|
||||
needsReview: false,
|
||||
status: IS_ML_EXPERIMENTAL ? 'experimental' : 'active',
|
||||
icon: 'sparkles',
|
||||
status: IS_ML_EXPERIMENTAL ? "experimental" : "active",
|
||||
icon: "sparkles",
|
||||
onSubmit: (record) => {
|
||||
if (record) {
|
||||
const requestedProjectName = record.newProjectName || record.projectName
|
||||
const requestedPrompt = record.prompt
|
||||
const isProjectNew = !!record.newProjectName
|
||||
const requestedProjectName =
|
||||
record.newProjectName || record.projectName;
|
||||
const requestedPrompt = record.prompt;
|
||||
const isProjectNew = !!record.newProjectName;
|
||||
systemIOActor.send({
|
||||
type: SystemIOMachineEvents.generateTextToCAD,
|
||||
data: { requestedPrompt, requestedProjectName, isProjectNew },
|
||||
})
|
||||
});
|
||||
}
|
||||
},
|
||||
args: {
|
||||
method: {
|
||||
inputType: 'options',
|
||||
inputType: "options",
|
||||
required: true,
|
||||
skip: true,
|
||||
options: isDesktop()
|
||||
? [
|
||||
{ name: 'New project', value: 'newProject' },
|
||||
{ name: 'Existing project', value: 'existingProject' },
|
||||
{ name: "New project", value: "newProject" },
|
||||
{ name: "Existing project", value: "existingProject" },
|
||||
]
|
||||
: [{ name: 'Overwrite', value: 'existingProject' }],
|
||||
: [{ name: "Overwrite", value: "existingProject" }],
|
||||
valueSummary(value) {
|
||||
return isDesktop()
|
||||
? value === 'newProject'
|
||||
? 'New project'
|
||||
: 'Existing project'
|
||||
: 'Overwrite'
|
||||
? value === "newProject"
|
||||
? "New project"
|
||||
: "Existing project"
|
||||
: "Overwrite";
|
||||
},
|
||||
},
|
||||
projectName: {
|
||||
inputType: 'options',
|
||||
inputType: "options",
|
||||
required: (commandsContext) =>
|
||||
isDesktop() &&
|
||||
commandsContext.argumentsToSubmit.method === 'existingProject',
|
||||
defaultValue: isDesktop() ? undefined : 'browser',
|
||||
commandsContext.argumentsToSubmit.method === "existingProject",
|
||||
defaultValue: isDesktop() ? undefined : "browser",
|
||||
skip: true,
|
||||
options: (_, _context) => {
|
||||
const { folders } = systemIOActor.getSnapshot().context
|
||||
const options: CommandArgumentOption<string>[] = []
|
||||
const { folders } = systemIOActor.getSnapshot().context;
|
||||
const options: CommandArgumentOption<string>[] = [];
|
||||
folders.forEach((folder) => {
|
||||
options.push({
|
||||
name: folder.name,
|
||||
value: folder.name,
|
||||
isCurrent: false,
|
||||
})
|
||||
})
|
||||
return options
|
||||
});
|
||||
});
|
||||
return options;
|
||||
},
|
||||
},
|
||||
newProjectName: {
|
||||
inputType: 'text',
|
||||
inputType: "text",
|
||||
required: (commandsContext) =>
|
||||
isDesktop() &&
|
||||
commandsContext.argumentsToSubmit.method === 'newProject',
|
||||
commandsContext.argumentsToSubmit.method === "newProject",
|
||||
skip: true,
|
||||
},
|
||||
prompt: {
|
||||
inputType: 'text',
|
||||
inputType: "text",
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
const addKCLFileToProject: Command = {
|
||||
name: 'add-kcl-file-to-project',
|
||||
displayName: 'Add file to project',
|
||||
name: "add-kcl-file-to-project",
|
||||
displayName: "Add file to project",
|
||||
description:
|
||||
'Add KCL file, Zoo sample, or 3D model to new or existing project.',
|
||||
"Add KCL file, Zoo sample, or 3D model to new or existing project.",
|
||||
needsReview: false,
|
||||
icon: 'importFile',
|
||||
groupId: 'application',
|
||||
icon: "importFile",
|
||||
groupId: "application",
|
||||
onSubmit(data) {
|
||||
if (data) {
|
||||
/** TODO: Make a new machine for models. This is only a temporary location
|
||||
@ -195,16 +198,16 @@ export function createApplicationCommands({
|
||||
* inside the systemIOMachine. We can have a fancy model machine that loads
|
||||
* KCL samples
|
||||
*/
|
||||
const folders = systemIOActor.getSnapshot().context.folders
|
||||
const isProjectNew = !!data.newProjectName
|
||||
const requestedProjectName = data.newProjectName || data.projectName
|
||||
const folders = systemIOActor.getSnapshot().context.folders;
|
||||
const isProjectNew = !!data.newProjectName;
|
||||
const requestedProjectName = data.newProjectName || data.projectName;
|
||||
const uniqueNameIfNeeded = isProjectNew
|
||||
? getUniqueProjectName(requestedProjectName, folders)
|
||||
: requestedProjectName
|
||||
: requestedProjectName;
|
||||
|
||||
const kclSample = findKclSample(data.sample)
|
||||
const kclSample = findKclSample(data.sample);
|
||||
if (
|
||||
data.source === 'kcl-samples' &&
|
||||
data.source === "kcl-samples" &&
|
||||
kclSample &&
|
||||
kclSample.files.length >= 1
|
||||
) {
|
||||
@ -214,12 +217,12 @@ export function createApplicationCommands({
|
||||
uniqueNameIfNeeded,
|
||||
systemIOActor,
|
||||
isProjectNew,
|
||||
})
|
||||
} else if (data.source === 'local' && data.path) {
|
||||
const clonePath = data.path
|
||||
const fileNameWithExtension = getStringAfterLastSeparator(clonePath)
|
||||
});
|
||||
} else if (data.source === "local" && data.path) {
|
||||
const clonePath = data.path;
|
||||
const fileNameWithExtension = getStringAfterLastSeparator(clonePath);
|
||||
const readFileContentsAndCreateNewFile = async () => {
|
||||
const text = await window.electron.readFile(clonePath, 'utf8')
|
||||
const text = await window.electron.readFile(clonePath, "utf8");
|
||||
systemIOActor.send({
|
||||
type: SystemIOMachineEvents.importFileFromURL,
|
||||
data: {
|
||||
@ -227,135 +230,129 @@ export function createApplicationCommands({
|
||||
requestedFileNameWithExtension: fileNameWithExtension,
|
||||
requestedCode: text,
|
||||
},
|
||||
})
|
||||
}
|
||||
readFileContentsAndCreateNewFile().catch(reportRejection)
|
||||
});
|
||||
};
|
||||
readFileContentsAndCreateNewFile().catch(reportRejection);
|
||||
} else {
|
||||
toast.error("The command couldn't be submitted, check the arguments.")
|
||||
toast.error(
|
||||
"The command couldn't be submitted, check the arguments.",
|
||||
);
|
||||
}
|
||||
}
|
||||
},
|
||||
args: {
|
||||
source: {
|
||||
inputType: 'options',
|
||||
inputType: "options",
|
||||
required: true,
|
||||
skip: false,
|
||||
defaultValue: isDesktop() ? 'local' : 'kcl-samples',
|
||||
defaultValue: isDesktop() ? "local" : "kcl-samples",
|
||||
options() {
|
||||
return [
|
||||
{
|
||||
value: 'kcl-samples',
|
||||
name: 'KCL Samples',
|
||||
value: "kcl-samples",
|
||||
name: "KCL Samples",
|
||||
isCurrent: true,
|
||||
},
|
||||
...(isDesktop()
|
||||
? [
|
||||
{
|
||||
value: 'local',
|
||||
name: 'Local Drive',
|
||||
value: "local",
|
||||
name: "Local Drive",
|
||||
isCurrent: false,
|
||||
},
|
||||
]
|
||||
: []),
|
||||
]
|
||||
];
|
||||
},
|
||||
},
|
||||
sample: {
|
||||
inputType: 'options',
|
||||
inputType: "options",
|
||||
required: (commandContext) =>
|
||||
!['local'].includes(
|
||||
commandContext.argumentsToSubmit.source as string
|
||||
!["local"].includes(
|
||||
commandContext.argumentsToSubmit.source as string,
|
||||
),
|
||||
hidden: (commandContext) =>
|
||||
['local'].includes(commandContext.argumentsToSubmit.source as string),
|
||||
["local"].includes(commandContext.argumentsToSubmit.source as string),
|
||||
valueSummary(value) {
|
||||
const MAX_LENGTH = 12
|
||||
if (typeof value === 'string') {
|
||||
const MAX_LENGTH = 12;
|
||||
if (typeof value === "string") {
|
||||
return value.length > MAX_LENGTH
|
||||
? value.substring(0, MAX_LENGTH) + '...'
|
||||
: value
|
||||
? value.substring(0, MAX_LENGTH) + "..."
|
||||
: value;
|
||||
}
|
||||
return value
|
||||
return value;
|
||||
},
|
||||
options: ({ argumentsToSubmit }) => {
|
||||
const samples =
|
||||
isDesktop() && argumentsToSubmit.method !== 'existingProject'
|
||||
? everyKclSample
|
||||
: kclSamplesManifestWithNoMultipleFiles
|
||||
const samples = isDesktop()
|
||||
? everyKclSample
|
||||
: kclSamplesManifestWithNoMultipleFiles;
|
||||
return samples.map((sample) => {
|
||||
return {
|
||||
value: sample.pathFromProjectDirectoryToFirstFile,
|
||||
name: sample.title,
|
||||
}
|
||||
})
|
||||
};
|
||||
});
|
||||
},
|
||||
},
|
||||
method: {
|
||||
inputType: 'options',
|
||||
inputType: "options",
|
||||
required: true,
|
||||
skip: true,
|
||||
options: ({ argumentsToSubmit }, _) => {
|
||||
if (isDesktop() && typeof argumentsToSubmit.sample === 'string') {
|
||||
const kclSample = findKclSample(argumentsToSubmit.sample)
|
||||
if (kclSample && kclSample.files.length > 1) {
|
||||
return [
|
||||
{ name: 'New project', value: 'newProject', isCurrent: true },
|
||||
]
|
||||
} else {
|
||||
return [
|
||||
{ name: 'New project', value: 'newProject', isCurrent: true },
|
||||
{ name: 'Existing project', value: 'existingProject' },
|
||||
]
|
||||
}
|
||||
if (isDesktop() && typeof argumentsToSubmit.sample === "string") {
|
||||
return [
|
||||
{ name: "New project", value: "newProject", isCurrent: true },
|
||||
{ name: "Existing project", value: "existingProject" },
|
||||
];
|
||||
} else {
|
||||
return [{ name: 'Overwrite', value: 'existingProject' }]
|
||||
return [{ name: "Overwrite", value: "existingProject" }];
|
||||
}
|
||||
},
|
||||
valueSummary(value) {
|
||||
return isDesktop()
|
||||
? value === 'newProject'
|
||||
? 'New project'
|
||||
: 'Existing project'
|
||||
: 'Overwrite'
|
||||
? value === "newProject"
|
||||
? "New project"
|
||||
: "Existing project"
|
||||
: "Overwrite";
|
||||
},
|
||||
},
|
||||
projectName: {
|
||||
inputType: 'options',
|
||||
inputType: "options",
|
||||
required: (commandsContext) =>
|
||||
isDesktop() &&
|
||||
commandsContext.argumentsToSubmit.method === 'existingProject',
|
||||
commandsContext.argumentsToSubmit.method === "existingProject",
|
||||
skip: true,
|
||||
options: (_, _context) => {
|
||||
const { folders } = systemIOActor.getSnapshot().context
|
||||
const options: CommandArgumentOption<string>[] = []
|
||||
const { folders } = systemIOActor.getSnapshot().context;
|
||||
const options: CommandArgumentOption<string>[] = [];
|
||||
folders.forEach((folder) => {
|
||||
options.push({
|
||||
name: folder.name,
|
||||
value: folder.name,
|
||||
isCurrent: false,
|
||||
})
|
||||
})
|
||||
return options
|
||||
});
|
||||
});
|
||||
return options;
|
||||
},
|
||||
},
|
||||
newProjectName: {
|
||||
inputType: 'text',
|
||||
inputType: "text",
|
||||
required: (commandsContext) =>
|
||||
isDesktop() &&
|
||||
commandsContext.argumentsToSubmit.method === 'newProject',
|
||||
commandsContext.argumentsToSubmit.method === "newProject",
|
||||
skip: true,
|
||||
},
|
||||
path: {
|
||||
inputType: 'path',
|
||||
inputType: "path",
|
||||
skip: true,
|
||||
hidden: !isDesktop(),
|
||||
defaultValue: '',
|
||||
defaultValue: "",
|
||||
valueSummary: (value) => {
|
||||
return isDesktop() ? window.electron.path.basename(value) : ''
|
||||
return isDesktop() ? window.electron.path.basename(value) : "";
|
||||
},
|
||||
required: (commandContext) =>
|
||||
isDesktop() &&
|
||||
['local'].includes(commandContext.argumentsToSubmit.source as string),
|
||||
["local"].includes(commandContext.argumentsToSubmit.source as string),
|
||||
filters: [
|
||||
{
|
||||
name: `Import ${relevantFileExtensions().map((f) => ` .${f}`)}`,
|
||||
@ -364,7 +361,7 @@ export function createApplicationCommands({
|
||||
],
|
||||
},
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Looks similar to Add file to project but more data is hard coded for the home page button
|
||||
@ -374,71 +371,71 @@ export function createApplicationCommands({
|
||||
* Desktop only command for now!
|
||||
*/
|
||||
const createASampleDesktopOnly: Command = {
|
||||
name: 'create-a-sample',
|
||||
displayName: 'Create a sample',
|
||||
description: 'Create a new project from a Zoo Sample',
|
||||
name: "create-a-sample",
|
||||
displayName: "Create a sample",
|
||||
description: "Create a new project from a Zoo Sample",
|
||||
needsReview: false,
|
||||
icon: 'importFile',
|
||||
groupId: 'application',
|
||||
icon: "importFile",
|
||||
groupId: "application",
|
||||
hideFromSearch: true,
|
||||
onSubmit: (data) => {
|
||||
if (data) {
|
||||
const folders = systemIOActor.getSnapshot().context.folders
|
||||
const kclSample = findKclSample(data.sample)
|
||||
const folders = systemIOActor.getSnapshot().context.folders;
|
||||
const kclSample = findKclSample(data.sample);
|
||||
if (!kclSample) {
|
||||
toast.error(
|
||||
'The command could not be submitted, unable to find Zoo sample'
|
||||
)
|
||||
return
|
||||
"The command could not be submitted, unable to find Zoo sample",
|
||||
);
|
||||
return;
|
||||
}
|
||||
const pathParts = webSafePathSplit(
|
||||
kclSample.pathFromProjectDirectoryToFirstFile
|
||||
)
|
||||
const folderNameBecomesSampleName = pathParts[0]
|
||||
kclSample.pathFromProjectDirectoryToFirstFile,
|
||||
);
|
||||
const folderNameBecomesSampleName = pathParts[0];
|
||||
const uniqueNameIfNeeded = getUniqueProjectName(
|
||||
folderNameBecomesSampleName,
|
||||
folders
|
||||
)
|
||||
folders,
|
||||
);
|
||||
onSubmitKCLSampleCreation({
|
||||
sample: data.sample,
|
||||
kclSample,
|
||||
uniqueNameIfNeeded,
|
||||
systemIOActor,
|
||||
isProjectNew: true,
|
||||
})
|
||||
});
|
||||
}
|
||||
},
|
||||
args: {
|
||||
source: {
|
||||
inputType: 'text',
|
||||
inputType: "text",
|
||||
required: true,
|
||||
skip: false,
|
||||
defaultValue: 'kcl-samples',
|
||||
defaultValue: "kcl-samples",
|
||||
hidden: true,
|
||||
},
|
||||
sample: {
|
||||
inputType: 'options',
|
||||
inputType: "options",
|
||||
required: true,
|
||||
valueSummary(value) {
|
||||
const MAX_LENGTH = 12
|
||||
if (typeof value === 'string') {
|
||||
const MAX_LENGTH = 12;
|
||||
if (typeof value === "string") {
|
||||
return value.length > MAX_LENGTH
|
||||
? value.substring(0, MAX_LENGTH) + '...'
|
||||
: value
|
||||
? value.substring(0, MAX_LENGTH) + "..."
|
||||
: value;
|
||||
}
|
||||
return value
|
||||
return value;
|
||||
},
|
||||
options: everyKclSample.map((sample) => {
|
||||
return {
|
||||
value: sample.pathFromProjectDirectoryToFirstFile,
|
||||
name: sample.title,
|
||||
}
|
||||
};
|
||||
}),
|
||||
},
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
return isDesktop()
|
||||
? [textToCADCommand, addKCLFileToProject, createASampleDesktopOnly]
|
||||
: [textToCADCommand, addKCLFileToProject]
|
||||
: [textToCADCommand, addKCLFileToProject];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user