Rename some blacklist object fields

Author: davidjrichardson

commands/blacklist.py

@@ -46,8 +46,8 @@ async def add(self, ctx: Context, item: str):
         author_id = db_session.query(User).filter(User.user_uid == ctx.message.author.id).first().id
 
         if not db_session.query(BlockedKarma) \
-                .filter(BlockedKarma.name == item.casefold()).all():
-            blacklist = BlockedKarma(name=item.casefold(), added_by=author_id)
+                .filter(BlockedKarma.topic == item.casefold()).all():
+            blacklist = BlockedKarma(topic=item.casefold(), user_id=author_id)
             db_session.add(blacklist)
             db_session.commit()
             await ctx.send(f'Added {item} to the karma blacklist. :pencil:')
@@ -58,10 +58,10 @@ async def add(self, ctx: Context, item: str):
     @blacklist.command(help="Remove a word from the karma blacklist.")
     @is_compsoc_exec()
     async def remove(self, ctx: Context, item: str):
-        if not db_session.query(BlockedKarma).filter(BlockedKarma.name == item.casefold()).all():
+        if not db_session.query(BlockedKarma).filter(BlockedKarma.topic == item.casefold()).all():
             await ctx.send(f'{item} is not in the karma blacklist. :page_with_curl:')
         else:
-            db_session.query(BlockedKarma).filter(BlockedKarma.name == item.casefold()).delete()
+            db_session.query(BlockedKarma).filter(BlockedKarma.topic == item.casefold()).delete()
             db_session.commit()
 
             await ctx.send(f'{item} has been removed from the karma blacklist. :pencil:')
@@ -84,7 +84,7 @@ async def list(self, ctx: Context):
     async def search(self, ctx: Context, item: str):
         item_folded = item.replace('*', '%').casefold()
         items = db_session.query(BlockedKarma) \
-            .filter(BlockedKarma.name.ilike(f'%{item_folded}%')).all()
+            .filter(BlockedKarma.topic.ilike(f'%{item_folded}%')).all()
         if len(items) == 0:
             await ctx.send(
                 f'There were no topics matching "{item}" in the blacklist. :sweat:')

karma/karma.py

@@ -124,7 +124,7 @@ def process_karma(message: Message, message_id: int, db_session: Session, timeou
                 karma_item.minuses = karma_item.minuses + 1
 
         # Give some sass if someone is trying to downvote the bot
-        if transaction.name.lower() == 'apollo' and transaction.net_karma < 0:
+        if transaction.name.casefold() == 'Apollo'.casefold() and transaction.net_karma < 0:
             apollo_response = ':wink:'
         else:
             apollo_response = ''

karma/parser.py

@@ -47,7 +47,7 @@ def parse_message(message: str, db_session: Session):
         if not (item.group('karma_target').startswith('"') and item.group('karma_target').endswith('"')):
             # Check to make sure non quoted item is not in blacklist
             if not db_session.query(BlockedKarma)\
-                    .filter(BlockedKarma.name == item.group('karma_target').casefold()).all():
+                    .filter(BlockedKarma.topic == item.group('karma_target').casefold()).all():
                 results.append(RawKarma(name=item.group('karma_target').replace('"', '').lstrip('@'),
                                         op=item.group('karma_op'),
                                         reason=item.group('karma_reason') or item.group('karma_reason_2')))

migrations/versions/3e497f4c9795_rename_blocked_karma_topic_column_names.py

@@ -0,0 +1,23 @@
+"""Rename blocked karma topic column names
+
+Revision ID: 3e497f4c9795
+Revises: fd2fd5c8960d
+Create Date: 2018-04-20 12:28:11.497984
+
+"""
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = '3e497f4c9795'
+down_revision = 'fd2fd5c8960d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.alter_column('blacklist', column_name='name', new_column_name='topic')
+    op.alter_column('blacklist', column_name='added_by', new_column_name='user_id')
+
+
+def downgrade():
+    pass

models.py

@@ -119,6 +119,6 @@ class User(Base):
 class BlockedKarma(Base):
     __tablename__ = 'blacklist'
 
-    name = Column(String, primary_key=True, nullable=False)
-    added_by = Column(Integer, ForeignKey('users.id'), nullable=False)
+    topic = Column(String, primary_key=True, nullable=False)
+    user_id = Column(Integer, ForeignKey('users.id'), nullable=False)
     added_at = Column(DateTime, nullable=False, default=func.current_timestamp())