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-15 17:50:42 +00:00
parent 2c722e9902 4c794b0155
commit 777d8005f4
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README_commandline.md
View File

@ -442,6 +442,7 @@ show dm|sent|inbox Show a timeline
next Next page in the timeline next Next page in the timeline
prev Previous page in the timeline prev Previous page in the timeline
read [post number] Read a post from a timeline read [post number] Read a post from a timeline
open [post number] Open web links within a timeline post
``` ```
If you have a GPG key configured on your local system and are sending a direct message to someone who has a PGP key (the exported key, not just the key ID) set as a tag on their profile then it will try to encrypt the message automatically. So under some conditions end-to-end encryption is possible, such that the instance server only sees ciphertext. Conversely, for arriving direct messages if they are PGP encrypted then the notification client will try to obtain the relevant public key and decrypt. If you have a GPG key configured on your local system and are sending a direct message to someone who has a PGP key (the exported key, not just the key ID) set as a tag on their profile then it will try to encrypt the message automatically. So under some conditions end-to-end encryption is possible, such that the instance server only sees ciphertext. Conversely, for arriving direct messages if they are PGP encrypted then the notification client will try to obtain the relevant public key and decrypt.

47
notifications_client.py
View File

@ -379,7 +379,7 @@ def _readLocalBoxPost(boxName: str, index: int,
return speakerJson return speakerJson
def _showLocalBox(boxName: str, def _showLocalBox(notifyJson: {}, boxName: str,
screenreader: str, systemLanguage: str, espeak, screenreader: str, systemLanguage: str, espeak,
startPostIndex=0, noOfPosts=10) -> None: startPostIndex=0, noOfPosts=10) -> None:
"""Shows locally stored posts for a given subdirectory """Shows locally stored posts for a given subdirectory
@ -408,7 +408,26 @@ def _showLocalBox(boxName: str,
# title # title
_clearScreen() _clearScreen()
_showDesktopBanner() _showDesktopBanner()
print(indent + boxName.upper() + '\n') notificationIcons = ''
if notifyJson.get('followRequests'):
notificationIcons += '👤'
if notifyJson.get('dm'):
notificationIcons += '📩'
if notifyJson.get('reply'):
notificationIcons += '📨'
if notifyJson.get('calendar'):
notificationIcons += '📅'
if notifyJson.get('share'):
notificationIcons += '🤝'
if notifyJson.get('likedBy'):
if '##sent##' not in notifyJson['likedBy']:
notificationIcons += '❤'
titleStr = boxName.upper()
if notificationIcons:
while len(titleStr) < 40 - len(notificationIcons):
titleStr += ' '
titleStr += notificationIcons
print(indent + titleStr + '\n')
maxPostIndex = len(index) maxPostIndex = len(index)
index.sort(reverse=True) index.sort(reverse=True)
@ -683,7 +702,7 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
if not showNewPosts: if not showNewPosts:
print('') print('')
currInboxIndex = 0 currInboxIndex = 0
_showLocalBox('inbox', _showLocalBox(None, 'inbox',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currInboxIndex, 10) currInboxIndex, 10)
currTimeline = 'inbox' currTimeline = 'inbox'
@ -717,11 +736,13 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
currSentIndex = 0 currSentIndex = 0
while (1): while (1):
session = createSession(proxyType) session = createSession(proxyType)
notifyJson = None
speakerJson = \ speakerJson = \
getSpeakerFromServer(baseDir, session, nickname, password, getSpeakerFromServer(baseDir, session, nickname, password,
domain, port, httpPrefix, True, __version__) domain, port, httpPrefix, True, __version__)
if speakerJson: if speakerJson:
if speakerJson.get('notify'): if speakerJson.get('notify'):
notifyJson = speakerJson['notify']
title = 'Epicyon' title = 'Epicyon'
if speakerJson['notify'].get('title'): if speakerJson['notify'].get('title'):
title = speakerJson['notify']['title'] title = speakerJson['notify']['title']
@ -849,7 +870,7 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
if not showNewPosts: if not showNewPosts:
_clearScreen() _clearScreen()
_showLocalBox(currTimeline, _showLocalBox(notifyJson, currTimeline,
None, systemLanguage, espeak, None, systemLanguage, espeak,
currInboxIndex, 10) currInboxIndex, 10)
else: else:
@ -874,37 +895,37 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
break break
elif keyPress.startswith('show dm'): elif keyPress.startswith('show dm'):
currDMIndex = 0 currDMIndex = 0
_showLocalBox('dm', _showLocalBox(notifyJson, 'dm',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currDMIndex, 10) currDMIndex, 10)
currTimeline = 'dm' currTimeline = 'dm'
elif keyPress.startswith('show sen'): elif keyPress.startswith('show sen'):
currSentIndex = 0 currSentIndex = 0
_showLocalBox('sent', _showLocalBox(notifyJson, 'sent',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currSentIndex, 10) currSentIndex, 10)
currTimeline = 'sent' currTimeline = 'sent'
elif (keyPress == 'show' or keyPress.startswith('show in') or elif (keyPress == 'show' or keyPress.startswith('show in') or
keyPress == 'clear'): keyPress == 'clear'):
currInboxIndex = 0 currInboxIndex = 0
_showLocalBox('inbox', _showLocalBox(notifyJson, 'inbox',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currInboxIndex, 10) currInboxIndex, 10)
currTimeline = 'inbox' currTimeline = 'inbox'
elif keyPress.startswith('next'): elif keyPress.startswith('next'):
if currTimeline == 'dm': if currTimeline == 'dm':
currDMIndex += 10 currDMIndex += 10
_showLocalBox('dm', _showLocalBox(notifyJson, 'dm',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currDMIndex, 10) currDMIndex, 10)
elif currTimeline == 'sent': elif currTimeline == 'sent':
currSentIndex += 10 currSentIndex += 10
_showLocalBox('sent', _showLocalBox(notifyJson, 'sent',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currSentIndex, 10) currSentIndex, 10)
elif currTimeline == 'inbox': elif currTimeline == 'inbox':
currInboxIndex += 10 currInboxIndex += 10
_showLocalBox('inbox', _showLocalBox(notifyJson, 'inbox',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currInboxIndex, 10) currInboxIndex, 10)
elif keyPress.startswith('prev'): elif keyPress.startswith('prev'):
@ -912,21 +933,21 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
currDMIndex -= 10 currDMIndex -= 10
if currDMIndex < 0: if currDMIndex < 0:
currDMIndex = 0 currDMIndex = 0
_showLocalBox('dm', _showLocalBox(notifyJson, 'dm',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currDMIndex, 10) currDMIndex, 10)
elif currTimeline == 'sent': elif currTimeline == 'sent':
currSentIndex -= 10 currSentIndex -= 10
if currSentIndex < 0: if currSentIndex < 0:
currSentIndex = 0 currSentIndex = 0
_showLocalBox('sent', _showLocalBox(notifyJson, 'sent',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currSentIndex, 10) currSentIndex, 10)
elif currTimeline == 'inbox': elif currTimeline == 'inbox':
currInboxIndex -= 10 currInboxIndex -= 10
if currInboxIndex < 0: if currInboxIndex < 0:
currInboxIndex = 0 currInboxIndex = 0
_showLocalBox('inbox', _showLocalBox(notifyJson, 'inbox',
screenreader, systemLanguage, espeak, screenreader, systemLanguage, espeak,
currInboxIndex, 10) currInboxIndex, 10)
elif keyPress.startswith('read '): elif keyPress.startswith('read '):