diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index 6f63b130b..e12603d06 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -210,7 +210,7 @@ const EMOJIS_STRINGS = [ "marseyakumu": {"author":"elfbinn", "tags":"simp love loving weebshit"}, "marseyalien": {"author":"chapose", "tags":"green man martian scepter"}, "marseyamazon": {"author":"dramarama", "tags":"warehouse piss bottle driver wagecuck piss jug pissbottle pissjug wagie"}, - "marseyandmarcus": {"author":"unknown", "tags":"bed sleeping cuddling cuddle marseyismywaifu"}, + "marseyandmarcus": {"author":"dad", "tags":"bed sleeping cuddling cuddle marseyismywaifu"}, "marseyanime": {"author":"altaccountumbreon", "tags":"sayian weeb"}, "marseyannoyed": {"author":"jellyfishjam", "tags":"pissed irritation reaction annoyance angry mad irritated stfu grr"}, "marseyanticarp": {"author":"uraniumdonger", "tags":"reaction fish carpathianflorist"}, @@ -260,7 +260,7 @@ const EMOJIS_STRINGS = [ "marseybog": {"author":"dramamine", "tags":"rich brothers bogdanoff"}, "marseybong": {"author":"altaccountumbreon", "tags":"england walkers britain english chips british bad teeth crisps"}, "marseybooba": {"author":"pippy", "tags":"awooga tits titties boobs eyes animated tiddies"}, - "marseyboomer": {"author":"unknown", "tags":"sipping shades sunglasses old yup vape"}, + "marseyboomer": {"author":"dad", "tags":"sipping shades sunglasses old yup vape"}, "marseybountyhunter": {"author":"mom", "tags":"abortion leather vest cowboy gunslinger texas revolver"}, "marseybowl": {"author":"unknown", "tags":"marijuana weed dude weed lmao ganja drugs reaction pot pipe"}, "marseybrainlet": {"author":"john", "tags":"idiot imbecile smoothbrain crushed head retard caved in head sped dumb stupid drooling moron"}, @@ -336,7 +336,7 @@ const EMOJIS_STRINGS = [ "marseycow": {"author":"chiobu", "tags":"cow fursona skin animal costume furry heifer fursuit"}, "marseycowboy": {"author":"unknown", "tags":"western pardner reaction hat tootin yeehaw rootin"}, "marseycreepy": {"author":"chapose", "tags":"pervert pedophile weird reaction chomo creeper sketchy molester"}, - "marseycrucified": {"author":"jesus", "tags":"christ crucifix cross christian"}, + "marseycrucified": {"author":"dad", "tags":"jesus christ crucifix cross christian"}, "marseycrusader": {"author":"dramarama", "tags":"knight deusvult templar crusades catholic"}, "marseycrying": {"author":"mom", "tags":"tear cried despair weeping reaction depression sob tears sadness depressed animated sad"}, "marseycthulhu": {"author":"feynmandidnothingwrong", "tags":"horror halloween lovecraftian holiday eldritch evil scary monster"}, diff --git a/files/routes/awards.py b/files/routes/awards.py index 6798845aa..f679de7a2 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -76,7 +76,7 @@ def shop(v): for val in AWARDS.values(): val["price"] = int(val["price"]*discount) - sales = g.db.query(Vote.id).count() + g.db.query(CommentVote.id).count() - g.db.query(func.sum(User.coins)).scalar() + sales = g.db.query(func.sum(User.coins_spent)).scalar() return render_template("shop.html", awards=list(AWARDS.values()), v=v, sales=sales)