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

main
Bob Mottram 2021-03-10 18:30:45 +00:00
commit f55107dec3
1 changed files with 49 additions and 4 deletions

View File

@ -137,6 +137,42 @@ def _sayCommand(sayStr: str, screenreader: str,
systemLanguage, espeak)
def _replyToPost(postId: str,
screenreader: str, systemLanguage: str, espeak) -> None:
"""Use the notification client to send a reply to the most recent post
"""
if '://' not in postId:
return
toNickname = getNicknameFromActor(postId)
toDomain, toPort = getDomainFromActor(postId)
# toDomainFull = getFullDomain(toDomain, toPort)
sayStr = 'Replying to ' + toNickname + '@' + toDomain
_sayCommand(sayStr,
screenreader, systemLanguage, espeak)
sayStr = 'Type your reply message, then press Enter.'
_sayCommand(sayStr, screenreader, systemLanguage, espeak)
replyMessage = input()
if not replyMessage:
sayStr = 'No reply was entered.'
_sayCommand(sayStr, screenreader, systemLanguage, espeak)
return
replyMessage = replyMessage.strip()
if not replyMessage:
sayStr = 'No reply was entered.'
_sayCommand(sayStr, screenreader, systemLanguage, espeak)
return
sayStr = 'You entered this reply:'
_sayCommand(sayStr, screenreader, systemLanguage, espeak)
_sayCommand(replyMessage, screenreader, systemLanguage, espeak)
sayStr = 'Send this reply, yes or no?'
_sayCommand(sayStr, screenreader, systemLanguage, espeak)
yesno = input()
if 'y' not in yesno.lower():
sayStr = 'Abandoning reply'
_sayCommand(sayStr, screenreader, systemLanguage, espeak)
return
def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
nickname: str, domain: str, port: int,
password: str, screenreader: str,
@ -313,12 +349,18 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
systemLanguage, espeak)
keyPress = _waitForKeypress(2, debug)
break
elif keyPress == 'reply' or keyPress == 'r':
if speakerJson.get('id'):
postId = speakerJson['id']
_replyToPost(postId, screenreader, systemLanguage, espeak)
print('')
elif keyPress == 'like':
if nameStr and gender and messageStr:
_sayCommand('Liking post by ' + nameStr,
screenreader,
systemLanguage, espeak)
sendLikeViaServer(baseDir, session,
sessionLike = createSession(proxyType)
sendLikeViaServer(baseDir, sessionLike,
nickname, password,
domain, port,
httpPrefix, speakerJson['id'],
@ -330,7 +372,8 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
_sayCommand('Undoing like of post by ' + nameStr,
screenreader,
systemLanguage, espeak)
sendUndoLikeViaServer(baseDir, session,
sessionUnlike = createSession(proxyType)
sendUndoLikeViaServer(baseDir, sessionUnlike,
nickname, password,
domain, port,
httpPrefix, speakerJson['id'],
@ -349,7 +392,8 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
_sayCommand('Sending follow request to ' +
followNickname + '@' + followDomain,
screenreader, systemLanguage, espeak)
sendFollowRequestViaServer(baseDir, session,
sessionFollow = createSession(proxyType)
sendFollowRequestViaServer(baseDir, sessionFollow,
nickname, password,
domain, port,
followNickname,
@ -377,7 +421,8 @@ def runNotificationsClient(baseDir: str, proxyType: str, httpPrefix: str,
_sayCommand('Stop following ' +
followNickname + '@' + followDomain,
screenreader, systemLanguage, espeak)
sendUnfollowRequestViaServer(baseDir, session,
sessionUnfollow = createSession(proxyType)
sendUnfollowRequestViaServer(baseDir, sessionUnfollow,
nickname, password,
domain, port,
followNickname,