diff --git a/files/assets/css/main.css b/files/assets/css/main.css index c608c715b..a63bf1dee 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -5197,6 +5197,8 @@ span.green { } .effortpost-flair { padding: 5px 5px 4px 5px !important; + z-index: 2; + position: relative; } .patron[style*="background-color:#ffffff"] { color: black !important; diff --git a/files/assets/css/themes/4chan.css b/files/assets/css/themes/4chan.css index a66e92541..5f1bf9752 100644 --- a/files/assets/css/themes/4chan.css +++ b/files/assets/css/themes/4chan.css @@ -143,7 +143,7 @@ blockquote a { margin-top: 6px; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #949494 !important; } diff --git a/files/assets/css/themes/coffee.css b/files/assets/css/themes/coffee.css index 223555df4..ff685c4d8 100644 --- a/files/assets/css/themes/coffee.css +++ b/files/assets/css/themes/coffee.css @@ -101,7 +101,7 @@ blockquote { margin-top: 6px; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #949494 !important; } diff --git a/files/assets/css/themes/dark.css b/files/assets/css/themes/dark.css index 21ca50ed5..3b60ea5be 100644 --- a/files/assets/css/themes/dark.css +++ b/files/assets/css/themes/dark.css @@ -93,7 +93,7 @@ pre { border-color: #101010; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #7a7a7a !important; } diff --git a/files/assets/css/themes/dramblr.css b/files/assets/css/themes/dramblr.css index 0c3303cf8..102cc38c5 100644 --- a/files/assets/css/themes/dramblr.css +++ b/files/assets/css/themes/dramblr.css @@ -145,7 +145,7 @@ color: var(--gray-700); background-color: #313131 !important; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #6e6e6e !important; } diff --git a/files/assets/css/themes/light.css b/files/assets/css/themes/light.css index ae13dbbd3..d3c2de0d5 100644 --- a/files/assets/css/themes/light.css +++ b/files/assets/css/themes/light.css @@ -83,7 +83,7 @@ blockquote { background: rgba(var(--primary_rgb), 0.2) !important; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #7a7a7a !important; } diff --git a/files/assets/css/themes/midnight.css b/files/assets/css/themes/midnight.css index c8fa556ec..dbc7fbd50 100644 --- a/files/assets/css/themes/midnight.css +++ b/files/assets/css/themes/midnight.css @@ -56,7 +56,7 @@ body, .navbar-light, .navbar-dark, .card, .modal-content, .comment-write textare background-color: #313131 !important; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #6e6e6e !important; } diff --git a/files/assets/css/themes/tron.css b/files/assets/css/themes/tron.css index 3a10984af..a0f8ff7f8 100644 --- a/files/assets/css/themes/tron.css +++ b/files/assets/css/themes/tron.css @@ -227,7 +227,7 @@ background-color: #313131 !important; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #b0b0b0 !important; } diff --git a/files/assets/css/themes/win98.css b/files/assets/css/themes/win98.css index 6eb3f32f1..60a0db939 100644 --- a/files/assets/css/themes/win98.css +++ b/files/assets/css/themes/win98.css @@ -162,7 +162,7 @@ blockquote { margin-top: 6px; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #5c5c5c !important; } diff --git a/files/assets/events/fistmas/css/main_fistmas.css b/files/assets/events/fistmas/css/main_fistmas.css index 5d3ff6f0f..9a3696efe 100644 --- a/files/assets/events/fistmas/css/main_fistmas.css +++ b/files/assets/events/fistmas/css/main_fistmas.css @@ -90,7 +90,7 @@ pre { background: none !important; } -.visited, h5.post-title a:visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { +.visited, h5.post-title a:not(.effortpost-flair):visited, a[href^="https://"]:not([href^="https://rdrama.net" i], [href^="https://watchpeopledie.tv" i], .dropdown-item, .nav-link, .no-visited):visited { color: #7a7a7a !important; } diff --git a/files/routes/front.py b/files/routes/front.py index 3cecdaac2..b6eec2caa 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -41,6 +41,7 @@ def front_all(v, hole=None): sort = request.values.get("sort", defaultsorting) t = request.values.get('t', defaulttime) + effortposts_only = request.values.get('effortposts_only', False) if SITE == 'rdrama.net' and t == 'all' and sort == 'hot' and page > 1000: sort = 'top' @@ -57,7 +58,7 @@ def front_all(v, hole=None): pins = session.get(f'{hole}_{sort}', default) if not v: - result = cache.get(f'frontpage_{sort}_{t}_{page}_{hole}_{pins}') + result = cache.get(f'frontpage_{sort}_{t}_{page}_{hole}_{pins}_{effortposts_only}') if result: calc_users() return result @@ -71,6 +72,7 @@ def front_all(v, hole=None): lt=lt, hole=hole, pins=pins, + effortposts_only=effortposts_only, ) posts = get_posts(ids, v=v) @@ -83,7 +85,7 @@ def front_all(v, hole=None): result = render_template("home.html", v=v, listing=posts, total=total, sort=sort, t=t, page=page, hole=hole, home=True, pins=pins, size=size) if not v: - cache.set(f'frontpage_{sort}_{t}_{page}_{hole}_{pins}', result, timeout=900) + cache.set(f'frontpage_{sort}_{t}_{page}_{hole}_{pins}_{effortposts_only}', result, timeout=900) return result @@ -94,7 +96,7 @@ LIMITED_WPD_HOLES = {'aftermath', 'fights', 'gore', 'medical', 'request', 'selfh 'slavshit', 'sandshit'} @cache.memoize() -def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='', gt=0, lt=0, hole=None, pins=True): +def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='', gt=0, lt=0, hole=None, pins=True, effortposts_only=False): posts = g.db.query(Post) if v and v.hidevotedon: @@ -113,6 +115,9 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words=' if gt: posts = posts.filter(Post.created_utc > gt) if lt: posts = posts.filter(Post.created_utc < lt) + if effortposts_only: + posts = posts.filter_by(effortpost=True) + if not gt and not lt: posts = apply_time_filter(t, posts, Post) diff --git a/files/templates/post.html b/files/templates/post.html index 8806c8d79..62683ad3b 100644 --- a/files/templates/post.html +++ b/files/templates/post.html @@ -94,12 +94,12 @@

{% if p.realurl(v) and not v_forbid_deleted %} - {% if p.effortpost %}EFFORTPOST{% endif %} + {% if p.effortpost %}EFFORTPOST{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}} {% else %} - {% if p.effortpost %}EFFORTPOST{% endif %} + {% if p.effortpost %}EFFORTPOST{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}} {% endif %} diff --git a/files/templates/post_listing.html b/files/templates/post_listing.html index 2bfd74809..8ca94d403 100644 --- a/files/templates/post_listing.html +++ b/files/templates/post_listing.html @@ -92,7 +92,7 @@

- {% if p.effortpost %}EFFORTPOST{% endif %} + {% if p.effortpost %}EFFORTPOST{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}}