Refactor database, further progress on managers

main
Mari 3 months ago
parent 1fd98e04c6
commit 8714891c2e
  1. 426
      migrations/0001-characters.sql
  2. 7
      src/bin/bot.ts
  3. 4
      src/commands/bot/index.ts
  4. 8
      src/commands/bot/rebuild.ts
  5. 8
      src/commands/bot/restart.ts
  6. 8
      src/commands/bot/shutdown.ts
  7. 8
      src/commands/character/create.ts
  8. 66
      src/database/battle_types.ts
  9. 64
      src/database/character_creation.ts
  10. 58
      src/database/gender.ts
  11. 24
      src/database/index.ts
  12. 10
      src/database/inmemory/database.ts
  13. 46
      src/database/inmemory/users.ts
  14. 22
      src/database/pronouns.ts
  15. 88
      src/database/users.ts
  16. 115
      src/managers/battle_types.ts
  17. 13
      src/managers/character.ts
  18. 168
      src/managers/gender.ts
  19. 16
      src/managers/index.ts
  20. 87
      src/managers/users.ts

@ -16,75 +16,80 @@ CREATE TABLE IF NOT EXISTS users
--changeset reya:battle_types_table runInTransaction:false
CREATE TABLE IF NOT EXISTS battle_types
(
id INT NOT NULL PRIMARY KEY,
name STRING NOT NULL UNIQUE,
emoji STRING NOT NULL UNIQUE,
color STRING NOT NULL,
display_order INT NOT NULL,
immunities INT[] NOT NULL DEFAULT '{}',
resistances INT[] NOT NULL DEFAULT '{}',
weaknesses INT[] NOT NULL DEFAULT '{}'
id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
name STRING NOT NULL UNIQUE,
emoji STRING NOT NULL UNIQUE,
display_order SMALLINT NOT NULL
);
--rollback DROP TABLE IF EXISTS battle_types;
--changeset reya:battle_types_relationships runInTransaction:false
CREATE TABLE IF NOT EXISTS battle_types_relationships
(
defender UUID NOT NULL REFERENCES battle_types (id) ON DELETE CASCADE,
attacker UUID NOT NULL REFERENCES battle_types (id) ON DELETE CASCADE,
damage_percentage SMALLINT NOT NULL DEFAULT 100,
PRIMARY KEY (defender, attacker)
);
--rollback DROP TABLE IF EXISTS battle_types_relationships
--changeset reya:battle_types_values runInTransaction:true
INSERT INTO battle_types (id, name, emoji, color, display_order)
VALUES (0, 'Basic', '๐Ÿ”ฒ', '', 0),
(1, 'Sassy', '๐Ÿ”ฅ', '', 1),
(2, 'Gentle', '๐Ÿ’™', '', 2),
(3, 'Sexy', '๐Ÿ’‹', '', 3),
(4, 'Muscle', '๐Ÿ’ช', '', 4),
(5, 'Glam', 'โœจ', '', 5),
(6, 'Punk', '๐ŸŽธ', '', 6),
(7, 'Glutton', '๐Ÿ—', '', 7),
(8, 'Dumb', '๐Ÿชจ', '', 8),
(9, 'Drone', '๐Ÿค–', '', 9),
(10, 'Spooky', '๐Ÿ‘ป', '', 10),
(11, 'Lively', '๐ŸŽ‰', '', 11),
(12, 'Smart', '๐Ÿง ', '', 12),
(13, 'Cool', '๐ŸงŠ', '', 13),
(14, 'Bully', '๐Ÿ˜ˆ', '', 14),
(15, 'Mythic', '๐Ÿ”ฑ', '', 15),
(16, 'Toy', '๐Ÿงธ', '', 16),
(17, 'Cute', '๐ŸŒบ', '', 17)
INSERT INTO battle_types (name, emoji, display_order)
VALUES ('Basic', '๐Ÿ”ฒ', 0),
('Sassy', '๐Ÿ”ฅ', 1),
('Gentle', '๐Ÿ’™', 2),
('Sexy', '๐Ÿ’‹', 3),
('Muscle', '๐Ÿ’ช', 4),
('Glam', 'โœจ', 5),
('Punk', '๐ŸŽธ', 6),
('Glutton', '๐Ÿ—', 7),
('Dumb', '๐Ÿชจ', 8),
('Drone', '๐Ÿค–', 9),
('Spooky', '๐Ÿ‘ป', 10),
('Lively', '๐ŸŽ‰', 11),
('Smart', '๐Ÿง ', 12),
('Cool', '๐ŸงŠ', 13),
('Bully', '๐Ÿ˜ˆ', 14),
('Mythic', '๐Ÿ”ฑ', 15),
('Toy', '๐Ÿงธ', 16),
('Cute', '๐ŸŒบ', 17)
ON CONFLICT DO NOTHING;
--rollback DELETE FROM battle_types WHERE id in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17)
--rollback TRUNCATE battle_types;
--changeset reya:difficulties_table runInTransaction:false
CREATE TABLE IF NOT EXISTS difficulties
(
id INT NOT NULL PRIMARY KEY,
name STRING NOT NULL UNIQUE,
emoji STRING NOT NULL UNIQUE,
short_description STRING NOT NULL,
long_description STRING NOT NULL,
display_order INT NOT NULL,
allow_digestion BOOLEAN NOT NULL DEFAULT true,
regenerate_talent BOOLEAN NOT NULL DEFAULT false,
reformation_health_percent FLOAT NOT NULL DEFAULT 100,
reformation_stamina_percent FLOAT NOT NULL DEFAULT 100,
lose_proficiency_percent FLOAT NOT NULL DEFAULT 0,
lose_exp_percent FLOAT NOT NULL DEFAULT 0,
lose_money_percent FLOAT NOT NULL DEFAULT 0
id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
name STRING NOT NULL UNIQUE,
emoji STRING NOT NULL UNIQUE,
short_description STRING NOT NULL,
long_description STRING NOT NULL,
display_order SMALLINT NOT NULL,
allow_digestion BOOLEAN NOT NULL DEFAULT true,
regenerate_talent BOOLEAN NOT NULL DEFAULT false,
reformation_health_percent FLOAT NOT NULL DEFAULT 100,
reformation_stamina_percent FLOAT NOT NULL DEFAULT 100,
lose_proficiency_percent FLOAT NOT NULL DEFAULT 0,
lose_exp_percent FLOAT NOT NULL DEFAULT 0,
lose_money_percent FLOAT NOT NULL DEFAULT 0
);
--rollback DROP TABLE IF EXISTS difficulties;
--changeset reya:difficulties_values runInTransaction:true
INSERT INTO difficulties
(id, name, emoji, short_description, long_description, display_order, allow_digestion, regenerate_talent,
(name, emoji, short_description, long_description, display_order, allow_digestion, regenerate_talent,
reformation_health_percent, reformation_stamina_percent, lose_proficiency_percent, lose_exp_percent,
lose_money_percent)
VALUES (0, 'Indigestible', '๐Ÿ”ฐ',
VALUES ('Indigestible', '๐ŸŒž',
'You can''t be digested. Stomachs just make you sleepy, and you always come out none the worse for wear.',
'Stomachs have no effect on you. When your health is reduced to 0, you simply become tired and drift off to '
||
'sleep. You don''t need to be reformed after battles when this happens, and you won''t lose anything for '
|| 'falling asleep this way. You''ll be ready to go right away as soon as you''re released!'
|| 'sleep. You don''t need to be reformed after battles when this happens, and you won''t lose anything '
|| 'for falling asleep this way. You''ll be ready to go right away as soon as you''re released!'
|| e'\n\n'
|| 'Suitable for players who play with the Pred Only or Spectator preferences, or who don''t want their '
|| 'character to die even temporarily.',
0, false, false, 100, 100, 0, 0, 0),
(1, 'Very Safe', 'โ˜€',
('Very Safe', 'โ˜€',
'You''ll be completely safe. The only downsides to being digested? Inconvenience. And smug predators.',
'Reformation is a cakewalk for you. You can be digested, but you can reform after battle with no penalties '
|| 'of any kind. Your body and mind are completely unaffected by the visit to someone else''s gut.'
@ -92,11 +97,11 @@ VALUES (0, 'Indigestible', '๐Ÿ”ฐ',
|| 'Reformation leaves you a little bit weary, but in good health.'
|| e'\n\n'
|| 'Suitable for players who prefer a digestive end, but don''t want to lose any progress.',
1, true, false, 100, 90, 0, 0, 0),
(2, 'Safe', '๐ŸŒค',
1, true, false, 95, 90, 0, 0, 0),
('Safe', '๐ŸŒค',
'There''s a small price to being digested, but you didn''t think cheating death would be free, right?',
'Digestion takes a little bit of a toll on your body and mind. And while you do come back, you don''t come '
|| 'back _quite_ the way you left.'
|| 'back _quite_ the way you left. '
|| 'Your proficiencies will drop by 10% as a little of what you''ve taken from your past exploits fades '
|| 'from you. You''ll also lose 10% of your money as a cost for the reformation process.'
|| e'\n\n'
@ -104,8 +109,8 @@ VALUES (0, 'Indigestible', '๐Ÿ”ฐ',
|| e'\n\n'
|| 'Suitable for players who want to add a little risk to being digested, but don''t want to lose levels.',
2, true, false, 90, 75, 10, 0, 10),
(3, 'Risky', '๐ŸŒฅ',
'Reformation is a painful experience. It''s no laughing matter to be digested, so watch your back.',
('Risky', '๐ŸŒฅ',
'Reformation is an unpleasant experience, but you can handle it if you have to.',
'Digestion is no walk in the park for you. When you come back, you leave some of yourself in the predator who '
|| 'turned you from a person to a snack. Your proficiencies drop by 25% as some of what you''ve taken from '
|| 'your past conquests fades from you, and your talents will be re-randomized, as the process of '
@ -113,152 +118,194 @@ VALUES (0, 'Indigestible', '๐Ÿ”ฐ',
|| 'lose 25% of your money as the cost of returning from being belly paunch. Worst of all, you''ll lose '
|| '10% of your experience points as your memories are clouded by your brush with fatality.'
|| e'\n\n'
|| ''
|| 'After reforming, you''ll need some time to rest before you''re back at your peak.'
|| e'\n\n'
|| 'Suitable for players who want a balance between risk and maintaining their progress.',
3, true, true, 25, 10, 25),
(4, 'Dangerous', '๐ŸŒฆ',
'Digestion pushes your',
'Digestion is something to be avoided at all costs. You''ll lose half your money, your stats will have atrophied, and you''ll lose some of your memories.',
4, true, true, 50, 25, 50),
(5, 'Very Dangerous', '๐ŸŒง', '',
'Being a meal is not just humiliating - it''s a nightmare. You''re lucky you get to hold on to anything.',
5, true, true, 90, 50, 90),
(6, 'Extremely Dangerous', 'โ›ˆ', '',
'If you get devoured and you don''t get out, you''ll lose just about everything. Be very, very careful...',
6, true, true, 100, 100, 100)
3, true, true, 75, 60, 25, 10, 25),
('Dangerous', '๐ŸŒฆ',
'You need to be careful around predators, as you''ll be in real trouble if you melt away.',
'Digestion is something to be avoided at all costs. The process of being revived is expensive, costing a full '
|| '50% of your available money. You''ll also lose 50% of your proficiencies and 25% of your experience '
|| 'points as your mind and body are imperfectly restored. Your talents will be regenerated, as well.'
|| e'\n\n'
|| 'After reforming, you will be tired and still vulnerable to other predators. Take some time to rest '
|| 'after a defeat, or you''ll find yourself back in another stomach before you know it.'
|| e'\n\n'
|| 'Suitable for players who want digestion to be particularly painful, but not devastating.',
4, true, true, 50, 30, 50, 25, 50),
('Very Dangerous', '๐ŸŒง',
'The world is cruel. Once you start getting digested, it''s hard to stop.',
'Being a meal is not just humiliating - it''s a nightmare. You''re lucky you still remember who you are when '
|| 'you stumble out of the reformation chamber. You''ll lose 90% of your money to the reformation fee, '
|| 'and 90% of your proficiency points will be drained away as the reformation process leaves you '
|| 'seriously addled and barely feeling like yourself. Your experience point total will also drop by 50%.'
|| e'\n\n'
|| 'After reforming, you will be very weak and exhausted. Make sure to rest and recover before you get '
|| 'into another fight, or you''ll lose another large chunk of progress.'
|| e'\n\n'
|| 'Suitable for players who want digestion to be a devastating loss.',
5, true, true, 25, 15, 90, 50, 90),
('Extremely Dangerous', 'โ›ˆ',
'Be very, very careful. There''s no coming back from digestion. Not really. You''ll lose everything...',
'After being digested, your experience points, proficiencies, and money will all be set to 0, as if you '
|| 'had just stumbled blinking into this world for the first time. You''ll be able to keep your items, '
|| 'but that''s little comfort as your body and mind are returned to life as a blank slate...'
|| e'\n\n'
|| 'After reforming, you will have 1 Health and Energy. You definitely need to spend some time resting - '
|| 'or you won''t be able to break out of the cycle of digestion.'
|| e'\n\n'
|| 'Suitable for players who want a soft-perma type of experience.',
6, true, true, 0, 0, 100, 100, 100)
ON CONFLICT DO NOTHING;
--rollback DELETE FROM difficulties WHERE id IN (0, 1, 2, 3, 4, 5, 6, 7);
--rollback TRUNCATE difficulties;
--changeset reya:preferences_table runInTransaction:false
CREATE TABLE IF NOT EXISTS preferences
(
id INT NOT NULL PRIMARY KEY,
name STRING NOT NULL UNIQUE,
emoji STRING NOT NULL UNIQUE,
short_description STRING NOT NULL,
long_description STRING NOT NULL,
display_order INT NOT NULL,
can_use_vore BOOLEAN NOT NULL,
can_receive_vore BOOLEAN NOT NULL
id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
name STRING NOT NULL UNIQUE,
emoji STRING NOT NULL UNIQUE,
short_description STRING NOT NULL,
display_order SMALLINT NOT NULL,
can_use_vore BOOLEAN NOT NULL,
can_receive_vore BOOLEAN NOT NULL
);
--rollback DROP TABLE IF EXISTS preferences;
--changeset reya:preferences_values runInTransaction:true
INSERT INTO preferences (id, name, emoji, short_description, long_description, display_order, can_use_vore,
INSERT INTO preferences (name, emoji, short_description, display_order, can_use_vore,
can_receive_vore)
VALUES (0, 'Observer', '', 'You can neither eat nor be eaten.', '', 0, false, false),
(1, 'Prey Only', '', 'You can only be eaten, not eat.', '', 1, false, true),
(2, 'Pred Only', '', 'You can only eat, not be eaten.', '', 2, true, false),
(3, 'Switch', '', 'You can both eat and be eaten.', '', 3, true, true)
VALUES ('Switch', '๐Ÿ˜ƒ', 'You can both eat and be eaten.', 0, true, true),
('Pred Only', '๐Ÿคค', 'You can only eat, not be eaten.', 1, true, false),
('Prey Only', '๐Ÿฅฉ', 'You can only be eaten, not eat.', 2, false, true),
('Observer', '๐Ÿ‘€', 'You can neither eat nor be eaten.', 3, false, false)
ON CONFLICT DO NOTHING;
--rollback TRUNCATE preferences;
--changeset reya:gender_markers_table runInTransaction:false
CREATE TABLE IF NOT EXISTS gender_markers
(
emoji STRING NOT NULL PRIMARY KEY,
default_name STRING NOT NULL UNIQUE,
display_order SMALLINT NOT NULL
);
--rollback DROP TABLE IF EXISTS gender_markers;
--changeset reya:gender_markers runInTransaction:true
INSERT INTO gender_markers (default_name, emoji, display_order)
VALUES ('Non-binary', 'โšง', 0),
('Female', 'โ™€๏ธ', 1),
('Male', 'โ™‚๏ธ', 2),
('Non*binary', 'โœณ๏ธ', 3),
('Genderless', 'โฌœ', 4)
ON CONFLICT DO NOTHING;
--rollback DELETE FROM preferences WHERE id IN (0, 1, 2, 3);
--rollback TRUNCATE gender_markers;
--changeset reya:pronouns_table runInTransaction:false
CREATE TABLE IF NOT EXISTS pronouns
(
id INT NOT NULL PRIMARY KEY,
default_gender STRING NOT NULL,
pronouns STRING NOT NULL UNIQUE,
display_order INT NOT NULL,
use_plural BOOLEAN NOT NULL,
subjective STRING NOT NULL,
adjective STRING NOT NULL,
possessive STRING NOT NULL,
reflexive STRING NOT NULL,
objective STRING NOT NULL
id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
default_marker STRING NOT NULL REFERENCES gender_markers (emoji) ON DELETE RESTRICT,
name STRING NOT NULL UNIQUE,
display_order SMALLINT NOT NULL,
use_plural BOOLEAN NOT NULL,
subjective STRING NOT NULL,
adjective STRING NOT NULL,
possessive STRING NOT NULL,
reflexive STRING NOT NULL,
objective STRING NOT NULL,
UNIQUE (subjective, adjective, possessive, reflexive, objective)
);
--rollback DROP TABLE IF EXISTS pronouns;
--changeset reya:pronouns_values runInTransaction:true
INSERT INTO pronouns (id, default_gender, pronouns, display_order, use_plural, subjective, adjective, possessive,
INSERT INTO pronouns (default_marker, name, display_order, use_plural, subjective, adjective, possessive,
reflexive, objective)
VALUES (0, 'Genderless', 'none', 0, false, '@@', '@@''s', '@@''s', '@@''s self', '@@'),
(1, 'Female', 'she/her', 1, false, 'she', 'her', 'hers', 'herself', 'her'),
(2, 'Non-binary', 'they/them', 2, true, 'they', 'their', 'theirs', 'themself', 'them'),
(3, 'Male', 'he/him', 3, false, 'he', 'his', 'his', 'himself', 'him'),
(4, 'Genderless', 'it/its', 4, false, 'it', 'its', 'its', 'itself', 'it'),
(5, 'Herm', 'shi/hir', 5, false, 'shi', 'hir', 'hirs', 'hirself', 'hir'),
(6, 'Non-binary', 'ae/aer', 6, false, 'ae', 'aer', 'aers', 'aerself', 'aer'),
(7, 'Non-binary', 'fae/faer', 7, false, 'fae', 'faer', 'faers', 'faerself', 'faer'),
(8, 'Non-binary', 'e/em', 8, false, 'e', 'eir', 'eirs', 'emself', 'em'),
(9, 'Non-binary', 'ey/em', 9, false, 'ey', 'eir', 'eirs', 'emself', 'em'),
(10, 'Non-binary', 'per/per', 10, false, 'per', 'pers', 'pers', 'perself', 'per'),
(11, 'Non-binary', 've/ver', 11, false, 've', 'vis', 'vis', 'verself', 'ver'),
(12, 'Non-binary', 'xe/xem', 12, false, 'xe', 'xyr', 'xyrs', 'xemself', 'xem'),
(13, 'Non-binary', 'ze/hir', 13, false, 'ze', 'hir', 'hirs', 'hirself', 'hir'),
(14, 'Non-binary', 'zie/hir', 14, false, 'zie', 'hir', 'hirs', 'hirself', 'hir'),
(15, 'Non-binary', 'zie/zim', 15, false, 'zie', 'zir', 'zis', 'zieself', 'zim'),
(16, 'Non-binary', 'sie/sie', 16, false, 'sie', 'hir', 'hirs', 'hirself', 'sie'),
(17, 'Non-binary', 'te/ter', 17, false, 'te', 'tem', 'ters', 'terself', 'ter')
VALUES ('โฌœ', 'none', 0, false, '@@', '@@''s', '@@''s', '@@''s self', '@@'),
('โ™€', 'she/her', 1, false, 'she', 'her', 'hers', 'herself', 'her'),
('โšง', 'they/them', 2, true, 'they', 'their', 'theirs', 'themself', 'them'),
('โ™‚๏ธ', 'he/him', 3, false, 'he', 'his', 'his', 'himself', 'him'),
('โฌœ', 'it/its', 4, false, 'it', 'its', 'its', 'itself', 'it'),
('โšง', 'shi/hir', 5, false, 'shi', 'hir', 'hirs', 'hirself', 'hir'),
('โœณ๏ธ', 'fae/faer', 6, false, 'fae', 'faer', 'faers', 'faerself', 'faer'),
('โœณ๏ธ', 'ae/aer', 7, false, 'ae', 'aer', 'aers', 'aerself', 'aer'),
('โœณ๏ธ', 'e/em', 8, false, 'e', 'eir', 'eirs', 'emself', 'em'),
('โœณ๏ธ', 'ey/em', 9, false, 'ey', 'eir', 'eirs', 'emself', 'em'),
('โœณ๏ธ', 'per/per', 10, false, 'per', 'pers', 'pers', 'perself', 'per'),
('โœณ๏ธ', 've/ver', 11, false, 've', 'vis', 'vis', 'verself', 'ver'),
('โœณ๏ธ', 'xe/xem', 12, false, 'xe', 'xyr', 'xyrs', 'xemself', 'xem'),
('โœณ๏ธ', 'ze/hir', 13, false, 'ze', 'hir', 'hirs', 'hirself', 'hir'),
('โœณ๏ธ', 'zie/hir', 14, false, 'zie', 'hir', 'hirs', 'hirself', 'hir'),
('โœณ๏ธ', 'zie/zim', 15, false, 'zie', 'zir', 'zis', 'zieself', 'zim'),
('โœณ๏ธ', 'sie/sie', 16, false, 'sie', 'hir', 'hirs', 'hirself', 'sie'),
('โœณ๏ธ', 'te/ter', 17, false, 'te', 'tem', 'ters', 'terself', 'ter')
ON CONFLICT DO NOTHING;
--rollback DELETE FROM pronouns WHERE id IN (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17);
--rollback DELETE FROM pronouns;
--changeset reya:characters_table runInTransaction:false
CREATE TABLE IF NOT EXISTS characters
(
id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
user_id UUID NOT NULL REFERENCES users (id) ON DELETE CASCADE,
name STRING NOT NULL,
discriminator INT NULL DEFAULT NULL,
title STRING NOT NULL,
profile STRING NOT NULL,
pronouns_id INT NOT NULL REFERENCES pronouns (id) ON DELETE RESTRICT,
gender_name STRING NOT NULL,
difficulty_id INT NOT NULL REFERENCES difficulties (id) ON DELETE RESTRICT,
preference_id INT NOT NULL REFERENCES preferences (id) ON DELETE RESTRICT,
battle_type1_id INT NOT NULL REFERENCES battle_types (id) ON DELETE RESTRICT,
battle_type2_id INT NOT NULL REFERENCES battle_types (id) ON DELETE RESTRICT,
experience INT NOT NULL DEFAULT 0,
money INT NOT NULL DEFAULT 0,
id UUID NOT NULL PRIMARY KEY DEFAULT gen_random_uuid(),
user_id UUID NOT NULL REFERENCES users (id) ON DELETE CASCADE,
archived BOOLEAN NOT NULL DEFAULT FALSE,
name STRING NOT NULL,
title STRING NOT NULL,
profile STRING NOT NULL,
pronouns_id SMALLINT NOT NULL REFERENCES pronouns (id) ON DELETE RESTRICT,
gender_marker STRING NOT NULL REFERENCES gender_markers (emoji) ON DELETE RESTRICT,
gender_name STRING NOT NULL,
difficulty_id SMALLINT NOT NULL REFERENCES difficulties (id) ON DELETE RESTRICT,
preference_id SMALLINT NOT NULL REFERENCES preferences (id) ON DELETE RESTRICT,
battle_type1_id SMALLINT NOT NULL REFERENCES battle_types (id) ON DELETE RESTRICT,
battle_type2_id SMALLINT NOT NULL REFERENCES battle_types (id) ON DELETE RESTRICT,
experience SMALLINT NOT NULL DEFAULT 0,
money SMALLINT NOT NULL DEFAULT 0,
-- stats: base
base_confidence INT NOT NULL DEFAULT 70,
base_health INT NOT NULL DEFAULT 70,
base_stamina INT NOT NULL DEFAULT 70,
base_brawn INT NOT NULL DEFAULT 70,
base_durability INT NOT NULL DEFAULT 70,
base_intensity INT NOT NULL DEFAULT 70,
base_resilience INT NOT NULL DEFAULT 70,
base_speed INT NOT NULL DEFAULT 70,
base_confidence SMALLINT NOT NULL DEFAULT 70,
base_health SMALLINT NOT NULL DEFAULT 70,
base_stamina SMALLINT NOT NULL DEFAULT 70,
base_brawn SMALLINT NOT NULL DEFAULT 70,
base_durability SMALLINT NOT NULL DEFAULT 70,
base_intensity SMALLINT NOT NULL DEFAULT 70,
base_resilience SMALLINT NOT NULL DEFAULT 70,
base_speed SMALLINT NOT NULL DEFAULT 70,
-- stats: banked talent points
min_confidence_talent INT NOT NULL DEFAULT 0,
min_health_talent INT NOT NULL DEFAULT 0,
min_stamina_talent INT NOT NULL DEFAULT 0,
min_brawn_talent INT NOT NULL DEFAULT 0,
min_durability_talent INT NOT NULL DEFAULT 0,
min_intensity_talent INT NOT NULL DEFAULT 0,
min_resilience_talent INT NOT NULL DEFAULT 0,
min_speed_talent INT NOT NULL DEFAULT 0,
min_confidence_talent SMALLINT NOT NULL DEFAULT 0,
min_health_talent SMALLINT NOT NULL DEFAULT 0,
min_stamina_talent SMALLINT NOT NULL DEFAULT 0,
min_brawn_talent SMALLINT NOT NULL DEFAULT 0,
min_durability_talent SMALLINT NOT NULL DEFAULT 0,
min_intensity_talent SMALLINT NOT NULL DEFAULT 0,
min_resilience_talent SMALLINT NOT NULL DEFAULT 0,
min_speed_talent SMALLINT NOT NULL DEFAULT 0,
-- stats: current talent points
confidence_talent INT NOT NULL DEFAULT floor(random() * 32)::INT, --min_confidence_talent + floor(random() * (32 - min_confidence_talent)),
health_talent INT NOT NULL DEFAULT floor(random() * 32)::INT, --min_health_talent + floor(random() * (32 - min_health_talent)),
stamina_talent INT NOT NULL DEFAULT floor(random() * 32)::INT, --min_stamina_talent + floor(random() * (32 - min_stamina_talent)),
brawn_talent INT NOT NULL DEFAULT floor(random() * 32)::INT, --min_brawn_talent + floor(random() * (32 - min_brawn_talent)),
durability_talent INT NOT NULL DEFAULT floor(random() * 32)::INT, --min_durability_talent + floor(random() * (32 - min_durability_talent)),
intensity_talent INT NOT NULL DEFAULT floor(random() * 32)::INT, --min_intensity_talent + floor(random() * (32 - min_intensity_talent)),
resilience_talent INT NOT NULL DEFAULT floor(random() * 32)::INT, --min_resilience_talent + floor(random() * (32 - min_resilience_talent)),
speed_talent INT NOT NULL DEFAULT floor(random() * 32)::INT, --min_speed_talent + floor(random() * (32 - min_speed_talent)),
confidence_talent SMALLINT NOT NULL DEFAULT floor(random() * 32)::SMALLINT, --min_confidence_talent + floor(random() * (32 - min_confidence_talent)),
health_talent SMALLINT NOT NULL DEFAULT floor(random() * 32)::SMALLINT, --min_health_talent + floor(random() * (32 - min_health_talent)),
stamina_talent SMALLINT NOT NULL DEFAULT floor(random() * 32)::SMALLINT, --min_stamina_talent + floor(random() * (32 - min_stamina_talent)),
brawn_talent SMALLINT NOT NULL DEFAULT floor(random() * 32)::SMALLINT, --min_brawn_talent + floor(random() * (32 - min_brawn_talent)),
durability_talent SMALLINT NOT NULL DEFAULT floor(random() * 32)::SMALLINT, --min_durability_talent + floor(random() * (32 - min_durability_talent)),
intensity_talent SMALLINT NOT NULL DEFAULT floor(random() * 32)::SMALLINT, --min_intensity_talent + floor(random() * (32 - min_intensity_talent)),
resilience_talent SMALLINT NOT NULL DEFAULT floor(random() * 32)::SMALLINT, --min_resilience_talent + floor(random() * (32 - min_resilience_talent)),
speed_talent SMALLINT NOT NULL DEFAULT floor(random() * 32)::SMALLINT, --min_speed_talent + floor(random() * (32 - min_speed_talent)),
-- stats: current proficiency points
confidence_proficiency INT NOT NULL DEFAULT 0,
health_proficiency INT NOT NULL DEFAULT 0,
stamina_proficiency INT NOT NULL DEFAULT 0,
brawn_proficiency INT NOT NULL DEFAULT 0,
durability_proficiency INT NOT NULL DEFAULT 0,
intensity_proficiency INT NOT NULL DEFAULT 0,
resilience_proficiency INT NOT NULL DEFAULT 0,
speed_proficiency INT NOT NULL DEFAULT 0,
confidence_proficiency SMALLINT NOT NULL DEFAULT 0,
health_proficiency SMALLINT NOT NULL DEFAULT 0,
stamina_proficiency SMALLINT NOT NULL DEFAULT 0,
brawn_proficiency SMALLINT NOT NULL DEFAULT 0,
durability_proficiency SMALLINT NOT NULL DEFAULT 0,
intensity_proficiency SMALLINT NOT NULL DEFAULT 0,
resilience_proficiency SMALLINT NOT NULL DEFAULT 0,
speed_proficiency SMALLINT NOT NULL DEFAULT 0,
UNIQUE (user_id, name, discriminator),
FAMILY character_base (id, user_id, name, title, profile, pronouns_id, battle_type1_id, battle_type2_id,
base_confidence,
base_health,
base_stamina, base_brawn, base_durability, base_intensity, base_resilience, base_speed),
FAMILY character_base (id, user_id, name, title, profile, pronouns_id, gender_marker, gender_name,
battle_type1_id, battle_type2_id, base_confidence, base_health, base_stamina,
base_brawn, base_durability, base_intensity, base_resilience, base_speed),
FAMILY character_reformation_stats (min_confidence_talent, min_health_talent, min_stamina_talent, min_brawn_talent,
min_durability_talent, min_intensity_talent, min_resilience_talent,
min_speed_talent,
confidence_talent, health_talent, stamina_talent, brawn_talent,
durability_talent, intensity_talent, resilience_talent, speed_talent),
min_speed_talent, confidence_talent, health_talent, stamina_talent,
brawn_talent, durability_talent, intensity_talent, resilience_talent,
speed_talent),
FAMILY character_live_stats (difficulty_id, preference_id, experience, money, confidence_proficiency,
health_proficiency, stamina_proficiency, brawn_proficiency, durability_proficiency,
intensity_proficiency, resilience_proficiency, speed_proficiency)
@ -268,38 +315,39 @@ CREATE TABLE IF NOT EXISTS characters
--changeset reya:character_creation_table runInTransaction:false
CREATE TABLE IF NOT EXISTS character_creation
(
user_id UUID NOT NULL REFERENCES users (id) ON DELETE CASCADE,
character_id UUID NULL REFERENCES characters (id) ON DELETE CASCADE,
name STRING NULL,
title STRING NULL,
profile STRING NULL,
pronouns_id INT NULL REFERENCES pronouns (id) ON DELETE RESTRICT,
gender_name STRING NULL,
difficulty_id INT NULL REFERENCES difficulties (id) ON DELETE RESTRICT,
preference_id INT NULL REFERENCES preferences (id) ON DELETE RESTRICT,
battle_type1_id INT NULL REFERENCES battle_types (id) ON DELETE RESTRICT,
battle_type2_id INT NULL REFERENCES battle_types (id) ON DELETE RESTRICT,
base_confidence INT NULL DEFAULT 70,
base_health INT NULL DEFAULT 70,
base_stamina INT NULL DEFAULT 70,
base_brawn INT NULL DEFAULT 70,
base_durability INT NULL DEFAULT 70,
base_intensity INT NULL DEFAULT 70,
base_resilience INT NULL DEFAULT 70,
base_speed INT NULL DEFAULT 70,
PRIMARY KEY (user_id, character_id)
user_id UUID NOT NULL REFERENCES users (id) ON DELETE CASCADE PRIMARY KEY,
character_id UUID NULL REFERENCES characters (id) ON DELETE CASCADE,
name STRING NULL,
title STRING NULL,
profile STRING NULL,
pronouns_id UUID NULL REFERENCES pronouns (id) ON DELETE SET NULL,
gender_marker STRING NULL REFERENCES gender_markers (emoji) ON DELETE SET NULL,
gender_name STRING NULL,
difficulty_id UUID NULL REFERENCES difficulties (id) ON DELETE SET NULL,
preference_id UUID NULL REFERENCES preferences (id) ON DELETE SET NULL,
battle_type1_id UUID NULL REFERENCES battle_types (id) ON DELETE SET NULL,
battle_type2_id UUID NULL REFERENCES battle_types (id) ON DELETE SET NULL,
base_confidence SMALLINT NULL DEFAULT 70,
base_health SMALLINT NULL DEFAULT 70,
base_stamina SMALLINT NULL DEFAULT 70,
base_brawn SMALLINT NULL DEFAULT 70,
base_durability SMALLINT NULL DEFAULT 70,
base_intensity SMALLINT NULL DEFAULT 70,
base_resilience SMALLINT NULL DEFAULT 70,
base_speed SMALLINT NULL DEFAULT 70
);
--rollback DROP TABLE IF EXISTS character_creation;
--changeset reya:userDefaultDifficultyPreferenceGender
ALTER TABLE users
ADD COLUMN default_pronouns_id INT NULL REFERENCES pronouns (id) ON DELETE RESTRICT DEFAULT NULL
ADD COLUMN default_pronouns_id UUID NULL REFERENCES pronouns (id) ON DELETE RESTRICT DEFAULT NULL
CREATE IF NOT EXISTS FAMILY character_defaults,
ADD COLUMN default_gender_name STRING NULL DEFAULT NULL
ADD COLUMN default_gender_marker STRING NULL REFERENCES gender_markers (emoji) ON DELETE RESTRICT DEFAULT NULL
FAMILY character_defaults,
ADD COLUMN default_gender_name STRING NULL DEFAULT NULL
FAMILY character_defaults,
ADD COLUMN default_difficulty_id INT NULL REFERENCES difficulties (id) ON DELETE RESTRICT DEFAULT NULL
ADD COLUMN default_difficulty_id UUID NULL REFERENCES difficulties (id) ON DELETE RESTRICT DEFAULT NULL
FAMILY character_defaults,
ADD COLUMN default_preference_id INT NULL REFERENCES preferences (id) ON DELETE RESTRICT DEFAULT NULL
ADD COLUMN default_preference_id UUID NULL REFERENCES preferences (id) ON DELETE RESTRICT DEFAULT NULL
FAMILY character_defaults;
--rollback ALTER
--rollback ALTER TABLE users DROP COLUMN default_pronouns_id, DROP COLUMN default_gender_marker, DROP COLUMN default_gender_name, DROP COLUMN default_difficulty_id, DROP COLUMN default_preference_id

@ -5,7 +5,7 @@ import {Commands} from "../commands/index.js"
import {checkIsRestart, reportFailed, reportReady, reportStarted} from "../ipc/restart.js"
import {defaultPresence} from "../defaultPresence.js"
import {Pool} from "pg"
import {Database, DatabaseImpl, makeTransactable} from "../database/database.js"
import {Database, DatabaseImpl, makeTransact} from "../database"
async function bot() {
await checkIsRestart()
@ -16,6 +16,9 @@ async function bot() {
const p = new Pool({
application_name: "VoreRPG Bot",
})
p.on("error", (err) => {
console.log(err)
})
async function cleanUp() {
await p.end()
@ -24,7 +27,7 @@ async function bot() {
const db: Database = new DatabaseImpl({
query: p.query.bind(p),
transactable: makeTransactable(p),
transact: makeTransact(p),
})
const cmd = new Commands({users: db.users, cleanUp})

@ -3,7 +3,7 @@ import {ApplicationCommandType} from "discord.js"
import {BotRestartCommand} from "./restart"
import {BotShutdownCommand} from "./shutdown"
import {BotRebuildCommand} from "./rebuild"
import {UsersTable} from "../../database/users.js"
import {UsersManager} from "../../managers/users";
export class BotCommand extends CommandWithSubcommandsData {
readonly rebuild: BotRebuildCommand
@ -11,7 +11,7 @@ export class BotCommand extends CommandWithSubcommandsData {
readonly shutdown: BotShutdownCommand
readonly subcommands: SubcommandData[]
constructor({users, cleanUp}: { users: UsersTable, cleanUp: () => Promise<void> }) {
constructor({users, cleanUp}: { users: UsersManager, cleanUp: () => Promise<void> }) {
super()
this.rebuild = new BotRebuildCommand({users, cleanUp})
this.restart = new BotRestartCommand({users, cleanUp})

@ -9,13 +9,13 @@ import {wrappedRestart} from "../../ipc/restart"
import {fork} from "child_process"
import {defaultPresence} from "../../defaultPresence"
import {resolve as resolvePath} from "path"
import {UsersTable} from "../../database/users.js"
import {UsersManager} from "../../managers/users";
export class BotRebuildCommand extends SubcommandData {
private readonly _users: UsersTable
private readonly _users: UsersManager
private readonly _cleanUp: () => Promise<void>
constructor({users, cleanUp}: { users: UsersTable, cleanUp(): Promise<void> }) {
constructor({users, cleanUp}: { users: UsersManager, cleanUp(): Promise<void> }) {
super()
this._users = users
this._cleanUp = cleanUp
@ -28,7 +28,7 @@ export class BotRebuildCommand extends SubcommandData {
}
async execute(b: ChatInputCommandInteraction): Promise<void> {
if (await this._users.getActiveSnowflakeIsAdmin(b.user.id)) {
if (await this._users.isSnowflakeAdmin(b.user.id)) {
await b.reply({
content: "I dunno... Let's check if this will work...",
ephemeral: true,

@ -6,13 +6,13 @@ import {
ChatInputCommandInteraction,
} from "discord.js"
import {wrappedRestart} from "../../ipc/restart"
import {UsersTable} from "../../database/users.js"
import {UsersManager} from "../../managers/users";
export class BotRestartCommand extends SubcommandData {
private readonly _users: UsersTable
private readonly _users: UsersManager
private readonly _cleanUp: () => Promise<void>
constructor({users, cleanUp}: { users: UsersTable, cleanUp(): Promise<void> }) {
constructor({users, cleanUp}: { users: UsersManager, cleanUp(): Promise<void> }) {
super()
this._users = users
this._cleanUp = cleanUp
@ -25,7 +25,7 @@ export class BotRestartCommand extends SubcommandData {
}
async execute(b: ChatInputCommandInteraction): Promise<void> {
if (await this._users.getActiveSnowflakeIsAdmin(b.user.id)) {
if (await this._users.isSnowflakeAdmin(b.user.id)) {
await b.reply({
ephemeral: true,
content: "Yaaaawwn... Okay... Just a quick nap then...",

@ -1,12 +1,12 @@
import {SubcommandData} from "../types"
import {ApplicationCommandOptionType, ApplicationCommandSubCommandData, ChatInputCommandInteraction} from "discord.js"
import {UsersTable} from "../../database/users.js"
import {UsersManager} from "../../managers/users";
export class BotShutdownCommand extends SubcommandData {
private readonly _users: UsersTable
private readonly _users: UsersManager
private readonly _cleanUp: () => Promise<void>
constructor({users, cleanUp}: { users: UsersTable, cleanUp(): Promise<void> }) {
constructor({users, cleanUp}: { users: UsersManager, cleanUp(): Promise<void> }) {
super()
this._users = users
this._cleanUp = cleanUp
@ -19,7 +19,7 @@ export class BotShutdownCommand extends SubcommandData {
}
async execute(b: ChatInputCommandInteraction): Promise<void> {
if (await this._users.getActiveSnowflakeIsAdmin(b.user.id)) {
if (await this._users.isSnowflakeAdmin(b.user.id)) {
await b.reply({
ephemeral: true,
content: "Good night =w=",

@ -31,6 +31,14 @@ export class CharacterCreateCommand extends SubcommandData {
required: false,
autocomplete: true,
},
{
name: "gender",
type: ApplicationCommandOptionType.String,
description: "Your character's pronouns. Don't worry, you can change this later.",
required: false,
maxLength: 20,
minLength: 1,
},
{
name: "difficulty",
type: ApplicationCommandOptionType.String,

@ -1,18 +1,54 @@
export interface BattleType {
id: number,
name: string,
emoji: string,
color: string,
displayOrder: number,
immmunities: BattleTypeStub[]
resistances: BattleTypeStub[]
weaknesses: BattleTypeStub[]
import {TransactType} from "./index";
export interface BattleTypeData {
id: string
name: string
emoji: string
display_order: number
}
export interface BattleTypeRelationshipData {
attacker: string
defender: string
damage_percentage: number
}
export interface BattleTypeTablesData {
types: BattleTypeData[]
relationships: BattleTypeRelationshipData[]
}
export interface BattleTypeStub {
id: number,
name: string,
emoji: string,
color: string,
displayOrder: number
export interface BattleTypeTables {
getTypesAndRelationships(): Promise<BattleTypeTablesData>
}
export class BattleTypeTablesImpl implements BattleTypeTables {
private readonly _transact: TransactType
constructor({transact}: { transact: TransactType }) {
this._transact = transact
}
async getTypesAndRelationships(): Promise<BattleTypeTablesData> {
const result: BattleTypeTablesData = {
types: [],
relationships: [],
}
await this._transact({
readonly: true,
async transaction(query) {
const types = await query<{ id: string, name: string, emoji: string, display_order: number }>(
`SELECT id, name, emoji, display_order
FROM battle_types`
)
const relationships = await query<{ attacker: string, defender: string, damage_percentage: number }>(
`SELECT attacker, defender, damage_percentage
FROM battle_types_relationships`
)
result.types = types.rows
result.relationships = relationships.rows
}
})
return result
}
}

@ -1,64 +0,0 @@
import {QueryType, Transactable} from "./database.js"
import {Snowflake} from "discord-api-types/globals.js"
import {Pronouns} from "./pronouns.js"
export interface CharacterCreationState {
name: string | null
title: string | null
profile: string | null
gender: string | null
pronouns: Pronouns | null
difficulty: Difficulty | null
preference: Preference | null
type1: BattleType | null,
type2: BattleType | null,
baseConfidence: number | null,
baseHealth: number | null,
baseStamina: number | null,
baseBrawn: number | null,
baseDurability: number | null,
baseIntensity: number | null,
baseResilience: number | null,
baseSpeed: number | null,
}
export interface CharacterCreationInput {
name?: string
title?: string
profile?: string
gender?: string
pronouns?: string
difficultyName?: string
preferenceName?: string
type1Name?: string
type2Name?: string
baseConfidence?: number
baseHealth?: number
baseStamina?: number
baseBrawn?: number
baseDurability?: number
baseIntensity?: number
baseResilience?: number
baseSpeed?: number
}
export interface CharacterCreationTable {
startOrContinueCreatingCharacter(snowflake: Snowflake,
input: CharacterCreationInput): Promise<CharacterCreationState>
}
export class CharacterCreationTableImpl implements CharacterCreationTable {
private readonly _query: QueryType
private readonly _transactable: Transactable
constructor({query, transactable}: { query: QueryType, transactable: Transactable }) {
this._query = query
this._transactable = transactable
}
async startOrContinueCreatingCharacter(
owner: Snowflake,
input: CharacterCreationInput): Promise<CharacterCreationState> {
}
}

@ -0,0 +1,58 @@
import {TransactType} from "./index";
export interface PronounData {
id: string
default_marker: string
name: string
display_order: number
use_plural: boolean
subjective: string
adjective: string
possessive: string
reflexive: string
objective: string
}
export interface GenderMarkerData {
emoji: string
default_name: string
display_order: number
}
export interface GenderTablesData {
pronouns: PronounData[]
markers: GenderMarkerData[]
}
export interface GenderTables {
getPronounsAndMarkers(): Promise<GenderTablesData>
}
export class GenderTablesImpl implements GenderTables {
private readonly _transact: TransactType
constructor({transact}: { transact: TransactType }) {
this._transact = transact
}
async getPronounsAndMarkers(): Promise<GenderTablesData> {
const result: GenderTablesData = {
pronouns: [],
markers: [],
}
await this._transact({
readonly: true,
async transaction(query) {
const pronouns = await query<{id: string, default_marker: string, name: string, display_order: number, use_plural: boolean, subjective: string, adjective: string, possessive: string, reflexive: string, objective: string}>(
`SELECT id, default_marker, name, display_order, use_plural, subjective, adjective, possessive, reflexive, objective FROM pronouns`
)
const markers = await query<{emoji: string, default_name: string, display_order: number}>(
`SELECT emoji, default_name, display_order FROM gender_markers`
)
result.pronouns = pronouns.rows
result.markers = markers.rows
}
})
return result
}
}

@ -1,6 +1,7 @@
import {QueryResult, QueryResultRow} from "pg"
import {UsersTable, UsersTableImpl} from "./users.js"
import {CharacterCreationTable, CharacterCreationTableImpl} from "./character_creation.js"
import {BattleTypeTables, BattleTypeTablesImpl} from "./battle_types";
import {GenderTables, GenderTablesImpl} from "./gender";
export interface PoolLike {
connect(): Promise<PoolClientLike>
@ -10,21 +11,21 @@ export interface PoolClientLike extends Queryable {
release(err?: boolean): void
}
export function makeTransactable(p: PoolLike): Transactable {
return async function transactable(callback: (q: QueryType, attempts: number) => Promise<void>): Promise<void> {
export function makeTransact(p: PoolLike): TransactType {
return async function transact({readonly=false, transaction}: {readonly?: boolean, transaction: (q: QueryType, attempts: number) => Promise<void>}): Promise<void> {
const client = await p.connect()
const query = client.query.bind(client)
let committed = false
let attempts = 0
while (!committed) {
try {
await client.query("BEGIN")
await client.query("BEGIN READ " + (readonly ? "ONLY" : "WRITE"))
} catch (err) {
client.release()
throw err
}
try {
await callback(query, attempts)
await transaction(query, attempts)
} catch (err) {
try {
await client.query("ROLLBACK")
@ -47,7 +48,8 @@ export function makeTransactable(p: PoolLike): Transactable {
export interface Database {
readonly users: UsersTable
readonly characterCreation: CharacterCreationTable
readonly gender: GenderTables
readonly battleTypes: BattleTypeTables
}
export interface Queryable {
@ -58,14 +60,16 @@ export interface Queryable {
}
export type QueryType = Queryable["query"]
export type Transactable = (transaction: (client: QueryType, attempts: number) => Promise<void>) => Promise<void>
export type TransactType = (config: {readonly?: boolean, transaction: (client: QueryType, attempts: number) => Promise<void>}) => Promise<void>
export class DatabaseImpl implements Database {
readonly users: UsersTableImpl
readonly characterCreation: CharacterCreationTableImpl
readonly gender: GenderTables
readonly battleTypes: BattleTypeTablesImpl
constructor({query, transactable}: { query: QueryType, transactable: Transactable }) {
constructor({query, transact}: { query: QueryType, transact: TransactType }) {
this.users = new UsersTableImpl({query})
this.characterCreation = new CharacterCreationTableImpl({query, transactable})
this.gender = new GenderTablesImpl({transact})
this.battleTypes = new BattleTypeTablesImpl({transact})
}
}

@ -1,10 +0,0 @@
import {Database} from "../database.js"
import {InMemoryUsersTable} from "./users.js"
export class InMemoryDatabase implements Database {
readonly users: InMemoryUsersTable
constructor() {
this.users = new InMemoryUsersTable()
}
}

@ -1,46 +0,0 @@
import {userSnowflakeToUuid, UsersTable} from "../users.js"
import {Snowflake} from "discord-api-types/globals.js"
interface InMemoryUserData {
id: string,
is_admin: boolean
active_at: Date | null
}
export class InMemoryUsersTable implements UsersTable {
private readonly _users: Record<string, InMemoryUserData> = {}
async createBotOwnerAsAdmin(snowflake: Snowflake): Promise<void> {
const uuid = userSnowflakeToUuid(snowflake)
this._users[uuid] = {
id: uuid,
is_admin: true,
active_at: null,
}
}
async getActiveSnowflakeIsAdmin(snowflake: Snowflake): Promise<boolean> {
const uuid = userSnowflakeToUuid(snowflake)
if (!this._users.hasOwnProperty(uuid)) {
this._users[uuid] = {
id: uuid,
is_admin: false,
active_at: new Date(),
}
}
const user = this._users[uuid]
return user.is_admin
}
async getUuidForActiveSnowflake(snowflake: Snowflake): Promise<string> {
const uuid = userSnowflakeToUuid(snowflake)
if (!this._users.hasOwnProperty(uuid)) {
this._users[uuid] = {
id: uuid,
is_admin: false,
active_at: new Date(),
}
}
return uuid
}
}

@ -1,22 +0,0 @@
export interface Pronouns {
id: number
defaultGender: string
pronouns: string
displayOrder: number
usePlural: boolean
subjective: string
adjective: string
possessive: string
reflexive: string
objective: string
}
export interface PronounsAutocomplete {
pronouns: string
usePlural: boolean
subjective: string
adjective: string
possessive: string
reflexive: string
objective: string
}

@ -1,15 +1,11 @@
import {Snowflake} from "discord-api-types/globals.js"
import {fast1a52 as fnvFast1a52} from "fnv-plus"
import {parse as uuidParse, v1 as uuidV1, validate as uuidValidate, version as uuidVersion} from "uuid"
import {SnowflakeUtil} from "discord.js"
import {QueryType} from "./database.js"
import {QueryType} from "./index.js"
export interface UsersTable {
getUuidForActiveSnowflake(snowflake: Snowflake): Promise<string>
createUserOrUpdateActiveTime(id: string): Promise<void>
getActiveSnowflakeIsAdmin(snowflake: Snowflake): Promise<boolean>
getUserExistsAndIsAdmin(id: string): Promise<boolean>
createBotOwnerAsAdmin(snowflake: Snowflake): Promise<void>
createOrSetUserAsAdmin(id: string): Promise<void>
}
export class UsersTableImpl implements UsersTable {
@ -19,95 +15,33 @@ export class UsersTableImpl implements UsersTable {
this._query = query
}
async getUuidForActiveSnowflake(snowflake: Snowflake): Promise<string> {
const result = await this._query<{ id: string }, [string]>(
async createUserOrUpdateActiveTime(id: string): Promise<void> {
await this._query<{ id: string }, [string]>(
`INSERT INTO users (id, is_admin, created_at, updated_at, active_at)
VALUES ($1, FALSE, now(), now(), now())
ON CONFLICT (id) DO UPDATE SET active_at = now()
RETURNING id;`, [userSnowflakeToUuid(snowflake)])
return result.rows[0].id
RETURNING id;`, [id])
}
async getActiveSnowflakeIsAdmin(snowflake: Snowflake): Promise<boolean> {
async getUserExistsAndIsAdmin(id: string): Promise<boolean> {
const result = await this._query<{ is_admin: boolean }, [string]>(
`UPDATE users
SET active_at = NOW()
WHERE id = $1
RETURNING is_admin;`, [userSnowflakeToUuid(snowflake)])
RETURNING is_admin;`, [id])
if (result.rowCount === 0) {
return false
}
return result.rows[0].is_admin
}
async createBotOwnerAsAdmin(snowflake: Snowflake): Promise<void> {
async createOrSetUserAsAdmin(id: string): Promise<void> {
await this._query<{}, [string]>(
`INSERT INTO users (id, is_admin, created_at, updated_at)
VALUES ($1, TRUE, now(), now())
ON CONFLICT (id) DO UPDATE SET is_admin = TRUE,
updated_at = NOW()
WHERE users.is_admin = FALSE;`, [userSnowflakeToUuid(snowflake)])
WHERE users.is_admin = FALSE;`, [id])