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

restore push notifs

master
Aevann1 2022-06-27 20:42:41 +02:00
parent 197637b872
commit d31d6b8617
3 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/routes/comments.py
View File

@ -26,8 +26,8 @@ import os
d = Dict("en_US")
# if PUSHER_ID != 'blahblahblah':
# beams_client = PushNotifications(instance_id=PUSHER_ID, secret_key=PUSHER_KEY)
if PUSHER_ID != 'blahblahblah':
beams_client = PushNotifications(instance_id=PUSHER_ID, secret_key=PUSHER_KEY)
WORDLE_COLOR_MAPPINGS = {-1: "🟥", 0: "🟨", 1: "🟩"}
@ -597,9 +597,9 @@ def api_comment(v):
n = Notification(comment_id=c.id, user_id=x)
g.db.add(n)
# if parent.author.id != v.id and PUSHER_ID != 'blahblahblah' and not v.shadowbanned:
# try: gevent.spawn(pusher_thread, f'{request.host}{parent.author.id}', c, c.author_name)
# except: pass
if parent.author.id != v.id and PUSHER_ID != 'blahblahblah' and not v.shadowbanned:
try: gevent.spawn(pusher_thread, f'{request.host}{parent.author.id}', c, c.author_name)
except: pass

64
files/routes/users.py
View File

@ -17,8 +17,8 @@ import gevent
from sys import stdout
import os
# if PUSHER_ID != 'blahblahblah':
# beams_client = PushNotifications(instance_id=PUSHER_ID, secret_key=PUSHER_KEY)
if PUSHER_ID != 'blahblahblah':
beams_client = PushNotifications(instance_id=PUSHER_ID, secret_key=PUSHER_KEY)
def pusher_thread2(interests, notifbody, username):
beams_client.publish_to_interests(
@ -707,12 +707,12 @@ def message2(v, username):
g.db.add(notif)
# if PUSHER_ID != 'blahblahblah' and not v.shadowbanned:
# if len(message) > 500: notifbody = message[:500] + '...'
# else: notifbody = message
if PUSHER_ID != 'blahblahblah' and not v.shadowbanned:
if len(message) > 500: notifbody = message[:500] + '...'
else: notifbody = message
# try: gevent.spawn(pusher_thread2, f'{request.host}{user.id}', notifbody, v.username)
# except: pass
try: gevent.spawn(pusher_thread2, f'{request.host}{user.id}', notifbody, v.username)
except: pass
return {"message": "Message sent!"}
@ -773,32 +773,32 @@ def messagereply(v):
for n in notifications:
g.db.delete(n)
# if PUSHER_ID != 'blahblahblah' and not v.shadowbanned:
# if len(body) > 500: notifbody = body[:500] + '...'
# else: notifbody = body
if PUSHER_ID != 'blahblahblah' and not v.shadowbanned:
if len(body) > 500: notifbody = body[:500] + '...'
else: notifbody = body
# beams_client.publish_to_interests(
# interests=[f'{request.host}{user_id}'],
# publish_body={
# 'web': {
# 'notification': {
# 'title': f'New message from @{v.username}',
# 'body': notifbody,
# 'deep_link': f'{SITE_FULL}/notifications?messages=true',
# 'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp"a=1015',
# }
# },
# 'fcm': {
# 'notification': {
# 'title': f'New message from @{v.username}',
# 'body': notifbody,
# },
# 'data': {
# 'url': '/notifications?messages=true',
# }
# }
# },
# )
beams_client.publish_to_interests(
interests=[f'{request.host}{user_id}'],
publish_body={
'web': {
'notification': {
'title': f'New message from @{v.username}',
'body': notifbody,
'deep_link': f'{SITE_FULL}/notifications?messages=true',
'icon': f'{SITE_FULL}/assets/images/{SITE_NAME}/icon.webp"a=1015',
}
},
'fcm': {
'notification': {
'title': f'New message from @{v.username}',
'body': notifbody,
},
'data': {
'url': '/notifications?messages=true',
}
}
},
)
if c.top_comment.sentto == 2:

4
files/templates/home.html
View File

@ -201,8 +201,7 @@
</nav>
{% endif %}
{% if False %}
{% if PUSHER_ID != 'blahblahblah' and v %}
{% if PUSHER_ID != 'blahblahblah' and v %}
<div class="d-none" id="strid">{{request.host}}{{v.id}}</div>
<div class="d-none" id="pusherid">{{PUSHER_ID}}</div>
<script src="/assets/js/pusher.js?v=244"></script>
@ -211,7 +210,6 @@
Android.Subscribe('{{request.host}}{{v.id}}');
}
</script>
{% endif %}
{% endif %}
{% if request.path in ('/','/logged_out','/logged_out/') and time.time() > session.get('tooltip_last_dismissed',0)+60*60*24*30 and not g.webview %}