indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon into main

main
Bob Mottram 2021-03-16 18:30:50 +00:00
parent 05a51074c5 931e5a2080
commit 578e0e0f81
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
notifications_client.py
View File

@ -799,7 +799,6 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
newRepliesExist = False newRepliesExist = False
newDMsExist = False newDMsExist = False
currPostId = '' currPostId = ''
firstTime = True
while (1): while (1):
session = createSession(proxyType) session = createSession(proxyType)
notifyJson = None notifyJson = None
@ -824,22 +823,11 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
indicatorDM = False indicatorDM = False
if speakerJson.get('direct'): if speakerJson.get('direct'):
if speakerJson['direct'] is True: if speakerJson['direct'] is True:
indicatorDM = speakerJson.get('direct') indicatorDM = True
indicatorReplies = False indicatorReplies = False
if speakerJson.get('replyToYou'): if speakerJson.get('replyToYou'):
if speakerJson['replyToYou'] is True: if speakerJson['replyToYou'] is True:
indicatorReplies = speakerJson.get('replyToYou') indicatorReplies = True
if firstTime:
# If new DM has not been viewed via web interface
if not speakerJson.get('direct'):
if speakerJson['notify']['dm']:
indicatorDM = True
# If new reply has not been viewed via web interface
if not speakerJson.get('replyToYou'):
if speakerJson['notify']['reply']:
indicatorReplies = True
firstTime = False
if indicatorDM: if indicatorDM:
if currPostId != speakerJson['id']: if currPostId != speakerJson['id']:
@ -950,15 +938,6 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
if storeInboxPosts: if storeInboxPosts:
_storeMessage(speakerJson, 'inbox') _storeMessage(speakerJson, 'inbox')
# DM has been viewed via the web interface
if newDMsExist and \
not speakerJson['notify']['dm']:
newDMsExist = False
# Reply has been viewed via the web interface
if newRepliesExist and \
not speakerJson['notify']['reply']:
newRepliesExist = False
if not showNewPosts: if not showNewPosts:
_clearScreen() _clearScreen()
_showLocalBox(notifyJson, currTimeline, _showLocalBox(notifyJson, currTimeline,