diff --git a/chart.png b/chart.png new file mode 100644 index 000000000..ec435e14d Binary files /dev/null and b/chart.png differ diff --git a/files/helpers/discord.py b/files/helpers/discord.py index b87339cac..41d60a2e2 100644 --- a/files/helpers/discord.py +++ b/files/helpers/discord.py @@ -11,7 +11,7 @@ AUTH = environ.get("DISCORD_AUTH",'').strip() ROLES={ "linked": "849621030926286920", "shrigma": "864612849199480914", - "admin": "846509661288267776", + "admin": "879459632656048180" if environ.get("DOMAIN") == "pcmemes.net" else "846509661288267776", "feedback": "850716291714383883", "newuser": "854783259229421589", "norep": "850971811918512208", diff --git a/files/routes/settings.py b/files/routes/settings.py index c05887570..5465dc42f 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -678,8 +678,8 @@ def settings_apps(v): @validate_formkey def settings_remove_discord(v): - if v.admin_level>1: - return render_template("settings_filters.html", v=v, error="Admins can't disconnect Discord.") + #if v.admin_level>1: + # return render_template("settings_filters.html", v=v, error="Admins can't disconnect Discord.") remove_user(v) diff --git a/files/templates/comments.html b/files/templates/comments.html index bfc56465c..7af3dcfb4 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -141,7 +141,7 @@ {% if c.author.verified %} {% endif %} - {{c.author.username}}{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %} + {{c.author.username}}{% if c.author.customtitle %}  {% if c.author.quadrant %}{% endif %}{{c.author.customtitle | safe}}{% endif %}  {{c.age_string}} {% if c.edited_utc %} @@ -263,81 +263,80 @@ {% endif %} -
  • Votes
    • + {% if v %} +
  • Reply
    • + {% endif %} + +
    • {% if v %} -
  • Unsave
    • +
    • -
  • Save
    • - -
  • Reply
    • +
    • {% if v.id!=c.author_id %} -
  • Give Award
    • +
    • {% endif %} {% endif %} -
  • Context
    • -
  • Copy link
    • - - {% if v %} -
  • Report
    • - {% else %} -
  • Report
    • - {% endif %} +
    • +
    • +
    • + +
    • {% if v and c.parent_submission and c.author_id==v.id %} -
  • Edit
    • +
    • -
  • Delete
    • +
    • -
  • Undelete
    • +
    • {% endif %} {% if v and v.admin_level==6 and v.id==c.author_id %} -
  • Undistinguish
    • -
  • Distinguish
    • +
    • +
    • {% endif %} {% if v and not v.id==c.author_id and v.admin_level == 0 %} -
  • Unblock user
    • -
  • Block user
    • +
    • +
    • {% endif %} {% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) and c.level == 1 %} -
  • Unpin
    • +
    • -
  • Pin
    • +
    • {% endif %} {% if v and v.admin_level>=3 %} {% if "/flagged/" in request.path %} -
  • Approve
    • -
  • Remove
    • +
    • +
    • {% else %} -
  • Approve
    • -
  • Remove
    • +
    • +
    • {% endif %} {% endif %} {% if v and c.parent_submission and (c.author_id==v.id or v.admin_level > 0) %} -
  • Unmark +18
    • -
  • Mark +18
    • +
    • +
    • {% endif %} {% if v and v.admin_level==6 and v.id != c.author_id %} -
  • Unban user
    • -
  • Ban user
    • +
    • +
    • {% endif %} {% if v and v.admin_level >=4 and c.oauth_app %} -
  • API App
    • +
    • {% endif %}
    • diff --git a/files/templates/default.html b/files/templates/default.html index fc9283b61..8464ba07d 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -1288,4 +1288,23 @@ + + diff --git a/files/templates/submission.html b/files/templates/submission.html index 4b0419915..c1016cbf1 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -267,7 +267,7 @@ {% if p.active_flags %}{{p.active_flags}} Reports{% endif %} {% if p.author.verified %} {% endif %} - {{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{% endif %}{{p.author.customtitle | safe}}{% endif %} + {{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{% endif %}{{p.author.customtitle | safe}}{% endif %}  {{p.age_string}} ({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 9662465d7..bb1065fec 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -112,7 +112,7 @@ {% if p.active_flags %}{{p.active_flags}} Reports{% endif %} {% if p.author.verified %} {% endif %} - {{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{% endif %}{{p.author.customtitle | safe}}{% endif %} + {{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{% endif %}{{p.author.customtitle | safe}}{% endif %}  {{p.age_string}}   ({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) diff --git a/image.PNG b/image.PNG new file mode 100644 index 000000000..29431f336 Binary files /dev/null and b/image.PNG differ diff --git a/image.jpeg b/image.jpeg new file mode 100644 index 000000000..125491f5d Binary files /dev/null and b/image.jpeg differ diff --git a/image.jpg b/image.jpg new file mode 100644 index 000000000..41563836a Binary files /dev/null and b/image.jpg differ diff --git a/schema.sql b/schema.sql index 165c9be72..c33490cd4 100644 --- a/schema.sql +++ b/schema.sql @@ -393,7 +393,8 @@ CREATE TABLE public.comments ( is_pinned boolean DEFAULT false, app_id integer, sentto integer, - bannedfor boolean + bannedfor boolean, + removed_by integer ); @@ -807,7 +808,8 @@ CREATE TABLE public.submissions ( is_bot boolean, bannedfor boolean, comment_count integer DEFAULT 0, - processing boolean DEFAULT false + processing boolean DEFAULT false, + removed_by integer );