diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index 87bfda248..fb6cb6de6 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -110,7 +110,7 @@ class ModAction(Base): return f"{SITE_FULL}/log/{self.id}" ACTIONTYPES = { - 'agendaposter': { + 'agendaposter': { "str": 'set chud theme on {self.target_link}', "icon": 'fa-snooze', "color": 'bg-danger' diff --git a/files/helpers/const.py b/files/helpers/const.py index 038b2fc84..5a6fe4e81 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -439,13 +439,13 @@ AWARDS = { "price": 2500 }, "deflector": { - "kind": "deflector", - "title": "Deflector", - "description": "Causes most awards received for the next 10 hours to be deflected back at their giver.", - "icon": "fas fa-shield", - "color": "text-pink", - "price": 2750 - }, + "kind": "deflector", + "title": "Deflector", + "description": "Causes most awards received for the next 10 hours to be deflected back at their giver.", + "icon": "fas fa-shield", + "color": "text-pink", + "price": 2750 + }, "marsey": { "kind": "marsey", "title": "Marsey", diff --git a/files/helpers/patter.py b/files/helpers/patter.py index feb0afca6..ad8e7ed30 100644 --- a/files/helpers/patter.py +++ b/files/helpers/patter.py @@ -3,80 +3,80 @@ from PIL import Image import io pat_frames = [ - Image.open("files/assets/images/pat/0.gif").convert("RGBA"), - Image.open("files/assets/images/pat/1.gif").convert("RGBA"), - Image.open("files/assets/images/pat/2.gif").convert("RGBA"), - Image.open("files/assets/images/pat/3.gif").convert("RGBA"), - Image.open("files/assets/images/pat/4.gif").convert("RGBA"), - Image.open("files/assets/images/pat/5.gif").convert("RGBA"), - Image.open("files/assets/images/pat/6.gif").convert("RGBA"), - Image.open("files/assets/images/pat/7.gif").convert("RGBA"), - Image.open("files/assets/images/pat/8.gif").convert("RGBA"), - Image.open("files/assets/images/pat/9.gif").convert("RGBA") + Image.open("files/assets/images/pat/0.gif").convert("RGBA"), + Image.open("files/assets/images/pat/1.gif").convert("RGBA"), + Image.open("files/assets/images/pat/2.gif").convert("RGBA"), + Image.open("files/assets/images/pat/3.gif").convert("RGBA"), + Image.open("files/assets/images/pat/4.gif").convert("RGBA"), + Image.open("files/assets/images/pat/5.gif").convert("RGBA"), + Image.open("files/assets/images/pat/6.gif").convert("RGBA"), + Image.open("files/assets/images/pat/7.gif").convert("RGBA"), + Image.open("files/assets/images/pat/8.gif").convert("RGBA"), + Image.open("files/assets/images/pat/9.gif").convert("RGBA") ] def getPat(avatar_file, format="webp"): - avatar_x = 5 - avatar_y = 5 - avatar_width = 150 - avatar_height = 150 - image_width = 160 - image_height = 160 - hand_x = 0 - hand_y = 0 - delay = 30 + avatar_x = 5 + avatar_y = 5 + avatar_width = 150 + avatar_height = 150 + image_width = 160 + image_height = 160 + hand_x = 0 + hand_y = 0 + delay = 30 - y_scale = [ - 1, - 0.95, - 0.9, - 0.85, - 0.8, - 0.8, - 0.85, - 0.9, - 0.95, - 1 - ] + y_scale = [ + 1, + 0.95, + 0.9, + 0.85, + 0.8, + 0.8, + 0.85, + 0.9, + 0.95, + 1 + ] - x_scale = [ - 0.80, - 0.85, - 0.90, - 0.95, - 1, - 1, - 0.95, - 0.90, - 0.85, - 0.80 - ] + x_scale = [ + 0.80, + 0.85, + 0.90, + 0.95, + 1, + 1, + 0.95, + 0.90, + 0.85, + 0.80 + ] - frames = [] - avatar_img = Image.open(avatar_file) - for i in range(0, 10): - avatar_actual_x = math.ceil((1 - x_scale[i]) * avatar_width / 2 + avatar_x) - avatar_actual_y = math.ceil((1 - y_scale[i]) * avatar_height + avatar_y) - avatar_actual_width = math.ceil(avatar_width * x_scale[i]) - avatar_actual_height = math.ceil(avatar_height * y_scale[i]) + frames = [] + avatar_img = Image.open(avatar_file) + for i in range(0, 10): + avatar_actual_x = math.ceil((1 - x_scale[i]) * avatar_width / 2 + avatar_x) + avatar_actual_y = math.ceil((1 - y_scale[i]) * avatar_height + avatar_y) + avatar_actual_width = math.ceil(avatar_width * x_scale[i]) + avatar_actual_height = math.ceil(avatar_height * y_scale[i]) - scaled_avatar_img = avatar_img.resize((avatar_actual_width, avatar_actual_height)) - frame = Image.new(mode="RGBA", size=(image_width, image_height)) - frame.paste(scaled_avatar_img, (avatar_actual_x, avatar_actual_y)) - frame.paste(pat_frames[i], (hand_x, hand_y), pat_frames[i]) - frames.append(frame) - - output = io.BytesIO() - frames[0].save(output, format, - save_all = True, - append_images = frames[1:], - duration = delay, - loop = 0 - ) - return output + scaled_avatar_img = avatar_img.resize((avatar_actual_width, avatar_actual_height)) + frame = Image.new(mode="RGBA", size=(image_width, image_height)) + frame.paste(scaled_avatar_img, (avatar_actual_x, avatar_actual_y)) + frame.paste(pat_frames[i], (hand_x, hand_y), pat_frames[i]) + frames.append(frame) + + output = io.BytesIO() + frames[0].save(output, format, + save_all = True, + append_images = frames[1:], + duration = delay, + loop = 0 + ) + return output def pat(emoji): - stream = getPat(open(f'files/assets/images/emojis/{emoji}.webp', "rb"), "webp") - stream.seek(0) - open(f'files/assets/images/emojis/{emoji}pat.webp', "wb").write(stream.read()) \ No newline at end of file + stream = getPat(open(f'files/assets/images/emojis/{emoji}.webp', "rb"), "webp") + stream.seek(0) + open(f'files/assets/images/emojis/{emoji}pat.webp', "wb").write(stream.read()) \ No newline at end of file diff --git a/files/templates/authforms.html b/files/templates/authforms.html index f22d183da..b83658215 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/chat.html b/files/templates/chat.html index 1cd42cf53..15b144019 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -14,7 +14,7 @@