skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a merge conflict that I somehow missed and removed marsey images from seed db

Browse source
This commit is contained in:
Michael House 2022-05-22 08:27:13 -05:00
parent 82a18e5cad
commit ddb1523bde
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
files/routes/votes.py
View file

@ -94,13 +94,9 @@ def api_vote_post(post_id, new, v):
post.author.truecoins += coin_delta post.author.truecoins += coin_delta
g.db.add(post.author) g.db.add(post.author)
<<<<<<< HEAD
DEFAULT_IMAGE = '/assets/images/default-profile-pic.webp' DEFAULT_IMAGE = '/assets/images/default-profile-pic.webp'
if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profile_url == DEFAULT_IMAGE and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False if new == 1 and (v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profile_url == DEFAULT_IMAGE and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False
=======
if new == 1 and (v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profile_url.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False
>>>>>>> frost
else: real = True else: real = True
vote = Vote(user_id=v.id, vote = Vote(user_id=v.id,

4
seed-db.sql
View file

File diff suppressed because one or more lines are too long