Merge branch 'master' into patch-5

docker-compose.yml

@@ -8,7 +8,7 @@ services:
       - "./:/service"
     environment:
       - DATABASE_URL=postgresql://postgres@postgres:5432
-      - MASTER_KEY=${MASTER_KEY:XuxGqp5NyygJrM24b5gt3YgyvFVGdQnwVDwLzLwpu3eQwY}
+      - MASTER_KEY=XuxGqp5NyygJrM24b5gt3YgyvFVGdQnwVDwLzLwpu3eQwY
       - REDIS_URL=redis://redis
       - DOMAIN=127.0.0.1
       - SITE_NAME=Drama

files/__main__.py

@@ -73,7 +73,7 @@ r=redis.Redis(host=environ.get("REDIS_URL", "redis://127.0.0.1"),  decode_respon
 limiter = Limiter(
 	app,
 	key_func=get_ipaddr,
-	default_limits=["50/minute"],
+	default_limits=["3/second;30/minute;100/hour"],
 	headers_enabled=True,
 	strategy="fixed-window"
 )

files/assets/css/main.css

@@ -4119,7 +4119,6 @@ th {
 
 .modal-header {
   border-bottom: none;
-  background-color: var(--gray-400);
   border-top-left-radius: 0.35rem;
   border-top-right-radius: 0.35rem;
   padding: 0.5rem 1rem;
@@ -4139,7 +4138,6 @@ th {
 
 .modal-footer {
   border: none;
-  background-color: var(--gray-400);
   border-bottom-right-radius: 0.35rem;
   border-bottom-left-radius: 0.35rem;
 }
@@ -4439,7 +4437,7 @@ th {
 }
 
 .modal .comment-actions .list-group-item:focus, .modal .comment-actions .list-group-item:hover {
-  background-color: var(--gray-300);
+  background-color: var(--gray-300) !important;
 }
 
 .modal .comment-actions a {
@@ -5629,6 +5627,18 @@ blockquote p {
   color: orange !important;
 }
 
+.text-silver {
+  color: silver !important;
+}
+
+.text-gold {
+  color: gold !important;
+}
+
+.text-green {
+  color: green !important;
+}
+
 .timeline-Widget {
   max-height: 500px !important;
   overflow-y: scroll !important;

files/assets/css/midnight.css

@@ -36,3 +36,7 @@ body, .navbar-light, .navbar-dark, .card, .modal-content, .comment-write textare
 .tooltip-inner {
 	color: #383838 !important;
 }
+
+.modal .comment-actions .list-group-item {
+    background-color: var(--gray-600)!important;	
+}