diff --git a/files/classes/badges.py b/files/classes/badges.py index 111b3d95f..b805bebd1 100644 --- a/files/classes/badges.py +++ b/files/classes/badges.py @@ -2,7 +2,9 @@ from sqlalchemy import * from sqlalchemy.orm import relationship from files.__main__ import Base, app +from os import environ +site_name = environ.get("SITE_NAME").strip() class BadgeDef(Base): @@ -22,11 +24,11 @@ class BadgeDef(Base): @property def path(self): - return f"/assets/images/badges/{self.icon}" + return f"/assets/images/{site_name}/badges/{self.icon}" @property def json_core(self): - data={ + return { "name": self.name, "description": self.description, "icon": self.icon diff --git a/files/helpers/discord.py b/files/helpers/discord.py index 3d5a7e8df..cf1fcadcf 100644 --- a/files/helpers/discord.py +++ b/files/helpers/discord.py @@ -18,7 +18,7 @@ ROLES={ "2": "875569477671067688", "3": "869434199575236649", "4": "868140288013664296", - # "5": "880445545771044884", + "5": "880445545771044884", "8": "868140288013664296", } diff --git a/files/routes/admin.py b/files/routes/admin.py index 09bbda204..d26d798df 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -130,10 +130,10 @@ def monthly(v): grant_awards["shit"] = 10 grant_awards["gold"] = 10 grant_awards["ban"] = 3 - # elif u.patron == 5: - # grant_awards["shit"] = 10 - # grant_awards["gold"] = 10 - # grant_awards["ban"] = 6 + elif u.patron == 5: + grant_awards["shit"] = 10 + grant_awards["gold"] = 10 + grant_awards["ban"] = 6 for name in grant_awards: @@ -254,11 +254,11 @@ def badge_grant_post(v): grant_awards["shit"] = 10 grant_awards["gold"] = 10 grant_awards["ban"] = 3 - # elif badge_id == 25: - # if user.discord_id: add_role(user, "5") - # grant_awards["shit"] = 10 - # grant_awards["gold"] = 10 - # grant_awards["ban"] = 6 + elif badge_id == 25: + if user.discord_id: add_role(user, "5") + grant_awards["shit"] = 10 + grant_awards["gold"] = 10 + grant_awards["ban"] = 6 if len(grant_awards): diff --git a/files/routes/settings.py b/files/routes/settings.py index 75cc24ee2..cc620d70a 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -285,11 +285,11 @@ def gumroad(v): grant_awards["shit"] = 10 grant_awards["gold"] = 10 grant_awards["ban"] = 3 - # elif tier == 5: - # if v.discord_id: add_role(v, "5") - # grant_awards["shit"] = 10 - # grant_awards["gold"] = 10 - # grant_awards["ban"] = 6 + elif tier == 5: + if v.discord_id: add_role(v, "5") + grant_awards["shit"] = 10 + grant_awards["gold"] = 10 + grant_awards["ban"] = 6 _awards = [] diff --git a/files/templates/comments.html b/files/templates/comments.html index aebb08241..369c2d91c 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -60,7 +60,7 @@ {% endfor %}
- More comments + More comments
{% endif %} {% endif %} @@ -272,7 +272,7 @@ {% endif %}
  • Context
  • -
  • Copy link
  • +
  • Copy link
  • {% if v %}
  • Report
  • @@ -399,7 +399,7 @@ {% endfor %}
    - More comments + More comments
    {% endif %} {% endif %}