engineering
/
cloudservices
3
0
Fork 1
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.libraryofcode.org:engineering/cloudservices-rewrite

merge-requests/1/merge
Matthew 2019-10-30 21:26:22 -04:00
parent fd4cd6a9b3 094a59d45d
commit 115b26d17a
No known key found for this signature in database
GPG Key ID: 766BE43AE75F7559
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/createaccount.ts
View File

@ -78,7 +78,7 @@ export default class CreateAccount extends Command {
<h2>Useful information</h2> <h2>Useful information</h2>
<h3>How to log in:</h3> <h3>How to log in:</h3>
<ol> <ol>
<li>Open your desired terminal application - we recommend using <a target="_blank" href="https://www.gnu.org/software/bash/">Bash</a>, but you can use your computer's default</li> <li>Open your desired terminal application - we recommend using <a target="_blank" href="https://git-scm.com/downloads">Bash</a>, but you can use your computer's default</li>
<li>Type in your SSH Login as above</li> <li>Type in your SSH Login as above</li>
<li>When prompted, enter your password <em>Please note that inputs will be blank, so be careful not to type in your password incorrectly</em></li> <li>When prompted, enter your password <em>Please note that inputs will be blank, so be careful not to type in your password incorrectly</em></li>
</ol> </ol>

13
src/commands/eval.ts
View File

@ -32,19 +32,16 @@ export default class Eval extends Command {
evaled = error.stack; evaled = error.stack;
} }
/* evaled = evaled.replace(new RegExp(this.client.config.token, 'gi'), 'juul');
if (output) { evaled = evaled.replace(new RegExp(this.client.config.emailPass, 'gi'), 'juul');
output = output.replace(RegExp(this.client.config.prefix, 'gi'), 'juul'); evaled = evaled.replace(new RegExp(this.client.config.cloudflare, 'gi'), 'juul');
output = output.replace(RegExp(this.client.config.emailPass, 'gi'), 'juul');
output = output.replace(RegExp(this.client.config.cloudflare, 'gi'), 'juul');
}
*/
const display = this.client.util.splitString(evaled, 1975); const display = this.client.util.splitString(evaled, 1975);
if (display[5]) { if (display[5]) {
try { try {
const { data } = await axios.post('https://snippets.cloud.libraryofcode.org/documents', display.join('')); const { data } = await axios.post('https://snippets.cloud.libraryofcode.org/documents', display.join(''));
return message.channel.createMessage(`${this.client.stores.emojis.success} Your evaluation output can be found on https://snippets.cloud.libraryofcode.org/${data.key}`); return message.channel.createMessage(`${this.client.stores.emojis.success} Your evaluation evaled can be found on https://snippets.cloud.libraryofcode.org/${data.key}`);
} catch (error) { } catch (error) {
return message.channel.createMessage(`${this.client.stores.emojis.error} ${error}`); return message.channel.createMessage(`${this.client.stores.emojis.error} ${error}`);
} }

2
src/commands/pull.ts
View File

@ -25,7 +25,7 @@ export default class Pull extends Command {
if (pull.includes('Already up to date')) return updateMessage.edit(`${this.client.stores.emojis.success} ***No updates available***`); if (pull.includes('Already up to date')) return updateMessage.edit(`${this.client.stores.emojis.success} ***No updates available***`);
if (!pull.includes('origin/master')) return updateMessage.edit(`${this.client.stores.emojis.error} ***Unexpected output:***\n\`\`\`sh\n${pull}\n\`\`\``); if (!pull.includes('origin/master')) return updateMessage.edit(`${this.client.stores.emojis.error} ***Unexpected output:***\n\`\`\`sh\n${pull}\n\`\`\``);
const passedPull = await updateMessage.edit(`${this.client.stores.emojis.success} ***Pulled latest commit***\n${this.client.stores.emojis.loading} ***Rebuilding files...***`); const passedPull = await updateMessage.edit(`${this.client.stores.emojis.success} ***Pulled latest commit***\n${this.client.stores.emojis.loading} ***Rebuilding files...***\n\`\`\`sh\n${pull}\n\`\`\``);
try { try {
await this.client.util.exec('cd ../ && tsc -p ./tsconfig.json'); await this.client.util.exec('cd ../ && tsc -p ./tsconfig.json');
} catch (error) { } catch (error) {