carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

xcv

master
Aevann1 2022-02-10 18:11:14 +02:00
parent 978b18d307
commit c8893fc27b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/classes/comment.py
View File

@ -345,7 +345,7 @@ class Comment(Base):
if v.teddit: body = body.replace("old.reddit.com", "teddit.net") if v.teddit: body = body.replace("old.reddit.com", "teddit.net")
elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com") elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
if v.nitter and not '/i/spaces/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net") if v.nitter and not '/i/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
if v and v.controversial: if v and v.controversial:
for i in re.finditer('(/comments/.*?)"', body): for i in re.finditer('(/comments/.*?)"', body):
@ -407,7 +407,7 @@ class Comment(Base):
if v and not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com") if v and not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
if v and v.nitter and not '/i/spaces/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net") if v and v.nitter and not '/i/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
if v and v.controversial: if v and v.controversial:
for i in re.finditer('(/comments/.*?)"', body): for i in re.finditer('(/comments/.*?)"', body):

6
files/classes/submission.py
View File

@ -353,7 +353,7 @@ class Submission(Base):
if v.controversial: url += "&sort=controversial" if v.controversial: url += "&sort=controversial"
return url return url
elif self.url: elif self.url:
if v and v.nitter and not '/i/spaces/' in self.url: return self.url.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net") if v and v.nitter and not '/i/' in self.url: return self.url.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
if self.url.startswith('/'): return SITE_FULL + self.url if self.url.startswith('/'): return SITE_FULL + self.url
return self.url return self.url
else: return "" else: return ""
@ -369,7 +369,7 @@ class Submission(Base):
if v.teddit: body = body.replace("old.reddit.com", "teddit.net") if v.teddit: body = body.replace("old.reddit.com", "teddit.net")
elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com") elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
if v.nitter and not '/i/spaces/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net") if v.nitter and not '/i/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
if v and v.shadowbanned and v.id == self.author_id and 86400 > time.time() - self.created_utc > 20: if v and v.shadowbanned and v.id == self.author_id and 86400 > time.time() - self.created_utc > 20:
ti = max(int((time.time() - self.created_utc)/60), 1) ti = max(int((time.time() - self.created_utc)/60), 1)
@ -436,7 +436,7 @@ class Submission(Base):
if v.teddit: body = body.replace("old.reddit.com", "teddit.net") if v.teddit: body = body.replace("old.reddit.com", "teddit.net")
elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com") elif not v.oldreddit: body = body.replace("old.reddit.com", "reddit.com")
if v.nitter and not '/i/spaces/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net") if v.nitter and not '/i/' in body: body = body.replace("www.twitter.com", "nitter.net").replace("twitter.com", "nitter.net")
return body return body

6
files/templates/userpage.html
View File

@ -487,13 +487,13 @@
<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 autocomplete="off" id="coin-transfer-amount-mobile" class="form-control" name="amount" type="number" oninput="updateTax(true)"> <input autocomplete="off" id="coin-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</div> <div>{{u.username}} will receive <span id="coins-transfer-taxed-mobile">0</span> coins</div>
<button class="btn btn-primary mt-3" onclick="transferCoins(true)">Gift</button> <button class="btn btn-primary mt-2 mb-3" onclick="transferCoins(true)">Gift</button>
</div> </div>
<div class="d-none mt-3 profile-toggleable-mobile" id="bux-transfer-mobile"> <div class="d-none mt-3 profile-toggleable-mobile" id="bux-transfer-mobile">
<input autocomplete="off" id="bux-transfer-amount-mobile" class="form-control" name="amount" type="number" oninput="updateBux(true)"> <input autocomplete="off" id="bux-transfer-amount-mobile" class="form-control" name="amount" type="number" oninput="updateBux(true)">
<div>{{u.username}} will receive <span id="bux-transfer-taxed-mobile">0</span> marseybux</div> <div>{{u.username}} will receive <span id="bux-transfer-taxed-mobile">0</span> marseybux</div>
<button class="btn btn-primary mt-3" onclick="transferBux(true)">Gift</button> <button class="btn btn-primary mt-2 mb-3" onclick="transferBux(true)">Gift</button>
</div> </div>
{% if v.admin_level > 1 %} {% if v.admin_level > 1 %}
@ -567,7 +567,7 @@
<a id="verify2" class="{% if u.verified %}d-none{% endif %} btn btn-success" role="button" onclick="post_toast2('/admin/verify/{{u.id}}','verify2','unverify2')">Verify</a> <a id="verify2" class="{% if u.verified %}d-none{% endif %} btn btn-success" role="button" onclick="post_toast2('/admin/verify/{{u.id}}','verify2','unverify2')">Verify</a>
<a id="unverify2" class="{% if not u.verified %}d-none{% endif %} btn btn-success" role="button" onclick="post_toast2('/admin/unverify/{{u.id}}','verify2','unverify2')">Unverify</a> <a id="unverify2" class="{% if not u.verified %}d-none{% endif %} btn btn-success" role="button" onclick="post_toast2('/admin/unverify/{{u.id}}','verify2','unverify2')">Unverify</a>
{% endif %} {% endif %}
<pre></pre> <pre></pre>
<form action="/admin/unnuke_user" method="post"> <form action="/admin/unnuke_user" method="post">
<input autocomplete="off" type="hidden" name="formkey", value="{{v.formkey}}"> <input autocomplete="off" type="hidden" name="formkey", value="{{v.formkey}}">