Add challenge editing stuff

Author: simmsb

alembic/versions/38188dd2243f_add_challenge_creation_date.py

@@ -0,0 +1,29 @@
+"""Add challenge creation_date
+
+Revision ID: 38188dd2243f
+Revises: b0df6f4097b7
+Create Date: 2020-09-19 06:34:59.966877
+
+"""
+from alembic import op
+import sqlalchemy as sa
+import sqlalchemy_utils
+
+
+# revision identifiers, used by Alembic.
+revision = '38188dd2243f'
+down_revision = 'b0df6f4097b7'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('challenges', sa.Column('creation_date', sa.DateTime(), server_default=sa.text('now()'), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('challenges', 'creation_date')
+    # ### end Alembic commands ###

luhack_bot/cogs/challenges.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 import logging
 import textwrap
 from typing import List, Tuple, TypeVar
@@ -88,17 +89,6 @@ async def challenges(self, ctx, challenge_title: Optional[str]):
 
         await ctx.send(self.format_challenge(challenge))
 
-    @challenges.command()
-    async def add_debug(self, ctx, title: str, content: str, flag: str):
-        challenge = await Challenge.create_auto(
-            title=title,
-            content=content,
-            flag=flag,
-            points=10,
-        )
-
-        await ctx.send(self.format_challenge(challenge))
-
     @challenges.command(aliases=["top10"])
     async def leaderboard(self, ctx):
         """View the leaderboard for completed challenges."""
@@ -217,6 +207,18 @@ async def claim(self, ctx, flag: str):
             + warn_dm_message
         )
 
+        embed = discord.Embed(
+            title=f"Challenge Solved!",
+            description=f"{ctx.author.mention} just solved '{challenge.title}' and was awarded '{challenge.points}' points.",
+            color=discord.Colour.dark_teal(),
+            timestamp=datetime.utcnow(),
+            url=str(self.challenge_url(challenge.slug)),
+        )
+        embed.set_author(name=ctx.author.display_name, icon_url=ctx.author.avatar_url_as(format="png"))
+        channel = ctx.bot.luhack_guild().get_channel(constants.challenge_log_channel_id)
+        if channel is not None:
+            await channel.send(embed=embed)
+
 
 def setup(bot):
     bot.add_cog(Challenges(bot))

luhack_bot/cogs/writeups.py

@@ -128,9 +128,9 @@ async def delete(self, ctx, *, title: str):
         await writeup.delete()
         await ctx.send(f"RIP {writeup.title}")
 
-    @writeups.command(aliases=["link"])
-    async def token(self, ctx):
-        """Generate a token allowing you to create writeups & manage those you have authority to."""
+    @commands.command(aliases=["site_link"])
+    async def site_token(self, ctx):
+        """Generate a token allowing you to create/edit writeups (and blogs/challenges for disciples)."""
 
         member_in_luhack = self.bot.luhack_guild().get_member(ctx.author.id)
 
@@ -145,7 +145,8 @@ async def token(self, ctx):
         url = constants.writeups_base_url.with_query(token=token)
 
         await ctx.author.send(
-            f"Visit this link and you'll be authed for 24 hours: {url}"
+            f"Visit this link and you'll be authed for a month: {url}"
         )
+
 def setup(bot):
     bot.add_cog(Writeups(bot))

luhack_bot/constants.py

@@ -24,6 +24,7 @@ def env_fail(var: str):
     master_cyber_wizard_role_id,
 }
 bot_log_channel_id = 588443109994528816
+challenge_log_channel_id = 576418418211684393
 inner_magic_circle_id = 631618075254325257
 writeups_base_url = yarl.URL("https://scc-luhack.lancs.ac.uk/writeups")
 challenges_base_url = yarl.URL("https://scc-luhack.lancs.ac.uk/challenges")

luhack_bot/db/models.py

@@ -169,6 +169,8 @@ class Challenge(db.Model):
     completed_users = relationship(User, secondary=lambda: CompletedChallenge,
                                    back_populates="users")
 
+    creation_date = db.Column(db.DateTime, server_default=func.now(), nullable=False)
+
     @classmethod
     def create_auto(cls, *args, **kwargs):
         if "slug" not in kwargs:

luhack_bot/token_tools.py

@@ -38,11 +38,11 @@ def decode_writeup_edit_token(token: str) -> Optional[Tuple[str, int, bool]]:
     """Decode a writeup edit token, returns a tuple of the user id and if they are
     admin if the token was valid, None otherwise.
 
-    Writeup edit tokens have a max age of 24h.
+    Writeup edit tokens have a max age of a month.
     """
 
     try:
-        data = token_signer.loads(token, max_age=24 * 60 * 60)
+        data = token_signer.loads(token, max_age=31 * 24 * 60 * 60)
         return (data["username"], data["user_id"], data["is_admin"])
     except BadSignature:
         return None

luhack_site/blog.py

@@ -1,7 +1,6 @@
 from itertools import groupby
 from textwrap import shorten
 from typing import List, Tuple
-from datetime import datetime
 import calendar
 
 import sqlalchemy as sa
@@ -11,10 +10,9 @@
 from starlette.authentication import requires
 from starlette.endpoints import HTTPEndpoint
 from starlette.requests import HTTPConnection
-from starlette.responses import RedirectResponse
 from starlette.routing import Router
 
-from luhack_site.utils import abort
+from luhack_site.utils import abort, redirect_response
 from luhack_site.authorization import can_edit
 from luhack_site.forms import PostForm
 from luhack_site.markdown import highlight_markdown, plaintext_markdown
@@ -44,7 +42,7 @@ def group_yearly(blogs):
 
 @router.route("/")
 async def blog_index(request: HTTPConnection):
-    latest = await Blog.query.order_by(sa.desc(Blog.creation_date)).limit(20).gino.all()
+    latest = await Blog.query.order_by(sa.desc(Blog.creation_date)).gino.all()
 
     rendered = [
         (w, shorten(plaintext_markdown(w.content), width=800, placeholder="..."))
@@ -180,9 +178,9 @@ async def blog_delete(request: HTTPConnection):
         return abort(400)
 
     await blog.delete()
-    await log_delete("blog", blog.name, request.user.username)
+    await log_delete("blog", blog.title, request.user.username)
 
-    return RedirectResponse(url=request.url_for("blog_index"))
+    return redirect_response(url=request.url_for("blog_index"))
 
 
 @router.route("/new")
@@ -227,9 +225,9 @@ async def post(self, request: HTTPConnection):
             )
 
             url = request.url_for("blog_view", slug=blog.slug)
-            await log_create("blog", blog.name, request.user.username, url)
+            await log_create("blog", blog.title, request.user.username, url)
 
-            return RedirectResponse(url=url)
+            return redirect_response(url=url)
 
         images = await encoded_existing_images(request)
         tags = ujson.dumps(await get_all_tags())
@@ -297,9 +295,9 @@ async def post(self, request: HTTPConnection):
             ).apply()
 
             url = request.url_for("blog_view", slug=blog.slug)
-            await log_edit("blog", blog.name, request.user.username, url)
+            await log_edit("blog", blog.title, request.user.username, url)
 
-            return RedirectResponse(url=url)
+            return redirect_response(url=url)
 
         images = await encoded_existing_images(request)
         tags = ujson.dumps(await get_all_tags())