rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

fd

remotes/1693045480750635534/spooky-22
Aevann1 2021-07-25 01:24:23 +02:00
parent c3f7383c93
commit ce22d06655
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -20,7 +20,7 @@ services:
- CLOUDFLARE_ZONE=vcxvdfgfc6r554etrgd - CLOUDFLARE_ZONE=vcxvdfgfc6r554etrgd
- CLOUDFLARE_KEY=vcxvdfgfc6r554etrgd - CLOUDFLARE_KEY=vcxvdfgfc6r554etrgd
- TENOR_KEY=vcxvdfgfc6r554etrgd - TENOR_KEY=vcxvdfgfc6r554etrgd
- S3_BUCKET_NAME=i.drama.ga - S3_BUCKET_NAME=i.ruqqus.ga
- AWS_ACCESS_KEY_ID=vcxvdfgfc6r554etrgd - AWS_ACCESS_KEY_ID=vcxvdfgfc6r554etrgd
- AWS_SECRET_ACCESS_KEY=vcxvdfgfc6r554etrgd - AWS_SECRET_ACCESS_KEY=vcxvdfgfc6r554etrgd
- MAILGUN_KEY=vcxvdfgfc6r554etrgd - MAILGUN_KEY=vcxvdfgfc6r554etrgd

2
drama/classes/submission.py
View File

@ -282,7 +282,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
if self.over_18: return f"/assets/images/nsfw.png" if self.over_18: return f"/assets/images/nsfw.png"
elif self.has_thumb: elif self.has_thumb:
if self.thumburl: return self.thumburl if self.thumburl: return self.thumburl
else: return f"https://s3.eu-central-1.amazonaws.com/i.drama.ga/posts/{self.base36id}/thumb.png" else: return f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/posts/{self.base36id}/thumb.png"
elif self.is_image: elif self.is_image:
return self.url return self.url
else: else:

4
drama/routes/comments.py
View File

@ -434,7 +434,7 @@ def api_comment(v):
# g.db.commit() # g.db.commit()
# csam_thread=threading.Thread(target=check_csam_url, # csam_thread=threading.Thread(target=check_csam_url,
# args=(f"https://s3.eu-central-1.amazonaws.com/i.drama.ga/{name}", # args=(f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/{name}",
# v, # v,
# del_function # del_function
# ) # )
@ -809,7 +809,7 @@ def edit_comment(cid, v):
# g.db.commit() # g.db.commit()
# csam_thread=threading.Thread(target=check_csam_url, # csam_thread=threading.Thread(target=check_csam_url,
# args=(f"https://s3.eu-central-1.amazonaws.com/i.drama.ga/{name}", # args=(f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/{name}",
# v, # v,
# del_function # del_function
# ) # )

2
drama/routes/posts.py
View File

@ -934,7 +934,7 @@ def submit_post(v):
name = f'post/{new_post.base36id}/{secrets.token_urlsafe(8)}' name = f'post/{new_post.base36id}/{secrets.token_urlsafe(8)}'
new_post.url = upload_file(name, file) new_post.url = upload_file(name, file)
new_post.domain_ref = 1 # id of i.drama.ga domain new_post.domain_ref = 1 # id of i.ruqqus.ga domain
g.db.add(new_post) g.db.add(new_post)
g.db.add(new_post.submission_aux) g.db.add(new_post.submission_aux)
g.db.commit() g.db.commit()