MarseyFX #206
|
|
@ -7,3 +7,7 @@ __pycache__/
|
|||
emojis.zip
|
||||
emojis_original.zip
|
||||
includes/content-security-policy
|
||||
includes/headers
|
||||
nginx.conf
|
||||
.gitignore
|
||||
docker-compose.yml
|
||||
|
|
@ -4003,7 +4003,7 @@ small, .small {
|
|||
width: 28px;
|
||||
height: 28px;
|
||||
}
|
||||
.profile-pic-20, .pp20, img[src^="/uid/"], img[src^="/pp/"]:not(img[alt^=":"]) {
|
||||
.profile-pic-20, .pp20, img[src^="/uid/"], img[src^="/pp/"]:not(img[alt^=":"]):not(.marseyfx-emoji) {
|
||||
margin-right: 0.25rem !important;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
|
|
@ -5396,8 +5396,7 @@ input[type=radio] ~ .custom-control-label::before {
|
|||
height: 150px;
|
||||
width: 150px;
|
||||
}
|
||||
.emj, .emoji, .bigemoji, .emoji-md, .emoji-lg, img[alt^=":"]
|
||||
{
|
||||
.emj, .emoji, .bigemoji, .emoji-md, .emoji-lg, img[alt^=":"] {
|
||||
max-width: 150px !important;
|
||||
max-height: 150px !important;
|
||||
max-width: min(150px,25vw) !important;
|
||||
|
|
@ -5405,6 +5404,9 @@ input[type=radio] ~ .custom-control-label::before {
|
|||
display: inline-block;
|
||||
object-fit: contain;
|
||||
}
|
||||
.emoji, .emoji-lg, img[data-kind=Classic] {
|
||||
image-rendering: pixelated;
|
||||
}
|
||||
|
||||
span[data-bs-toggle], .pat-preview {
|
||||
position: relative;
|
||||
|
|
@ -7554,3 +7556,465 @@ ul {
|
|||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
p { /* DO NOT REMOVE */
|
||||
overflow: hidden !important;
|
||||
}
|
||||
|
||||
#hole-name {
|
||||
font-size: max(14px, 1.2vw);
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
#hole-name {
|
||||
font-size: 1.5vw;
|
||||
}
|
||||
}
|
||||
|
||||
ul {
|
||||
padding-inline-start: 20px;
|
||||
}
|
||||
|
||||
.hide-scrollbar {
|
||||
scrollbar-width: none;
|
||||
}
|
||||
.hide-scrollbar::-webkit-scrollbar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
*:target {
|
||||
scroll-margin-top: 100px;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.modal-open {
|
||||
padding-right: 10px;
|
||||
}
|
||||
.modal-open nav {
|
||||
padding-right: 10px;
|
||||
}
|
||||
::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
}
|
||||
::-webkit-scrollbar-thumb {
|
||||
background: #555;
|
||||
}
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: #3d3d3d;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 768px) or (min-width: 992px) {
|
||||
#sidebar-btn {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* ~~~ marseyfx ~~~ */
|
||||
|
||||
.marseyfx-container {
|
||||
position: relative;
|
||||
display: inline-flex;
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.marseyfx-container.marseyfx-big {
|
||||
width: 150px;
|
||||
height: 150px;
|
||||
}
|
||||
|
||||
.marseyfx-container * {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
:root .marseyfx-container .marseyfx-container {
|
||||
width: unset;
|
||||
height: unset;
|
||||
}
|
||||
|
||||
.marseyfx-image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: contain;
|
||||
}
|
||||
|
||||
.marseyfx-error {
|
||||
background-color: rgb(129, 0, 0);
|
||||
color: white;
|
||||
font-family: monospace;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.marseyfx-image-talking {
|
||||
bottom: unset;
|
||||
height: unset;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-pat {
|
||||
animation: marseyfx-modifier-pat 0.3s infinite;
|
||||
transform-origin: bottom center;
|
||||
}
|
||||
|
||||
.marseyfx-image-hand {
|
||||
animation: marseyfx-modifier-pat 0.3s infinite;
|
||||
top: -30%;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-pat {
|
||||
0% {
|
||||
transform: scale(1, 0.8)
|
||||
}
|
||||
50% {
|
||||
transform: scale(0.8, 1)
|
||||
}
|
||||
100% {
|
||||
transform: scale(1, 0.8)
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-love-self {
|
||||
transform: scale(0.5) translate(20%, 50%);
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-genocide {
|
||||
0% {
|
||||
transform: scale(1) rotate(0deg)
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(0, 0) rotate(360deg)
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-genocide {
|
||||
display: inline-block;
|
||||
animation: marseyfx-modifier-genocide 2s infinite;
|
||||
animation-timing-function: linear;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-party {
|
||||
animation: marseyfx-modifier-party-color 0.5s infinite alternate linear,
|
||||
marseyfx-modifier-party-skew 0.15s infinite alternate linear;
|
||||
transform-origin: bottom center;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-party-color {
|
||||
from{
|
||||
filter:sepia(100%) saturate(500%) hue-rotate(270deg)
|
||||
}
|
||||
to{
|
||||
filter:sepia(100%) saturate(600%) hue-rotate(1500deg)
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-party-skew {
|
||||
0% {
|
||||
transform: skew(-15deg, 0deg) scale(0.9, 0.7);
|
||||
}
|
||||
|
||||
50% {
|
||||
transform: skew(0deg, 0deg) scale(1.0);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: skew(15deg, 0deg) scale(0.9, 0.7);
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-says > .marseyfx-emoji-container {
|
||||
transform-origin: bottom center;
|
||||
transform: scale(0.8, 0.8);
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-fallover {
|
||||
0% {
|
||||
transform: rotateX(0deg);
|
||||
}
|
||||
|
||||
50%, 100% {
|
||||
transform: rotateX(90deg);
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-says-container {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
filter: drop-shadow(0 2px 5px black)
|
||||
}
|
||||
|
||||
.marseyfx-modifier-says-text {
|
||||
display: block;
|
||||
color: black;
|
||||
font-family: Impact;
|
||||
background-color: white;
|
||||
border-radius: 25px;
|
||||
padding: 2px;
|
||||
text-align: center;
|
||||
bottom: unset;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-says-nub {
|
||||
width: 15px;
|
||||
position: absolute;
|
||||
top: 20px;
|
||||
bottom: 50%;
|
||||
left: 75%;
|
||||
clip-path: polygon(0 0, 100% 0, 50% 100%);
|
||||
transform: rotate(20deg) translateX(-50%);
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-fallover-container {
|
||||
perspective: 400px;
|
||||
perspective-origin: 150%;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-fallover {
|
||||
transform-origin: bottom center;
|
||||
animation: 3s marseyfx-modifier-fallover infinite
|
||||
cubic-bezier(0.19, -0.02, 0.9, 0.1);
|
||||
}
|
||||
|
||||
.marseyfx-memetext-toptext, .marseyfx-memetext-bottomtext {
|
||||
position: absolute;
|
||||
display: block;
|
||||
inset: 0;
|
||||
font-family: Impact;
|
||||
font-size: 2rem;
|
||||
text-transform: uppercase;
|
||||
color: white;
|
||||
text-align: center;
|
||||
text-justify: center;
|
||||
text-shadow:
|
||||
1px 1px black,
|
||||
-1px 1px black,
|
||||
1px -1px black,
|
||||
-1px -1px black,
|
||||
2px 2px black,
|
||||
-2px 2px black,
|
||||
2px -2px black,
|
||||
-2px -2px black;
|
||||
}
|
||||
|
||||
.marseyfx-memetext-toptext {
|
||||
bottom: unset;
|
||||
}
|
||||
|
||||
.marseyfx-memetext-bottomtext {
|
||||
top: unset;
|
||||
}
|
||||
|
||||
|
||||
.marseyfx-modifier-enraged {
|
||||
filter: sepia(1) hue-rotate(315deg) saturate(10);
|
||||
animation: marsey-modifier-enraged 0.05s infinite linear;
|
||||
}
|
||||
|
||||
@keyframes marsey-modifier-enraged {
|
||||
0% {
|
||||
transform: translate(4%, 4%)
|
||||
}
|
||||
25% {
|
||||
transform: translate(-4%, -4%)
|
||||
}
|
||||
50% {
|
||||
transform: translate(-4%, 4%)
|
||||
}
|
||||
75% {
|
||||
transform: translate(4%, -4%)
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-enraged-underlay {
|
||||
/*background-color: red;*/
|
||||
}
|
||||
|
||||
.marseyfx-modifier-spin {
|
||||
animation: marseyfx-modifier-spin 1s infinite linear;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-spin {
|
||||
0% {
|
||||
transform: rotate(0)
|
||||
}
|
||||
100% {
|
||||
transform: rotate(1turn)
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-triumphs-self {
|
||||
animation: marseyfx-modifier-triumphs-self 0.25s infinite alternate;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-triumphs-self {
|
||||
0% {
|
||||
transform: scale(0.9, 0.7) translate(0, 0) ;
|
||||
}
|
||||
100% {
|
||||
transform: scale(0.7, 0.9) translate(0, -40%);
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-triumphs-other {
|
||||
animation: marseyfx-modifier-triumphs-other 0.25s infinite alternate;
|
||||
transform-origin: bottom center;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-triumphs-other {
|
||||
0% {
|
||||
transform: scale(0.8, 0.2);
|
||||
}
|
||||
50%, 100% {
|
||||
transform: scale(0.8, 0.5);
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-nested-other {
|
||||
transform: scale(0.7);
|
||||
}
|
||||
|
||||
.marseyfx-modifier-nested-outer-container {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
filter: drop-shadow(0 2px 5px black);
|
||||
}
|
||||
|
||||
.marseyfx-modifier-nested-side {
|
||||
transform: scale(0.8);
|
||||
}
|
||||
|
||||
.marseyfx-modifier-nested-outer-container > .marseyfx-modifier-nested-side:nth-child(1) {
|
||||
transform-origin: left center;
|
||||
clip-path: inset(0 50% 0 0);
|
||||
}
|
||||
|
||||
.marseyfx-modifier-nested-outer-container > .marseyfx-modifier-nested-side:nth-child(2) {
|
||||
transform-origin: right center;
|
||||
clip-path: inset(0 0 0 50%);
|
||||
}
|
||||
|
||||
.marseyfx-modifier-morph-self {
|
||||
animation: marseyfx-modifier-morph 2s infinite linear;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-morph-other {
|
||||
animation: marseyfx-modifier-morph 2s infinite reverse linear;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-morph {
|
||||
0%, 20% {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
80%, 100% {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-scope-target {
|
||||
transform: scale(0.8);
|
||||
}
|
||||
|
||||
/*.marseyfx-modifier-bulge {
|
||||
filter: url('/i/filters.svg#bulge')
|
||||
} I'll come back to this later
|
||||
*/
|
||||
|
||||
.marseyfx-modifier-fucks-self {
|
||||
animation: marseyfx-modifier-fucks-self 0.25s infinite;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-fucks-self {
|
||||
0%, 100% {
|
||||
transform: scale(0.7) translate(-30%, 0)
|
||||
}
|
||||
45%, 55% {
|
||||
transform: scale(0.7) translate(-20%, 0)
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-fucks-other {
|
||||
animation: marseyfx-modifier-fucks-other 0.25s infinite;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-fucks-other {
|
||||
0%, 100% {
|
||||
transform: rotate(95deg) scale(0.7) translate(25%, -50%)
|
||||
}
|
||||
|
||||
50% {
|
||||
transform: rotate(95deg) scale(0.7) translate(25%, -45%);
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-glow {
|
||||
filter: drop-shadow(0px 0px 5px green) invert(22%) sepia(75%) hue-rotate(69deg) brightness(96%) contrast(150%);
|
||||
animation: marseyfx-modifier-glow 1s infinite;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-glow {
|
||||
0%, 100% {
|
||||
filter: drop-shadow(0px 0px 4px green) invert(22%) sepia(75%) hue-rotate(97deg) brightness(96%) contrast(150%);
|
||||
}
|
||||
|
||||
50% {
|
||||
filter: drop-shadow(0px 0px 7px green) invert(22%) sepia(75%) hue-rotate(90deg) brightness(96%) contrast(150%);
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-echo-self:not(.marseyfx-modifier-echo-clone) {
|
||||
transform: scale(0.5);
|
||||
z-index: 6;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-echo-clone {
|
||||
animation: marseyfx-modifier-echo 1.8s infinite linear, marseyfx-modifier-echo-opacity 1.8s infinite linear;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-echo-clone-1 {
|
||||
animation-delay: -0s;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-echo-clone-2 {
|
||||
animation-delay: -0.6s;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-echo-clone-3 {
|
||||
animation-delay: -1.2s;
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-echo {
|
||||
0% {
|
||||
transform: scale(0.5);
|
||||
z-index: 5
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(1);
|
||||
z-index: 1
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes marseyfx-modifier-echo-opacity {
|
||||
10%, 80% {
|
||||
opacity: 0.4
|
||||
}
|
||||
|
||||
0%, 100% {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.marseyfx-modifier-rentfree-wrapper {
|
||||
clip-path: polygon(32% 60%, 25% 52%, 22% 42%, 24% 31%, 29% 19%, 36% 14%, 48% 11%, 61% 11%, 72% 15%, 79% 20%, 86% 26%, 89% 35%, 91% 45%, 88% 54%, 81% 60%);
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.marseyfx-modifier-rentfree-self {
|
||||
transform: scale(0.5) translate(11%, -20%);
|
||||
}
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
width="265"
|
||||
height="265"
|
||||
fill-rule="evenodd"
|
||||
version="1.1"
|
||||
id="svg2"
|
||||
sodipodi:docname="prohibition.svg"
|
||||
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
id="namedview2"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:zoom="2.1906969"
|
||||
inkscape:cx="113.66246"
|
||||
inkscape:cy="153.14762"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1017"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg2"
|
||||
showgrid="true">
|
||||
<inkscape:grid
|
||||
id="grid2"
|
||||
units="px"
|
||||
originx="0"
|
||||
originy="0"
|
||||
spacingx="1"
|
||||
spacingy="1"
|
||||
empcolor="#0099e5"
|
||||
empopacity="0.30196078"
|
||||
color="#0099e5"
|
||||
opacity="0.14901961"
|
||||
empspacing="5"
|
||||
dotted="false"
|
||||
gridanglex="30"
|
||||
gridanglez="30"
|
||||
visible="true" />
|
||||
</sodipodi:namedview>
|
||||
<path
|
||||
d="m 230.37889,132.5 c 0,-54.05717 -43.82172,-97.878887 -97.87889,-97.878887 A 97.463774,97.463774 0 0 0 70.394811,56.846774 L 208.48791,194.18915 C 222.17277,177.35442 230.37889,155.88687 230.37889,132.5 Z M 56.512094,70.810849 C 42.828151,87.646509 34.621113,109.11313 34.621113,132.5 c 0,54.05717 43.821717,97.87889 97.878887,97.87889 23.57825,0 45.20851,-8.33832 62.10519,-22.22566 z M 255,132.5 C 255,64.844868 200.15513,10 132.5,10 64.844868,10 10,64.844868 10,132.5 10,200.15513 64.844868,255 132.5,255 200.15513,255 255,200.15513 255,132.5"
|
||||
fill="#b71f2e"
|
||||
id="path2"
|
||||
style="stroke-width:8;stroke:#ffffff;stroke-opacity:1;stroke-dasharray:none;paint-order:stroke fill markers" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
|
|
@ -0,0 +1,347 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="256"
|
||||
height="256"
|
||||
viewBox="0 0 256 256"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
|
||||
sodipodi:docname="scope.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<sodipodi:namedview
|
||||
id="namedview7"
|
||||
pagecolor="#d8d8d8"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:document-units="px"
|
||||
showgrid="true"
|
||||
inkscape:zoom="1.4912879"
|
||||
inkscape:cx="164.95809"
|
||||
inkscape:cy="127.07137"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1017"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="layer1">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid132"
|
||||
empspacing="8"
|
||||
originx="0"
|
||||
originy="0"
|
||||
spacingy="4"
|
||||
spacingx="4"
|
||||
units="px"
|
||||
visible="true" />
|
||||
</sodipodi:namedview>
|
||||
<defs
|
||||
id="defs2">
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect3097"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,0.52916668,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916668,0,1"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
radius="0"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect3089"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,0.52916668,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916668,0,1"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
radius="0"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect3081"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,0.52916668,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916668,0,1"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
radius="0"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect3073"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,0.52916668,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916668,0,1"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
radius="0"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect1613"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,0.52916668,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916663,0,1 @ F,0,0,1,0,0.52916668,0,1"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
radius="0"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect1038"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1 @ F,0,0,1,0,1,0,1"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
radius="0"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<linearGradient
|
||||
id="linearGradient916"
|
||||
inkscape:swatch="solid">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop914" />
|
||||
</linearGradient>
|
||||
<inkscape:path-effect
|
||||
effect="fillet_chamfer"
|
||||
id="path-effect3224"
|
||||
is_visible="true"
|
||||
lpeversion="1"
|
||||
nodesatellites_param="F,0,0,1,0,1.3229167,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
|
||||
unit="px"
|
||||
method="auto"
|
||||
mode="F"
|
||||
radius="0"
|
||||
chamfer_steps="1"
|
||||
flexible="false"
|
||||
use_knot_distance="true"
|
||||
apply_no_radius="true"
|
||||
apply_with_radius="true"
|
||||
only_selected="false"
|
||||
hide_knots="false" />
|
||||
<linearGradient
|
||||
id="linearGradient3219"
|
||||
inkscape:swatch="solid">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3217" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="Secondary"
|
||||
inkscape:swatch="solid">
|
||||
<stop
|
||||
style="stop-color:#808080;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3104" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3073"
|
||||
inkscape:swatch="solid">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3071" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="Primary"
|
||||
inkscape:swatch="solid">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2068" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1">
|
||||
<g
|
||||
id="path1"
|
||||
style="stroke:#ffffff;stroke-width:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
|
||||
transform="matrix(1.2035109,0,0,1.2035109,-26.011018,-26.011018)">
|
||||
<path
|
||||
style="color:#000000;fill:#039600;fill-opacity:0.254202;stroke:#ffffff;stroke-width:4;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
|
||||
d="m 224,128 a 96,96 0 0 1 -96,96 96,96 0 0 1 -96,-96 96,96 0 0 1 96,-96 96,96 0 0 1 96,96 z"
|
||||
id="path43" />
|
||||
<path
|
||||
style="color:#000000;fill:#000000;stroke:#ffffff;stroke-width:4;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
|
||||
d="M 128,27 C 72.278519,27 27,72.278519 27,128 27,183.72148 72.278519,229 128,229 183.72148,229 229,183.72148 229,128 229,72.278519 183.72148,27 128,27 Z m 0,10 c 50.31709,0 91,40.682915 91,91 0,50.31709 -40.68291,91 -91,91 -50.317085,0 -91,-40.68291 -91,-91 0,-50.317085 40.682915,-91 91,-91 z"
|
||||
id="path44" />
|
||||
</g>
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:3.8738;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 128.03838,243.57541 V 166.77639"
|
||||
id="path11"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:3.8738;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 128.03838,12.50133 V 89.300371"
|
||||
id="path12"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:3.8738;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 243.57541,128.03837 -76.79902,1e-5"
|
||||
id="path13"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:3.8738;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 12.50133,128.03838 H 89.300371"
|
||||
id="path14"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 128.03838,131.91218 v 34.86421"
|
||||
id="path15"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 89.300371,128.03838 H 124.16458"
|
||||
id="path16"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 128.03838,89.300371 V 124.16458"
|
||||
id="path17"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 166.77639,128.03838 H 131.91218"
|
||||
id="path18"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 120.29077,124.16458 v 7.7476"
|
||||
id="path19" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 112.54317,124.16458 v 7.7476"
|
||||
id="path20" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 104.79557,124.16458 v 7.7476"
|
||||
id="path21" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 97.047972,124.16458 v 7.7476"
|
||||
id="path22" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 89.300371,124.16458 v 7.7476"
|
||||
id="path23" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,120.29077 h -7.7476"
|
||||
id="path24" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,112.54317 h -7.7476"
|
||||
id="path25" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,104.79557 h -7.7476"
|
||||
id="path26" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,97.047972 h -7.7476"
|
||||
id="path27" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,89.300371 h -7.7476"
|
||||
id="path28" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 166.77639,124.16458 v 7.7476"
|
||||
id="path33" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 159.02878,124.16458 v 7.7476"
|
||||
id="path34" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 151.28118,124.16458 v 7.7476"
|
||||
id="path35" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 143.53358,124.16458 v 7.7476"
|
||||
id="path36" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 135.78597,124.16458 v 7.7476"
|
||||
id="path37" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,166.77639 h -7.7476"
|
||||
id="path38" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,159.02878 h -7.7476"
|
||||
id="path39" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,151.28118 h -7.7476"
|
||||
id="path40" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,143.53358 h -7.7476"
|
||||
id="path41" />
|
||||
<path
|
||||
style="fill:#039600;fill-opacity:0.254202;stroke:#000000;stroke-width:1.9369;stroke-miterlimit:3;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="m 131.91218,135.78597 h -7.7476"
|
||||
id="path42" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 13 KiB |
|
|
@ -59,7 +59,8 @@ DELETE_EDIT_RATELIMIT = "10/minute;50/day"
|
|||
|
||||
PUSH_NOTIF_LIMIT = 1000
|
||||
|
||||
IS_LOCALHOST = SITE == "localhost" or SITE == "127.0.0.1" or SITE.startswith("192.168.") or SITE.endswith(".local")
|
||||
IS_LOCALHOST = SITE.startswith("localhost:") or SITE.startswith("127.0.0.1") or SITE.startswith("192.168.") or SITE.endswith(".local")
|
||||
print(f"IS_LOCALHOST: {IS_LOCALHOST}")
|
||||
|
||||
if IS_LOCALHOST:
|
||||
SITE_FULL = 'http://' + SITE
|
||||
|
|
@ -1084,6 +1085,7 @@ approved_embed_hosts_for_csp = ' '.join(set([x.split('/')[0] for x in approved_e
|
|||
csp = f"default-src 'none'; frame-ancestors 'none'; form-action 'self'; manifest-src 'self'; worker-src 'self'; base-uri 'self'; font-src 'self'; style-src-elem 'self'; style-src-attr 'unsafe-inline'; style-src 'self' 'unsafe-inline'; script-src-elem 'self' challenges.cloudflare.com; script-src-attr 'none'; script-src 'self' challenges.cloudflare.com; frame-src challenges.cloudflare.com www.youtube.com platform.twitter.com rumble.com player.twitch.tv; connect-src 'self' videos.watchpeopledie.tv use1.fptls.com use1.fptls3.com api.fpjs.io; img-src {approved_embed_hosts_for_csp} data:; media-src {approved_embed_hosts_for_csp};"
|
||||
if not IS_LOCALHOST:
|
||||
csp += ' upgrade-insecure-requests;'
|
||||
|
||||
|
||||
with open("includes/content-security-policy", "w") as f:
|
||||
f.write(f'add_header Content-Security-Policy "{csp}";')
|
||||
|
|
|
|||
|
|
@ -0,0 +1,348 @@
|
|||
import copy
|
||||
import re
|
||||
from typing import Optional
|
||||
from bs4 import BeautifulSoup, Tag
|
||||
from files.helpers.config.const import SITE_FULL_IMAGES
|
||||
from files.helpers.marseyfx.tokenizer import GroupToken, NumberLiteralToken, StringLiteralToken, Token, Tokenizer
|
||||
import files.helpers.marseyfx.parser as parser
|
||||
|
||||
modifier_whitelist = []
|
||||
|
||||
class Modifier:
|
||||
name: str
|
||||
args: list[Token]
|
||||
|
||||
def __init__(self, name: str, args: list[Token]):
|
||||
self.name = name
|
||||
self.args = args
|
||||
|
||||
def modifier(fn):
|
||||
modifier_whitelist.append(fn.__name__)
|
||||
|
||||
def wrapper(*args, **kwargs):
|
||||
slf = args[0]
|
||||
ctx = ModifierContextFrame(fn.__name__)
|
||||
slf.context_frames.insert(0, ctx)
|
||||
slf.child = slf.container
|
||||
slf.container = slf.child.wrap(slf.soup.new_tag('div', attrs={'class': f'marseyfx-modifier marseyfx-modifier-{ctx.name}'}))
|
||||
slf.add_child_class(f'marseyfx-modifier-{ctx.name}-self')
|
||||
res = fn(*args, **kwargs)
|
||||
slf.context_frames.pop(0)
|
||||
return res
|
||||
return wrapper
|
||||
|
||||
def heavy(fn):
|
||||
def wrapper(*args, **kwargs):
|
||||
slf = args[0]
|
||||
slf.heavy_count += 1
|
||||
return fn(*args, **kwargs)
|
||||
|
||||
wrapper.heavy_count = 1
|
||||
|
||||
return wrapper
|
||||
|
||||
class ModifierContextFrame:
|
||||
name: str
|
||||
wrap_depth: int = 0
|
||||
def __init__(self, name: str):
|
||||
self.name = name
|
||||
|
||||
class Modified:
|
||||
soup: BeautifulSoup
|
||||
container: Tag
|
||||
child: Tag
|
||||
tokenizer: Tokenizer
|
||||
heavy_count = 0
|
||||
context_frames: list[ModifierContextFrame]
|
||||
|
||||
def __init__(self, el, tokenizer):
|
||||
self.soup = BeautifulSoup()
|
||||
self.container = el
|
||||
self.tokenizer = tokenizer
|
||||
self.context_frames = []
|
||||
|
||||
def ctx(self):
|
||||
return self.context_frames[0] if len(self.context_frames) > 0 else None
|
||||
|
||||
def add_class(self, class_: str):
|
||||
if not 'class' in self.container.attrs:
|
||||
self.container.attrs['class'] = [class_]
|
||||
else:
|
||||
self.container.attrs['class'].append(' ' + class_)
|
||||
|
||||
def add_child_class(self, class_: str):
|
||||
if not 'class' in self.child.attrs:
|
||||
self.child.attrs['class'] = [class_]
|
||||
else:
|
||||
self.child.attrs['class'].append(' ' + class_)
|
||||
|
||||
def apply_modifiers(self, modifiers: list[Modifier]):
|
||||
for modifier in modifiers:
|
||||
if modifier.name in modifier_whitelist:
|
||||
getattr(self, modifier.name)(*map(GroupToken.unwrap, modifier.args))
|
||||
|
||||
# Using this instead of throwing everything in a string and then parsing it helps
|
||||
# mitigate the risk of XSS attacks
|
||||
def image(self, name: str):
|
||||
|
||||
filename = name
|
||||
|
||||
if not '.' in filename:
|
||||
filename += '.webp'
|
||||
|
||||
image = self.soup.new_tag(
|
||||
'img',
|
||||
loading='lazy',
|
||||
src=f'{SITE_FULL_IMAGES}/i/{filename}',
|
||||
attrs={'class': f'marseyfx-image marseyfx-image-{name}'}
|
||||
)
|
||||
|
||||
container = self.soup.new_tag(
|
||||
'div',
|
||||
attrs={'class': f'marseyfx-image-container marseyfx-image-container-{name}'}
|
||||
)
|
||||
|
||||
container.append(image)
|
||||
return container
|
||||
|
||||
def underlay(self, underlay: Tag):
|
||||
self.container.insert(0, underlay)
|
||||
|
||||
def overlay(self, overlay: Tag):
|
||||
self.container.append(overlay)
|
||||
|
||||
def add_style(self, style: str):
|
||||
if 'style' in self.container.attrs:
|
||||
style = self.container.attrs['style'] + style
|
||||
|
||||
self.container.attrs['style'] = style
|
||||
|
||||
def meme_text(self, text: str, class_: Optional[str] = None):
|
||||
attrs = {}
|
||||
if class_ is not None:
|
||||
attrs = {'class': f'marseyfx-memetext-{class_}'}
|
||||
|
||||
tag = self.soup.new_tag(
|
||||
'span',
|
||||
attrs=attrs
|
||||
)
|
||||
|
||||
tag.string = text
|
||||
|
||||
self.overlay(tag)
|
||||
|
||||
def create_other(self, other: GroupToken = None):
|
||||
wrapper = self.soup.new_tag('div', attrs={'class': f'marseyfx-modifier-{self.ctx().name}-other'})
|
||||
|
||||
if other is None:
|
||||
return wrapper
|
||||
|
||||
other = other.wrap()
|
||||
other_emoji = parser.parse_from_token(self.tokenizer, other)
|
||||
|
||||
if other_emoji is None:
|
||||
return wrapper
|
||||
|
||||
other_emoji.is_primary = False
|
||||
|
||||
return other_emoji.create_el(self.tokenizer).wrap(wrapper)
|
||||
|
||||
def wrap_child(self, class_: str = ''):
|
||||
ctx = self.ctx()
|
||||
wrap_insert = ''
|
||||
if ctx.wrap_depth > 0:
|
||||
wrap_insert = f'-{ctx.wrap_depth + 1}'
|
||||
|
||||
self.child = self.child.wrap(self.soup.new_tag('div', attrs={'class': f'marseyfx-modifier-{self.ctx().name}-wrapper{wrap_insert} {class_}'}))
|
||||
|
||||
ctx.wrap_depth += 1
|
||||
|
||||
@modifier
|
||||
def pat(self):
|
||||
self.overlay(self.image('hand'))
|
||||
|
||||
@modifier
|
||||
def love(self):
|
||||
self.overlay(self.image('love-foreground'))
|
||||
self.underlay(self.image('love-background'))
|
||||
|
||||
@modifier
|
||||
def talking(self):
|
||||
self.overlay(self.image('talking'))
|
||||
|
||||
@modifier
|
||||
def genocide(self):
|
||||
pass
|
||||
|
||||
@modifier
|
||||
def party(self):
|
||||
pass
|
||||
|
||||
@modifier
|
||||
def says(self, msg):
|
||||
if not isinstance(msg, StringLiteralToken):
|
||||
return
|
||||
|
||||
container = self.soup.new_tag(
|
||||
'div',
|
||||
attrs={'class': 'marseyfx-modifier-says-container'}
|
||||
)
|
||||
self.container.append(container)
|
||||
|
||||
container.append(self.soup.new_tag(
|
||||
'div',
|
||||
attrs={'class': 'marseyfx-modifier-says-nub'}
|
||||
))
|
||||
|
||||
tag = self.soup.new_tag(
|
||||
'span',
|
||||
attrs={'class': 'marseyfx-modifier-says-text'}
|
||||
)
|
||||
tag.string = msg.value
|
||||
container.append(tag)
|
||||
|
||||
@modifier
|
||||
def fallover(self):
|
||||
self.container = self.container.wrap(self.soup.new_tag(
|
||||
'div',
|
||||
attrs={'class': 'marseyfx-modifier-fallover-container'}
|
||||
))
|
||||
|
||||
@modifier
|
||||
def transform(self, transformstyle: StringLiteralToken):
|
||||
if not re.fullmatch(r'[\w()\s%\.,]*', transformstyle.value):
|
||||
print(f'Evil transform detected: {transformstyle.value}')
|
||||
return
|
||||
|
||||
self.add_style(f'transform: {transformstyle.value};')
|
||||
|
||||
@modifier
|
||||
def enraged(self):
|
||||
self.underlay(self.soup.new_tag(
|
||||
'div',
|
||||
attrs={'class': 'marseyfx-modifier-enraged-underlay'}
|
||||
))
|
||||
|
||||
@modifier
|
||||
def meme(self, toptext: Optional[StringLiteralToken] = None, bottomtext: Optional[StringLiteralToken] = None):
|
||||
if isinstance(toptext, StringLiteralToken):
|
||||
self.meme_text(toptext.value, 'toptext')
|
||||
|
||||
if isinstance(bottomtext, StringLiteralToken):
|
||||
self.meme_text(bottomtext.value, 'bottomtext')
|
||||
|
||||
def bottomtext(self, text: StringLiteralToken):
|
||||
if not isinstance(text, StringLiteralToken):
|
||||
return
|
||||
|
||||
tag = self.soup.new_tag(
|
||||
'span',
|
||||
attrs={'class': 'marseyfx-modifier-bottomtext-text'}
|
||||
)
|
||||
|
||||
tag.string = text.value
|
||||
|
||||
self.overlay(tag)
|
||||
|
||||
@modifier
|
||||
def spin(self, speed=None):
|
||||
if not isinstance(speed, NumberLiteralToken):
|
||||
return
|
||||
|
||||
self.add_style(f'animation-duration: {1/speed.value}s;')
|
||||
|
||||
@modifier
|
||||
def triumphs(self, other: GroupToken):
|
||||
other = other.wrap()
|
||||
other_emoji = parser.parse_from_token(self.tokenizer, other)
|
||||
|
||||
if other_emoji is None:
|
||||
return
|
||||
|
||||
self.add_child_class('marseyfx-modifier-triumphs-self')
|
||||
|
||||
other_emoji.is_primary = False
|
||||
|
||||
other = other_emoji.create_el(self.tokenizer).wrap(
|
||||
self.soup.new_tag('div', attrs={'class': 'marseyfx-modifier-triumphs-other'})
|
||||
)
|
||||
self.underlay(other)
|
||||
|
||||
@modifier
|
||||
def nested(self, inside: GroupToken):
|
||||
inside = inside.wrap()
|
||||
inside_emoji = parser.parse_from_token(self.tokenizer, inside)
|
||||
|
||||
if inside_emoji is None:
|
||||
return
|
||||
|
||||
inside_emoji.is_primary = False
|
||||
|
||||
inside = inside_emoji.create_el(self.tokenizer).wrap(
|
||||
self.soup.new_tag('div', attrs={'class': 'marseyfx-modifier-nested-other'})
|
||||
)
|
||||
|
||||
self.underlay(inside)
|
||||
|
||||
self.add_child_class('marseyfx-modifier-nested-side')
|
||||
child = self.child
|
||||
self.child = child.wrap(self.soup.new_tag('div', attrs={'class': 'marseyfx-modifier-nested-outer-container'}))
|
||||
other_side = copy.copy(child)
|
||||
self.child.append(other_side)
|
||||
|
||||
@modifier
|
||||
def morph(self, other: GroupToken):
|
||||
self.add_child_class('marseyfx-modifier-morph-self')
|
||||
|
||||
other = other.wrap()
|
||||
other_emoji = parser.parse_from_token(self.tokenizer, other)
|
||||
|
||||
if other_emoji is None:
|
||||
return
|
||||
|
||||
other_emoji.is_primary = False
|
||||
other = other_emoji.create_el(self.tokenizer).wrap(
|
||||
self.soup.new_tag('div', attrs={'class': 'marseyfx-modifier-morph-other'})
|
||||
)
|
||||
|
||||
self.container.append(other)
|
||||
|
||||
""" Coming Soon (TM)
|
||||
@heavy
|
||||
@modifier
|
||||
def bulge(self, strength: NumberLiteralToken = None):
|
||||
self.child = self.child.wrap(self.soup.new_tag('svg', attrs={'class': 'marseyfx-modifier-bulge-container'}))
|
||||
"""
|
||||
|
||||
@modifier
|
||||
def prohibition(self):
|
||||
self.overlay(self.image('prohibition.svg'))
|
||||
|
||||
@modifier
|
||||
def scope(self):
|
||||
self.overlay(self.image('scope.svg'))
|
||||
self.add_child_class('marseyfx-modifier-scope-target')
|
||||
|
||||
@modifier
|
||||
def fucks(self, other: GroupToken):
|
||||
other = self.create_other(other)
|
||||
self.container.append(other)
|
||||
|
||||
@heavy
|
||||
@modifier
|
||||
def glow(self):
|
||||
pass
|
||||
|
||||
@heavy
|
||||
@modifier
|
||||
def echo(self):
|
||||
for i in range(1, 4):
|
||||
tag = copy.copy(self.child)
|
||||
tag.attrs['class'] = tag.attrs['class'].copy()
|
||||
tag.attrs['class'].append(f'marseyfx-modifier-echo-clone marseyfx-modifier-echo-clone-{i}')
|
||||
self.container.append(tag)
|
||||
|
||||
@modifier
|
||||
def rentfree(self):
|
||||
self.wrap_child()
|
||||
self.overlay(self.image('rentfree.png'))
|
||||
|
|
@ -0,0 +1,173 @@
|
|||
import numbers
|
||||
import random
|
||||
from tokenize import Token
|
||||
|
||||
from bs4 import BeautifulSoup
|
||||
from files.helpers.config.const import EMOJI_KINDS, SITE_FULL_IMAGES
|
||||
from files.helpers.get import get_user
|
||||
from files.helpers.marseyfx.tokenizer import ArgsToken, DotToken, GroupToken, NumberLiteralToken, Tokenizer, WordToken
|
||||
from files.helpers.marseyfx.modifiers import Modified, Modifier, modifier_whitelist
|
||||
from sqlalchemy.sql import func
|
||||
|
||||
|
||||
emoji_replacers = {
|
||||
'!': 'is_flipped',
|
||||
'#': 'is_big',
|
||||
'@': 'is_user'
|
||||
}
|
||||
|
||||
class Emoji:
|
||||
name: str
|
||||
token: Token
|
||||
is_big = False
|
||||
is_flipped = False
|
||||
is_user = False
|
||||
modifiers: list[Modifier]
|
||||
is_primary = True
|
||||
is_golden = False
|
||||
|
||||
def __init__(self, name: str, modifiers, token: Token, **args):
|
||||
for symbol, value in emoji_replacers.items():
|
||||
if symbol in name:
|
||||
name = name.replace(symbol, '')
|
||||
setattr(self, value, True)
|
||||
|
||||
if name.endswith('random'):
|
||||
kind = name.split('random')[0].title()
|
||||
if kind == 'Donkeykong': kind = 'Donkey Kong'
|
||||
elif kind == 'Marseyflag': kind = 'Marsey Flags'
|
||||
elif kind == 'Marseyalphabet': kind = 'Marsey Alphabet'
|
||||
|
||||
if kind in EMOJI_KINDS:
|
||||
name = g.db.query(Emoji.name).filter_by(kind=kind).order_by(func.random()).first()[0]
|
||||
|
||||
self.name = name
|
||||
self.modifiers = modifiers
|
||||
self.token = token
|
||||
self.is_primary = args.get('is_primary', True)
|
||||
if random.random() < 0.004:
|
||||
self.is_golden = True
|
||||
|
||||
def heavy_count(self):
|
||||
count = 0
|
||||
for modifier in self.modifiers:
|
||||
if hasattr(Modified, modifier.name):
|
||||
fn = getattr(Modified, modifier.name)
|
||||
if hasattr(fn, 'heavy_count') and isinstance(fn.heavy_count, numbers.Number) :
|
||||
count += fn.heavy_count
|
||||
|
||||
return count
|
||||
|
||||
def create_el(self, tokenizer: Tokenizer):
|
||||
soup = BeautifulSoup()
|
||||
el = None
|
||||
if (self.is_user):
|
||||
user = get_user(self.name, graceful=True)
|
||||
src = None
|
||||
if user:
|
||||
src = f'/pp/{user.id}'
|
||||
|
||||
el = soup.new_tag(
|
||||
'img',
|
||||
loading='lazy',
|
||||
src=src,
|
||||
attrs={
|
||||
'class': f'marseyfx-emoji marseyfx-image marseyfx-user',
|
||||
}
|
||||
)
|
||||
else:
|
||||
el = soup.new_tag(
|
||||
'img',
|
||||
loading='lazy',
|
||||
src=f'{SITE_FULL_IMAGES}/e/{self.name}.webp',
|
||||
attrs={
|
||||
'class': f'marseyfx-emoji marseyfx-image',
|
||||
}
|
||||
)
|
||||
|
||||
if self.is_golden:
|
||||
el['class'].append(' golden')
|
||||
|
||||
soup.append(el)
|
||||
el = el.wrap(
|
||||
soup.new_tag('div', attrs={
|
||||
'class': 'marseyfx-emoji-container'
|
||||
})
|
||||
)
|
||||
|
||||
mod = Modified(el, tokenizer)
|
||||
mod.apply_modifiers(self.modifiers)
|
||||
|
||||
|
||||
container_attrs = {
|
||||
'class': 'marseyfx-container',
|
||||
}
|
||||
|
||||
if self.is_primary:
|
||||
container_attrs |= {
|
||||
'data-bs-toggle': 'tooltip',
|
||||
'title': tokenizer.str
|
||||
}
|
||||
|
||||
container = soup.new_tag('div', attrs=container_attrs)
|
||||
|
||||
if (self.is_big):
|
||||
container['class'].append(' marseyfx-big')
|
||||
|
||||
if (self.is_flipped):
|
||||
container['class'].append(' marseyfx-flipped')
|
||||
|
||||
return mod.container.wrap(container)
|
||||
|
||||
def parse_emoji(tokenizer: Tokenizer):
|
||||
token = tokenizer.parse_next_tokens()
|
||||
|
||||
if len(tokenizer.errors) > 0 or token is None:
|
||||
return False, None, token
|
||||
|
||||
emoji = parse_from_token(tokenizer, token)
|
||||
|
||||
if not emoji:
|
||||
return False, None, token
|
||||
|
||||
return True, emoji, token
|
||||
|
||||
def parse_from_token(tokenizer: Tokenizer, token: GroupToken):
|
||||
if not isinstance(token, GroupToken):
|
||||
tokenizer.error('Malformed token -- Expected a group token')
|
||||
return
|
||||
|
||||
emoji = token.children[0]
|
||||
|
||||
if not isinstance(emoji, WordToken) and not isinstance(emoji, NumberLiteralToken):
|
||||
tokenizer.error('Malformed token -- Expected an emoji (word token) or number literal token')
|
||||
return
|
||||
|
||||
modifiers = []
|
||||
|
||||
i = 1
|
||||
while i + 1 < len(token.children):
|
||||
t = token.children[i]
|
||||
|
||||
if not isinstance(t, DotToken):
|
||||
tokenizer.error('Malformed token -- Expected a dot')
|
||||
return
|
||||
|
||||
modifier = token.children[i + 1]
|
||||
if not isinstance(modifier, WordToken):
|
||||
tokenizer.error('Malformed token -- Expected a modifier name (word token)')
|
||||
return
|
||||
|
||||
if not modifier.value in modifier_whitelist:
|
||||
tokenizer.error(f'Unknown modifier: {modifier.value}')
|
||||
return
|
||||
|
||||
if not i + 2 < len(token.children) or not isinstance(token.children[i + 2], ArgsToken):
|
||||
modifiers.append(Modifier(modifier.value, []))
|
||||
i += 2
|
||||
else:
|
||||
args = token.children[i + 2]
|
||||
modifiers.append(Modifier(modifier.value, args.children))
|
||||
i += 3
|
||||
|
||||
return Emoji(tokenizer.str[emoji.span[0]:emoji.span[1]], modifiers, token)
|
||||
|
|
@ -0,0 +1,236 @@
|
|||
from abc import abstractmethod
|
||||
import re
|
||||
|
||||
class TokenizerError:
|
||||
index: int
|
||||
error: str
|
||||
|
||||
def __init__(self, tokenizer, index: int, error: str):
|
||||
self.tokenizer = tokenizer
|
||||
self.index = index
|
||||
self.error = error
|
||||
|
||||
def __str__(self):
|
||||
return f'{self.error}\n {self.tokenizer.str}\n {" " * self.index}^'
|
||||
|
||||
class Tokenizer:
|
||||
str: str
|
||||
index: int
|
||||
errors: list[TokenizerError]
|
||||
|
||||
def __init__(self, str: str):
|
||||
self.str = str
|
||||
self.index = 0
|
||||
self.errors = []
|
||||
|
||||
def has_next(self):
|
||||
return self.index < len(self.str)
|
||||
|
||||
def peek(self):
|
||||
if not self.has_next():
|
||||
self.error('Unexpected end of input')
|
||||
return None
|
||||
return self.str[self.index]
|
||||
|
||||
def eat(self):
|
||||
c = self.peek()
|
||||
self.index += 1
|
||||
return c
|
||||
|
||||
def barf(self):
|
||||
self.index -= 1
|
||||
|
||||
def error(self, error: str):
|
||||
self.errors.append(TokenizerError(self, self.index, error))
|
||||
|
||||
def token_to_string(self, token):
|
||||
return self.str[token.span[0]:token.span[1]]
|
||||
|
||||
def parse_next_tokens(self):
|
||||
start = self.index
|
||||
tokens = []
|
||||
while self.has_next():
|
||||
if self.peek() == ' ':
|
||||
self.eat()
|
||||
elif NumberLiteralToken.can_parse(self):
|
||||
tokens.append(NumberLiteralToken.parse(self))
|
||||
elif WordToken.can_parse(self):
|
||||
tokens.append(WordToken.parse(self))
|
||||
elif DotToken.can_parse(self):
|
||||
tokens.append(DotToken.parse(self))
|
||||
elif ArgsToken.can_parse(self):
|
||||
tokens.append(ArgsToken.parse(self))
|
||||
elif StringLiteralToken.can_parse(self):
|
||||
tokens.append(StringLiteralToken.parse(self))
|
||||
else:
|
||||
break
|
||||
|
||||
if len(tokens) == 0:
|
||||
self.error('Expected a token')
|
||||
return None
|
||||
|
||||
return GroupToken((start, self.index), tokens)
|
||||
|
||||
class Token:
|
||||
span: tuple[int, int]
|
||||
|
||||
def wrap(self):
|
||||
if isinstance(self, GroupToken):
|
||||
return self
|
||||
else:
|
||||
return GroupToken(self.span, [self])
|
||||
|
||||
@staticmethod
|
||||
@abstractmethod
|
||||
def can_parse(tokenizer: Tokenizer) -> bool:
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
@abstractmethod
|
||||
def parse(tokenizer: Tokenizer):
|
||||
pass
|
||||
|
||||
class WordToken(Token):
|
||||
value: str
|
||||
|
||||
def __init__(self, span: tuple[int, int], value: str):
|
||||
self.value = value
|
||||
self.span = span
|
||||
|
||||
@staticmethod
|
||||
def can_parse(tokenizer: Tokenizer):
|
||||
return re.fullmatch(r'[!#@a-zA-Z]', tokenizer.peek())
|
||||
|
||||
@staticmethod
|
||||
def parse(tokenizer: Tokenizer):
|
||||
start = tokenizer.index
|
||||
value = ''
|
||||
while tokenizer.has_next():
|
||||
if re.fullmatch(r'[!#@a-zA-Z\d]', tokenizer.peek()):
|
||||
value += tokenizer.eat()
|
||||
else:
|
||||
break
|
||||
|
||||
return WordToken((start, tokenizer.index), value)
|
||||
|
||||
class StringLiteralToken(Token):
|
||||
value: str
|
||||
|
||||
def __init__(self, span: tuple[int, int], value: str):
|
||||
self.value = value
|
||||
self.span = span
|
||||
|
||||
@staticmethod
|
||||
def can_parse(tokenizer: Tokenizer):
|
||||
return tokenizer.peek() == '"'
|
||||
|
||||
# i was cuddling with my fwb while writing this ;3
|
||||
@staticmethod
|
||||
def parse(tokenizer: Tokenizer):
|
||||
start = tokenizer.index
|
||||
tokenizer.eat()
|
||||
value = ''
|
||||
next_escaped = False
|
||||
while tokenizer.has_next():
|
||||
if tokenizer.peek() == '"' and not next_escaped:
|
||||
tokenizer.eat()
|
||||
break
|
||||
elif tokenizer.peek() == '\\' and not next_escaped:
|
||||
next_escaped = True
|
||||
tokenizer.eat()
|
||||
else:
|
||||
value += tokenizer.eat()
|
||||
next_escaped = False
|
||||
|
||||
return StringLiteralToken((start, tokenizer.index), value)
|
||||
|
||||
class NumberLiteralToken(Token):
|
||||
value: float
|
||||
|
||||
def __init__(self, span: tuple[int, int], value: float):
|
||||
self.value = value
|
||||
self.span = span
|
||||
|
||||
@staticmethod
|
||||
def can_parse(tokenizer: Tokenizer):
|
||||
return re.fullmatch(r'[-\d]', tokenizer.peek())
|
||||
|
||||
@staticmethod
|
||||
def can_parse_next(tokenizer: Tokenizer):
|
||||
return re.fullmatch(r'[-\d\.]', tokenizer.peek())
|
||||
|
||||
@staticmethod
|
||||
def parse(tokenizer: Tokenizer):
|
||||
start = tokenizer.index
|
||||
value = ''
|
||||
while tokenizer.has_next():
|
||||
if NumberLiteralToken.can_parse_next(tokenizer):
|
||||
value += tokenizer.eat()
|
||||
else:
|
||||
break
|
||||
|
||||
try:
|
||||
value = float(value)
|
||||
except ValueError:
|
||||
tokenizer.error('Invalid number literal')
|
||||
value = 0.0
|
||||
|
||||
return NumberLiteralToken((start, tokenizer.index), value)
|
||||
|
||||
def get_float(self):
|
||||
return float(self.value)
|
||||
|
||||
class DotToken(Token):
|
||||
def __init__(self, span: tuple[int, int]):
|
||||
self.span = span
|
||||
|
||||
@staticmethod
|
||||
def can_parse(tokenizer: Tokenizer):
|
||||
return tokenizer.peek() == '.'
|
||||
|
||||
@staticmethod
|
||||
def parse(tokenizer: Tokenizer):
|
||||
tokenizer.eat()
|
||||
return DotToken((tokenizer.index, tokenizer.index + 1))
|
||||
|
||||
class GroupToken(Token):
|
||||
children: list[Token]
|
||||
|
||||
def __init__(self, span: tuple[int, int], children: list[Token]):
|
||||
self.children = children
|
||||
|
||||
# this span is probably wrong tbh but idc
|
||||
self.span = span
|
||||
|
||||
def unwrap(self):
|
||||
if len(self.children) == 1:
|
||||
return self.children[0]
|
||||
else:
|
||||
return self
|
||||
|
||||
class ArgsToken(Token):
|
||||
children: list[GroupToken]
|
||||
def __init__(self, span: tuple[int, int], children: list[Token]):
|
||||
self.children = children
|
||||
self.span = span
|
||||
|
||||
@staticmethod
|
||||
def can_parse(tokenizer: Tokenizer):
|
||||
return tokenizer.peek() == '('
|
||||
|
||||
@staticmethod
|
||||
def parse(tokenizer: Tokenizer):
|
||||
start = tokenizer.index
|
||||
tokens = []
|
||||
while tokenizer.has_next():
|
||||
if tokenizer.peek() == '(':
|
||||
tokenizer.eat()
|
||||
if tokenizer.peek() == ')':
|
||||
tokenizer.eat()
|
||||
break
|
||||
elif tokenizer.peek() == ',':
|
||||
tokenizer.eat()
|
||||
else:
|
||||
tokens.append(tokenizer.parse_next_tokens())
|
||||
|
||||
return ArgsToken((start, tokenizer.index), tokens)
|
||||
|
|
@ -52,6 +52,8 @@ mute_regex = re.compile("\/mute @?([\w-]{1,30}) ([0-9]+)", flags=re.A|re.I)
|
|||
emoji_regex = re.compile(f"<p>\s*(:[!#@\w\-]{{1,72}}:\s*)+<\/p>", flags=re.A)
|
||||
emoji_regex2 = re.compile(f'(?<!"):([!#@\w\-]{{1,72}}?):(?![^<]*<\/(code|pre)>)', flags=re.A)
|
||||
|
||||
marseyfx_emoji_regex = re.compile(':[\w#!].{0,98}?[^\\\\]:', flags=re.A)
|
||||
|
||||
snappy_url_regex = re.compile('<a href="(https?:\/\/.+?)".*?>(.+?)<\/a>', flags=re.A)
|
||||
|
||||
email_regex = re.compile('[A-Za-z0-9._%+-]{1,64}@[A-Za-z0-9.-]{2,63}\.[A-Za-z]{2,63}', flags=re.A)
|
||||
|
|
@ -118,7 +120,7 @@ twitch_regex = re.compile('(https:\/\/)?(www\.)?twitch.tv\/(.*)', flags=re.I|re.
|
|||
|
||||
link_fix_regex = re.compile("(\[.*?\]\()(?!http|\/)(.*?\))" + NOT_IN_CODE_OR_LINKS, flags=re.A)
|
||||
|
||||
css_url_regex = re.compile('url\([\'"]?((.|\n)*?)[",);}$]', flags=re.I|re.A) # AEVANN, DO NOT TOUCH THIS, IT WENT THROUGH A MILLION ITERATIONS, IT'S PERFECT NOW
|
||||
css_url_regex = re.compile('url\([\'"]?((.|\n)*?)[);}$]', flags=re.I|re.A) # AEVANN, DO NOT TOUCH THIS, IT WENT THROUGH A MILLION ITERATIONS, IT'S PERFECT NOW
|
||||
|
||||
linefeeds_regex = re.compile("([^\n])\n([^\n])", flags=re.A)
|
||||
|
||||
|
|
@ -217,7 +219,7 @@ protocols = ('http', 'https')
|
|||
|
||||
sanitize_url_regex = re.compile(
|
||||
r"""\(*# Match any opening parentheses.
|
||||
\b(?<![@.])(?:(?:{0}):/{{0,3}}(?:(?:\w+:)?\w+@)?)?# http://
|
||||
\b(?<![@.:#!])(?:(?:{0}):/{{0,3}}(?:(?:\w+:)?\w+@)?)?# http://
|
||||
([\w-]+\.)+(?:{1})(?:\:[0-9]+)?(?!\.\w)\b# xx.yy.tld(:##)?
|
||||
(?:[/?][^#\s\{{\}}\|\\\^\[\]`<>"]*)?
|
||||
# /path/zz (excluding "unsafe" chars from RFC 1738,
|
||||
|
|
|
|||
|
|
@ -1,19 +1,24 @@
|
|||
import copy
|
||||
import functools
|
||||
import random
|
||||
import re
|
||||
import signal
|
||||
from functools import partial
|
||||
from os import path, listdir
|
||||
from typing import Union
|
||||
from typing_extensions import deprecated
|
||||
from urllib.parse import parse_qs, urlparse, unquote, ParseResult, urlencode, urlunparse
|
||||
import time
|
||||
import requests
|
||||
from files.helpers.marseyfx.parser import parse_emoji
|
||||
from files.helpers.marseyfx.tokenizer import Tokenizer
|
||||
|
||||
from sqlalchemy.sql import func
|
||||
|
||||
import bleach
|
||||
from bleach.css_sanitizer import CSSSanitizer
|
||||
from bleach.linkifier import LinkifyFilter
|
||||
from bs4 import BeautifulSoup
|
||||
from bs4 import BeautifulSoup, Tag
|
||||
from mistletoe import markdown
|
||||
|
||||
from files.classes.domains import BannedDomain
|
||||
|
|
@ -62,6 +67,7 @@ def allowed_attributes(tag, name, value):
|
|||
if name in {'alt','title'}: return True
|
||||
if name == 'class' and value == 'img': return True
|
||||
if name == 'data-user-submitted' and not value: return True
|
||||
if name == 'data-kind' and value in EMOJI_KINDS: return True
|
||||
|
||||
if tag == 'lite-youtube':
|
||||
if name == 'params' and value.startswith('autoplay=1&modestbranding=1'): return True
|
||||
|
|
@ -221,8 +227,91 @@ def find_all_emoji_endings(emoji):
|
|||
|
||||
return endings, emoji
|
||||
|
||||
class RenderEmojisResult:
|
||||
emojis_used: set[str]
|
||||
heavy_count = 0
|
||||
tags: list[Union[str, Tag]]
|
||||
|
||||
def render_emoji(html, regexp, golden, emojis_used, b=False, is_title=False):
|
||||
def __init__(self):
|
||||
self.emojis_used = set()
|
||||
self.tags = []
|
||||
|
||||
def update(self, other):
|
||||
self.emojis_used |= other.emojis_used
|
||||
self.heavy_count += other.heavy_count
|
||||
self.tags.extend(other.tags)
|
||||
|
||||
def db_update_count(self):
|
||||
for emoji in g.db.query(Emoji).filter(Emoji.submitter_id==None, Emoji.name.in_(self.emojis_used)):
|
||||
emoji.count += 1
|
||||
g.db.add(emoji)
|
||||
|
||||
def is_nsfw(self):
|
||||
for emoji in self.emojis_used:
|
||||
if emoji in OVER_18_EMOJIS:
|
||||
return True
|
||||
return False
|
||||
|
||||
def render_emojis_tag(tag: Tag, **kwargs):
|
||||
result = RenderEmojisResult()
|
||||
tag = copy.copy(tag)
|
||||
|
||||
for text_el in tag.find_all(text=True):
|
||||
if not text_el.parent or text_el.parent.name in {'code', 'pre'}:
|
||||
continue
|
||||
res = render_emojis(text_el.text)
|
||||
text_el.replace_with(*res.tags)
|
||||
result.update(res)
|
||||
|
||||
result.tags = [tag]
|
||||
|
||||
return result
|
||||
|
||||
def render_emojis(markup: Union[str, Tag], **kwargs):
|
||||
if isinstance(markup, Tag):
|
||||
return render_emojis_tag(markup, **kwargs)
|
||||
result = RenderEmojisResult()
|
||||
last_match_end = 0
|
||||
|
||||
permit_golden = kwargs.get('permit_golden', True)
|
||||
permit_big = kwargs.get('permit_big', True)
|
||||
|
||||
for emoji_match in marseyfx_emoji_regex.finditer(markup):
|
||||
previous_text = markup[last_match_end:emoji_match.start()]
|
||||
if previous_text != '':
|
||||
result.tags.append(previous_text)
|
||||
last_match_end = emoji_match.end()
|
||||
|
||||
emoji_str = emoji_match.group()[1:-1] # Cut off colons
|
||||
|
||||
tokenizer = Tokenizer(emoji_str)
|
||||
success, emoji, _ = parse_emoji(tokenizer)
|
||||
if success:
|
||||
result.emojis_used.add(emoji.name)
|
||||
|
||||
if not permit_big:
|
||||
emoji.is_big = False
|
||||
|
||||
if not permit_golden:
|
||||
emoji.is_golden = False
|
||||
|
||||
emoji_html = emoji.create_el(tokenizer)
|
||||
result.tags.append(emoji_html)
|
||||
result.heavy_count += emoji.heavy_count()
|
||||
|
||||
if len(tokenizer.errors) > 0:
|
||||
soup = BeautifulSoup()
|
||||
err_tag = soup.new_tag('pre', attrs={'class': 'marseyfx-error'})
|
||||
nl = "\n "
|
||||
err_tag.string = 'MarseyFX error:' + nl + nl.join(map(str,tokenizer.errors))
|
||||
result.tags.append(err_tag)
|
||||
#result.tags.append(f':{emoji_str}:')
|
||||
|
||||
result.tags.append(markup[last_match_end:])
|
||||
return result
|
||||
|
||||
@deprecated("Use the new one")
|
||||
def old_render_emoji(html, regexp, golden, emojis_used, b=False, is_title=False):
|
||||
emojis = list(regexp.finditer(html))
|
||||
captured = set()
|
||||
|
||||
|
|
@ -273,6 +362,10 @@ def render_emoji(html, regexp, golden, emojis_used, b=False, is_title=False):
|
|||
if(is_loved):
|
||||
modifier_html = f'{modifier_html}{loved_html}'
|
||||
|
||||
kind = g.db.query(Emoji.kind).filter(Emoji.name==emoji).one_or_none()
|
||||
if kind:
|
||||
attrs += ' data-kind="' + kind[0].replace('"', '') + '"'
|
||||
|
||||
if (is_patted and emoji != 'marseyunpettable') or is_talking or is_genocided or is_loved:
|
||||
if path.isfile(f"files/assets/images/emojis/{emoji}.webp"):
|
||||
emoji_html = f'<span alt=":{old}:" data-bs-toggle="tooltip" title=":{old}:"{genocide_attr}>{modifier_html}{emoji_partial_pat.format(old, f"{SITE_FULL_IMAGES}/e/{emoji}.webp", attrs)}</span>'
|
||||
|
|
@ -492,46 +585,11 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis
|
|||
|
||||
sanitized = spoiler_regex.sub(r'<spoiler>\1</spoiler>', sanitized)
|
||||
|
||||
emojis_used = set()
|
||||
|
||||
emojis = list(emoji_regex.finditer(sanitized))
|
||||
if len(emojis) > 20: golden = False
|
||||
|
||||
captured = []
|
||||
for i in emojis:
|
||||
if i.group(0) in captured: continue
|
||||
captured.append(i.group(0))
|
||||
|
||||
old = i.group(0)
|
||||
if 'marseylong1' in old or 'marseylong2' in old or 'marseylongcockandballs' in old or 'marseyllama1' in old or 'marseyllama2' in old:
|
||||
new = old.lower().replace(">", " class='mb-0'>")
|
||||
else: new = old.lower()
|
||||
|
||||
new = render_emoji(new, emoji_regex2, golden, emojis_used, True)
|
||||
|
||||
sanitized = sanitized.replace(old, new)
|
||||
|
||||
emojis = list(emoji_regex2.finditer(sanitized))
|
||||
if len(emojis) > 20: golden = False
|
||||
|
||||
sanitized = render_emoji(sanitized, emoji_regex2, golden, emojis_used)
|
||||
|
||||
sanitized = sanitized.replace('&','&')
|
||||
|
||||
sanitized = video_sub_regex.sub(r'<p class="resizable"><video controls preload="none" src="\1"></video></p>', sanitized)
|
||||
sanitized = audio_sub_regex.sub(r'<audio controls preload="none" src="\1"></audio>', sanitized)
|
||||
|
||||
if count_emojis:
|
||||
for emoji in g.db.query(Emoji).filter(Emoji.submitter_id==None, Emoji.name.in_(emojis_used)):
|
||||
emoji.count += 1
|
||||
g.db.add(emoji)
|
||||
|
||||
if obj:
|
||||
for emoji in emojis_used:
|
||||
if emoji in OVER_18_EMOJIS:
|
||||
obj.nsfw = True
|
||||
break
|
||||
|
||||
sanitized = sanitized.replace('<p></p>', '')
|
||||
|
||||
allowed_css_properties = allowed_styles.copy()
|
||||
|
|
@ -547,11 +605,73 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis
|
|||
parse_email=False, url_re=sanitize_url_regex)]
|
||||
).clean(sanitized)
|
||||
|
||||
#doing this here cuz of the linkifyfilter right above it (therefore unifying all link processing logic)
|
||||
|
||||
#doing this here cuz of the linkifyfilter right above it (therefore unifying all link processing logic) <-- i have no clue what this means lol
|
||||
soup = BeautifulSoup(sanitized, 'lxml')
|
||||
|
||||
has_transform = bool(soup.select('[style*=transform i]'))
|
||||
|
||||
# -- EMOJI RENDERING --
|
||||
emoji_render = render_emojis(soup)
|
||||
soup = emoji_render.tags[0]
|
||||
|
||||
if emoji_render.heavy_count > 5:
|
||||
error("Too many heavy emojis! (Max 5)")
|
||||
|
||||
if count_emojis:
|
||||
emoji_render.db_update_count()
|
||||
|
||||
if obj and emoji_render.is_nsfw():
|
||||
obj.nsfw = True
|
||||
|
||||
# -- @ MENTIONS --
|
||||
ping_count = 0
|
||||
names = set(m.group(1) for m in mention_regex.finditer(sanitized))
|
||||
|
||||
users_list = get_users(names, graceful=True)
|
||||
users_dict = {}
|
||||
for u in users_list:
|
||||
users_dict[u.username.lower()] = u
|
||||
if u.original_username:
|
||||
users_dict[u.original_username.lower()] = u
|
||||
if u.prelock_username:
|
||||
users_dict[u.prelock_username.lower()] = u
|
||||
|
||||
for text_el in soup.find_all(text=True):
|
||||
start = 0
|
||||
tags = []
|
||||
for match in mention_regex.finditer(text_el):
|
||||
tags.append(text_el[start:match.start()])
|
||||
start = match.end()
|
||||
name = match.group(1).lower()
|
||||
u = users_dict.get(name)
|
||||
if not u or (v and u.id in v.all_twoway_blocks) or (v and u.has_muted(v)):
|
||||
tags.append(match.group(0))
|
||||
continue
|
||||
else:
|
||||
link = soup.new_tag("a", href=f"/id/{u.id}")
|
||||
img = soup.new_tag("img", loading="lazy", src=f"/pp/{u.id}")
|
||||
link.extend([img, f'@{u.username}'])
|
||||
tags.append(link)
|
||||
ping_count += 1
|
||||
if limit_pings and ping_count >= limit_pings:
|
||||
if limit_pings and len(names) > limit_pings and v.admin_level < PERMS['POST_COMMENT_INFINITE_PINGS']:
|
||||
error("Max ping limit is 5 for comments and 50 for posts!")
|
||||
|
||||
def replacer(m):
|
||||
u = users_dict.get(m.group(1).lower())
|
||||
if not u or (v and u.id in v.all_twoway_blocks) or (v and u.has_muted(v)):
|
||||
return m.group(0)
|
||||
#return f'<a href="/id/{u.id}"><img loading="lazy" src="/pp/{u.id}">@{u.username}</a>'
|
||||
|
||||
if not text_el.parent or text_el.parent.name in {'code', 'pre', 'a'}:
|
||||
continue
|
||||
text_el.replace_with(*tags, text_el[start:])
|
||||
|
||||
sanitized = mention_regex.sub(replacer, sanitized)
|
||||
|
||||
# -- LINKS --
|
||||
|
||||
links = soup.find_all("a")
|
||||
|
||||
if v and v.admin_level >= PERMS["IGNORE_DOMAIN_BAN"]:
|
||||
|
|
@ -631,9 +751,6 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis
|
|||
html = f'<p class="resizable yt">{html}</p>'
|
||||
sanitized = sanitized.replace(i.group(0), html)
|
||||
|
||||
if '<pre>' not in sanitized and blackjack != "rules":
|
||||
sanitized = sanitized.replace('\n','')
|
||||
|
||||
if showmore:
|
||||
# Insert a show more button if the text is too long or has too many paragraphs
|
||||
CHARLIMIT = 3000
|
||||
|
|
@ -671,12 +788,12 @@ def allowed_attributes_emojis(tag, name, value):
|
|||
if name == 'cide' and not value: return True
|
||||
return False
|
||||
|
||||
|
||||
@with_sigalrm_timeout(2)
|
||||
def filter_emojis_only(title, golden=True, count_emojis=False, obj=None, author=None):
|
||||
|
||||
# XSS warning: do not allow any html tags, otherwise someone could do something like this:
|
||||
# `<img src=":marsey: evilShit">` because when :marsey: is rendered, it will include quotes that
|
||||
# will end the attribute and allow someone to inject an evil attribute like onerror
|
||||
title = title.replace("\n", "").replace("\r", "").replace("\t", "").replace('<','<').replace('>','>')
|
||||
|
||||
title = remove_cuniform(title)
|
||||
|
||||
if obj and not (isinstance(obj, Post) and len(obj.body) > 1000):
|
||||
|
|
@ -687,30 +804,42 @@ def filter_emojis_only(title, golden=True, count_emojis=False, obj=None, author=
|
|||
if obj.sharpened:
|
||||
title = sharpen(title)
|
||||
|
||||
emojis_used = set()
|
||||
result = render_emojis(title, permit_golden=golden, permit_big=False)
|
||||
|
||||
title = render_emoji(title, emoji_regex2, golden, emojis_used, is_title=True)
|
||||
|
||||
if count_emojis:
|
||||
for emoji in g.db.query(Emoji).filter(Emoji.submitter_id==None, Emoji.name.in_(emojis_used)):
|
||||
emoji.count += 1
|
||||
g.db.add(emoji)
|
||||
|
||||
if obj:
|
||||
for emoji in emojis_used:
|
||||
if emoji in OVER_18_EMOJIS:
|
||||
obj.nsfw = True
|
||||
break
|
||||
if obj and result.is_nsfw():
|
||||
obj.nsfw = True
|
||||
|
||||
title = strikethrough_regex.sub(r'\1<del>\2</del>', title)
|
||||
|
||||
title = bleach.clean(title, tags=['img','del','span'], attributes=allowed_attributes_emojis, protocols=['http','https']).replace('\n','')
|
||||
|
||||
if len(title) > POST_TITLE_HTML_LENGTH_LIMIT:
|
||||
abort(400, "Rendered title is too big!")
|
||||
res = render_emojis(title, permit_big=False) #old_render_emoji(title, emoji_regex2, golden, emojis_used, is_title=True)
|
||||
|
||||
if res.heavy_count > 0:
|
||||
abort(400, "You can't have heavy/filter emojis in the title!")
|
||||
|
||||
title = ''.join(map(str, res.tags))
|
||||
|
||||
if count_emojis:
|
||||
res.db_update_count()
|
||||
|
||||
title = title.strip()
|
||||
|
||||
res = render_emojis(title, permit_big=False) #old_render_emoji(title, emoji_regex2, golden, emojis_used, is_title=True)
|
||||
|
||||
if res.heavy_count > 0:
|
||||
abort(400, "You can't have heavy/filter emojis in the title!")
|
||||
|
||||
title = ''.join(map(str, res.tags))
|
||||
|
||||
if count_emojis:
|
||||
res.db_update_count()
|
||||
|
||||
title = title.strip()
|
||||
|
||||
if len(title) > POST_TITLE_HTML_LENGTH_LIMIT:
|
||||
abort(400, "Rendered title is too big!")
|
||||
|
||||
return title
|
||||
|
||||
def is_whitelisted(domain, k):
|
||||
|
|
|
|||
Loading…
Reference in New Issue