Remove verification features

5 files changed, 30 insertions, 26 deletions

diff --git a/alembic/versions/a259ab5efcec_remove_verified_columns.py b/alembic/versions/a259ab5efcec_remove_verified_columns.py
new file mode 100644
index 0000000..099e158
--- /dev/null
+++ b/alembic/versions/a259ab5efcec_remove_verified_columns.py
@@ -0,0 +1,30 @@
+"""remove verified columns
+
+Revision ID: a259ab5efcec
+Revises: 2faa292e5818
+Create Date: 2020-12-19 22:44:27.897133
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'a259ab5efcec'
+down_revision = '2faa292e5818'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'is_verified')
+    op.drop_column('users', 'verified_at')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('verified_at', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.add_column('users', sa.Column('is_verified', sa.BOOLEAN(), autoincrement=False, nullable=True))
+    # ### end Alembic commands ###
diff --git a/config-default.toml b/config-default.toml
index 46f34af..a6c7551 100644
--- a/config-default.toml
+++ b/config-default.toml
@@ -43,9 +43,6 @@ ignore_categories = [
 # Respond to opt-in/opt-out commands in the following channel
 bot_commands_channel = 267659945086812160
 
-# Role ID that is used as a role gate on the server
-role_gate_id = 352427296948486144
-
 [database]
 # Postgres!
 
diff --git a/metricity/bot.py b/metricity/bot.py
index ffdef0c..984fb3a 100644
--- a/metricity/bot.py
+++ b/metricity/bot.py
@@ -165,7 +165,6 @@ async def on_guild_available(guild: Guild) -> None:
             "is_staff": BotConfig.staff_role_id in [role.id for role in user.roles],
             "bot": user.bot,
             "in_guild": True,
-            "is_verified": BotConfig.role_gate_id in [role.id for role in user.roles],
             "public_flags": dict(user.public_flags)
         })
 
@@ -199,7 +198,6 @@ async def on_member_join(member: Member) -> None:
             joined_at=member.joined_at,
             created_at=member.created_at,
             is_staff=BotConfig.staff_role_id in [role.id for role in member.roles],
-            is_verified=False,
             public_flags=dict(member.public_flags)
         ).apply()
     else:
@@ -211,7 +209,6 @@ async def on_member_join(member: Member) -> None:
                 joined_at=member.joined_at,
                 created_at=member.created_at,
                 is_staff=BotConfig.staff_role_id in [role.id for role in member.roles],
-                is_verified=False,
                 public_flags=dict(member.public_flags)
             )
         except UniqueViolationError:
@@ -245,16 +242,6 @@ async def on_member_update(before: Member, member: Member) -> None:
     if not member.joined_at:
         return
 
-    before_roles = set([r.id for r in before.roles])
-    after_roles = set([r.id for r in member.roles])
-
-    diff = after_roles - before_roles
-
-    verified_at = None
-
-    if BotConfig.role_gate_id in diff:
-        verified_at = datetime.utcnow()
-
     roles = set([role.id for role in member.roles])
 
     if db_user := await User.get(str(member.id)):
@@ -263,8 +250,6 @@ async def on_member_update(before: Member, member: Member) -> None:
             db_user.avatar_hash != member.avatar or
             BotConfig.staff_role_id in
             [role.id for role in member.roles] != db_user.is_staff
-            or verified_at
-            or BotConfig.role_gate_id in roles != db_user.is_verified
         ):
             await db_user.update(
                 id=str(member.id),
@@ -273,9 +258,7 @@ async def on_member_update(before: Member, member: Member) -> None:
                 joined_at=member.joined_at,
                 created_at=member.created_at,
                 is_staff=BotConfig.staff_role_id in roles,
-                is_verified=BotConfig.role_gate_id in roles,
                 public_flags=dict(member.public_flags),
-                verified_at=verified_at or db_user.verified_at
             ).apply()
     else:
         try:
@@ -286,9 +269,7 @@ async def on_member_update(before: Member, member: Member) -> None:
                 joined_at=member.joined_at,
                 created_at=member.created_at,
                 is_staff=BotConfig.staff_role_id in roles,
-                is_verified=BotConfig.role_gate_id in roles,
                 public_flags=dict(member.public_flags),
-                verified_at=verified_at
             )
         except UniqueViolationError:
             pass
diff --git a/metricity/config.py b/metricity/config.py
index 2078acc..1cf7dfa 100644
--- a/metricity/config.py
+++ b/metricity/config.py
@@ -114,7 +114,6 @@ class BotConfig(metaclass=ConfigSection):
 
     guild_id: int
     staff_role_id: int
-    role_gate_id: int
 
     staff_categories: List[int]
     ignore_categories: List[int]
diff --git a/metricity/models.py b/metricity/models.py
index 172a135..348debc 100644
--- a/metricity/models.py
+++ b/metricity/models.py
@@ -46,9 +46,7 @@ class User(db.Model):
     opt_out = db.Column(db.Boolean, default=False)
     bot = db.Column(db.Boolean, default=False)
     in_guild = db.Column(db.Boolean, default=True)
-    is_verified = db.Column(db.Boolean, default=False)
     public_flags = db.Column(db.JSON, default={})
-    verified_at = db.Column(db.DateTime, nullable=True)
 
     @classmethod
     def bulk_upsert(cls: type, users: List[Dict[str, Any]]) -> Any:
@@ -62,7 +60,6 @@ class User(db.Model):
             "is_staff",
             "bot",
             "in_guild",
-            "is_verified",
             "public_flags"
         ]