Skip to content

Commit

Permalink
Merge branch 'master' into bso
Browse files Browse the repository at this point in the history
  • Loading branch information
gc committed Jul 30, 2024
2 parents b909d2d + 44b3167 commit 63e3e80
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ import { MahojiClient } from '@oldschoolgg/toolkit';
import { init } from '@sentry/node';
import type { TextChannel } from 'discord.js';
import { GatewayIntentBits, Options, Partials } from 'discord.js';
import { isObject, noOp } from 'e';
import { isObject } from 'e';

import { SENTRY_DSN, SupportServer } from './config';
import { BLACKLISTED_GUILDS, BLACKLISTED_USERS } from './lib/blacklists';
import { Channel, Events, gitHash, globalConfig } from './lib/constants';
import { economyLog } from './lib/economyLogs';
import { onMessage } from './lib/events';
import { modalInteractionHook } from './lib/modals';
import { preStartup } from './lib/preStartup';
import { OldSchoolBotClient } from './lib/structures/OldSchoolBotClient';
import { CACHED_ACTIVE_USER_IDS } from './lib/util/cachedUserIDs';
import { interactionHook } from './lib/util/globalInteractions';
Expand Down Expand Up @@ -194,8 +195,7 @@ client.once('ready', () => onStartup());

async function main() {
await Promise.all([
roboChimpClient.$connect().then(noOp),
prisma.$connect().then(noOp),
preStartup(),
import('exit-hook').then(({ asyncExitHook }) =>
asyncExitHook(exitCleanup, {
wait: 2000
Expand Down
6 changes: 4 additions & 2 deletions src/lib/startupScripts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ BEGIN
END
);
END;
$$;
$$;`
});

CREATE OR REPLACE FUNCTION remove_item_from_bank(
startupScripts.push({
sql: `CREATE OR REPLACE FUNCTION remove_item_from_bank(
bank JSONB,
key TEXT,
quantity INT
Expand Down

0 comments on commit 63e3e80

Please sign in to comment.