fixed gitignore

pull/26/head
TheCodedProf 3 years ago
commit 89781200bf

@ -0,0 +1,4 @@
if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
fi
use flake

@ -15,12 +15,14 @@ on:
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3.6.0
with:
node-version: 19.x
- run: yarn install --immutable
- name: Compile
run: yarn build
- name: Run eslint
uses: mrdivyansh/eslint-action@v1.0.7
- name: Run prettier
uses: actionsx/prettier@v2
- name: Run prettier and eslint
run: yarn lint-ci

2
.gitignore vendored

@ -19,3 +19,5 @@ src/utils/temp/*.jpg
ClicksMigratingProblems/oldData/
ClicksMigratingProblems/oldData copy/
.direnv/

@ -0,0 +1,43 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1677852945,
"narHash": "sha256-liiVJjkBTuBTAkRW3hrI8MbPD2ImYzwUpa7kvteiKhM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f5ffd5787786dde3a8bf648c7a1b5f78c4e01abb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

@ -0,0 +1,14 @@
{
description = "A basic flake with a shell";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
devShells.default = pkgs.mkShell {
packages = [ pkgs.yarn pkgs.nodejs-19_x pkgs.typescript pkgs.act ];
};
});
}

@ -2,7 +2,9 @@
"dependencies": {
"@discordjs/rest": "^0.2.0-canary.0",
"@hokify/agenda": "^6.2.12",
"@total-typescript/ts-reset": "^0.3.7",
"@tsconfig/node18-strictest-esm": "^1.0.0",
"@types/node": "^18.14.6",
"@ungap/structured-clone": "^1.0.1",
"agenda": "^4.3.0",
"body-parser": "^1.20.0",
@ -18,7 +20,7 @@
"node-tesseract-ocr": "^2.2.1",
"structured-clone": "^0.2.2",
"systeminformation": "^5.17.3"
},
},
"resolutions": {
"discord-api-types": "0.37.23"
},
@ -34,6 +36,7 @@
"lint": "echo 'Style checking...'; prettier --check .; echo 'Linting...'; eslint src; echo 'To auto-fix everything possible, please run `yarn lint-fix`'; true",
"lint-fix": "echo 'Fixing eslint issues...'; eslint src --fix; echo 'Reformatting...'; prettier --write --loglevel warn --cache .; true",
"lint-list": "echo 'Style checking...'; prettier --check .; echo 'Linting...'; eslint src; echo 'To view errors in more detail, please run `yarn lint`'; true",
"lint-ci" : "echo 'Style checking...' && prettier --check . && echo 'Linting...' && eslint src",
"setup": "node Installer.js",
"win-force-build": "clear | rm -r dist | tsc-suppress"
},

@ -874,6 +874,7 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
await i.deferUpdate();
if(i.isButton()) {
await client.database.guilds.write(interaction.guild.id, {filters: config});
await client.memory.forceUpdate(interaction.guild.id);
} else {
switch(i.values[0]) {
case "invites": {

@ -79,6 +79,7 @@ export const callback = async (interaction: CommandInteraction): Promise<void> =
await client.database.guilds.write(interaction.guild!.id, { "autoPublish": data });
config = await client.database.guilds.read(interaction.guild!.id);
data = _.cloneDeep(config.autoPublish);
await client.memory.forceUpdate(interaction.guild!.id);
break;
}
}

@ -93,6 +93,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
"logging.attachments.channel": channel
});
data = await client.database.guilds.read(interaction.guild!.id);
await client.memory.forceUpdate(interaction.guild!.id);
break;
}
}

@ -139,6 +139,7 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
await client.database.guilds.write(interaction.guild!.id, {"logging.logs": data});
config = await client.database.guilds.read(interaction.guild!.id);
data = Object.assign({}, config.logging.logs);
await client.memory.forceUpdate(interaction.guild!.id)
break;
}
case "remove": {

@ -81,6 +81,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
"logging.warnings.channel": channel
});
data = await client.database.guilds.read(interaction.guild!.id);
await client.memory.forceUpdate(interaction.guild!.id);
break;
}
}

@ -436,8 +436,9 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
break;
}
case "save": {
client.database.guilds.write(interaction.guild.id, {"roleMenu.options": currentObject});
await client.database.guilds.write(interaction.guild.id, {"roleMenu.options": currentObject});
modified = false;
await client.memory.forceUpdate(interaction.guild.id);
break;
}
}

@ -378,9 +378,10 @@ const callback = async (interaction: CommandInteraction) => {
break;
}
case "save": {
client.database.guilds.write(interaction.guild.id, {stats: currentObject});
await client.database.guilds.write(interaction.guild.id, {stats: currentObject});
singleNotify("statsChannelDeleted", interaction.guild.id, true);
modified = false;
await client.memory.forceUpdate(interaction.guild.id);
break;
}
}
@ -400,4 +401,4 @@ const check = (interaction: CommandInteraction, _partial: boolean = false) => {
export { command };
export { callback };
export { check };
export { check };

@ -135,6 +135,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
await i.deferUpdate();
await client.database.guilds.write(interaction.guild.id, { tickets: ticketData });
changesMade = false;
await client.memory.forceUpdate(interaction.guild.id);
break;
}
case "enabled": {

@ -413,6 +413,7 @@ const callback = async (interaction: CommandInteraction) => {
case "save": {
client.database.guilds.write(interaction.guild!.id, {tracks: tracks});
modified = false;
await client.memory.forceUpdate(interaction.guild!.id);
break;
}
}

@ -88,6 +88,7 @@ const callback = async (interaction: CommandInteraction): Promise<unknown> => {
client.database.guilds.write(interaction.guild.id, {"verify": data} )
config = await client.database.guilds.read(interaction.guild.id);
data = Object.assign({}, config.verify);
await client.memory.forceUpdate(interaction.guild.id);
break
}
case "switch": {

@ -223,6 +223,7 @@ const callback = async (interaction: CommandInteraction): Promise<void> => {
await client.database.guilds.write(interaction.guild!.id, {"welcome": data});
config = await client.database.guilds.read(interaction.guild!.id);
data = Object.assign({}, config.welcome);
await client.memory.forceUpdate(interaction.guild!.id)
break;
}
case "channelDM": {
@ -297,4 +298,4 @@ const autocomplete = async (interaction: AutocompleteInteraction): Promise<strin
return autocompletions;
};
export { command, callback, check, autocomplete };
export { command, callback, check, autocomplete };

@ -5,12 +5,22 @@ import { messageException } from "../utils/createTemporaryStorage.js";
import getEmojiByName from "../utils/getEmojiByName.js";
import client from "../utils/client.js";
import { callback as statsChannelUpdate } from "../reflex/statsChannelUpdate.js";
import { Message, ThreadChannel } from "discord.js";
import { ChannelType, Message, ThreadChannel } from "discord.js";
export const event = "messageCreate";
export async function callback(_client: NucleusClient, message: Message) {
if (!message.guild) return;
const config = await client.memory.readGuildInfo(message.guild.id);
if (config.autoPublish.enabled
&& config.autoPublish.channels.includes(message.channel.id)
&& message.channel.type === ChannelType.GuildAnnouncement
&& message.reference === null
) {
await message.crosspost();
}
if (message.author.bot) return;
if (message.channel.isDMBased()) return;
try {
@ -24,7 +34,6 @@ export async function callback(_client: NucleusClient, message: Message) {
const fileNames = await logAttachment(message);
const content = message.content.toLowerCase() || "";
const config = await client.memory.readGuildInfo(message.guild.id);
if(config.filters.clean.channels.includes(message.channel.id)) {
const memberRoles = message.member!.roles.cache.map(role => role.id);
const roleAllow = config.filters.clean.allowed.roles.some(role => memberRoles.includes(role));
@ -32,10 +41,6 @@ export async function callback(_client: NucleusClient, message: Message) {
if(!roleAllow && !userAllow) return await message.delete();
}
if (config.autoPublish.enabled && config.autoPublish.channels.includes(message.channel.id)) {
await message.crosspost();
}
const filter = getEmojiByName("ICONS.FILTER");
let attachmentJump = "";
if (config.logging.attachments.saved[message.channel.id + message.id]) {

@ -1,3 +1,5 @@
import "@total-typescript/ts-reset";
import runServer from "./api/index.js";
import client from "./utils/client.js";
import config from "./config/main.js";

@ -263,7 +263,7 @@ export class Transcript {
}
}
if(!data) return null;
doc = JSON.parse(Buffer.from(data).toString());
doc = JSON.parse(Buffer.from(data).toString()) as TranscriptSchema;
}
if(!doc) return null;
return doc;
@ -294,7 +294,7 @@ export class Transcript {
}
}
if(!data) return null;
doc = JSON.parse(Buffer.from(data).toString());
doc = JSON.parse(Buffer.from(data).toString()) as TranscriptSchema;
}
if(!doc) return null;
for(const message of doc.messages) {

Loading…
Cancel
Save