remotes/1693045480750635534/spooky-22
Aevann1 2021-08-04 18:21:10 +02:00
parent bdafb6f01a
commit b78293130c
22 changed files with 56 additions and 57 deletions

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
image.gif
dramacache/
cache/
__pycache__/
*.py[cod]
*$py.class

View File

@ -2,12 +2,12 @@ version: 0.0
os: linux
files:
- source: /
destination: drama
destination: files
permissions:
- object: drama/*
- object: files/*
mode: 4755
hooks:
AfterInstall:
- location: scripts/install_pip
ApplicationStart:
- location: scripts/start_drama
- location: scripts/start_files

View File

@ -1,13 +1,13 @@
version: '2.3'
services:
drama:
files:
build:
context: .
volumes:
- "./:/drama/service"
- "./:/service"
environment:
- PYTHONPATH="drama/service"
- PYTHONPATH="/service"
- REDIS_URL=redis://redis
- DATABASE_URL=postgresql://postgres@postgres:5432/postgres
- DATABASE_CONNECTION_POOL_URL=postgresql://postgres@postgres:5432/postgres
@ -19,7 +19,6 @@ services:
- TENOR_KEY=vcxvdfgfc6r554etrgd
- MAILGUN_KEY=vcxvdfgfc6r554etrgd
- MAILGUN_DOMAIN=rdrama.net
- admin_email=drama@rdrama.net
- FORCE_HTTPS=0
- DISCORD_SERVER_ID=vcxvdfgfc6r554etrgd
- DISCORD_CLIENT_ID=vcxvdfgfc6r554etrgd
@ -27,7 +26,7 @@ services:
- DISCORD_BOT_TOKEN=vcxvdfgfc6r554etrgd
- imgurkey=vcxvdfgfc6r554etrgd
- FACEBOOK_TOKEN=vcxvdfgfc6r554etrgd
#- HCAPTCHA_SITEKEY=vcxvdfgfc6r554etrgd
#- HCAPTCHA_SITEKEY=vcxvdfgfc6r554etrgd
- HCAPTCHA_SECRET=vcxvdfgfc6r554etrgd
- youtubekey=vcxvdfgfc6r554etrgd
- PUSHER_KEY=vcxvdfgfc6r554etrgd

View File

@ -31,7 +31,7 @@ app.wsgi_app = ProxyFix(app.wsgi_app, x_for=3)
app.url_map.strict_slashes = False
app.config["SITE_NAME"]=environ.get("SITE_NAME").strip()
app.config["coins_name"]=environ.get("SITE_NAME").strip()
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
app.config['DATABASE_URL'] = environ.get("DATABASE_CONNECTION_POOL_URL",environ.get("DATABASE_URL"))

View File

@ -43,7 +43,7 @@ Python example:
headers={"Authorization": "access_token_goes_here", "User-Agent": "sex"}
url="https://rdrama.net/@carpathianflorist"
url="{{request.host_url}}@carpathianflorist"
r=requests.get(url, headers=headers)
@ -93,7 +93,7 @@ DO NOT reveal your Client ID or Access Token. Anyone with these information will
## Step 2: Prompt Your User for Authorization
Send your user to `https://rdrama.net/authorize/?client_id=YOUR_CLIENT_ID`
Send your user to `{{request.host_url}}authorize/?client_id=YOUR_CLIENT_ID`
If done correctly, the user will see that your application wants to access their {{"SITE_NAME" | app_config}} account, and be prompted to approve or deny the request.
@ -112,7 +112,7 @@ Python example:
headers={"Authorization": "access_token_goes_here", "User-Agent": "sex"}
url="https://rdrama.net/@carpathianflorist"
url="{{request.host_url}}@carpathianflorist"
r=requests.get(url, headers=headers)

View File

@ -16,7 +16,7 @@
{% for user in badmins %}
<tr>
<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
<td style="font-weight:bold; text-align:right;">{{user.dramacoins}}</td>
<td style="font-weight:bold; text-align:right;">{{user.coins}}</td>
</tr>
{% endfor %}
</table>

View File

@ -807,13 +807,13 @@
<meta property="og:image" content="{{'/assets/images/preview.png' | full_link}}" />
<meta property="og:url" content="{{request.path | full_link}}">
<meta property="og:description" name="description" content="Dude bussy lmao">
<meta property="og:author" name="author" content="@drama" />
<meta property="og:author" name="author" content="@{{request.host_url}}" />
<meta property="og:site_name" content="{{request.host}}" />
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="@drama">
<meta name="twitter:site" content="@{{request.host_url}}">
<meta name="twitter:title" content="{{"SITE_NAME" | app_config}}" />
<meta name="twitter:creator" content="@drama">
<meta name="twitter:creator" content="@{{request.host_url}}">
<meta name="twitter:description" content="Dude bussy lmao" />
<meta name="twitter:image" content="/assets/images/preview.png" />
<meta name="twitter:url" content="{{request.path | full_link}}" />

View File

@ -37,7 +37,7 @@
<nav class="navbar navbar-expand-md navbar-light shadow shadow-md fixed-top" id="navbar">
<div class="container-fluid">
<div class="flex-grow-1"><a href="/" class="navbar-brand"><img src="/assets/images/drama.png" height="20"><span class="text-small-extra text-uppercase text-gray-400"> Sigma</span></a></div>
<div class="flex-grow-1"><a href="/" class="navbar-brand"><img src="/assets/images/logo.png" height="20"><span class="text-small-extra text-uppercase text-gray-400"> Sigma</span></a></div>

View File

@ -44,7 +44,7 @@
<!-- Navigation -->
<nav class="navbar navbar-expand-md navbar-light bg-white shadow shadow-md fixed-top" id="navbar">
<div class="container">
<div class="flex-grow-1"><span class="text-primary navbar-brand">drama</span></div>
<div class="flex-grow-1"><span class="text-primary navbar-brand">{{"SITE_NAME" | app_config}}</span></div>
@ -59,7 +59,7 @@
<li class="nav-item nav-item">
<a class="nav-link text-small-extra" href="https://github.com/drama/drama">GitHub</a>
<a class="nav-link text-small-extra" href="https://github.com/Aevann1/Drama">GitHub</a>
</li>
</ul>

View File

@ -2,7 +2,7 @@
<nav class="navbar navbar-expand-md navbar-light shadow shadow-md fixed-top" id="navbar">
<div class="container-fluid">
<div class="flex-grow-1"><a href="/" class="navbar-brand"><img src="/assets/images/drama.gif" height="20"><span class="text-small-extra text-uppercase text-gray-400"> Sigma</span></a></div>
<div class="flex-grow-1"><a href="/" class="navbar-brand"><img src="/assets/images/logo.gif" height="20"><span class="text-small-extra text-uppercase text-gray-400"> Sigma</span></a></div>
<div class="flex-grow-1 d-fl d-none d-md-block">
<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" action="/search/posts/" method="get">
<input class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
@ -79,7 +79,7 @@
<div><img src="{{v.profile_url}}" class="profile-pic-35"></div>
<div class="text-left pl-2">
<div style="color: #{{v.namecolor}}" class="text-small font-weight-bold {% if v.animatedname %}{% if v.patron %}patron{% else %}leaderboard{% endif %}{% endif %}">{{v.username}}</div>
<div class="text-small-extra text-purple"><i class="fad fa-diamond mr-1"></i>{{v.dramacoins}} {{"SITE_NAME" | app_config}}coins</div>
<div class="text-small-extra text-purple"><i class="fad fa-diamond mr-1"></i>{{v.coins}} {{"SITE_NAME" | app_config}}coins</div>
</div>
</div>
</a>

View File

@ -4,7 +4,7 @@
{% block content %}
<pre class="d-none d-md-inline-block"></pre>
<h5 style="font-weight:bold;text-align: center;">Top 25 dramatards by dramacoins</h5>
<h5 style="font-weight:bold;text-align: center;">Top 25 by {{"coins_name" | app_config}}</h5>
<pre></pre>
<table class="table table-striped mb-5">
<thead class="bg-primary text-white">
@ -18,7 +18,7 @@
<tr>
<td style="font-weight:bold;">{{users1.index(user)+1}}</td>
<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/uid/{{user.id}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
<td style="font-weight:bold; text-align:right;">{{user.dramacoins}}</td>
<td style="font-weight:bold; text-align:right;">{{user.coins}}</td>
</tr>
{% endfor %}
</table>
@ -26,7 +26,7 @@
</pre>
<h5 style="font-weight:bold;text-align: center;">Top 10 dramatards by followers</h5>
<h5 style="font-weight:bold;text-align: center;">Top 10 by followers</h5>
<pre>
@ -51,7 +51,7 @@
</pre>
<h5 style="font-weight:bold;text-align: center;">Top 10 dramatards by post count</h5>
<h5 style="font-weight:bold;text-align: center;">Top 10 by post count</h5>
<pre>
@ -76,7 +76,7 @@
</pre>
<h5 style="font-weight:bold;text-align: center;">Top 10 dramatards by comment count</h5>
<h5 style="font-weight:bold;text-align: center;">Top 10 by comment count</h5>
<pre>

View File

@ -52,7 +52,7 @@
<div class="col-10 col-md-7">
<div class="mb-5">
<a href="/" class="text-decoration-none"><span class="h3 text-primary">drama</span></a>
<a href="/" class="text-decoration-none"><span class="h3 text-primary">{{"SITE_NAME" | app_config}}</span></a>
</div>
<div id="login-form" class="">

View File

@ -56,13 +56,13 @@
<meta property="og:image" content="{{'/assets/images/preview.png' | full_link}}" />
<meta property="og:url" content="{{request.host}}">
<meta property="og:description" name="description" content="Dude bussy lmao">
<meta property="og:author" name="author" content="@drama" />
<meta property="og:author" name="author" content="@{{request.host_url}}" />
<meta property="og:site_name" content="{{request.host}}" />
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="@drama">
<meta name="twitter:site" content="@{{request.host_url}}">
<meta name="twitter:title" content="{{"SITE_NAME" | app_config}}" />
<meta name="twitter:creator" content="@drama">
<meta name="twitter:creator" content="@{{request.host_url}}">
<meta name="twitter:description" content="Dude bussy lmao" />
<meta name="twitter:image" content="{{'/assets/images/preview.png' | full_link}}" />
<meta name="twitter:url" content="{{request.host}}" />

View File

@ -17,13 +17,13 @@
<meta property="og:image" content="{{'/assets/images/preview.png' | full_link}}" />
<meta property="og:url" content="{{request.path | full_link}}">
<meta property="og:description" name="description" content="Dude bussy lmao">
<meta property="og:author" name="author" content="@drama" />
<meta property="og:author" name="author" content="{{request.host_url}}" />
<meta property="og:site_name" content="{{request.host}}" />
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="@drama">
<meta name="twitter:site" content="{{request.host_url}}">
<meta name="twitter:title" content="{{"SITE_NAME" | app_config}}" />
<meta name="twitter:creator" content="@drama">
<meta name="twitter:creator" content="{{request.host_url}}">
<meta name="twitter:description" content="Dude bussy lmao" />
<meta name="twitter:image" content="/assets/images/preview.png" />
<meta name="twitter:url" content="{{request.path | full_link}}" />

View File

@ -185,7 +185,7 @@
<label class="custom-control-label" for="slurreplacer"></label>
</div>
<span class="text-small-extra text-muted">Enable if you would like to automatically replace slurs with funny r/drama equivalents.</span>
<span class="text-small-extra text-muted">Enable if you would like to automatically replace slurs.</span>
</div>

View File

@ -328,7 +328,7 @@
<label class="custom-control-label" for="animatedname"></label>
</div>
<span class="text-small-extra text-muted">Enable animated username (only available to users in the dramacoin leaderboard and patrons)</span>
<span class="text-small-extra text-muted">Enable animated username (only available to users in the {{"coins_name" | app_config}} leaderboard and patrons)</span>
</div>
</div>

View File

@ -33,11 +33,11 @@
var id = document.getElementById("usernameHelpRegister");
var successID = document.getElementById("usernameHelpSuccess");
var dramaAPI = '/is_available/' + charCount;
var API = '/is_available/' + charCount;
if (charCount.length >= 3) {
$.getJSON(dramaAPI, function(result) {
$.getJSON(API, function(result) {
$.each(result, function(i, field) {
if (field == false) {
id.innerHTML = '<span class="form-text font-weight-bold text-danger mt-1">Username already taken :(';
@ -74,13 +74,13 @@
<meta property="og:image" content="{{'/assets/images/preview.png' | full_link}}" />
<meta property="og:url" content="{{request.host}}">
<meta property="og:description" name="description" content="Sign up now! Dude bussy lmao">
<meta property="og:author" name="author" content="@drama" />
<meta property="og:author" name="author" content="{{request.host_url}}" />
<meta property="og:site_name" content="{{request.host}}" />
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="@drama">
<meta name="twitter:site" content="{{request.host_url}}">
<meta name="twitter:title" content="{{"SITE_NAME" | app_config}}" />
<meta name="twitter:creator" content="@drama">
<meta name="twitter:creator" content="{{request.host_url}}">
<meta name="twitter:description" content="Sign up now! Dude bussy lmao" />
<meta name="twitter:image" content="{{'/assets/images/preview.png' | full_link}}" />
<meta name="twitter:url" content="{{request.host}}" />

View File

@ -14,13 +14,13 @@
<meta property="og:image" content="{{'/assets/images/preview.png' | full_link}}" />
<meta property="og:url" content="{{request.host}}">
<meta property="og:description" name="description" content="Sign up now! Dude bussy lmao">
<meta property="og:author" name="author" content="@drama" />
<meta property="og:author" name="author" content="{{request.host_url}}" />
<meta property="og:site_name" content="{{request.host}}" />
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="@drama">
<meta name="twitter:site" content="{{request.host_url}}">
<meta name="twitter:title" content="{{"SITE_NAME" | app_config}}" />
<meta name="twitter:creator" content="@drama">
<meta name="twitter:creator" content="{{request.host_url}}">
<meta name="twitter:description" content="Sign up now! Dude bussy lmao" />
<meta name="twitter:image" content="{{'/assets/images/preview.png' | full_link}}" />
<meta name="twitter:url" content="{{request.host}}" />
@ -69,7 +69,7 @@
<div class="col-10 col-md-7">
<div class="text-center mb-5">
<a href="/" class="text-decoration-none"><span class="h3 text-primary">drama</span></a>
<a href="/" class="text-decoration-none"><span class="h3 text-primary">{{"SITE_NAME" | app_config}}</span></a>
</div>
<div id="register-form" class="">

View File

@ -40,7 +40,7 @@
<meta property="og:site_name" content="{{request.host}}" />
<meta name="twitter:card" content="summary" />
<meta name="twitter:site" content="@drama">
<meta name="twitter:site" content="{{request.host_url}}">
<meta name="twitter:title" content="{{'@'+comment_info.author.username}} comments on {{title}} - {{"SITE_NAME" | app_config}}" />
<meta name="twitter:creator" content="{{'@'+comment_info.author.username}}">
<meta name="twitter:description" content="{{comment_info.body}}" />
@ -66,7 +66,7 @@
<meta property="og:site_name" content="{{request.host}}" />
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="@drama">
<meta name="twitter:site" content="{{request.host_url}}">
<meta name="twitter:title" content="{{title}} - {{"SITE_NAME" | app_config}}" />
<meta name="twitter:creator" content="{{'@'+p.author.username}}">
<meta name="twitter:description" content="{{p.body}}" />
@ -566,7 +566,7 @@
<div class="card border-0 bg-light mt-4">
<div class="card-body">
<h5 class="card-title">Jump in the discussion.</h5>
<p class="card-text">Become a dramatard, no email address required.</p>
<p class="card-text">No email address required.</p>
<div>
<a href="/signup?redirect={{request.path | urlencode}}" class="btn btn-primary">Sign up</a>
<a href="/login?redirect={{request.path | urlencode}}" class="btn btn-link text-muted">Sign in</a>

View File

@ -25,7 +25,7 @@
<meta property="og:article:author" content="@{{u.username}}" />
<meta property="article:section" content="{{u.username}}'s profile - {{"SITE_NAME" | app_config}}" />
<meta property="article:published_time" content="{{u.created_date}}" />
<meta property="og:description" name="description" content="{{u.dramacoins}} {{"SITE_NAME" | app_config}}coins - Joined {{u.created_date}} - {% if u.stored_subscriber_count >=1 and not u.is_private and not u.is_nofollow %}{{u.stored_subscriber_count}} Followers - {% endif %}{% if not u.is_private %}{{u.post_count}} Posts - {{u.comment_count}} Comments - {% endif %}{{u.bio}}" />
<meta property="og:description" name="description" content="{{u.coins}} {{"SITE_NAME" | app_config}}coins - Joined {{u.created_date}} - {% if u.stored_subscriber_count >=1 and not u.is_private and not u.is_nofollow %}{{u.stored_subscriber_count}} Followers - {% endif %}{% if not u.is_private %}{{u.post_count}} Posts - {{u.comment_count}} Comments - {% endif %}{{u.bio}}" />
<meta property="og:author" name="author" content="@{{u.username}}" />
<meta property="og:title" content="{{u.username}}" />
<meta property="og:image" content="{% if u.bannerurl %}{{u.banner_url}}{% else %}{{'/assets/images/preview.png' | full_link}}{% endif %}" />
@ -33,10 +33,10 @@
<meta property="og:site_name" content="{{request.host}}" />
<meta name="twitter:card" content="summary_large_image"/>
<meta name="twitter:site" content="@drama">
<meta name="twitter:site" content="{{request.host_url}}">
<meta name="twitter:title" content="{{u.username}}'s profile - {{"SITE_NAME" | app_config}}" />
<meta name="twitter:creator" content="@{{u.username}}">
<meta name="twitter:description" content="{{u.dramacoins}} {{"SITE_NAME" | app_config}}coins - Joined {{u.created_date}} - {% if u.stored_subscriber_count >=1 and not u.is_private and not u.is_nofollow %}{{u.stored_subscriber_count}} Followers -{% endif %} {% if not u.is_private %} {{u.post_count}} Posts - {{u.comment_count}} Comments -{% endif %} {{u.bio}}" />
<meta name="twitter:description" content="{{u.coins}} {{"SITE_NAME" | app_config}}coins - Joined {{u.created_date}} - {% if u.stored_subscriber_count >=1 and not u.is_private and not u.is_nofollow %}{{u.stored_subscriber_count}} Followers -{% endif %} {% if not u.is_private %} {{u.post_count}} Posts - {{u.comment_count}} Comments -{% endif %} {{u.bio}}" />
<meta name="twitter:image" content="{% if u.bannerurl %}{{u.banner_url}}{% else %}{{'/assets/images/preview.png' | full_link}}{% endif %}" />
<meta name="twitter:url" content="{{u.permalink | full_link}}" />
{% endblock %}
@ -119,7 +119,7 @@
{% if u.customtitle %}<p class="font-weight-bolder" style="color: #{{u.titlecolor}}">{{u.customtitle | safe}}</p>{% endif %}
<div class="font-weight-bolder">
<span>{{u.dramacoins}}</span> {{"SITE_NAME" | app_config}}coins&nbsp;&nbsp; {% if u.stored_subscriber_count >=1 and not u.is_nofollow %}<a href="/@{{u.username}}/followers">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp; {% endif %}joined <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="{{u.created_datetime}}">{{u.created_date}}</span>
<span>{{u.coins}}</span> {{"SITE_NAME" | app_config}}coins&nbsp;&nbsp; {% if u.stored_subscriber_count >=1 and not u.is_nofollow %}<a href="/@{{u.username}}/followers">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp; {% endif %}joined <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="{{u.created_datetime}}">{{u.created_date}}</span>
</div>
{% if u.bio_html %}
<pre></pre>
@ -306,7 +306,7 @@
{% endif %}
{% if u.customtitle %}<p style="color: #{{u.titlecolor}}">{{u.customtitle | safe}}</p>{% endif %}
<div class="font-weight-normal">
<span class="font-weight-bold">{{u.dramacoins}}</span> {{"SITE_NAME" | app_config}}coins&nbsp;&nbsp;{% if u.stored_subscriber_count >=1 and not u.is_nofollow %}<a href="/@{{u.username}}/followers" class="font-weight-bold">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp; {% endif %}<br>joined <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="{{u.created_datetime}}" class="font-weight-bold">{{u.created_date}}</span>
<span class="font-weight-bold">{{u.coins}}</span> {{"SITE_NAME" | app_config}}coins&nbsp;&nbsp;{% if u.stored_subscriber_count >=1 and not u.is_nofollow %}<a href="/@{{u.username}}/followers" class="font-weight-bold">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp; {% endif %}<br>joined <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="{{u.created_datetime}}" class="font-weight-bold">{{u.created_date}}</span>
</div>
{% if u.bio_html %}
<p class="text-muted text-break">{{u.bio_html | safe}}</p>

View File

@ -11,7 +11,7 @@
</span>
<h2 class="h5">This account is private</h2>
<p class="text-muted">This user has enabled private mode to cloak their posting history.</p>
<!-- {% if u.id == 253 %}<a class="btn btn-primary" href="/@Landlord_Messiah/?rent=true">Pay Rent to View (500 dramacoins)</a>{% endif %} -->
<!-- {% if u.id == 253 %}<a class="btn btn-primary" href="/@Landlord_Messiah/?rent=true">Pay Rent to View (500 {{"coins_name" | app_config}})</a>{% endif %} -->
</div>
</div>
</div>

View File

@ -3,9 +3,9 @@ nodaemon=true
pidfile=/tmp/supervisord.pid
logfile=/tmp/supervisord.log
[program:dramaservice]
directory=/drama/service
command=gunicorn drama.__main__:app -k gevent -w 5 --max-requests 10000 --max-requests-jitter 500 --reload --bind 0.0.0.0:80
[program:service]
directory=/service
command=gunicorn files.__main__:app -k gevent -w 5 --max-requests 10000 --max-requests-jitter 500 --reload --bind 0.0.0.0:80
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr