diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 7d4f4579e..aefcbecd9 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -4636,7 +4636,7 @@ code { .fa,.fas,.far,.fal,.fad,.fab{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-sm{font-size:.875em}.fa-2x{font-size:2em}.fa-fw{text-align:center;width:1.25em}.fa-flip-horizontal{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-align-left:before{content:"\f036"}.fa-android:before{content:"\f17b"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-alt-down:before{content:"\f354"}.fa-arrow-alt-up:before{content:"\f357"}.fa-arrow-right:before{content:"\f061"}.fa-arrows-v:before{content:"\f07d"}.fa-badge-check:before{content:"\f336"}.fa-balance-scale:before{content:"\f24e"}.fa-ban:before{content:"\f05e"}.fa-bars:before{content:"\f0c9"}.fa-bell:before{content:"\f0f3"}.fa-bold:before{content:"\f032"}.fa-book:before{content:"\f02d"}.fa-book-dead:before{content:"\f6b7"}.fa-book-open:before{content:"\f518"}.fa-broom:before{content:"\f51a"}.fa-bug:before{content:"\f188"}.fa-bullhorn:before{content:"\f0a1"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-day:before{content:"\f783"}.fa-calendar-week:before{content:"\f784"}.fa-candy-cane:before{content:"\f786"}.fa-cat:before{content:"\f6be"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-circle:before{content:"\f111"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clock:before{content:"\f017"}.fa-code:before{content:"\f121"}.fa-cog:before{content:"\f013"}.fa-comment:before{content:"\f075"}.fa-comment-alt-smile:before{content:"\f4aa"}.fa-comment-dots:before{content:"\f4ad"}.fa-comments:before{content:"\f086"}.fa-compress-alt:before{content:"\f422"}.fa-copy:before{content:"\f0c5"}.fa-crown:before{content:"\f521"}.fa-discord:before{content:"\f392"}.fa-dna:before{content:"\f471"}.fa-dollar-sign:before{content:"\f155"}.fa-edit:before{content:"\f044"}.fa-ellipsis-h:before{content:"\f141"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open-text:before{content:"\f658"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand-alt:before{content:"\f424"}.fa-external-link-alt:before{content:"\f35d"}.fa-eye:before{content:"\f06e"}.fa-eye-evil:before{content:"\f6db"}.fa-eye-slash:before{content:"\f070"}.fa-feather-alt:before{content:"\f56b"}.fa-file-signature:before{content:"\f573"}.fa-filter:before{content:"\f0b0"}.fa-fire:before{content:"\f06d"}.fa-flag:before{content:"\f024"}.fa-frown:before{content:"\f119"}.fa-gavel:before{content:"\f0e3"}.fa-ghost:before{content:"\f6e2"}.fa-gift:before{content:"\f06b"}.fa-github:before{content:"\f09b"}.fa-globe:before{content:"\f0ac"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-home-alt:before{content:"\f80a"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-image:before{content:"\f03e"}.fa-infinity:before{content:"\f534"}.fa-info-circle:before{content:"\f05a"}.fa-italic:before{content:"\f033"}.fa-knife-kitchen:before{content:"\f6f5"}.fa-laugh-squint:before{content:"\f59b"}.fa-lights-holiday:before{content:"\f7b2"}.fa-link:before{content:"\f0c1"}.fa-lock:before{content:"\f023"}.fa-lock-alt:before{content:"\f30d"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-microphone-stand:before{content:"\f8cb"}.fa-mistletoe:before{content:"\f7b4"}.fa-music:before{content:"\f001"}.fa-palette:before{content:"\f53f"}.fa-pencil:before{content:"\f040"}.fa-pizza-slice:before{content:"\f818"}.fa-poop:before{content:"\f619"}.fa-quote-right:before{content:"\f10e"}.fa-random:before{content:"\f074"}.fa-reply:before{content:"\f3e5"}.fa-robot:before{content:"\f544"}.fa-save:before{content:"\f0c7"}.fa-scroll-old:before{content:"\f70f"}.fa-search:before{content:"\f002"}.fa-seedling:before{content:"\f4d8"}.fa-sign-out:before{content:"\f08b"}.fa-smile-beam:before{content:"\f5b8"}.fa-smoke:before{content:"\f760"}.fa-snooze:before{content:"\f880"}.fa-snowflake:before{content:"\f2dc"}.fa-sparkles:before{content:"\f890"}.fa-spider:before{content:"\f717"}.fa-square:before{content:"\f0c8"}.fa-store:before{content:"\f54e"}.fa-thumbtack:before{content:"\f08d";padding:2px;}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-train:before{content:"\f238"}.fa-trash-alt:before{content:"\f2ed"}.fa-treasure-chest:before{content:"\f723"}.fa-trophy:before{content:"\f091"}.fa-twitter:before{content:"\f099"}.fa-user:before{content:"\f007"}.fa-user-circle:before{content:"\f2bd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-friends:before{content:"\f500"}.fa-user-lock:before{content:"\f502"}.fa-user-minus:before{content:"\f503"}.fa-user-plus:before{content:"\f234"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-times:before{content:"\f235"}.fa-volume:before{content:"\f6a8"}.fa-volume-mute:before{content:"\f6a9"}@font-face{font-family:'font awesome 5 brands';font-style:normal;font-weight:400;font-display:swap;src:url(../fonts/fa-brands-400.eot);src:url(../fonts/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../fonts/fa-brands-400.woff2) format("woff2"),url(../fonts/fa-brands-400.woff) format("woff"),url(../fonts/fa-brands-400.ttf) format("truetype"),url(../fonts/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:'font awesome 5 brands'!important}@font-face{font-family:'font awesome 5 duotone';font-style:normal;font-weight:900;font-display:swap;src:url(../fonts/fa-duotone-900.eot);src:url(../fonts/fa-duotone-900.eot?#iefix) format("embedded-opentype"),url(../fonts/fa-duotone-900.woff2) format("woff2"),url(../fonts/fa-duotone-900.woff) format("woff"),url(../fonts/fa-duotone-900.ttf) format("truetype"),url(../fonts/fa-duotone-900.svg#fontawesome) format("svg")}.fad{position:relative;font-family:'font awesome 5 duotone'!important;font-weight:900}.fad:before{position:absolute;color:var(--fa-primary-color,inherit);opacity:1;opacity:var(--fa-primary-opacity,1)}.fad:after{color:var(--fa-secondary-color,inherit);opacity:.4;opacity:var(--fa-secondary-opacity,0.4)}.fad.fa-stack-1x,.fad.fa-stack-2x{position:absolute}.fad.fa-stack-1x:before,.fad.fa-stack-2x:before,.fad.fa-fw:before{left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.fad.fa-align-left:after{content:"\10f036"}.fad.fa-arrow-alt-circle-down:after{content:"\10f358"}.fad.fa-arrow-alt-circle-up:after{content:"\10f35b"}.fad.fa-arrow-alt-down:after{content:"\10f354"}.fad.fa-arrow-alt-up:after{content:"\10f357"}.fad.fa-arrow-right:after{content:"\10f061"}.fad.fa-arrows-v:after{content:"\10f07d"}.fad.fa-badge-check:after{content:"\10f336"}.fad.fa-balance-scale:after{content:"\10f24e"}.fad.fa-ban:after{content:"\10f05e"}.fad.fa-bars:after{content:"\10f0c9"}.fad.fa-bell:after{content:"\10f0f3"}.fad.fa-bold:after{content:"\10f032"}.fad.fa-book:after{content:"\10f02d"}.fad.fa-book-dead:after{content:"\10f6b7"}.fad.fa-book-open:after{content:"\10f518"}.fad.fa-broom:after{content:"\10f51a"}.fad.fa-bug:after{content:"\10f188"}.fad.fa-bullhorn:after{content:"\10f0a1"}.fad.fa-calendar:after{content:"\10f133"}.fad.fa-calendar-alt:after{content:"\10f073"}.fad.fa-calendar-day:after{content:"\10f783"}.fad.fa-calendar-week:after{content:"\10f784"}.fad.fa-candy-cane:after{content:"\10f786"}.fad.fa-cat:after{content:"\10f6be"}.fad.fa-check:after{content:"\10f00c"}.fad.fa-check-circle:after{content:"\10f058"}.fad.fa-circle:after{content:"\10f111"}.fad.fa-clipboard:after{content:"\10f328"}.fad.fa-clipboard-check:after{content:"\10f46c"}.fad.fa-clock:after{content:"\10f017"}.fad.fa-code:after{content:"\10f121"}.fad.fa-cog:after{content:"\10f013"}.fad.fa-comment:after{content:"\10f075"}.fad.fa-comment-alt-smile:after{content:"\10f4aa"}.fad.fa-comment-dots:after{content:"\10f4ad"}.fad.fa-comments:after{content:"\10f086"}.fad.fa-compress-alt:after{content:"\10f422"}.fad.fa-copy:after{content:"\10f0c5"}.fad.fa-crown:after{content:"\10f521"}.fad.fa-dna:after{content:"\10f471"}.fad.fa-dollar-sign:after{content:"\10f155"}.fad.fa-edit:after{content:"\10f044"}.fad.fa-ellipsis-h:after{content:"\10f141"}.fad.fa-envelope:after{content:"\10f0e0"}.fad.fa-envelope-open-text:after{content:"\10f658"}.fad.fa-exclamation-circle:after{content:"\10f06a"}.fad.fa-exclamation-triangle:after{content:"\10f071"}.fad.fa-expand-alt:after{content:"\10f424"}.fad.fa-external-link-alt:after{content:"\10f35d"}.fad.fa-eye:after{content:"\10f06e"}.fad.fa-eye-evil:after{content:"\10f6db"}.fad.fa-eye-slash:after{content:"\10f070"}.fad.fa-feather-alt:after{content:"\10f56b"}.fad.fa-file-signature:after{content:"\10f573"}.fad.fa-filter:after{content:"\10f0b0"}.fad.fa-fire:after{content:"\10f06d"}.fad.fa-flag:after{content:"\10f024"}.fad.fa-frown:after{content:"\10f119"}.fad.fa-gavel:after{content:"\10f0e3"}.fad.fa-ghost:after{content:"\10f6e2"}.fad.fa-gift:after{content:"\10f06b"}.fad.fa-globe:after{content:"\10f0ac"}.fad.fa-grin-beam-sweat:after{content:"\10f583"}.fad.fa-home-alt:after{content:"\10f80a"}.fad.fa-id-badge:after{content:"\10f2c1"}.fad.fa-id-card:after{content:"\10f2c2"}.fad.fa-image:after{content:"\10f03e"}.fad.fa-infinity:after{content:"\10f534"}.fad.fa-info-circle:after{content:"\10f05a"}.fad.fa-italic:after{content:"\10f033"}.fad.fa-knife-kitchen:after{content:"\10f6f5"}.fad.fa-laugh-squint:after{content:"\10f59b"}.fad.fa-lights-holiday:after{content:"\10f7b2"}.fad.fa-link:after{content:"\10f0c1"}.fad.fa-lock:after{content:"\10f023"}.fad.fa-lock-alt:after{content:"\10f30d"}.fad.fa-long-arrow-left:after{content:"\10f177"}.fad.fa-long-arrow-right:after{content:"\10f178"}.fad.fa-microphone-stand:after{content:"\10f8cb"}.fad.fa-mistletoe:after{content:"\10f7b4"}.fad.fa-music:after{content:"\10f001"}.fad.fa-palette:after{content:"\10f53f"}.fad.fa-pencil:after{content:"\10f040"}.fad.fa-pizza-slice:after{content:"\10f818"}.fad.fa-poop:after{content:"\10f619"}.fad.fa-quote-right:after{content:"\10f10e"}.fad.fa-random:after{content:"\10f074"}.fad.fa-reply:after{content:"\10f3e5"}.fad.fa-robot:after{content:"\10f544"}.fad.fa-save:after{content:"\10f0c7"}.fad.fa-scroll-old:after{content:"\10f70f"}.fad.fa-search:after{content:"\10f002"}.fad.fa-seedling:after{content:"\10f4d8"}.fad.fa-sign-out:after{content:"\10f08b"}.fad.fa-smile-beam:after{content:"\10f5b8"}.fad.fa-smoke:after{content:"\10f760"}.fad.fa-snooze:after{content:"\10f880"}.fad.fa-snowflake:after{content:"\10f2dc"}.fad.fa-sparkles:after{content:"\10f890"}.fad.fa-spider:after{content:"\10f717"}.fad.fa-square:after{content:"\10f0c8"}.fad.fa-store:after{content:"\10f54e"}.fad.fa-thumbtack:after{content:"\10f08d"}.fad.fa-times:after{content:"\10f00d"}.fad.fa-times-circle:after{content:"\10f057"}.fad.fa-train:after{content:"\10f238"}.fad.fa-trash-alt:after{content:"\10f2ed"}.fad.fa-treasure-chest:after{content:"\10f723"}.fad.fa-trophy:after{content:"\10f091"}.fad.fa-user:after{content:"\10f007"}.fad.fa-user-circle:after{content:"\10f2bd"}.fad.fa-user-cog:after{content:"\10f4fe"}.fad.fa-user-friends:after{content:"\10f500"}.fad.fa-user-lock:after{content:"\10f502"}.fad.fa-user-minus:after{content:"\10f503"}.fad.fa-user-plus:after{content:"\10f234"}.fad.fa-user-slash:after{content:"\10f506"}.fad.fa-user-tag:after{content:"\10f507"}.fad.fa-user-times:after{content:"\10f235"}.fad.fa-volume:after{content:"\10f6a8"}.fad.fa-volume-mute:after{content:"\10f6a9"}@font-face{font-family:'font awesome 5 pro';font-style:normal;font-weight:300;font-display:swap;src:url(../fonts/fa-light-300.eot);src:url(../fonts/fa-light-300.eot?#iefix) format("embedded-opentype"),url(../fonts/fa-light-300.woff2) format("woff2"),url(../fonts/fa-light-300.woff) format("woff"),url(../fonts/fa-light-300.ttf) format("truetype"),url(../fonts/fa-light-300.svg#fontawesome) format("svg")}.fal{font-family:'font awesome 5 pro'!important;;font-weight:300}@font-face{font-family:'font awesome 5 pro';font-style:normal;font-weight:400;font-display:swap;src:url(../fonts/fa-regular-400.eot);src:url(../fonts/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../fonts/fa-regular-400.woff2) format("woff2"),url(../fonts/fa-regular-400.woff) format("woff"),url(../fonts/fa-regular-400.ttf) format("truetype"),url(../fonts/fa-regular-400.svg#fontawesome) format("svg")}.far{font-family:'font awesome 5 pro'!important;;font-weight:400}@font-face{font-family:'font awesome 5 pro';font-style:normal;font-weight:900;font-display:swap;src:url(../fonts/fa-solid-900.eot);src:url(../fonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../fonts/fa-solid-900.woff2) format("woff2"),url(../fonts/fa-solid-900.woff) format("woff"),url(../fonts/fa-solid-900.ttf) format("truetype"),url(../fonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.fas{font-family:'font awesome 5 pro'!important;font-weight:900} -.fa-fish:before{content:"\f578"}.fa-gingerbread-man:before{content:"\f79d"}.fa-fireplace:before{content:"\f79a"}.fa-angry:before{content:"\f556"}.fad.fa-gingerbread-man:after{content:"\10f79d"}.fad.fa-fireplace:after{content:"\10f79a"}.fad.fa-angry:after{content:"\10f556"}.fa-stocking:before{content:"\f7d5"}.fad.fa-stocking:after{content:"\10f7d5"}.fa-columns:before{content:"\f0db"}.fad.fa-columns:after{content:"\10f0db"}.fa-shield:before{content:"\f132"}.fad.fa-shield:after{content:"\10f132"}.fa-dice-six:before{content:"\f526"}.fad.fa-dice-six:after{content:"\10f526"} +.fa-fish:before{content:"\f578"}.fa-gingerbread-man:before{content:"\f79d"}.fa-fireplace:before{content:"\f79a"}.fa-angry:before{content:"\f556"}.fad.fa-gingerbread-man:after{content:"\10f79d"}.fad.fa-fireplace:after{content:"\10f79a"}.fad.fa-angry:after{content:"\10f556"}.fa-stocking:before{content:"\f7d5"}.fad.fa-stocking:after{content:"\10f7d5"}.fa-columns:before{content:"\f0db"}.fad.fa-columns:after{content:"\10f0db"}.fa-shield:before{content:"\f132"}.fad.fa-shield:after{content:"\10f132"}.fa-dice-six:before{content:"\f526"}.fad.fa-dice-six:after{content:"\10f526"}.fa-badge:before{content:"\f335"}.fad.fa-badge:after{content:"\10f335"}.fa-users:before{content:"\f0c0"}.fad.fa-users:after{content:"\10f0c0"}.fa-user-crown:before{content:"\f6a4"}.fad.fa-user-crown:after{content:"\10f6a4"}.fa-radiation-alt:before{content:"\f7ba"}.fad.fa-radiation-alt:after{content:"\10f7ba"}.fa-golf-club:before{content:"\f451"}.fad.fa-golf-club:after{content:"\10f451"}.fa-memory:before{content:"\f538"}.fad.fa-memory:after{content:"\10f538"}.fa-award:before{content:"\f559"}.fad.fa-award:after{content:"\10f559"}.fa-sack-dollar:before{content:"\f81d"}.fad.fa-sack-dollar:after{content:"\10f81d"}.fa-history:before{content:"\f1da"}.fad.fa-history:after{content:"\10f1da"} lite-youtube { background-color: #000; @@ -4754,4 +4754,8 @@ img.golden { .text-black { color: var(--black); +} + +.bg-muted { + background-color: #6c757d !important; } \ No newline at end of file diff --git a/files/classes/comment.py b/files/classes/comment.py index bf0dcac21..199231186 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -410,7 +410,7 @@ class Comment(Base): if self.is_banned: return True - if path.startswith('/post') and (self.slots_result or self.blackjack_result) and (not self.body or len(self.body) <= 20) and self.level > 1: return True + if path.startswith('/post') and (self.slots_result or self.blackjack_result) and (not self.body or len(self.body) <= 50) and self.level > 1: return True if v and v.filter_words and self.body and any(x in self.body for x in v.filter_words): return True diff --git a/files/classes/mod_logs.py b/files/classes/mod_logs.py index d41b47de8..23b3515cd 100644 --- a/files/classes/mod_logs.py +++ b/files/classes/mod_logs.py @@ -113,18 +113,18 @@ class ModAction(Base): ACTIONTYPES={ "grant_awards": { "str": "granted awards to {self.target_link}", - "icon": "fa-user", + "icon": "fa-gift", "color": "bg-primary", }, "check": { "str": "gave {self.target_link} a checkmark", - "icon": "fa-user", + "icon": "fa-badge-check", "color": "bg-success", }, "uncheck": { "str": "removed checkmark from {self.target_link}", - "icon": "fa-user-slash", - "color": "bg-danger", + "icon": "fa-badge-check", + "color": "bg-muted", }, "ban_domain": { "str": "banned a domain", @@ -144,17 +144,12 @@ ACTIONTYPES={ "revoke_app": { "str": "revoked an application by {self.target_link}", "icon": "fa-robot", - "color": "bg-danger", + "color": "bg-muted", }, "reject_app": { "str": "rejected an application request by {self.target_link}", "icon": "fa-robot", - "color": "bg-danger", - }, - "change_rules": { - "str": "changed the rules", - "icon": "fa-balance-scale", - "color": "bg-primary", + "color": "bg-muted", }, "change_sidebar": { "str": "changed the sidebar", @@ -163,18 +158,18 @@ ACTIONTYPES={ }, "disable_signups": { "str": "disabled signups", - "icon": "fa-user-slash", + "icon": "fa-users", "color": "bg-danger", }, "enable_signups": { "str": "enabled signups", - "icon": "fa-user", + "icon": "fa-users", "color": "bg-success", }, "disable_under_attack": { "str": "disabled under attack mode", "icon": "fa-shield", - "color": "bg-danger", + "color": "bg-muted", }, "enable_under_attack": { "str": "enabled under attack mode", @@ -188,47 +183,47 @@ ACTIONTYPES={ }, "unban_user":{ "str":'unbanned user {self.target_link}', - "icon": "fa-user-slash", + "icon": "fa-user", "color": "bg-success", }, "nuke_user":{ "str":'removed all content of {self.target_link}', - "icon":"fa-user-slash", + "icon":"fa-radiation-alt", "color": "bg-danger", }, "unnuke_user":{ "str":'approved all content of {self.target_link}', - "icon": "fa-user-slash", + "icon": "fa-radiation-alt", "color": "bg-success", }, "shadowban": { "str": 'shadowbanned {self.target_link}', - "icon": "fa-user-slash", + "icon": "fa-eye-slash", "color": "bg-danger", }, "unshadowban": { "str": 'unshadowbanned {self.target_link}', - "icon": "fa-user-slash", + "icon": "fa-eye", "color": "bg-success", }, "agendaposter": { "str": "set chud theme on {self.target_link}", - "icon": "fa-user-slash", + "icon": "fa-snooze", "color": "bg-danger", }, "unagendaposter": { "str": "removed chud theme from {self.target_link}", - "icon": "fa-user-slash", + "icon": "fa-snooze", "color": "bg-success", }, "set_flair_locked":{ "str":"set {self.target_link}'s flair (locked)", - "icon": "fa-user-slash", + "icon": "fa-award", "color": "bg-primary", }, "set_flair_notlocked":{ "str":"set {self.target_link}'s flair (not locked)", - "icon": "fa-user-slash", + "icon": "fa-award", "color": "bg-primary", }, "pin_comment":{ @@ -239,7 +234,7 @@ ACTIONTYPES={ "unpin_comment":{ "str":'un-pinned a {self.target_link}', "icon":"fa-thumbtack fa-rotate--45", - "color": "bg-danger", + "color": "bg-muted", }, "pin_post":{ "str":'pinned post {self.target_link}', @@ -249,7 +244,7 @@ ACTIONTYPES={ "unpin_post":{ "str":'un-pinned post {self.target_link}', "icon":"fa-thumbtack fa-rotate--45", - "color": "bg-danger", + "color": "bg-muted", }, "set_nsfw":{ "str":'set nsfw on post {self.target_link}', @@ -281,6 +276,101 @@ ACTIONTYPES={ "icon":"fa-comment", "color": "bg-success", }, + "delete_report":{ + "str": 'deleted report on {self.target_link}', + "icon":"fa-flag", + "color": "bg-danger", + }, + "make_admin": { + "str": 'made {self.target_link} admin', + "icon": "fa-user-crown", + "color": "bg-success", + }, + "remove_admin": { + "str": 'removed {self.target_link} as admin', + "icon": "fa-user-crown", + "color": "bg-danger", + }, + "make_meme_admin": { + "str": 'made {self.target_link} meme admin', + "icon": "fa-user-crown", + "color": "bg-success", + }, + "remove_meme_admin": { + "str": 'removed {self.target_link} as meme admin', + "icon": "fa-user-crown", + "color": "bg-danger", + }, + "distribute":{ + "str": 'distributed bet winnings to voters on {self.target_link}', + "icon":"fa-dollar-sign", + "color": "bg-success", + }, + "revert":{ + "str": 'reverted {self.target_link} mod actions', + "icon":"fa-history", + "color": "bg-danger", + }, + "club_allow":{ + "str":'allowed user {self.target_link} into the {cc}', + "icon":"fa-golf-club", + "color": "bg-success", + }, + "club_ban":{ + "str":'disallowed user {self.target_link} from the {cc}', + "icon": "fa-golf-club", + "color": "bg-danger", + }, + "monthly":{ + "str": 'distributed monthly marseybux', + "icon":"fa-sack-dollar", + "color": "bg-success", + }, + "purge_cache":{ + "str": 'purged cache', + "icon":"fa-memory", + "color": "bg-muted", + }, + "dump_cache":{ + "str": 'dumped cache', + "icon":"fa-trash-alt", + "color": "bg-muted", + }, + "badge_grant":{ + "str":'granted badge to {self.target_link}', + "icon":"fa-badge", + "color": "bg-success", + }, + "badge_remove":{ + "str":'removed badge from {self.target_link}', + "icon": "fa-badge", + "color": "bg-danger", + }, + "link_accounts":{ + "str": 'linked {self.target_link}', + "icon":"fa-link", + "color": "bg-success", + }, + "distinguish_comment":{ + "str":'distinguished their {self.target_link}', + "icon": "fa-crown", + "color": "bg-success" + }, + "distinguish_post":{ + "str":'distinguished their post {self.target_link}', + "icon": "fa-crown", + "color": "bg-success" + }, + "undistinguish_comment":{ + "str":'un-distinguished their {self.target_link}', + "icon": "fa-crown", + "color": "bg-muted" + }, + "undistinguish_post":{ + "str":'un-distinguished their post {self.target_link}', + "icon": "fa-crown", + "color": "bg-muted" + }, } ACTIONTYPES2 = deepcopy(ACTIONTYPES) diff --git a/files/routes/posts.py b/files/routes/posts.py index 1cc31c177..c6d27cd1d 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -177,8 +177,8 @@ def post_id(pid, anything=None, v=None): elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) - first = [c[0] for c in comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 20)).all()] - second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 20).all()] + first = [c[0] for c in comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 50)).all()] + second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 50).all()] comments = first + second else: pinned = g.db.query(Comment).filter(Comment.parent_submission == post.id, Comment.is_pinned != None).all() @@ -196,8 +196,8 @@ def post_id(pid, anything=None, v=None): elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) - first = comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 20)).all() - second = comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 20).all() + first = comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 50)).all() + second = comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 50).all() comments = first + second offset = 0 @@ -303,8 +303,8 @@ def viewmore(v, pid, sort, offset): elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) - first = [c[0] for c in comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 20)).all()] - second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 20).all()] + first = [c[0] for c in comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 50)).all()] + second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 50).all()] comments = first + second else: comments = g.db.query(Comment).join(User, User.id == Comment.author_id).filter(User.shadowbanned == None, Comment.parent_submission == pid, Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID)), Comment.level == 1, Comment.is_pinned == None, Comment.id.notin_(ids)) @@ -320,8 +320,8 @@ def viewmore(v, pid, sort, offset): elif sort == "bottom": comments = comments.order_by(Comment.upvotes - Comment.downvotes) - first = comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 20)).all() - second = comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 20).all() + first = comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 50)).all() + second = comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 50).all() comments = first + second comments = comments[offset:] diff --git a/files/routes/reporting.py b/files/routes/reporting.py index 07718c40b..d0b1f732f 100644 --- a/files/routes/reporting.py +++ b/files/routes/reporting.py @@ -67,14 +67,14 @@ def remove_report(report_fn, v): if report_fn.startswith('c'): report = g.db.query(CommentFlag).filter_by(id=int(report_fn.lstrip('c'))).one_or_none() ma=ModAction( - kind="delete_report_comment", + kind="delete_report", user_id=v.id, target_comment_id=report.comment_id ) elif report_fn.startswith('p'): report = g.db.query(Flag).filter_by(id=int(report_fn.lstrip('p'))).one_or_none() ma=ModAction( - kind="delete_report_post", + kind="delete_report", user_id=v.id, target_submission_id=report.post_id ) diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 4cd5bb0fc..972c9cd47 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/default.html b/files/templates/default.html index 8e7ce603c..c41954204 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index 307ab1d3a..35642fdb7 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,7 +6,7 @@ {% block content %} {% if v %} - + {% if v.agendaposter %} - + {% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html index 228cb37ad..b5fe8b042 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -18,7 +18,7 @@ {% endblock %} - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 990b20287..e7a6e7bab 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{SITE_NAME}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index b6c4123d3..20f7e1a5a 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index ed01e7fc4..e7352b139 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 62692014b..1764bb2d3 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - + diff --git a/files/templates/submit.html b/files/templates/submit.html index 1d3bd1ffd..c8e362adb 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -26,7 +26,7 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}