🦞

onlylegs/views/group.py

@@ -5,9 +5,9 @@ sounds more limiting that it actually is in this gallery
 """
 from flask import Blueprint, render_template, url_for, request
 
-from onlylegs.models import Post, User, GroupJunction, Group
+from onlylegs.models import Pictures, Users, AlbumJunction, Albums
 from onlylegs.extensions import db
-from onlylegs.utils.colour import contrast
+from onlylegs.utils import colour
 
 
 blueprint = Blueprint("group", __name__, url_prefix="/group")
@@ -18,21 +18,21 @@ def groups():
     """
     Group overview, shows all image groups
     """
-    groups = Group.query.all()
+    groups = Albums.query.all()
 
     # For each group, get the 3 most recent images
     for group in groups:
         group.author_username = (
-            User.query.with_entities(User.username)
-            .filter(User.id == group.author_id)
+            Users.query.with_entities(Users.username)
+            .filter(Users.id == group.author_id)
             .first()[0]
         )
 
         # Get the 3 most recent images
         images = (
-            GroupJunction.query.with_entities(GroupJunction.post_id)
-            .filter(GroupJunction.group_id == group.id)
-            .order_by(GroupJunction.date_added.desc())
+            AlbumJunction.query.with_entities(AlbumJunction.picture_id)
+            .filter(AlbumJunction.album_id == group.id)
+            .order_by(AlbumJunction.date_added.desc())
             .limit(3)
         )
 
@@ -40,8 +40,10 @@ def groups():
         group.images = []
         for image in images:
             group.images.append(
-                Post.query.with_entities(Post.filename, Post.alt, Post.colours, Post.id)
-                .filter(Post.id == image[0])
+                Pictures.query.with_entities(
+                    Pictures.filename, Pictures.alt, Pictures.colours, Pictures.id
+                )
+                .filter(Pictures.id == image[0])
                 .first()
             )
 
@@ -54,26 +56,29 @@ def group(group_id):
     Group view, shows all images in a group
     """
     # Get the group, if it doesn't exist, 404
-    group = db.get_or_404(Group, group_id, description="Group not found! D:")
+    group = db.get_or_404(Albums, group_id, description="Group not found! D:")
 
     # Get all images in the group from the junction table
     junction = (
-        GroupJunction.query.with_entities(GroupJunction.post_id)
-        .filter(GroupJunction.group_id == group_id)
-        .order_by(GroupJunction.date_added.desc())
+        AlbumJunction.query.with_entities(AlbumJunction.picture_id)
+        .filter(AlbumJunction.album_id == group_id)
+        .order_by(AlbumJunction.date_added.desc())
         .all()
     )
 
     # Get the image data for each image in the group
     images = []
     for image in junction:
-        images.append(Post.query.filter(Post.id == image[0]).first())
+        images.append(Pictures.query.filter(Pictures.id == image[0]).first())
 
     # Check contrast for the first image in the group for the banner
     text_colour = "rgb(var(--fg-black))"
     if images:
-        text_colour = contrast(
-            images[0].colours[0], "rgb(var(--fg-black))", "rgb(var(--fg-white))"
+        colour_obj = colour.Colour(images[0].colours[0])
+        text_colour = (
+            "rgb(var(--fg-black));"
+            if colour_obj.is_light()
+            else "rgb(var(--fg-white));"
         )
 
     return render_template(
@@ -87,12 +92,12 @@ def group_post(group_id, image_id):
     Image view, shows the image and its metadata from a specific group
     """
     # Get the image, if it doesn't exist, 404
-    image = db.get_or_404(Post, image_id, description="Image not found :<")
+    image = db.get_or_404(Pictures, image_id, description="Image not found :<")
 
     # Get all groups the image is in
     groups = (
-        GroupJunction.query.with_entities(GroupJunction.group_id)
-        .filter(GroupJunction.post_id == image_id)
+        AlbumJunction.query.with_entities(AlbumJunction.album_id)
+        .filter(AlbumJunction.picture_id == image_id)
         .all()
     )
 
@@ -100,24 +105,24 @@ def group_post(group_id, image_id):
     image.groups = []
     for group in groups:
         image.groups.append(
-            Group.query.with_entities(Group.id, Group.name)
-            .filter(Group.id == group[0])
+            Albums.query.with_entities(Albums.id, Albums.name)
+            .filter(Albums.id == group[0])
             .first()
         )
 
     # Get the next and previous images in the group
     next_url = (
-        GroupJunction.query.with_entities(GroupJunction.post_id)
-        .filter(GroupJunction.group_id == group_id)
-        .filter(GroupJunction.post_id > image_id)
-        .order_by(GroupJunction.date_added.asc())
+        AlbumJunction.query.with_entities(AlbumJunction.picture_id)
+        .filter(AlbumJunction.album_id == group_id)
+        .filter(AlbumJunction.picture_id > image_id)
+        .order_by(AlbumJunction.date_added.asc())
         .first()
     )
     prev_url = (
-        GroupJunction.query.with_entities(GroupJunction.post_id)
-        .filter(GroupJunction.group_id == group_id)
-        .filter(GroupJunction.post_id < image_id)
-        .order_by(GroupJunction.date_added.desc())
+        AlbumJunction.query.with_entities(AlbumJunction.picture_id)
+        .filter(AlbumJunction.album_id == group_id)
+        .filter(AlbumJunction.picture_id < image_id)
+        .order_by(AlbumJunction.date_added.desc())
         .first()
     )