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

main
Bob Mottram 2021-06-04 09:48:39 +01:00
parent 14b6734ae1 73da024042
commit 25a52e9dbd
11 changed files with 157 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
announce.py
View File

@ -32,6 +32,8 @@ def outboxAnnounce(recentPostsCache: {},
""" """
if not messageJson.get('actor'): if not messageJson.get('actor'):
return False return False
if not isinstance(messageJson['actor'], str):
return False
if not messageJson.get('type'): if not messageJson.get('type'):
return False return False
if not messageJson.get('object'): if not messageJson.get('object'):
@ -39,6 +41,8 @@ def outboxAnnounce(recentPostsCache: {},
if messageJson['type'] == 'Announce': if messageJson['type'] == 'Announce':
if not isinstance(messageJson['object'], str): if not isinstance(messageJson['object'], str):
return False return False
if isSelfAnnounce(messageJson):
return False
nickname = getNicknameFromActor(messageJson['actor']) nickname = getNicknameFromActor(messageJson['actor'])
if not nickname: if not nickname:
print('WARN: no nickname found in ' + messageJson['actor']) print('WARN: no nickname found in ' + messageJson['actor'])
@ -386,3 +390,21 @@ def outboxUndoAnnounce(recentPostsCache: {},
messageJson['actor'], domain, debug) messageJson['actor'], domain, debug)
if debug: if debug:
print('DEBUG: post undo announce via c2s - ' + postFilename) print('DEBUG: post undo announce via c2s - ' + postFilename)
def isSelfAnnounce(postJsonObject: {}) -> bool:
"""Is the given post a self announce?
"""
if not postJsonObject.get('actor'):
return False
if not postJsonObject.get('type'):
return False
if postJsonObject['type'] != 'Announce':
return False
if not postJsonObject.get('object'):
return False
if not isinstance(postJsonObject['actor'], str):
return False
if not isinstance(postJsonObject['object'], str):
return False
return postJsonObject['actor'] in postJsonObject['object']

46
daemon.py
View File

@ -606,9 +606,10 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('Host', callingDomain) self.send_header('Host', callingDomain)
self.send_header('WWW-Authenticate', self.send_header('WWW-Authenticate',
'title="Login to Epicyon", Basic realm="epicyon"') 'title="Login to Epicyon", Basic realm="epicyon"')
self.send_header('X-Robots-Tag', # self.send_header('X-Robots-Tag',
'noindex, nofollow, noarchive, nosnippet') # 'noindex, nofollow, noarchive, nosnippet')
self.send_header('Referrer-Policy', 'origin') # self.send_header('Cache-Control', 'public')
# self.send_header('Referrer-Policy', 'origin')
self.end_headers() self.end_headers()
def _logout_headers(self, fileFormat: str, length: int, def _logout_headers(self, fileFormat: str, length: int,
@ -620,9 +621,10 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('Host', callingDomain) self.send_header('Host', callingDomain)
self.send_header('WWW-Authenticate', self.send_header('WWW-Authenticate',
'title="Login to Epicyon", Basic realm="epicyon"') 'title="Login to Epicyon", Basic realm="epicyon"')
self.send_header('X-Robots-Tag', # self.send_header('X-Robots-Tag',
'noindex, nofollow, noarchive, nosnippet') # 'noindex, nofollow, noarchive, nosnippet')
self.send_header('Referrer-Policy', 'origin') # self.send_header('Cache-Control', 'public')
# self.send_header('Referrer-Policy', 'origin')
self.end_headers() self.end_headers()
def _logout_redirect(self, redirect: str, cookie: str, def _logout_redirect(self, redirect: str, cookie: str,
@ -637,9 +639,10 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('Host', callingDomain) self.send_header('Host', callingDomain)
self.send_header('InstanceID', self.server.instanceId) self.send_header('InstanceID', self.server.instanceId)
self.send_header('Content-Length', '0') self.send_header('Content-Length', '0')
self.send_header('X-Robots-Tag', # self.send_header('X-Robots-Tag',
'noindex, nofollow, noarchive, nosnippet') # 'noindex, nofollow, noarchive, nosnippet')
self.send_header('Referrer-Policy', 'origin') # self.send_header('Cache-Control', 'public')
# self.send_header('Referrer-Policy', 'origin')
self.end_headers() self.end_headers()
def _set_headers_base(self, fileFormat: str, length: int, cookie: str, def _set_headers_base(self, fileFormat: str, length: int, cookie: str,
@ -657,16 +660,17 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('Cookie', cookieStr) self.send_header('Cookie', cookieStr)
self.send_header('Host', callingDomain) self.send_header('Host', callingDomain)
self.send_header('InstanceID', self.server.instanceId) self.send_header('InstanceID', self.server.instanceId)
self.send_header('X-Robots-Tag', # self.send_header('X-Robots-Tag',
'noindex, nofollow, noarchive, nosnippet') # 'noindex, nofollow, noarchive, nosnippet')
self.send_header('X-Clacks-Overhead', 'GNU Natalie Nguyen') self.send_header('X-Clacks-Overhead', 'GNU Natalie Nguyen')
self.send_header('Referrer-Policy', 'origin') # self.send_header('Cache-Control', 'public')
# self.send_header('Referrer-Policy', 'origin')
self.send_header('Accept-Ranges', 'none') self.send_header('Accept-Ranges', 'none')
def _set_headers(self, fileFormat: str, length: int, cookie: str, def _set_headers(self, fileFormat: str, length: int, cookie: str,
callingDomain: str) -> None: callingDomain: str) -> None:
self._set_headers_base(fileFormat, length, cookie, callingDomain) self._set_headers_base(fileFormat, length, cookie, callingDomain)
self.send_header('Cache-Control', 'public, max-age=0') # self.send_header('Cache-Control', 'public, max-age=0')
self.end_headers() self.end_headers()
def _set_headers_head(self, fileFormat: str, length: int, etag: str, def _set_headers_head(self, fileFormat: str, length: int, etag: str,
@ -680,7 +684,7 @@ class PubServer(BaseHTTPRequestHandler):
data, cookie: str, callingDomain: str) -> None: data, cookie: str, callingDomain: str) -> None:
datalen = len(data) datalen = len(data)
self._set_headers_base(fileFormat, datalen, cookie, callingDomain) self._set_headers_base(fileFormat, datalen, cookie, callingDomain)
self.send_header('Cache-Control', 'public, max-age=86400') # self.send_header('Cache-Control', 'public, max-age=86400')
etag = None etag = None
if os.path.isfile(mediaFilename + '.etag'): if os.path.isfile(mediaFilename + '.etag'):
try: try:
@ -745,9 +749,10 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('Host', callingDomain) self.send_header('Host', callingDomain)
self.send_header('InstanceID', self.server.instanceId) self.send_header('InstanceID', self.server.instanceId)
self.send_header('Content-Length', '0') self.send_header('Content-Length', '0')
self.send_header('X-Robots-Tag', # self.send_header('X-Robots-Tag',
'noindex, nofollow, noarchive, nosnippet') # 'noindex, nofollow, noarchive, nosnippet')
self.send_header('Referrer-Policy', 'origin') # self.send_header('Cache-Control', 'public')
# self.send_header('Referrer-Policy', 'origin')
self.end_headers() self.end_headers()
def _httpReturnCode(self, httpCode: int, httpDescription: str, def _httpReturnCode(self, httpCode: int, httpDescription: str,
@ -767,9 +772,10 @@ class PubServer(BaseHTTPRequestHandler):
self.send_header('Content-Type', 'text/html; charset=utf-8') self.send_header('Content-Type', 'text/html; charset=utf-8')
msgLenStr = str(len(msg)) msgLenStr = str(len(msg))
self.send_header('Content-Length', msgLenStr) self.send_header('Content-Length', msgLenStr)
self.send_header('X-Robots-Tag', # self.send_header('X-Robots-Tag',
'noindex, nofollow, noarchive, nosnippet') # 'noindex, nofollow, noarchive, nosnippet')
self.send_header('Referrer-Policy', 'origin') # self.send_header('Cache-Control', 'public')
# self.send_header('Referrer-Policy', 'origin')
self.end_headers() self.end_headers()
if not self._write(msg): if not self._write(msg):
print('Error when showing ' + str(httpCode)) print('Error when showing ' + str(httpCode))

4
desktop_client.py
View File

@ -836,7 +836,7 @@ def _desktopShowProfile(session, nickname: str, domain: str,
isHttp = False isHttp = False
if 'http://' in actor: if 'http://' in actor:
isHttp = True isHttp = True
actorJson = getActorJson(actor, isHttp, False, False, True) actorJson, asHeader = getActorJson(actor, isHttp, False, False, True)
_desktopShowActor(baseDir, actorJson, translate, _desktopShowActor(baseDir, actorJson, translate,
systemLanguage, screenreader, espeak) systemLanguage, screenreader, espeak)
@ -854,7 +854,7 @@ def _desktopShowProfileFromHandle(session, nickname: str, domain: str,
"""Shows the profile for a handle """Shows the profile for a handle
Returns the actor json Returns the actor json
""" """
actorJson = getActorJson(handle, False, False, False, True) actorJson, asHeader = getActorJson(handle, False, False, False, True)
_desktopShowActor(baseDir, actorJson, translate, _desktopShowActor(baseDir, actorJson, translate,
systemLanguage, screenreader, espeak) systemLanguage, screenreader, espeak)

5
inbox.py
View File

@ -80,6 +80,7 @@ from delete import removeOldHashtags
from categories import guessHashtagCategory from categories import guessHashtagCategory
from context import hasValidContext from context import hasValidContext
from speaker import updateSpeaker from speaker import updateSpeaker
from announce import isSelfAnnounce
def storeHashTags(baseDir: str, nickname: str, postJsonObject: {}) -> None: def storeHashTags(baseDir: str, nickname: str, postJsonObject: {}) -> None:
@ -1359,6 +1360,10 @@ def _receiveAnnounce(recentPostsCache: {},
'"users" or "profile" missing from actor in ' + '"users" or "profile" missing from actor in ' +
messageJson['type']) messageJson['type'])
return False return False
if isSelfAnnounce(messageJson):
if debug:
print('DEBUG: self-boost rejected')
return False
if not hasUsersPath(messageJson['object']): if not hasUsersPath(messageJson['object']):
if debug: if debug:
print('DEBUG: ' + print('DEBUG: ' +

30
metadata.py
View File

@ -60,6 +60,25 @@ def metaDataNodeInfo(baseDir: str,
return nodeinfo return nodeinfo
def _getStatusCount(baseDir: str) -> int:
"""Get the total number of posts
"""
statusCtr = 0
accountsDir = baseDir + '/accounts'
for subdir, dirs, files in os.walk(accountsDir):
for acct in dirs:
if '@' not in acct:
continue
if 'inbox@' in acct or 'news@' in acct:
continue
acctDir = os.path.join(accountsDir, acct + '/outbox')
for subdir2, dirs2, files2 in os.walk(acctDir):
statusCtr += len(files2)
break
break
return statusCtr
def metaDataInstance(instanceTitle: str, def metaDataInstance(instanceTitle: str,
instanceDescriptionShort: str, instanceDescriptionShort: str,
instanceDescription: str, instanceDescription: str,
@ -94,30 +113,21 @@ def metaDataInstance(instanceTitle: str,
'avatar': adminActor['icon']['url'], 'avatar': adminActor['icon']['url'],
'avatar_static': adminActor['icon']['url'], 'avatar_static': adminActor['icon']['url'],
'bot': isBot, 'bot': isBot,
'created_at': '2019-07-01T10:30:00Z',
'display_name': adminActor['name'], 'display_name': adminActor['name'],
'emojis': [],
'fields': [],
'followers_count': 1,
'following_count': 1,
'header': adminActor['image']['url'], 'header': adminActor['image']['url'],
'header_static': adminActor['image']['url'], 'header_static': adminActor['image']['url'],
'id': '1',
'last_status_at': '2019-07-01T10:30:00Z',
'locked': adminActor['manuallyApprovesFollowers'], 'locked': adminActor['manuallyApprovesFollowers'],
'note': '<p>Admin of ' + domain + '</p>', 'note': '<p>Admin of ' + domain + '</p>',
'statuses_count': 1,
'url': url, 'url': url,
'username': adminActor['preferredUsername'] 'username': adminActor['preferredUsername']
}, },
'description': instanceDescription, 'description': instanceDescription,
'email': 'admin@' + domain,
'languages': [systemLanguage], 'languages': [systemLanguage],
'registrations': registration, 'registrations': registration,
'short_description': instanceDescriptionShort, 'short_description': instanceDescriptionShort,
'stats': { 'stats': {
'domain_count': 2, 'domain_count': 2,
'status_count': 1, 'status_count': _getStatusCount(baseDir),
'user_count': noOfAccounts(baseDir) 'user_count': noOfAccounts(baseDir)
}, },
'thumbnail': httpPrefix + '://' + domainFull + '/login.png', 'thumbnail': httpPrefix + '://' + domainFull + '/login.png',

76
person.py
View File

@ -1205,7 +1205,7 @@ def setPersonNotes(baseDir: str, nickname: str, domain: str,
def getActorJson(handle: str, http: bool, gnunet: bool, def getActorJson(handle: str, http: bool, gnunet: bool,
debug: bool, quiet=False) -> {}: debug: bool, quiet=False) -> ({}, {}):
"""Returns the actor json """Returns the actor json
""" """
if debug: if debug:
@ -1216,15 +1216,16 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
handle.startswith('http') or \ handle.startswith('http') or \
handle.startswith('dat'): handle.startswith('dat'):
# format: https://domain/@nick # format: https://domain/@nick
originalHandle = handle
if not hasUsersPath(originalHandle):
if not quiet or debug:
print('getActorJson: Expected actor format: ' +
'https://domain/@nick or https://domain/users/nick')
return None, None
prefixes = getProtocolPrefixes() prefixes = getProtocolPrefixes()
for prefix in prefixes: for prefix in prefixes:
handle = handle.replace(prefix, '') handle = handle.replace(prefix, '')
handle = handle.replace('/@', '/users/') handle = handle.replace('/@', '/users/')
if not hasUsersPath(handle):
if not quiet or debug:
print('getActorJson: Expected actor format: ' +
'https://domain/@nick or https://domain/users/nick')
return None
if '/users/' in handle: if '/users/' in handle:
nickname = handle.split('/users/')[1] nickname = handle.split('/users/')[1]
nickname = nickname.replace('\n', '').replace('\r', '') nickname = nickname.replace('\n', '').replace('\r', '')
@ -1245,18 +1246,27 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
nickname = handle.split('/u/')[1] nickname = handle.split('/u/')[1]
nickname = nickname.replace('\n', '').replace('\r', '') nickname = nickname.replace('\n', '').replace('\r', '')
domain = handle.split('/u/')[0] domain = handle.split('/u/')[0]
elif '://' in originalHandle:
domain = originalHandle.split('://')[1]
if '/' in domain:
domain = domain.split('/')[0]
if '://' + domain + '/' not in originalHandle:
return None, None
nickname = originalHandle.split('://' + domain + '/')[1]
if '/' in nickname or '.' in nickname:
return None, None
else: else:
# format: @nick@domain # format: @nick@domain
if '@' not in handle: if '@' not in handle:
if not quiet: if not quiet:
print('getActorJson Syntax: --actor nickname@domain') print('getActorJson Syntax: --actor nickname@domain')
return None return None, None
if handle.startswith('@'): if handle.startswith('@'):
handle = handle[1:] handle = handle[1:]
if '@' not in handle: if '@' not in handle:
if not quiet: if not quiet:
print('getActorJsonSyntax: --actor nickname@domain') print('getActorJsonSyntax: --actor nickname@domain')
return None return None, None
nickname = handle.split('@')[0] nickname = handle.split('@')[0]
domain = handle.split('@')[1] domain = handle.split('@')[1]
domain = domain.replace('\n', '').replace('\r', '') domain = domain.replace('\n', '').replace('\r', '')
@ -1287,12 +1297,12 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
if not wfRequest: if not wfRequest:
if not quiet: if not quiet:
print('getActorJson Unable to webfinger ' + handle) print('getActorJson Unable to webfinger ' + handle)
return None return None, None
if not isinstance(wfRequest, dict): if not isinstance(wfRequest, dict):
if not quiet: if not quiet:
print('getActorJson Webfinger for ' + handle + print('getActorJson Webfinger for ' + handle +
' did not return a dict. ' + str(wfRequest)) ' did not return a dict. ' + str(wfRequest))
return None return None, None
if not quiet: if not quiet:
pprint(wfRequest) pprint(wfRequest)
@ -1306,12 +1316,12 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
else: else:
if debug: if debug:
print('No users path in ' + handle) print('No users path in ' + handle)
return None return None, None
profileStr = 'https://www.w3.org/ns/activitystreams' profileStr = 'https://www.w3.org/ns/activitystreams'
asHeader = { headersList = (
'Accept': 'application/activity+json; profile="' + profileStr + '"' "activity+json", "ld+json", "jrd+json"
} )
if not personUrl: if not personUrl:
personUrl = getUserUrl(wfRequest, 0, debug) personUrl = getUserUrl(wfRequest, 0, debug)
if nickname == domain: if nickname == domain:
@ -1322,36 +1332,26 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
personUrl = personUrl.replace('/u/', '/actor/') personUrl = personUrl.replace('/u/', '/actor/')
if not personUrl: if not personUrl:
# try single user instance # try single user instance
personUrl = httpPrefix + '://' + domain personUrl = httpPrefix + '://' + domain + '/' + nickname
profileStr = 'https://www.w3.org/ns/activitystreams' headersList = (
asHeader = { "ld+json", "jrd+json", "activity+json"
'Accept': 'application/ld+json; profile="' + profileStr + '"' )
}
if '/channel/' in personUrl or '/accounts/' in personUrl: if '/channel/' in personUrl or '/accounts/' in personUrl:
profileStr = 'https://www.w3.org/ns/activitystreams' headersList = (
"ld+json", "jrd+json", "activity+json"
)
if debug:
print('personUrl: ' + personUrl)
for headerType in headersList:
headerMimeType = 'application/' + headerType
asHeader = { asHeader = {
'Accept': 'application/ld+json; profile="' + profileStr + '"' 'Accept': headerMimeType + '; profile="' + profileStr + '"'
} }
personJson = \ personJson = \
getJson(session, personUrl, asHeader, None, getJson(session, personUrl, asHeader, None,
debug, __version__, httpPrefix, None, 20, quiet) debug, __version__, httpPrefix, None, 20, quiet)
if personJson: if personJson:
if not quiet: if not quiet:
pprint(personJson) pprint(personJson)
return personJson return personJson, asHeader
else: return None, None
profileStr = 'https://www.w3.org/ns/activitystreams'
asHeader = {
'Accept': 'application/jrd+json; profile="' + profileStr + '"'
}
personJson = \
getJson(session, personUrl, asHeader, None,
debug, __version__, httpPrefix, None)
if not quiet:
if personJson:
print('getActorJson returned actor')
pprint(personJson)
else:
print('Failed to get ' + personUrl)
return personJson

4
pgp.py
View File

@ -336,7 +336,7 @@ def _getPGPPublicKeyFromActor(handle: str, actorJson=None) -> str:
public key specified public key specified
""" """
if not actorJson: if not actorJson:
actorJson = getActorJson(handle, False, False, False, True) actorJson, asHeader = getActorJson(handle, False, False, False, True)
if not actorJson: if not actorJson:
return None return None
if not actorJson.get('attachment'): if not actorJson.get('attachment'):
@ -476,7 +476,7 @@ def pgpPublicKeyUpload(baseDir: str, session,
if debug: if debug:
print('Getting actor for ' + handle) print('Getting actor for ' + handle)
actorJson = getActorJson(handle, False, False, debug, True) actorJson, asHeader = getActorJson(handle, False, False, debug, True)
if not actorJson: if not actorJson:
if debug: if debug:
print('No actor returned for ' + handle) print('No actor returned for ' + handle)

3
posts.py
View File

@ -3924,6 +3924,9 @@ def downloadAnnounce(session, baseDir: str, httpPrefix: str,
return None return None
if not isinstance(postJsonObject['object'], str): if not isinstance(postJsonObject['object'], str):
return None return None
# ignore self-boosts
if postJsonObject['actor'] in postJsonObject['object']:
return None
# get the announced post # get the announced post
announceCacheDir = baseDir + '/cache/announce/' + nickname announceCacheDir = baseDir + '/cache/announce/' + nickname

21
utils.py
View File

@ -15,7 +15,6 @@ import json
import idna import idna
import locale import locale
from pprint import pprint from pprint import pprint
from calendar import monthrange
from followingCalendar import addPersonToCalendar from followingCalendar import addPersonToCalendar
from cryptography.hazmat.backends import default_backend from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives import hashes
@ -98,6 +97,16 @@ def hasUsersPath(pathStr: str) -> bool:
for usersStr in usersList: for usersStr in usersList:
if '/' + usersStr + '/' in pathStr: if '/' + usersStr + '/' in pathStr:
return True return True
if '://' in pathStr:
domain = pathStr.split('://')[1]
if '/' in domain:
domain = domain.split('/')[0]
if '://' + domain + '/' not in pathStr:
return False
nickname = pathStr.split('://' + domain + '/')[1]
if '/' in nickname or '.' in nickname:
return False
return True
return False return False
@ -842,6 +851,16 @@ def getNicknameFromActor(actor: str) -> str:
elif '@' in actor: elif '@' in actor:
nickStr = actor.split('@')[0] nickStr = actor.split('@')[0]
return nickStr return nickStr
elif '://' in actor:
domain = actor.split('://')[1]
if '/' in domain:
domain = domain.split('/')[0]
if '://' + domain + '/' not in actor:
return None
nickStr = actor.split('://' + domain + '/')[1]
if '/' in nickStr or '.' in nickStr:
return None
return nickStr
return None return None
nickStr = actor.split('/users/')[1].replace('@', '') nickStr = actor.split('/users/')[1].replace('@', '')
if '/' not in nickStr: if '/' not in nickStr:

105
webapp_profile.py
View File

@ -10,7 +10,6 @@ import os
from pprint import pprint from pprint import pprint
from utils import getOccupationName from utils import getOccupationName
from utils import getLockedAccount from utils import getLockedAccount
from utils import hasUsersPath
from utils import getFullDomain from utils import getFullDomain
from utils import isArtist from utils import isArtist
from utils import isDormant from utils import isDormant
@ -24,10 +23,9 @@ from utils import getImageFormats
from skills import getSkills from skills import getSkills
from theme import getThemesList from theme import getThemesList
from person import personBoxJson from person import personBoxJson
from person import getActorJson
from webfinger import webfingerHandle from webfinger import webfingerHandle
from session import getJson
from posts import parseUserFeed from posts import parseUserFeed
from posts import getUserUrl
from posts import getPersonBox from posts import getPersonBox
from donate import getDonationUrl from donate import getDonationUrl
from xmpp import getXmppAddress from xmpp import getXmppAddress
@ -74,46 +72,20 @@ def htmlProfileAfterSearch(cssCache: {},
accessKeys: {}) -> str: accessKeys: {}) -> str:
"""Show a profile page after a search for a fediverse address """Show a profile page after a search for a fediverse address
""" """
if hasUsersPath(profileHandle) or '/@' in profileHandle: http = False
searchNickname = getNicknameFromActor(profileHandle) gnunet = False
searchDomain, searchPort = getDomainFromActor(profileHandle) if httpPrefix == 'http':
else: http = True
if '@' not in profileHandle: elif httpPrefix == 'gnunet':
if debug: gnunet = True
print('DEBUG: no @ in ' + profileHandle) profileJson, asHeader = \
return None getActorJson(profileHandle, http, gnunet, debug, False)
if profileHandle.startswith('@'): if not profileJson:
profileHandle = profileHandle[1:]
if '@' not in profileHandle:
if debug:
print('DEBUG: no @ in ' + profileHandle)
return None
searchNickname = profileHandle.split('@')[0]
searchDomain = profileHandle.split('@')[1]
searchPort = None
if ':' in searchDomain:
searchPortStr = searchDomain.split(':')[1]
if searchPortStr.isdigit():
searchPort = int(searchPortStr)
searchDomain = searchDomain.split(':')[0]
if searchPort:
if debug:
print('DEBUG: Search for handle ' +
str(searchNickname) + '@' + str(searchDomain) + ':' +
str(searchPort))
else:
if debug:
print('DEBUG: Search for handle ' +
str(searchNickname) + '@' + str(searchDomain))
if not searchNickname:
if debug:
print('DEBUG: No nickname found in ' + profileHandle)
return None
if not searchDomain:
if debug:
print('DEBUG: No domain found in ' + profileHandle)
return None return None
personUrl = profileJson['id']
searchDomain, searchPort = getDomainFromActor(personUrl)
searchNickname = getNicknameFromActor(personUrl)
searchDomainFull = getFullDomain(searchDomain, searchPort) searchDomainFull = getFullDomain(searchDomain, searchPort)
profileStr = '' profileStr = ''
@ -121,57 +93,6 @@ def htmlProfileAfterSearch(cssCache: {},
if os.path.isfile(baseDir + '/epicyon.css'): if os.path.isfile(baseDir + '/epicyon.css'):
cssFilename = baseDir + '/epicyon.css' cssFilename = baseDir + '/epicyon.css'
wf = \
webfingerHandle(session,
searchNickname + '@' + searchDomainFull,
httpPrefix, cachedWebfingers,
domain, projectVersion, debug)
if not wf:
if debug:
print('DEBUG: Unable to webfinger ' +
searchNickname + '@' + searchDomainFull)
print('DEBUG: cachedWebfingers ' + str(cachedWebfingers))
print('DEBUG: httpPrefix ' + httpPrefix)
print('DEBUG: domain ' + domain)
return None
if not isinstance(wf, dict):
if debug:
print('WARN: Webfinger search for ' +
searchNickname + '@' + searchDomainFull +
' did not return a dict. ' +
str(wf))
return None
personUrl = None
if wf.get('errors'):
personUrl = httpPrefix + '://' + \
searchDomainFull + '/users/' + searchNickname
profileStr = 'https://www.w3.org/ns/activitystreams'
asHeader = {
'Accept': 'application/activity+json; profile="' + profileStr + '"'
}
if not personUrl:
personUrl = getUserUrl(wf, 0, debug)
if not personUrl:
# try single user instance
asHeader = {
'Accept': 'application/ld+json; profile="' + profileStr + '"'
}
personUrl = httpPrefix + '://' + searchDomainFull
profileJson = \
getJson(session, personUrl, asHeader, None, debug,
projectVersion, httpPrefix, domain)
if not profileJson:
asHeader = {
'Accept': 'application/ld+json; profile="' + profileStr + '"'
}
profileJson = \
getJson(session, personUrl, asHeader, None, debug,
projectVersion, httpPrefix, domain)
if not profileJson:
print('DEBUG: No actor returned from ' + personUrl)
return None
avatarUrl = '' avatarUrl = ''
if profileJson.get('icon'): if profileJson.get('icon'):
if profileJson['icon'].get('url'): if profileJson['icon'].get('url'):

3
webapp_timeline.py
View File

@ -31,6 +31,7 @@ from webapp_column_left import getLeftColumnContent
from webapp_column_right import getRightColumnContent from webapp_column_right import getRightColumnContent
from webapp_headerbuttons import headerButtonsTimeline from webapp_headerbuttons import headerButtonsTimeline
from posts import isModerator from posts import isModerator
from announce import isSelfAnnounce
def _logTimelineTiming(enableTimingLog: bool, timelineStartTime, def _logTimelineTiming(enableTimingLog: bool, timelineStartTime,
@ -684,6 +685,8 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
# is the actor who sent this post snoozed? # is the actor who sent this post snoozed?
if isPersonSnoozed(baseDir, nickname, domain, item['actor']): if isPersonSnoozed(baseDir, nickname, domain, item['actor']):
continue continue
if isSelfAnnounce(item):
continue
# is the post in the memory cache of recent ones? # is the post in the memory cache of recent ones?
currTlStr = None currTlStr = None