MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity

add dramacoin tax

remotes/1693045480750635534/spooky-22
atrc445 2021-09-21 20:06:41 +02:00
parent d666bfaa95
commit fd8bb4c54c
13 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker-compose.yml
View File

@ -9,6 +9,7 @@ services:
environment: environment:
- DATABASE_URL=postgresql://postgres@postgres:5432/postgres - DATABASE_URL=postgresql://postgres@postgres:5432/postgres
- MASTER_KEY=${MASTER_KEY:-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=} - MASTER_KEY=${MASTER_KEY:-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=}
- REDIS_URL=redis://redis
- DOMAIN=localhost - DOMAIN=localhost
- SITE_NAME=Drama - SITE_NAME=Drama
- GIPHY_KEY=3435tdfsdudebussylmaoxxt43 - GIPHY_KEY=3435tdfsdudebussylmaoxxt43
@ -63,5 +64,5 @@ services:
- "./seed-db.sql:/docker-entrypoint-initdb.d/01-schema.sql" - "./seed-db.sql:/docker-entrypoint-initdb.d/01-schema.sql"
environment: environment:
- POSTGRES_HOST_AUTH_METHOD=trust - POSTGRES_HOST_AUTH_METHOD=trust
ports: #ports:
- "5432:5432" #- "5432:5432"

4
files/__main__.py
View File

@ -59,9 +59,9 @@ app.config["RATELIMIT_DEFAULTS_EXEMPT_WHEN"]=lambda:False
app.config["RATELIMIT_HEADERS_ENABLED"]=True app.config["RATELIMIT_HEADERS_ENABLED"]=True
app.config["CACHE_TYPE"] = "filesystem" app.config["CACHE_TYPE"] = "filesystem"
app.config["CACHE_DIR"] = "cache" app.config["CACHE_DIR"] = "cache"
app.config["RATELIMIT_STORAGE_URL"] = "redis://127.0.0.1" app.config["RATELIMIT_STORAGE_URL"] = environ.get("REDIS_URL", "redis://127.0.0.1")
r=redis.Redis(host="127.0.0.1", decode_responses=True, ssl_cert_reqs=None) r=redis.Redis(host=environ.get("REDIS_URL", "redis://127.0.0.1"), decode_responses=True, ssl_cert_reqs=None)
cache = Cache(app) cache = Cache(app)
Markdown(app) Markdown(app)

15
files/routes/users.py
View File

@ -1,6 +1,7 @@
import qrcode import qrcode
import io import io
import time import time
import math
from files.classes.user import ViewerRelationship from files.classes.user import ViewerRelationship
from files.helpers.alerts import * from files.helpers.alerts import *
from files.helpers.sanitize import * from files.helpers.sanitize import *
@ -113,7 +114,8 @@ def get_coins(v, username):
@is_not_banned @is_not_banned
@validate_formkey @validate_formkey
def transfer_coins(v, username): def transfer_coins(v, username):
receiver = get_user(username) receiver = g.db.query(User).filter_by(username=username).first()
tax_receiver = g.db.query(User).filter_by(id=1).first()
if receiver is None: return {"error": "That user doesn't exist."}, 404 if receiver is None: return {"error": "That user doesn't exist."}, 404
@ -125,9 +127,12 @@ def transfer_coins(v, username):
if v.coins < amount: return {"error": f"You don't have enough {app.config['COINS_NAME']}"}, 400 if v.coins < amount: return {"error": f"You don't have enough {app.config['COINS_NAME']}"}, 400
if amount < 100: return {"error": f"You have to gift at least 100 {app.config['COINS_NAME']}."}, 400 if amount < 100: return {"error": f"You have to gift at least 100 {app.config['COINS_NAME']}."}, 400
v.coins -= amount tax = math.ceil(amount*0.01)
receiver.coins += amount v.coins -= amount-tax
receiver.coins += amount-tax
tax_receiver.coins += tax
g.db.add(receiver) g.db.add(receiver)
g.db.add(tax_receiver)
g.db.add(v) g.db.add(v)
transfer_message = f"🤑 [@{v.username}]({v.url}) has gifted you {amount} {app.config['COINS_NAME']}!" transfer_message = f"🤑 [@{v.username}]({v.url}) has gifted you {amount} {app.config['COINS_NAME']}!"
@ -135,7 +140,9 @@ def transfer_coins(v, username):
g.db.commit() g.db.commit()
return {"message": f"{app.config['COINS_NAME']} transferred!"} return {"message": f"{amount-tax} {app.config['COINS_NAME']} transferred!"}, 200
return {"message": f"You can't transfer {app.config['COINS_NAME']} to yourself!"}, 400
@app.get("/leaderboard") @app.get("/leaderboard")

2
files/templates/default.html
View File

@ -1378,7 +1378,7 @@
{% include "expanded_image_modal.html" %} {% include "expanded_image_modal.html" %}
<script src="/assets/js/general26.js"></script> <script src="/assets/js/general27.js"></script>
{% if request.path=='/' and g.system and g.timestamp>session.get('tooltip_last_dismissed',0)+60*60*24 and (not g.system.endswith('/chrome') and not g.system.endswith('/other')) and not g.system.endswith('/webview') %} {% if request.path=='/' and g.system and g.timestamp>session.get('tooltip_last_dismissed',0)+60*60*24 and (not g.system.endswith('/chrome') and not g.system.endswith('/other')) and not g.system.endswith('/webview') %}

2
files/templates/formatting.html
View File

@ -192,6 +192,6 @@ Allowed styles:
{% include "expanded_image_modal.html" %} {% include "expanded_image_modal.html" %}
<script src="/assets/js/general26.js"></script> <script src="/assets/js/general27.js"></script>
{% endblock %} {% endblock %}

2
files/templates/login.html
View File

@ -130,7 +130,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="/assets/js/general26.js"></script> <script src="/assets/js/general27.js"></script>
<pre> <pre>

2
files/templates/settings.html
View File

@ -239,7 +239,7 @@
</div> </div>
</div> </div>
<script src="/assets/js/general26.js"></script> <script src="/assets/js/general27.js"></script>
{% block onload %}{% endblock %} {% block onload %}{% endblock %}

2
files/templates/settings2.html
View File

@ -205,7 +205,7 @@
<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="/assets/js/general26.js"></script> <script src="/assets/js/general27.js"></script>
{% block scripts %} {% block scripts %}
{% endblock %} {% endblock %}

2
files/templates/sign_up.html
View File

@ -235,7 +235,7 @@
<!-- {{'SITE_NAME' | app_config}} JS --> <!-- {{'SITE_NAME' | app_config}} JS -->
<script src="/assets/js/general26.js"></script> <script src="/assets/js/general27.js"></script>
<pre> <pre>

2
files/templates/sign_up_failed_ref.html
View File

@ -124,7 +124,7 @@
<!-- {{'SITE_NAME' | app_config}} JS --> <!-- {{'SITE_NAME' | app_config}} JS -->
<script src="/assets/js/general26.js"></script> <script src="/assets/js/general27.js"></script>
<pre> <pre>

2
files/templates/submit.html
View File

@ -431,7 +431,7 @@
<!-- {{'SITE_NAME' | app_config}} JS --> <!-- {{'SITE_NAME' | app_config}} JS -->
<script src="/assets/js/general26.js"></script> <script src="/assets/js/general27.js"></script>
<script> <script>

32
files/templates/userpage.html
View File

@ -44,6 +44,8 @@
{% block desktopUserBanner %} {% block desktopUserBanner %}
<!-- Desktop --> <!-- Desktop -->
<script> <script>
const TRANSFER_TAX = 0.01;
window.addEventListener( 'load', function() { window.addEventListener( 'load', function() {
var userid = document.getElementById("userid").value; var userid = document.getElementById("userid").value;
if (userid != "nosong") if (userid != "nosong")
@ -61,14 +63,32 @@
let t = event.target; let t = event.target;
t.disabled = true; t.disabled = true;
post_toast("/@{{u.username}}/transfer_coins", let amount = parseInt(document.getElementById("coins-transfer-amount").value);
false, let transferred = amount - Math.ceil(amount*TRANSFER_TAX);
{"amount": document.getElementById(mobile ? "coins-transfer-amount-mobile" : "coins-transfer-amount").value}
post_toast_callback("/@{{u.username}}/transfer_coins",
{"amount": document.getElementById(mobile ? "coins-transfer-amount-mobile" : "coins-transfer-amount").value},
(xhr) => {
if(xhr.status == 200) {
document.getElementById("user-coins-amount").innerText = parseInt(document.getElementById("user-coins-amount").innerText) - transferred;
document.getElementById("profile-coins-amount-mobile").innerText = parseInt(document.getElementById("profile-coins-amount-mobile").innerText) + transferred;
document.getElementById("profile-coins-amount").innerText = parseInt(document.getElementById("profile-coins-amount").innerText) + transferred;
}
}
); );
setTimeout(_ => t.disabled = false, 2000); setTimeout(_ => t.disabled = false, 2000);
} }
function updateTax(mobile=false) {
let suf = mobile ? "-mobile" : "";
let amount = parseInt(document.getElementById("coins-transfer-amount" + suf).value);
if(isNaN(amount) || amount < 0) {
amount = 0;
}
document.getElementById("coins-transfer-taxed" + suf).innerText = amount - Math.ceil(amount*TRANSFER_TAX);
}
function toggleElement(group, id) { function toggleElement(group, id) {
for(let el of document.getElementsByClassName(group)) { for(let el of document.getElementsByClassName(group)) {
if(el.id != id) { if(el.id != id) {
@ -234,7 +254,8 @@
</form> </form>
<div class="d-none mt-3 profile-toggleable" id="coin-transfer"> <div class="d-none mt-3 profile-toggleable" id="coin-transfer">
<input id="coins-transfer-amount" class="form-control" name="amount" type="number"> <input autocomplete="off" id="coins-transfer-amount" class="form-control" name="amount" type="number" oninput="updateTax()">
<div>{{u.username}} will receive <span id="coins-transfer-taxed">0</span> {{'COINS_NAME' | app_config}}</div>
<button class="btn btn-primary mt-3" onclick="transferCoins()">Gift</button> <button class="btn btn-primary mt-3" onclick="transferCoins()">Gift</button>
</div> </div>
@ -504,7 +525,8 @@
</form> </form>
<div class="d-none mt-3 profile-toggleable-mobile" id="coin-transfer-mobile"> <div class="d-none mt-3 profile-toggleable-mobile" id="coin-transfer-mobile">
<input id="coins-transfer-amount-mobile" class="form-control" name="amount" type="number"> <input autocomplete="off" id="coins-transfer-amount-mobile" class="form-control" name="amount" type="number" oninput="updateTax(true)">
<div>{{u.username}} will receive <span id="coins-transfer-taxed-mobile">0</span> {{'COINS_NAME' | app_config}}</div>
<button class="btn btn-primary mt-3" onclick="transferCoins(true)">Gift</button> <button class="btn btn-primary mt-3" onclick="transferCoins(true)">Gift</button>
</div> </div>

56
seed-db.sql
View File

@ -24,56 +24,32 @@ INSERT INTO public.badge_defs VALUES (26, 'Agendaposter', 'Forced to use the age
INSERT INTO public.badge_defs VALUES (17, 'Marsey Artisan', 'Contributed a Marsey emoji ✨', 'marseybadge-1.webp', 3, NULL); INSERT INTO public.badge_defs VALUES (17, 'Marsey Artisan', 'Contributed a Marsey emoji ✨', 'marseybadge-1.webp', 3, NULL);
INSERT INTO public.badge_defs VALUES (16, 'Marsey Master', 'Contributed 10 (or more!!!!) Marsey emojis ✨', 'marseybadge-2.webp', 3, NULL); INSERT INTO public.badge_defs VALUES (16, 'Marsey Master', 'Contributed 10 (or more!!!!) Marsey emojis ✨', 'marseybadge-2.webp', 3, NULL);
INSERT INTO public.users (
id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private,
unban_utc, original_username, customtitle, defaultsorting, defaulttime, namecolor, titlecolor, profileurl, bannerurl,
customtitleplain, themecolor, changelogsub, oldreddit, css, profilecss, coins, agendaposter, suicide_utc,
post_count, comment_count, background, verified
) VALUES (1, 'Drama', '', 0, 0, true, true, '', '', 0, false,
0, 'Drama', '', 'hot', 'day', 'ff66ac', 'ff66ac', '', '',
'', 'ff66ac', false, false, '', '', 0, false, 0,
0, 0, '', true);
insert into public.award_relationships(id,user_id,kind) values(1,1,'shit'); insert into public.award_relationships(id,user_id,kind) values(1,1,'shit');
INSERT INTO public.users ( INSERT INTO public.users (
id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private, id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private,
unban_utc, original_username, customtitle, defaultsorting, defaulttime, namecolor, titlecolor, profileurl, bannerurl, unban_utc, original_username, customtitle, defaultsorting, defaulttime, namecolor, titlecolor, profileurl, bannerurl,
customtitleplain, themecolor, changelogsub, oldreddit, css, profilecss, coins, agendaposter, suicide_utc, customtitleplain, theme, themecolor, changelogsub, oldreddit, css, profilecss, coins, agendaposter, suicide_utc,
post_count, comment_count, background, verified post_count, comment_count, background, verified
) VALUES (2, 'AutoJanny', '', 0, 0, true, true, '', '', 0, false, ) VALUES (1, 'Drama', '', 0, 0, true, true, '', '', 0, false,
0, 'Drama', '', 'hot', 'day', 'ff66ac', 'ff66ac', '', '',
'', 'dark', 'ff66ac', false, false, '', '', 0, false, 0,
0, 0, '', true),
(2, 'AutoJanny', '', 0, 0, true, true, '', '', 0, false,
0, 'AutoJanny', '', 'hot', 'day', 'ff66ac', 'ff66ac', '', '', 0, 'AutoJanny', '', 'hot', 'day', 'ff66ac', 'ff66ac', '', '',
'', 'ff66ac', false, false, '', '', 0, false, 0, '', 'dark', 'ff66ac', false, false, '', '', 0, false, 0,
0, 0, '', true); 0, 0, '', true),
(3, 'Snappy', '', 0, 0, true, true, '', '', 0, false,
INSERT INTO public.users (
id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private,
unban_utc, original_username, customtitle, defaultsorting, defaulttime, namecolor, titlecolor, profileurl, bannerurl,
customtitleplain, themecolor, changelogsub, oldreddit, css, profilecss, coins, agendaposter, suicide_utc,
post_count, comment_count, background, verified
) VALUES (3, 'Snappy', '', 0, 0, true, true, '', '', 0, false,
0, 'Snappy', '', 'hot', 'day', '62ca56', 'e4432d', '', '', 0, 'Snappy', '', 'hot', 'day', '62ca56', 'e4432d', '', '',
'', '30409f', false, false, '', '', 0, false, 0, '', 'dark', '30409f', false, false, '', '', 0, false, 0,
0, 0, '', true); 0, 0, '', true),
(4, 'longpostbot', '', 0, 0, true, true, '', '', 0, false,
INSERT INTO public.users (
id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private,
unban_utc, original_username, customtitle, defaultsorting, defaulttime, namecolor, titlecolor, profileurl, bannerurl,
customtitleplain, themecolor, changelogsub, oldreddit, css, profilecss, coins, agendaposter, suicide_utc,
post_count, comment_count, background, verified
) VALUES (4, 'longpostbot', '', 0, 0, true, true, '', '', 0, false,
0, 'longpostbot', '', 'hot', 'day', '62ca56', 'e4432d', '', '', 0, 'longpostbot', '', 'hot', 'day', '62ca56', 'e4432d', '', '',
'', '30409f', false, false, '', '', 0, false, 0, '', 'dark', '30409f', false, false, '', '', 0, false, 0,
0, 0, '', true); 0, 0, '', true),
(5, 'zozbot', '', 0, 0, true, true, '', '', 0, false,
INSERT INTO public.users (
id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private,
unban_utc, original_username, customtitle, defaultsorting, defaulttime, namecolor, titlecolor, profileurl, bannerurl,
customtitleplain, themecolor, changelogsub, oldreddit, css, profilecss, coins, agendaposter, suicide_utc,
post_count, comment_count, background, verified
) VALUES (5, 'zozbot', '', 0, 0, true, true, '', '', 0, false,
0, 'zozbot', '', 'hot', 'day', '62ca56', 'e4432d', '', '', 0, 'zozbot', '', 'hot', 'day', '62ca56', 'e4432d', '', '',
'', '30409f', false, false, '', '', 0, false, 0, '', 'dark', '30409f', false, false, '', '', 0, false, 0,
0, 0, '', true); 0, 0, '', true);