From 86871ae9fccdb9004af2df817fc281d429b064fd Mon Sep 17 00:00:00 2001 From: Tdxdxoz Date: Wed, 19 Aug 2020 10:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=8F=90=E9=97=AE=E7=A7=81=E4=BF=A1?= =?UTF-8?q?=E5=9C=A8=E4=B8=80=E4=B8=AA=E8=AF=84=E8=AE=BA=E5=8C=BA=E9=9B=86?= =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=20=E6=B3=A8=E6=84=8F=E9=9C=80?= =?UTF-8?q?=E8=A6=81migrate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ask.py | 20 ++++-- migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++ migrations/env.py | 96 ++++++++++++++++++++++++++++ migrations/script.py.mako | 24 +++++++ migrations/versions/483862f48958_.py | 28 ++++++++ static/ask.html | 2 +- 7 files changed, 209 insertions(+), 7 deletions(-) create mode 100644 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100644 migrations/script.py.mako create mode 100644 migrations/versions/483862f48958_.py diff --git a/ask.py b/ask.py index 8b3e1d9..1d10074 100644 --- a/ask.py +++ b/ask.py @@ -2,6 +2,7 @@ from flask import Flask, request, render_template, send_from_directory, abort, r from flask_sqlalchemy import SQLAlchemy from flask_limiter import Limiter from flask_limiter.util import get_remote_address +from flask_migrate import Migrate from mastodon import Mastodon import re, random, string, datetime import html2text @@ -39,6 +40,7 @@ h2t = html2text.HTML2Text() h2t.ignore_links = True db = SQLAlchemy(app) +migrate = Migrate(app, db) class User(db.Model): id = db.Column(db.Integer, primary_key=True) @@ -47,6 +49,7 @@ class User(db.Model): avat = db.Column(db.String(256)) url = db.Column(db.String(128)) secr = db.Column(db.String(16)) + root = db.Column(db.BigInteger) def __init__(self, acct): self.acct = acct @@ -178,18 +181,23 @@ def inbox(acct, secr): @app.route('/askMe///new', methods=['POST']) @limiter.limit("50 / hour; 1 / 2 second") def new_question(acct, secr): - if not User.query.filter_by(acct=acct, secr=secr).first(): + u = User.query.filter_by(acct=acct, secr=secr).first() + if not u: abort(404) content = request.form.get('question') print(content) if not content or len(content)>400: abort(422) - - - toot = th.status_post(f"@{acct} 叮~ 有新提问 (戳我头像了解如何回复) 。\n\n{content}", visibility='direct') - if not toot: - abort(500) + + if not u.root: + toot = th.status_post(f"@{acct} 欢迎使用匿名提问箱。未来的新提问会集中显示在这里，方便管理。戳我头像了解如何回复。", visibility='direct') + u.root = toot.id + + toot = th.status_post(f"@{acct} 叮~ 有新提问：\n\n{content}", + in_reply_to_id=u.root, + visibility='direct' + ) #print(toot.id) diff --git a/migrations/README b/migrations/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..9452179 --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,96 @@ +from __future__ import with_statement + +import logging +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) +logger = logging.getLogger('alembic.env') + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from flask import current_app +config.set_main_option( + 'sqlalchemy.url', + str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, target_metadata=target_metadata, literal_binds=True + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + # this callback is used to prevent an auto-migration from being generated + # when there are no changes to the schema + # reference: http://alembic.zzzcomputing.com/en/latest/cookbook.html + def process_revision_directives(context, revision, directives): + if getattr(config.cmd_opts, 'autogenerate', False): + script = directives[0] + if script.upgrade_ops.is_empty(): + directives[:] = [] + logger.info('No changes in schema detected.') + + connectable = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, + target_metadata=target_metadata, + process_revision_directives=process_revision_directives, + **current_app.extensions['migrate'].configure_args + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100644 index 0000000..2c01563 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,24 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/483862f48958_.py b/migrations/versions/483862f48958_.py new file mode 100644 index 0000000..04fdf19 --- /dev/null +++ b/migrations/versions/483862f48958_.py @@ -0,0 +1,28 @@ +"""empty message + +Revision ID: 483862f48958 +Revises: +Create Date: 2020-08-19 09:56:23.732485 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '483862f48958' +down_revision = None +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('user', sa.Column('root', sa.BigInteger(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('user', 'root') + # ### end Alembic commands ### diff --git a/static/ask.html b/static/ask.html index 95db72d..5612001 100644 --- a/static/ask.html +++ b/static/ask.html @@ -72,7 +72,7 @@
-

选择任意一种方式创建提问箱

+

选择任意一种方式创建/进入提问箱

私信bot认证

输入闭社id并前往闭社私信 @ask_me_bot “新建”，然后点击下方按钮，即可新建或重置提问箱。