The API update

.github/restyled.yml

@@ -0,0 +1,23 @@
+enabled: true
+also_exclude:
+  - "alembic/**/*"
+
+request_review: author
+labels:
+  - "Type: Style"
+  - "Priority: 3"
+
+restylers:
+  - jq:
+      enabled: false
+  - reorder-python-imports:
+      enabled: false
+  - black:
+      enabled: false
+  - isort:
+      enabled: true
+  - prettier-json:
+      enabled: true
+  - "*"
+  - yapf:
+      arguments: ["--style pyproject.toml"]

alembic/env.py

@@ -50,6 +50,7 @@ def run_migrations_offline() -> None:
         dialect_opts={"paramstyle": "named"},
         include_schemas=True,
         compare_server_default=True,
+        compare_type=True,
     )
 
     with context.begin_transaction():
@@ -62,6 +63,7 @@ def do_run_migrations(connection: Connection) -> None:
         target_metadata=target_metadata,
         include_schemas=True,
         compare_server_default=True,
+        compare_type=True,
     )
 
     with context.begin_transaction():

alembic/versions/242c1f9f1463_v0_1_1_0_part2_notification.py

@@ -0,0 +1,50 @@
+"""v0.1.1.0 Part2 Notification
+
+Revision ID: 242c1f9f1463
+Revises: 8c4e4c4f3661
+Create Date: 2023-04-23 11:26:40.065546+00:00
+
+"""
+# pylint: skip-file
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '242c1f9f1463'
+down_revision = '8c4e4c4f3661'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('general_configs', sa.Column('warn_autoclose', sa.Interval(), nullable=True, comment='Time to warn user (via DM) after last response'), schema='tickets_plus')
+    op.add_column('tickets', sa.Column('notified', sa.Boolean(), nullable=True, comment='Whether the user has been notified about this ticket'), schema='tickets_plus')
+    op.execute('UPDATE tickets_plus.tickets SET notified = FALSE')
+    op.alter_column('tickets', 'notified', nullable=False, schema='tickets_plus')
+    # ### end Alembic commands ###
+    op.add_column('general_configs', sa.Column('first_autoclose_inter', sa.Interval(), nullable=True, comment='Time since open with no response to autoclose'), schema='tickets_plus')
+    op.add_column('general_configs', sa.Column('any_autoclose_inter', sa.Interval(), nullable=True, comment='Time since last response to autoclose'), schema='tickets_plus')
+    op.execute('UPDATE tickets_plus.general_configs SET first_autoclose_inter = INTERVAL \'1 minute\' * first_autoclose')
+    op.execute('UPDATE tickets_plus.general_configs SET any_autoclose_inter = INTERVAL \'1 minute\' * any_autoclose')
+    op.drop_column('general_configs', 'first_autoclose', schema='tickets_plus')
+    op.drop_column('general_configs', 'any_autoclose', schema='tickets_plus')
+    op.alter_column('general_configs', 'first_autoclose_inter', new_column_name='first_autoclose', schema='tickets_plus')
+    op.alter_column('general_configs', 'any_autoclose_inter', new_column_name='any_autoclose', schema='tickets_plus')
+
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('tickets', 'notified', schema='tickets_plus')
+    op.drop_column('general_configs', 'warn_autoclose', schema='tickets_plus')
+    # ### end Alembic commands ###
+    op.alter_column('general_configs', 'first_autoclose', new_column_name='first_autoclose_inter', schema='tickets_plus')
+    op.alter_column('general_configs', 'any_autoclose', new_column_name='any_autoclose_inter', schema='tickets_plus')
+    op.add_column('general_configs', sa.Column('first_autoclose', sa.Integer(), nullable=True, comment='Time since open with no response to autoclose'), schema='tickets_plus')
+    op.add_column('general_configs', sa.Column('any_autoclose', sa.Integer(), nullable=True, comment='Time since last response to autoclose'), schema='tickets_plus')
+    op.execute('UPDATE tickets_plus.general_configs SET first_autoclose = EXTRACT(MINUTE FROM first_autoclose_inter)::INTEGER')
+    op.execute('UPDATE tickets_plus.general_configs SET any_autoclose = EXTRACT(MINUTE FROM any_autoclose_inter)::INTEGER')
+    op.drop_column('general_configs', 'first_autoclose_inter', schema='tickets_plus')
+    op.drop_column('general_configs', 'any_autoclose_inter', schema='tickets_plus')

alembic/versions/8c4e4c4f3661_v0_1_1_0_integration_upgrade.py

@@ -0,0 +1,33 @@
+"""v0.1.1.0 Integration Upgrade
+
+Revision ID: 8c4e4c4f3661
+Revises: 8c713ab3df0b
+Create Date: 2023-04-21 13:27:35.953542+00:00
+
+"""
+# pylint: skip-file
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '8c4e4c4f3661'
+down_revision = '8c713ab3df0b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('general_configs', sa.Column('integrated', sa.Boolean(), nullable=True, comment='Whether the bot is integrated with the main bot'), schema='tickets_plus')
+    op.execute('UPDATE tickets_plus.general_configs SET integrated = FALSE')
+    op.alter_column('general_configs', 'integrated', nullable=False, schema='tickets_plus')
+    op.add_column('tickets', sa.Column('user_id', sa.BigInteger(), nullable=True, comment='Unique discord-provided user ID'), schema='tickets_plus')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('tickets', 'user_id', schema='tickets_plus')
+    op.drop_column('general_configs', 'integrated', schema='tickets_plus')
+    # ### end Alembic commands ###

example_config.json

@@ -1,17 +1,23 @@
 {
-    "info": "This is the example config file for the bot. All the <name>_info are not used and just comments. The bot will use the info in the <name> field of the config.json. Feel free to remove all the _info values.",
-    "dbtype": "postgresql+asyncpg",
-    "info_dbtype": "The type of database to use. Active support for postgresql. Support for SQLite+aiosqlite will be provided on a least-effort basis and may be removed at any time.",
-    "dbhost": "localhost",
-    "info_dbhost": "The host of the database.",
-    "dbport": 5432,
-    "info_dbport": "The port of the database.",
-    "dbname": "bot",
-    "info_dbname": "The name of the database.",
-    "dbuser": "bot",
-    "info_dbuser": "The username for the database.",
-    "dbpass": "bot",
-    "info_dbpass": "The password for the database.",
-    "dev_guild_id": 478114566509821953,
-    "dev_guild_id_info": "The id of a guild where you can use the override commands. This is required for the bot to work."
+  "info": "This is the example config file for the bot. All the <name>_info are not used and just comments. The bot will use the info in the <name> field of the config.json. Feel free to remove all the _info values.",
+  "dbtype": "postgresql+asyncpg",
+  "info_dbtype": "The type of database to use. Active support for postgresql. Support for SQLite+aiosqlite will be provided on a least-effort basis and may be removed at any time.",
+  "dbhost": "localhost",
+  "info_dbhost": "The host of the database.",
+  "dbport": 5432,
+  "info_dbport": "The port of the database.",
+  "dbname": "bot",
+  "info_dbname": "The name of the database.",
+  "dbuser": "bot",
+  "info_dbuser": "The username for the database.",
+  "dbpass": "bot",
+  "info_dbpass": "The password for the database.",
+  "dev_guild_id": 478114566509821953,
+  "dev_guild_id_info": "The id of a guild where you can use the override commands. This is required for the bot to work.",
+  "https_port": 443,
+  "https_port_info": "The port to run the https server on. This is required for the API to work.",
+  "ssl_cert": "/etc/letsencrypt/live/ticketsplus.xyz/fullchain.pem",
+  "ssl_cert_info": "The path to the ssl certificate. This is required for the API to work.",
+  "auth_token": "thequickbrownfoxjumpedoverthelazydog",
+  "auth_token_info": "The token to use for the API. Please set this to something else. This is required for the API to work."
 }

example_secret.json

@@ -1,4 +1,7 @@
 {
-    "info":"This is a file for the bot's token/secret (used to control the bot). You can get one @ discord.dev Don't share this with anyone or make it public. If you want to you can remove this line. Remember to remove the example_ from the file name!",
-    "token":"YOUR TOKEN HERE"
+  "info": "This is a file for the bot's private data. If you want to you can remove this line. Remember to remove the example_ from the file name!",
+  "token": "YOUR TOKEN HERE",
+  "token_info": "The token of the bot. You can get one @ discord.dev Don't share this with anyone or make it public. This is required for the bot to work.",
+  "ssl_key": "/etc/letsencrypt/live/ticketsplus.xyz/privkey.pem",
+  "ssl_key_info": "The path to the ssl key. This is required for the API to work."
 }