' + rssDescription + '
' + rssDescription = '
' + removeHtml(item[4]) + '
' mirrored = item[7] postUrl = url @@ -526,20 +519,9 @@ def _convertRSStoActivityPub(baseDir: str, httpPrefix: str, postUrl += '/index.html' # add the off-site link to the description - if rssDescription and \ - not dangerousMarkup(rssDescription, allowLocalNetworkAccess): - rssDescription += \ - '' + \ - translate['Read more...'] + '' - else: - rssDescription = \ - '' + \ - translate['Read more...'] + '' - - # remove image dimensions - if '' + \ + translate['Read more...'] + '' followersOnly = False # NOTE: the id when the post is created will not be diff --git a/newswire.py b/newswire.py index ae4b8d21e..5ebd2f9b2 100644 --- a/newswire.py +++ b/newswire.py @@ -304,13 +304,13 @@ def _xml2StrToDict(baseDir: str, domain: str, xmlStr: str, description = '' if '' in rssItem and '' in rssItem: description = rssItem.split('')[1] - description = _removeCDATA(description.split('')[0]) + description = removeHtml(description.split('')[0]) else: if '' in rssItem and \ '' in rssItem: description = rssItem.split('')[1] description = description.split('')[0] - description = _removeCDATA(description) + description = removeHtml(description) link = rssItem.split('')[1] link = link.split('')[0] if '://' not in link: @@ -388,13 +388,13 @@ def _xml1StrToDict(baseDir: str, domain: str, xmlStr: str, description = '' if '' in rssItem and '' in rssItem: description = rssItem.split('')[1] - description = _removeCDATA(description.split('')[0]) + description = removeHtml(description.split('')[0]) else: if '' in rssItem and \ '' in rssItem: description = rssItem.split('')[1] description = description.split('')[0] - description = _removeCDATA(description) + description = removeHtml(description) link = rssItem.split('')[1] link = link.split('')[0] if '://' not in link: @@ -460,13 +460,13 @@ def _atomFeedToDict(baseDir: str, domain: str, xmlStr: str, description = '' if '' in atomItem and '' in atomItem: description = atomItem.split('')[1] - description = _removeCDATA(description.split('')[0]) + description = removeHtml(description.split('')[0]) else: if '' in atomItem and \ '' in atomItem: description = atomItem.split('')[1] description = description.split('')[0] - description = _removeCDATA(description) + description = removeHtml(description) link = atomItem.split('')[1] link = link.split('')[0] if '://' not in link: @@ -538,11 +538,11 @@ def _atomFeedYTToDict(baseDir: str, domain: str, xmlStr: str, '' in atomItem: description = atomItem.split('')[1] description = description.split('')[0] - description = _removeCDATA(description) + description = removeHtml(description) elif '' in atomItem and '' in atomItem: description = atomItem.split('')[1] description = description.split('')[0] - description = _removeCDATA(description) + description = removeHtml(description) link = atomItem.split('')[1] link = link.split('')[0] link = 'https://www.youtube.com/watch?v=' + link.strip() @@ -692,7 +692,7 @@ def getRSSfromDict(baseDir: str, newswire: {}, continue rssStr += '\n' rssStr += ' ' + fields[0] + '\n' - description = _removeCDATA(firstParagraphFromString(fields[4])) + description = removeHtml(firstParagraphFromString(fields[4])) rssStr += ' ' + description + '\n' url = fields[1] if '://' not in url: @@ -812,7 +812,7 @@ def _addAccountBlogsToNewswire(baseDir: str, nickname: str, domain: str, votes = loadJson(fullPostFilename + '.votes') content = postJsonObject['object']['content'] description = firstParagraphFromString(content) - description = _removeCDATA(description) + description = removeHtml(description) tagsFromPost = _getHashtagsFromPost(postJsonObject) _addNewswireDictEntry(baseDir, domain, newswire, published, diff --git a/outbox.py b/outbox.py index 8da5d9b38..42504fa52 100644 --- a/outbox.py +++ b/outbox.py @@ -134,6 +134,7 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str, extensions = { "jpeg": "jpg", "gif": "gif", + "svg": "svg", "webp": "webp", "avif": "avif", "audio/mpeg": "mp3", diff --git a/person.py b/person.py index b7e80061a..d4194e936 100644 --- a/person.py +++ b/person.py @@ -60,8 +60,9 @@ def setProfileImage(baseDir: str, httpPrefix: str, nickname: str, domain: str, if not (imageFilename.endswith('.png') or imageFilename.endswith('.jpg') or imageFilename.endswith('.jpeg') or + imageFilename.endswith('.svg') or imageFilename.endswith('.gif')): - print('Profile image must be png, jpg or gif format') + print('Profile image must be png, jpg, gif or svg format') return False if imageFilename.startswith('~/'): @@ -95,6 +96,9 @@ def setProfileImage(baseDir: str, httpPrefix: str, nickname: str, domain: str, if imageFilename.endswith('.gif'): mediaType = 'image/gif' iconFilename = iconFilenameBase + '.gif' + if imageFilename.endswith('.svg'): + mediaType = 'image/svg+xml' + iconFilename = iconFilenameBase + '.svg' profileFilename = baseDir + '/accounts/' + handle + '/' + iconFilename personJson = loadJson(personFilename) @@ -591,7 +595,7 @@ def personLookup(domain: str, path: str, baseDir: str) -> {}: else: notPersonLookup = ('/inbox', '/outbox', '/outboxarchive', '/followers', '/following', '/featured', - '.png', '.jpg', '.gif', '.mpv') + '.png', '.jpg', '.gif', '.svg', '.mpv') for ending in notPersonLookup: if path.endswith(ending): return None diff --git a/posts.py b/posts.py index e3af38f53..c834c2d4c 100644 --- a/posts.py +++ b/posts.py @@ -30,6 +30,7 @@ from session import postJsonString from session import postImage from webfinger import webfingerHandle from httpsig import createSignedHeader +from utils import isPublicPost from utils import hasUsersPath from utils import validPostDate from utils import getFullDomain @@ -146,10 +147,10 @@ def _cleanHtml(rawHtml: str) -> str: def getUserUrl(wfRequest: {}, sourceId=0) -> str: """Gets the actor url from a webfinger request """ - # print('getUserUrl: ' + str(sourceId) + ' ' + str(wfRequest)) if not wfRequest.get('links'): if sourceId == 72367: - print('getUserUrl failed to get display name for webfinger ' + + print('getUserUrl ' + str(sourceId) + + ' failed to get display name for webfinger ' + str(wfRequest)) else: print('getUserUrl webfinger activity+json contains no links ' + @@ -283,6 +284,9 @@ def getPersonBox(baseDir: str, session, wfRequest: {}, displayName = None if personJson.get('name'): displayName = removeHtml(personJson['name']) + # have they moved? + if personJson.get('movedTo'): + displayName += ' ⌂' storePersonInCache(baseDir, personUrl, personJson, personCache, True) @@ -468,6 +472,46 @@ def _getPosts(session, outboxUrl: str, maxPosts: int, return personPosts +def _updateWordFrequency(content: str, wordFrequency: {}) -> None: + """Creates a dictionary containing words and the number of times + that they appear + """ + plainText = removeHtml(content) + plainText = plainText.replace('.', ' ') + plainText = plainText.replace(';', ' ') + plainText = plainText.replace('?', ' ') + wordsList = plainText.split(' ') + commonWords = ( + 'that', 'some', 'about', 'then', 'they', 'were', + 'also', 'from', 'with', 'this', 'have', 'more', + 'need', 'here', 'would', 'these', 'into', 'very', + 'well', 'when', 'what', 'your', 'there', 'which', + 'even', 'there', 'such', 'just', 'those', 'only', + 'will', 'much', 'than', 'them', 'each', 'goes', + 'been', 'over', 'their', 'where', 'could', 'though' + ) + for word in wordsList: + wordLen = len(word) + if wordLen < 3: + continue + if wordLen < 4: + if word.upper() != word: + continue + if '&' in word or \ + '"' in word or \ + '@' in word or \ + '://' in word: + continue + if word.endswith(':'): + word = word.replace(':', '') + if word.lower() in commonWords: + continue + if wordFrequency.get(word): + wordFrequency[word] += 1 + else: + wordFrequency[word] = 1 + + def getPostDomains(session, outboxUrl: str, maxPosts: int, maxMentions: int, maxEmoji: int, maxAttachments: int, @@ -475,7 +519,9 @@ def getPostDomains(session, outboxUrl: str, maxPosts: int, personCache: {}, debug: bool, projectVersion: str, httpPrefix: str, - domain: str, domainList=[]) -> []: + domain: str, + wordFrequency: {}, + domainList=[]) -> []: """Returns a list of domains referenced within public posts """ if not outboxUrl: @@ -502,6 +548,9 @@ def getPostDomains(session, outboxUrl: str, maxPosts: int, continue if not isinstance(item['object'], dict): continue + if item['object'].get('content'): + _updateWordFrequency(item['object']['content'], + wordFrequency) if item['object'].get('inReplyTo'): if isinstance(item['object']['inReplyTo'], str): postDomain, postPort = \ @@ -3091,7 +3140,7 @@ def _createBoxIndexed(recentPostsCache: {}, if not authorized: if p.get('object'): if isinstance(p['object'], dict): - if isDM(p): + if not isPublicPost(p): continue if p['object'].get('likes'): p['likes'] = {'items': []} @@ -3333,7 +3382,7 @@ def getPublicPostsOfPerson(baseDir: str, nickname: str, domain: str, def getPublicPostDomains(session, baseDir: str, nickname: str, domain: str, proxyType: str, port: int, httpPrefix: str, debug: bool, projectVersion: str, - domainList=[]) -> []: + wordFrequency: {}, domainList=[]) -> []: """ Returns a list of domains referenced within public posts """ if not session: @@ -3370,14 +3419,50 @@ def getPublicPostDomains(session, baseDir: str, nickname: str, domain: str, getPostDomains(session, personUrl, 64, maxMentions, maxEmoji, maxAttachments, federationList, personCache, debug, - projectVersion, httpPrefix, domain, domainList) + projectVersion, httpPrefix, domain, + wordFrequency, domainList) postDomains.sort() return postDomains +def downloadFollowCollection(followType: str, + session, httpPrefix, + actor: str, pageNumber=1, + noOfPages=1) -> []: + """Returns a list of following/followers for the given actor + by downloading the json for their following/followers collection + """ + prof = 'https://www.w3.org/ns/activitystreams' + if '/channel/' not in actor or '/accounts/' not in actor: + sessionHeaders = { + 'Accept': 'application/activity+json; profile="' + prof + '"' + } + else: + sessionHeaders = { + 'Accept': 'application/ld+json; profile="' + prof + '"' + } + result = [] + for pageCtr in range(noOfPages): + url = actor + '/' + followType + '?page=' + str(pageNumber + pageCtr) + followersJson = \ + getJson(session, url, sessionHeaders, None, __version__, + httpPrefix, None) + if followersJson: + if followersJson.get('orderedItems'): + for followerActor in followersJson['orderedItems']: + if followerActor not in result: + result.append(followerActor) + else: + break + else: + break + return result + + def getPublicPostInfo(session, baseDir: str, nickname: str, domain: str, proxyType: str, port: int, httpPrefix: str, - debug: bool, projectVersion: str) -> []: + debug: bool, projectVersion: str, + wordFrequency: {}) -> []: """ Returns a dict of domains referenced within public posts """ if not session: @@ -3415,7 +3500,8 @@ def getPublicPostInfo(session, baseDir: str, nickname: str, domain: str, getPostDomains(session, personUrl, maxPosts, maxMentions, maxEmoji, maxAttachments, federationList, personCache, debug, - projectVersion, httpPrefix, domain, []) + projectVersion, httpPrefix, domain, + wordFrequency, []) postDomains.sort() domainsInfo = {} for d in postDomains: @@ -3441,7 +3527,7 @@ def getPublicPostDomainsBlocked(session, baseDir: str, nickname: str, domain: str, proxyType: str, port: int, httpPrefix: str, debug: bool, projectVersion: str, - domainList=[]) -> []: + wordFrequency: {}, domainList=[]) -> []: """ Returns a list of domains referenced within public posts which are globally blocked on this instance """ @@ -3449,7 +3535,7 @@ def getPublicPostDomainsBlocked(session, baseDir: str, getPublicPostDomains(session, baseDir, nickname, domain, proxyType, port, httpPrefix, debug, projectVersion, - domainList) + wordFrequency, domainList) if not postDomains: return [] @@ -3497,9 +3583,10 @@ def checkDomains(session, baseDir: str, nickname: str, domain: str, proxyType: str, port: int, httpPrefix: str, debug: bool, projectVersion: str, - maxBlockedDomains: int, singleCheck: bool): + maxBlockedDomains: int, singleCheck: bool) -> None: """Checks follower accounts for references to globally blocked domains """ + wordFrequency = {} nonMutuals = _getNonMutualsOfPerson(baseDir, nickname, domain) if not nonMutuals: print('No non-mutual followers were found') @@ -3523,7 +3610,8 @@ def checkDomains(session, baseDir: str, nonMutualNickname, nonMutualDomain, proxyType, port, httpPrefix, - debug, projectVersion, []) + debug, projectVersion, + wordFrequency, []) if blockedDomains: if len(blockedDomains) > maxBlockedDomains: followerWarningStr += handle + '\n' @@ -3542,7 +3630,8 @@ def checkDomains(session, baseDir: str, nonMutualNickname, nonMutualDomain, proxyType, port, httpPrefix, - debug, projectVersion, []) + debug, projectVersion, + wordFrequency, []) if blockedDomains: print(handle) for d in blockedDomains: diff --git a/pyjsonld.py b/pyjsonld.py index 35ebdf7a3..0ccffe504 100644 --- a/pyjsonld.py +++ b/pyjsonld.py @@ -37,7 +37,9 @@ import traceback from collections import deque, namedtuple from numbers import Integral, Real +from context import getApschemaV1_9 from context import getApschemaV1_21 +from context import getLitepubV0_1 from context import getV1Schema from context import getV1SecuritySchema from context import getActivitystreamsSchema @@ -397,13 +399,27 @@ def load_document(url): 'document': getActivitystreamsSchema() } return doc - elif url == 'https://raitisoja.com/apschema/v1.21': + elif url.endswith('/apschema/v1.9'): + doc = { + 'contextUrl': None, + 'documentUrl': url, + 'document': getApschemaV1_9() + } + return doc + elif url.endswith('/apschema/v1.21'): doc = { 'contextUrl': None, 'documentUrl': url, 'document': getApschemaV1_21() } return doc + elif url.endswith('/litepub-0.1.jsonld'): + doc = { + 'contextUrl': None, + 'documentUrl': url, + 'document': getLitepubV0_1() + } + return doc return None except JsonLdError as e: raise e diff --git a/schedule.py b/schedule.py index 6d781b375..181c67288 100644 --- a/schedule.py +++ b/schedule.py @@ -142,6 +142,10 @@ def runPostSchedule(baseDir: str, httpd, maxScheduledPosts: int): for account in dirs: if '@' not in account: continue + if account.startswith('inbox@'): + continue + if account.startswith('news@'): + continue # scheduled posts index for this account scheduleIndexFilename = \ baseDir + '/accounts/' + account + '/schedule.index' diff --git a/session.py b/session.py index f740c4759..0e4116f52 100644 --- a/session.py +++ b/session.py @@ -180,8 +180,9 @@ def postImage(session, attachImageFilename: str, federationList: [], if not (attachImageFilename.endswith('.jpg') or attachImageFilename.endswith('.jpeg') or attachImageFilename.endswith('.png') or + attachImageFilename.endswith('.svg') or attachImageFilename.endswith('.gif')): - print('Image must be png, jpg, or gif') + print('Image must be png, jpg, gif or svg') return None if not os.path.isfile(attachImageFilename): print('Image not found: ' + attachImageFilename) @@ -191,6 +192,8 @@ def postImage(session, attachImageFilename: str, federationList: [], contentType = 'image/png' if attachImageFilename.endswith('.gif'): contentType = 'image/gif' + if attachImageFilename.endswith('.svg'): + contentType = 'image/svg+xml' headers['Content-type'] = contentType with open(attachImageFilename, 'rb') as avFile: diff --git a/socnet.py b/socnet.py index 36b5c7cb4..555512231 100644 --- a/socnet.py +++ b/socnet.py @@ -67,11 +67,13 @@ def instancesGraph(baseDir: str, handles: str, projectVersion, httpPrefix, nickname, domain, 'outbox', 27261) + wordFrequency = {} postDomains = \ getPostDomains(session, personUrl, 64, maxMentions, maxEmoji, maxAttachments, federationList, personCache, debug, - projectVersion, httpPrefix, domain, []) + projectVersion, httpPrefix, domain, + wordFrequency, []) postDomains.sort() for fedDomain in postDomains: dotLineStr = ' "' + domain + '" -> "' + fedDomain + '";\n' diff --git a/tests.py b/tests.py index e88c651b3..b9121b1ef 100644 --- a/tests.py +++ b/tests.py @@ -2799,7 +2799,6 @@ def testFunctions(): 'threadSendPost', 'sendToFollowers', 'expireCache', - 'migrateAccount', 'getMutualsOfPerson', 'runPostsQueue', 'runSharesExpire', diff --git a/theme/indymediamodern/banner.png b/theme/indymediamodern/banner.png index d6f5e8a0a..59fa1c986 100644 Binary files a/theme/indymediamodern/banner.png and b/theme/indymediamodern/banner.png differ diff --git a/theme/indymediamodern/icons/separator.png b/theme/indymediamodern/icons/separator.png index f3b5f0799..080feb1ce 100644 Binary files a/theme/indymediamodern/icons/separator.png and b/theme/indymediamodern/icons/separator.png differ diff --git a/theme/indymediamodern/search_banner.png b/theme/indymediamodern/search_banner.png index e8b0ef871..1c47c1914 100644 Binary files a/theme/indymediamodern/search_banner.png and b/theme/indymediamodern/search_banner.png differ diff --git a/theme/indymediamodern/theme.json b/theme/indymediamodern/theme.json index 48a92eeed..aab14209e 100644 --- a/theme/indymediamodern/theme.json +++ b/theme/indymediamodern/theme.json @@ -17,7 +17,7 @@ "hashtag-size2": "30px", "font-size-calendar-header": "2rem", "font-size-calendar-cell": "2rem", - "time-vertical-align": "10px", + "time-vertical-align": "1.1%", "publish-button-vertical-offset": "15px", "vertical-between-posts": "0", "vertical-between-posts-header": "0 0", @@ -34,12 +34,13 @@ "font-size-newswire": "12px", "font-size-newswire-mobile": "30px", "font-size-dropdown-header": "30px", + "post-separator-background": "#efefef", "post-separator-margin-top": "1%", "post-separator-margin-bottom": "1%", - "post-separator-width": "96%", + "post-separator-width": "100%", "separator-width-left": "98%", "separator-width-right": "99%", - "post-separator-height": "1px", + "post-separator-height": "0px", "column-left-top-margin": "10px", "column-left-border-width": "0px", "column-right-border-width": "0px", diff --git a/translations/ar.json b/translations/ar.json index 658be63fe..f23323482 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -351,5 +351,12 @@ "Peertube Instances": "مثيلات Peertube", "Show video previews for the following Peertube sites.": "إظهار معاينات الفيديو لمواقع Peertube التالية.", "Follows you": "يتبعك", - "Verify all signatures": "تحقق من جميع التوقيعات" + "Verify all signatures": "تحقق من جميع التوقيعات", + "Blocked followers": "المتابعون المحظورون", + "Blocked following": "المتابعة المحظورة", + "Receives posts from the following accounts": "يتلقى المشاركات من الحسابات التالية", + "Sends out posts to the following accounts": "يرسل المنشورات إلى الحسابات التالية", + "Word frequencies": "ترددات الكلمات", + "New account": "حساب جديد", + "Moved to new account address": "انتقل إلى عنوان الحساب الجديد" } diff --git a/translations/ca.json b/translations/ca.json index 06ea47e6d..38bfea5f3 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -351,5 +351,12 @@ "Peertube Instances": "Instàncies de Peertube", "Show video previews for the following Peertube sites.": "Mostra les previsualitzacions de vídeo dels següents llocs de Peertube.", "Follows you": "Et segueix", - "Verify all signatures": "Verifiqueu totes les signatures" + "Verify all signatures": "Verifiqueu totes les signatures", + "Blocked followers": "Seguidors bloquejats", + "Blocked following": "Seguiment bloquejat", + "Receives posts from the following accounts": "Rep publicacions dels comptes següents", + "Sends out posts to the following accounts": "Envia publicacions als comptes següents", + "Word frequencies": "Freqüències de paraules", + "New account": "Compte nou", + "Moved to new account address": "S'ha mogut a l'adreça del compte nova" } diff --git a/translations/cy.json b/translations/cy.json index a610b167a..700bf49bf 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -351,5 +351,12 @@ "Peertube Instances": "Camau Peertube", "Show video previews for the following Peertube sites.": "Dangos rhagolygon fideo ar gyfer y safleoedd Peertube canlynol.", "Follows you": "Yn eich dilyn chi", - "Verify all signatures": "Gwirio pob llofnod" + "Verify all signatures": "Gwirio pob llofnod", + "Blocked followers": "Dilynwyr wedi'u blocio", + "Blocked following": "Wedi'i rwystro yn dilyn", + "Receives posts from the following accounts": "Yn derbyn swyddi o'r cyfrifon canlynol", + "Sends out posts to the following accounts": "Yn anfon postiadau i'r cyfrifon canlynol", + "Word frequencies": "Amleddau geiriau", + "New account": "Cyfrif newydd", + "Moved to new account address": "Wedi'i symud i gyfeiriad cyfrif newydd" } diff --git a/translations/de.json b/translations/de.json index cdf9aaefa..301b4c5db 100644 --- a/translations/de.json +++ b/translations/de.json @@ -351,5 +351,12 @@ "Peertube Instances": "Peertube-Instanzen", "Show video previews for the following Peertube sites.": "Zeigen Sie eine Videovorschau für die folgenden Peertube-Websites an.", "Follows you": "Folgt dir", - "Verify all signatures": "Überprüfen Sie alle Signaturen" + "Verify all signatures": "Überprüfen Sie alle Signaturen", + "Blocked followers": "Blockierte Follower", + "Blocked following": "Folgendes blockiert", + "Receives posts from the following accounts": "Erhält Beiträge von folgenden Konten", + "Sends out posts to the following accounts": "Sendet Beiträge an die folgenden Konten", + "Word frequencies": "Worthäufigkeiten", + "New account": "Neues Konto", + "Moved to new account address": "An neue Kontoadresse verschoben" } diff --git a/translations/en.json b/translations/en.json index 40537ba17..4b799853d 100644 --- a/translations/en.json +++ b/translations/en.json @@ -351,5 +351,12 @@ "Peertube Instances": "Peertube Instances", "Show video previews for the following Peertube sites.": "Show video previews for the following Peertube sites.", "Follows you": "Follows you", - "Verify all signatures": "Verify all signatures" + "Verify all signatures": "Verify all signatures", + "Blocked followers": "Blocked followers", + "Blocked following": "Blocked following", + "Receives posts from the following accounts": "Receives posts from the following accounts", + "Sends out posts to the following accounts": "Sends out posts to the following accounts", + "Word frequencies": "Word frequencies", + "New account": "New account", + "Moved to new account address": "Moved to new account address" } diff --git a/translations/es.json b/translations/es.json index f63b2d4ea..6acba3b63 100644 --- a/translations/es.json +++ b/translations/es.json @@ -351,5 +351,12 @@ "Peertube Instances": "Instancias de Peertube", "Show video previews for the following Peertube sites.": "Muestre vistas previas de video para los siguientes sitios de Peertube.", "Follows you": "Te sigue", - "Verify all signatures": "Verificar todas las firmas" + "Verify all signatures": "Verificar todas las firmas", + "Blocked followers": "Seguidores bloqueadas", + "Blocked following": "Seguimiento bloqueado", + "Receives posts from the following accounts": "Recibe publicaciones de las siguientes cuentas", + "Sends out posts to the following accounts": "Envía publicaciones a las siguientes cuentas", + "Word frequencies": "Frecuencias de palabras", + "New account": "Nueva cuenta", + "Moved to new account address": "Movido a la nueva dirección de la cuenta" } diff --git a/translations/fr.json b/translations/fr.json index 1ae6dc989..2d7d83555 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -351,5 +351,12 @@ "Peertube Instances": "Instances Peertube", "Show video previews for the following Peertube sites.": "Afficher des aperçus vidéo pour les sites Peertube suivants.", "Follows you": "Vous suit", - "Verify all signatures": "Vérifier toutes les signatures" + "Verify all signatures": "Vérifier toutes les signatures", + "Blocked followers": "Abonnés bloqués", + "Blocked following": "Bloqué suite", + "Receives posts from the following accounts": "Reçoit les publications des comptes suivants", + "Sends out posts to the following accounts": "Envoie des messages aux comptes suivants", + "Word frequencies": "Fréquences des mots", + "New account": "Nouveau compte", + "Moved to new account address": "Déplacé vers une nouvelle adresse de compte" } diff --git a/translations/ga.json b/translations/ga.json index ef2f77fef..e6fb16db6 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -351,5 +351,12 @@ "Peertube Instances": "Imeachtaí Peertube", "Show video previews for the following Peertube sites.": "Taispeáin réamhamharcanna físe do na suíomhanna Peertube seo a leanas.", "Follows you": "Leanann tú", - "Verify all signatures": "Fíoraigh gach síniú" + "Verify all signatures": "Fíoraigh gach síniú", + "Blocked followers": "Leanúna blocáilte", + "Blocked following": "Blocáilte ina dhiaidh", + "Receives posts from the following accounts": "Faigheann sé poist ó na cuntais seo a leanas", + "Sends out posts to the following accounts": "Seoltar poist chuig na cuntais seo a leanas", + "Word frequencies": "Minicíochtaí focal", + "New account": "Cuntas nua", + "Moved to new account address": "Ar athraíodh a ionad go seoladh cuntas nua" } diff --git a/translations/hi.json b/translations/hi.json index 232cb54c2..7df3b17c9 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -351,5 +351,12 @@ "Peertube Instances": "Peertube उदाहरण", "Show video previews for the following Peertube sites.": "निम्नलिखित Peertube साइटों के लिए वीडियो पूर्वावलोकन दिखाएं।", "Follows you": "आपका पीछा करता है", - "Verify all signatures": "सभी हस्ताक्षर सत्यापित करें" + "Verify all signatures": "सभी हस्ताक्षर सत्यापित करें", + "Blocked followers": "अवरुद्ध अनुयायियों", + "Blocked following": "बाद में ब्लॉक किया गया", + "Receives posts from the following accounts": "निम्नलिखित खातों से पोस्ट प्राप्त करता है", + "Sends out posts to the following accounts": "निम्नलिखित खातों में पोस्ट भेजता है", + "Word frequencies": "शब्द आवृत्तियों", + "New account": "नया खाता", + "Moved to new account address": "नए खाते के पते पर ले जाया गया" } diff --git a/translations/it.json b/translations/it.json index 1ad7efef6..2e4fb153f 100644 --- a/translations/it.json +++ b/translations/it.json @@ -351,5 +351,12 @@ "Peertube Instances": "Istanze di Peertube", "Show video previews for the following Peertube sites.": "Mostra le anteprime dei video per i seguenti siti Peertube.", "Follows you": "Ti segue", - "Verify all signatures": "Verifica tutte le firme" + "Verify all signatures": "Verifica tutte le firme", + "Blocked followers": "Follower bloccati", + "Blocked following": "Seguito bloccato", + "Receives posts from the following accounts": "Riceve post dai seguenti account", + "Sends out posts to the following accounts": "Invia messaggi ai seguenti account", + "Word frequencies": "Frequenze di parole", + "New account": "Nuovo account", + "Moved to new account address": "Spostato al nuovo indirizzo dell'account" } diff --git a/translations/ja.json b/translations/ja.json index 7606a7aff..5c33aad20 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -351,5 +351,12 @@ "Peertube Instances": "Peertubeインスタンス", "Show video previews for the following Peertube sites.": "次のPeertubeサイトのビデオプレビューを表示します。", "Follows you": "あなたについていきます", - "Verify all signatures": "すべての署名を確認する" + "Verify all signatures": "すべての署名を確認する", + "Blocked followers": "ブロックされたフォロワー", + "Blocked following": "次のブロック", + "Receives posts from the following accounts": "以下のアカウントから投稿を受け取ります", + "Sends out posts to the following accounts": "以下のアカウントに投稿を送信します", + "Word frequencies": "単語の頻度", + "New account": "新しいアカウント", + "Moved to new account address": "新しいアカウントアドレスに移動しました" } diff --git a/translations/oc.json b/translations/oc.json index 07b9569c6..d5c98e96b 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -347,5 +347,12 @@ "Peertube Instances": "Peertube Instances", "Show video previews for the following Peertube sites.": "Show video previews for the following Peertube sites.", "Follows you": "Follows you", - "Verify all signatures": "Verify all signatures" + "Verify all signatures": "Verify all signatures", + "Blocked followers": "Blocked followers", + "Blocked following": "Blocked following", + "Receives posts from the following accounts": "Receives posts from the following accounts", + "Sends out posts to the following accounts": "Sends out posts to the following accounts", + "Word frequencies": "Word frequencies", + "New account": "New account", + "Moved to new account address": "Moved to new account address" } diff --git a/translations/pt.json b/translations/pt.json index 183b73d09..d71505127 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -351,5 +351,12 @@ "Peertube Instances": "Instâncias Peertube", "Show video previews for the following Peertube sites.": "Mostrar visualizações de vídeo para os seguintes sites Peertube.", "Follows you": "Segue você", - "Verify all signatures": "Verifique todas as assinaturas" + "Verify all signatures": "Verifique todas as assinaturas", + "Blocked followers": "Seguidores bloqueados", + "Blocked following": "Seguindo bloqueado", + "Receives posts from the following accounts": "Recebe postagens das seguintes contas", + "Sends out posts to the following accounts": "Envia postagens para as seguintes contas", + "Word frequencies": "Frequências de palavras", + "New account": "Nova conta", + "Moved to new account address": "Movido para o novo endereço da conta" } diff --git a/translations/ru.json b/translations/ru.json index 147a699a8..4e60087d5 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -351,5 +351,12 @@ "Peertube Instances": "Экземпляры Peertube", "Show video previews for the following Peertube sites.": "Показать превью видео для следующих сайтов Peertube.", "Follows you": "Следует за вами", - "Verify all signatures": "Проверить все подписи" + "Verify all signatures": "Проверить все подписи", + "Blocked followers": "Заблокированные подписчики", + "Blocked following": "Заблокировано подписок", + "Receives posts from the following accounts": "Получает сообщения от следующих аккаунтов", + "Sends out posts to the following accounts": "Отправляет сообщения на следующие аккаунты", + "Word frequencies": "Частоты слов", + "New account": "Новый аккаунт", + "Moved to new account address": "Перемещен на новый адрес учетной записи" } diff --git a/translations/zh.json b/translations/zh.json index 23a46718d..f4d2a77c4 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -351,5 +351,12 @@ "Peertube Instances": "Peertube实例", "Show video previews for the following Peertube sites.": "显示以下Peertube网站的视频预览。", "Follows you": "跟着你", - "Verify all signatures": "验证所有签名" + "Verify all signatures": "验证所有签名", + "Blocked followers": "被封锁的追随者", + "Blocked following": "被阻止", + "Receives posts from the following accounts": "从以下帐户接收帖子", + "Sends out posts to the following accounts": "将帖子发送到以下帐户", + "Word frequencies": "词频", + "New account": "新账户", + "Moved to new account address": "移至新帐户地址" } diff --git a/utils.py b/utils.py index 0187f86ef..fe2deda4c 100644 --- a/utils.py +++ b/utils.py @@ -47,8 +47,12 @@ def validPostDate(published: str, maxAgeDays=7) -> bool: daysDiff = datetime.datetime.utcnow() - baselineTime nowDaysSinceEpoch = daysDiff.days - postTimeObject = \ - datetime.datetime.strptime(published, "%Y-%m-%dT%H:%M:%SZ") + try: + postTimeObject = \ + datetime.datetime.strptime(published, "%Y-%m-%dT%H:%M:%SZ") + except BaseException: + return False + daysDiff = postTimeObject - baselineTime postDaysSinceEpoch = daysDiff.days @@ -129,7 +133,7 @@ def isEditor(baseDir: str, nickname: str) -> bool: def getImageExtensions() -> []: """Returns a list of the possible image file extensions """ - return ('png', 'jpg', 'jpeg', 'gif', 'webp', 'avif') + return ('png', 'jpg', 'jpeg', 'gif', 'webp', 'avif', 'svg') def getVideoExtensions() -> []: @@ -1721,6 +1725,7 @@ def mediaFileMimeType(filename: str) -> str: 'jpg': 'image/jpeg', 'jpeg': 'image/jpeg', 'gif': 'image/gif', + 'svg': 'image/svg+xml', 'webp': 'image/webp', 'avif': 'image/avif', 'mp3': 'audio/mpeg', diff --git a/webapp_about.py b/webapp_about.py index 8ef64f1ac..f84c31c41 100644 --- a/webapp_about.py +++ b/webapp_about.py @@ -37,7 +37,9 @@ def htmlAbout(cssCache: {}, baseDir: str, httpPrefix: str, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - aboutForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + aboutForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) aboutForm += '' + aboutText + '' if onionDomain: aboutForm += \ diff --git a/webapp_calendar.py b/webapp_calendar.py index e3a2dc495..d919e6535 100644 --- a/webapp_calendar.py +++ b/webapp_calendar.py @@ -10,6 +10,7 @@ import os from datetime import datetime from datetime import date from shutil import copyfile +from utils import getConfigParam from utils import getNicknameFromActor from utils import getDomainFromActor from utils import locatePost @@ -52,7 +53,9 @@ def htmlCalendarDeleteConfirm(cssCache: {}, translate: {}, baseDir: str, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - deletePostStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + deletePostStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) deletePostStr += \ '' + postTime + ' ' + str(year) + '/' + \ str(monthNumber) + \ @@ -109,7 +112,9 @@ def _htmlCalendarDay(cssCache: {}, translate: {}, if '/users/' in actor: calActor = '/users/' + actor.split('/users/')[1] - calendarStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + calendarStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) calendarStr += '\n' calendarStr += '\n' calendarStr += \ @@ -290,7 +295,9 @@ def htmlCalendar(cssCache: {}, translate: {}, if '/users/' in actor: calActor = '/users/' + actor.split('/users/')[1] - calendarStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + calendarStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) calendarStr += '\n' calendarStr += '\n' calendarStr += \ diff --git a/webapp_column_left.py b/webapp_column_left.py index 3157d9857..f9d608757 100644 --- a/webapp_column_left.py +++ b/webapp_column_left.py @@ -260,7 +260,9 @@ def htmlLinksMobile(cssCache: {}, baseDir: str, if ':' in domain: domain = domain.split(':')[0] - htmlStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + htmlStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) bannerFile, bannerFilename = \ getBannerFile(baseDir, nickname, domain, theme) htmlStr += \ @@ -321,7 +323,9 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str, bannerFile, bannerFilename = \ getBannerFile(baseDir, nickname, domain, theme) - editLinksForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + editLinksForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) # top banner editLinksForm += \ diff --git a/webapp_column_right.py b/webapp_column_right.py index 300fa9934..cf0fb10e8 100644 --- a/webapp_column_right.py +++ b/webapp_column_right.py @@ -15,6 +15,7 @@ from utils import loadJson from utils import votesOnNewswireItem from utils import getNicknameFromActor from utils import isEditor +from utils import getConfigParam from posts import isModerator from webapp_utils import getRightImageFile from webapp_utils import htmlHeaderWithExternalStyle @@ -342,7 +343,9 @@ def htmlCitations(baseDir: str, nickname: str, domain: str, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - htmlStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + htmlStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) # top banner bannerFile, bannerFilename = \ @@ -452,7 +455,9 @@ def htmlNewswireMobile(cssCache: {}, baseDir: str, nickname: str, showPublishButton = editor - htmlStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + htmlStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) bannerFile, bannerFilename = \ getBannerFile(baseDir, nickname, domain, theme) @@ -515,7 +520,9 @@ def htmlEditNewswire(cssCache: {}, translate: {}, baseDir: str, path: str, bannerFile, bannerFilename = \ getBannerFile(baseDir, nickname, domain, theme) - editNewswireForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + editNewswireForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) # top banner editNewswireForm += \ @@ -631,7 +638,9 @@ def htmlEditNewsPost(cssCache: {}, translate: {}, baseDir: str, path: str, if os.path.isfile(baseDir + '/links.css'): cssFilename = baseDir + '/links.css' - editNewsPostForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + editNewsPostForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) editNewsPostForm += \ '\n' diff --git a/webapp_confirm.py b/webapp_confirm.py index bf6b564c5..c6bbc00b7 100644 --- a/webapp_confirm.py +++ b/webapp_confirm.py @@ -13,6 +13,7 @@ from utils import getNicknameFromActor from utils import getDomainFromActor from utils import locatePost from utils import loadJson +from utils import getConfigParam from webapp_utils import getAltPath from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlFooter @@ -57,7 +58,9 @@ def htmlConfirmDelete(cssCache: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - deletePostStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + deletePostStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) deletePostStr += \ individualPostAsHtml(True, recentPostsCache, maxRecentPosts, translate, pageNumber, @@ -130,7 +133,9 @@ def htmlConfirmRemoveSharedItem(cssCache: {}, translate: {}, baseDir: str, if os.path.isfile(baseDir + '/follow.css'): cssFilename = baseDir + '/follow.css' - sharesStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + sharesStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) sharesStr += '\n' sharesStr += ' \n' sharesStr += ' \n' @@ -177,7 +182,9 @@ def htmlConfirmFollow(cssCache: {}, translate: {}, baseDir: str, if os.path.isfile(baseDir + '/follow.css'): cssFilename = baseDir + '/follow.css' - followStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + followStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) followStr += '\n' followStr += ' \n' followStr += ' \n' @@ -221,7 +228,9 @@ def htmlConfirmUnfollow(cssCache: {}, translate: {}, baseDir: str, if os.path.isfile(baseDir + '/follow.css'): cssFilename = baseDir + '/follow.css' - followStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + followStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) followStr += '\n' followStr += ' \n' followStr += ' \n' @@ -266,7 +275,9 @@ def htmlConfirmUnblock(cssCache: {}, translate: {}, baseDir: str, if os.path.isfile(baseDir + '/follow.css'): cssFilename = baseDir + '/follow.css' - blockStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + blockStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) blockStr += '\n' blockStr += ' \n' blockStr += ' \n' diff --git a/webapp_create_post.py b/webapp_create_post.py index d1614081a..147528b6f 100644 --- a/webapp_create_post.py +++ b/webapp_create_post.py @@ -12,6 +12,7 @@ from utils import getNicknameFromActor from utils import getDomainFromActor from utils import getImageFormats from utils import getMediaFormats +from utils import getConfigParam from webapp_utils import getBannerFile from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlFooter @@ -555,7 +556,9 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {}, dateAndLocation += '\n' dateAndLocation += '\n' - newPostForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + newPostForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) newPostForm += \ '\n' + \ diff --git a/webapp_frontscreen.py b/webapp_frontscreen.py index adfb0b24a..5994654d0 100644 --- a/webapp_frontscreen.py +++ b/webapp_frontscreen.py @@ -9,6 +9,7 @@ __status__ = "Production" import os from utils import isSystemAccount from utils import getDomainFromActor +from utils import getConfigParam from person import personBoxJson from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlFooter @@ -170,7 +171,9 @@ def htmlFrontScreen(rssIconAtTop: bool, profileFooterStr += ' \n' profileFooterStr += '\n' + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') profileStr = \ - htmlHeaderWithExternalStyle(cssFilename) + \ + htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \ profileStr + profileFooterStr + htmlFooter() return profileStr diff --git a/webapp_hashtagswarm.py b/webapp_hashtagswarm.py index 47369045f..68c7ec220 100644 --- a/webapp_hashtagswarm.py +++ b/webapp_hashtagswarm.py @@ -10,6 +10,7 @@ import os from shutil import copyfile from datetime import datetime from utils import getNicknameFromActor +from utils import getConfigParam from categories import getHashtagCategories from categories import getHashtagCategory from webapp_utils import getSearchBannerFile @@ -246,7 +247,9 @@ def htmlSearchHashtagCategory(cssCache: {}, translate: {}, if os.path.isfile(baseDir + '/search.css'): cssFilename = baseDir + '/search.css' - htmlStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + htmlStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) # show a banner above the search box searchBannerFile, searchBannerFilename = \ diff --git a/webapp_login.py b/webapp_login.py index 423d7fb24..a8871b3c5 100644 --- a/webapp_login.py +++ b/webapp_login.py @@ -61,6 +61,9 @@ def htmlLogin(cssCache: {}, translate: {}, elif os.path.isfile(baseDir + '/accounts/login.gif'): loginImage = 'login.gif' loginImageFilename = baseDir + '/accounts/' + loginImage + elif os.path.isfile(baseDir + '/accounts/login.svg'): + loginImage = 'login.svg' + loginImageFilename = baseDir + '/accounts/' + loginImage elif os.path.isfile(baseDir + '/accounts/login.webp'): loginImage = 'login.webp' loginImageFilename = baseDir + '/accounts/' + loginImage @@ -129,7 +132,9 @@ def htmlLogin(cssCache: {}, translate: {}, if not autocomplete: autocompleteStr = 'autocomplete="off" value=""' - loginForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + loginForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) loginForm += '\n' loginForm += '\n' loginForm += ' \n' diff --git a/webapp_moderation.py b/webapp_moderation.py index c18e5163d..c15cbaf48 100644 --- a/webapp_moderation.py +++ b/webapp_moderation.py @@ -7,10 +7,13 @@ __email__ = "bob@freedombone.net" __status__ = "Production" import os +from utils import getFullDomain from utils import isEditor from utils import loadJson from utils import getNicknameFromActor from utils import getDomainFromActor +from utils import getConfigParam +from posts import downloadFollowCollection from posts import getPublicPostInfo from posts import isModerator from webapp_timeline import htmlTimeline @@ -19,6 +22,8 @@ from webapp_utils import getContentWarningButton from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlFooter from blocking import isBlockedDomain +from blocking import isBlocked +from session import createSession def htmlModeration(cssCache: {}, defaultTimeline: str, @@ -70,31 +75,65 @@ def htmlAccountInfo(cssCache: {}, translate: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - infoForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + infoForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) searchNickname = getNicknameFromActor(searchHandle) searchDomain, searchPort = getDomainFromActor(searchHandle) searchHandle = searchNickname + '@' + searchDomain + searchActor = \ + httpPrefix + '://' + searchDomain + '/users/' + searchNickname infoForm += \ '' + \ - translate['Account Information'] + ': ' + searchHandle + '' + translate['Account Information'] + ': ' + searchHandle + '\n' - infoForm += translate[msgStr1] + '' + infoForm += translate[msgStr1] + '\n' proxyType = 'tor' if not os.path.isfile('/usr/bin/tor'): proxyType = None if domain.endswith('.i2p'): proxyType = None - domainDict = getPublicPostInfo(None, + + session = createSession(proxyType) + + wordFrequency = {} + domainDict = getPublicPostInfo(session, baseDir, searchNickname, searchDomain, proxyType, searchPort, httpPrefix, debug, - __version__) - infoForm += '' + __version__, wordFrequency) + + # get a list of any blocked followers + followersList = \ + downloadFollowCollection('followers', session, + httpPrefix, searchActor, 1, 5) + blockedFollowers = [] + for followerActor in followersList: + followerNickname = getNicknameFromActor(followerActor) + followerDomain, followerPort = getDomainFromActor(followerActor) + followerDomainFull = getFullDomain(followerDomain, followerPort) + if isBlocked(baseDir, nickname, domain, + followerNickname, followerDomainFull): + blockedFollowers.append(followerActor) + + # get a list of any blocked following + followingList = \ + downloadFollowCollection('following', session, + httpPrefix, searchActor, 1, 5) + blockedFollowing = [] + for followingActor in followingList: + followingNickname = getNicknameFromActor(followingActor) + followingDomain, followingPort = getDomainFromActor(followingActor) + followingDomainFull = getFullDomain(followingDomain, followingPort) + if isBlocked(baseDir, nickname, domain, + followingNickname, followingDomainFull): + blockedFollowing.append(followingActor) + + infoForm += '\n' usersPath = '/users/' + nickname + '/accountinfo' ctr = 1 for postDomain, blockedPostUrls in domainDict.items(): @@ -122,7 +161,7 @@ def htmlAccountInfo(cssCache: {}, translate: {}, '?handle=' + searchHandle + '">' infoForm += '' + \ translate['Unblock'] + ' ' + \ - blockedPostsHtml + blockedPostsHtml + '\n' else: infoForm += \ '' + \ translate['Block'] + '' - infoForm += '' - infoForm += '' + infoForm += '\n' + infoForm += '\n' + + infoForm += '\n' + + if blockedFollowing: + blockedFollowing.sort() + infoForm += '\n' + infoForm += '' + translate['Blocked following'] + '\n' + infoForm += \ + '' + \ + translate['Receives posts from the following accounts'] + \ + ':\n' + for actor in blockedFollowing: + followingNickname = getNicknameFromActor(actor) + followingDomain, followingPort = getDomainFromActor(actor) + followingDomainFull = \ + getFullDomain(followingDomain, followingPort) + infoForm += '' + \ + followingNickname + '@' + followingDomainFull + \ + '\n' + infoForm += '\n' + + if blockedFollowers: + blockedFollowers.sort() + infoForm += '\n' + infoForm += '' + translate['Blocked followers'] + '\n' + infoForm += \ + '' + \ + translate['Sends out posts to the following accounts'] + \ + ':\n' + for actor in blockedFollowers: + followerNickname = getNicknameFromActor(actor) + followerDomain, followerPort = getDomainFromActor(actor) + followerDomainFull = getFullDomain(followerDomain, followerPort) + infoForm += '' + \ + followerNickname + '@' + followerDomainFull + '\n' + infoForm += '\n' + + if wordFrequency: + maxCount = 1 + for word, count in wordFrequency.items(): + if count > maxCount: + maxCount = count + minimumWordCount = int(maxCount / 2) + if minimumWordCount >= 3: + infoForm += '\n' + infoForm += '' + translate['Word frequencies'] + '\n' + wordSwarm = '' + ctr = 0 + for word, count in wordFrequency.items(): + if count >= minimumWordCount: + if ctr > 0: + wordSwarm += ' ' + if count < maxCount - int(maxCount / 4): + wordSwarm += word + else: + if count != maxCount: + wordSwarm += '' + word + '' + else: + wordSwarm += '' + word + '' + ctr += 1 + infoForm += wordSwarm + infoForm += '\n' - infoForm += '' infoForm += htmlFooter() return infoForm @@ -151,7 +251,9 @@ def htmlModerationInfo(cssCache: {}, translate: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - infoForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + infoForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) infoForm += \ '' + \ diff --git a/webapp_person_options.py b/webapp_person_options.py index 30d623e0e..807465b95 100644 --- a/webapp_person_options.py +++ b/webapp_person_options.py @@ -47,7 +47,8 @@ def htmlPersonOptions(defaultTimeline: str, emailAddress: str, dormantMonths: int, backToPath: str, - lockedAccount: bool) -> str: + lockedAccount: bool, + movedTo: str) -> str: """Show options for a person: view/follow/block/report """ optionsDomain, optionsPort = getDomainFromActor(optionsActor) @@ -109,7 +110,9 @@ def htmlPersonOptions(defaultTimeline: str, '">' + \ translate['Donate'] + '\n' - optionsStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + optionsStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) optionsStr += '\n' optionsStr += '\n' optionsStr += ' \n' @@ -121,6 +124,8 @@ def htmlPersonOptions(defaultTimeline: str, handleShown = handle if lockedAccount: handleShown += '🔒' + if movedTo: + handleShown += ' ⌂' if dormant: handleShown += ' 💤' optionsStr += \ @@ -129,6 +134,15 @@ def htmlPersonOptions(defaultTimeline: str, if followsYou: optionsStr += \ ' ' + translate['Follows you'] + '\n' + if movedTo: + newNickname = getNicknameFromActor(movedTo) + newDomain, newPort = getDomainFromActor(movedTo) + if newNickname and newDomain: + newHandle = newNickname + '@' + newDomain + optionsStr += \ + ' ' + \ + translate['New account'] + \ + ': @' + newHandle + '\n' if emailAddress: optionsStr += \ '' + translate['Email'] + \ diff --git a/webapp_post.py b/webapp_post.py index 136adfc7b..ff1bfea8d 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -22,6 +22,7 @@ from posts import getPersonBox from posts import isDM from posts import downloadAnnounce from posts import populateRepliesJson +from utils import getConfigParam from utils import getFullDomain from utils import isEditor from utils import locatePost @@ -61,6 +62,7 @@ from webapp_utils import getBrokenLinkSubstitute from webapp_media import addEmbeddedElements from webapp_question import insertQuestion from devices import E2EEdecryptMessageFromDevice +from webfinger import webfingerHandle def _logPostTiming(enableTimingLog: bool, postStartTime, debugId: str) -> None: @@ -1153,14 +1155,29 @@ def individualPostAsHtml(allowDownloads: bool, # get the display name if domainFull not in postActor: - (inboxUrl, pubKeyId, pubKey, - fromPersonId, sharedInbox, - avatarUrl2, displayName) = getPersonBox(baseDir, session, - cachedWebfingers, - personCache, - projectVersion, httpPrefix, - nickname, domain, 'outbox', - 72367) + # lookup the correct webfinger for the postActor + postActorNickname = getNicknameFromActor(postActor) + postActorDomain, postActorPort = getDomainFromActor(postActor) + postActorDomainFull = getFullDomain(postActorDomain, postActorPort) + postActorHandle = postActorNickname + '@' + postActorDomainFull + postActorWf = \ + webfingerHandle(session, postActorHandle, httpPrefix, + cachedWebfingers, + domain, __version__) + + avatarUrl2 = None + displayName = None + if postActorWf: + (inboxUrl, pubKeyId, pubKey, + fromPersonId, sharedInbox, + avatarUrl2, displayName) = getPersonBox(baseDir, session, + postActorWf, + personCache, + projectVersion, + httpPrefix, + nickname, domain, + 'outbox', 72367) + _logPostTiming(enableTimingLog, postStartTime, '6') if avatarUrl2: @@ -1689,7 +1706,10 @@ def htmlIndividualPost(cssCache: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - return htmlHeaderWithExternalStyle(cssFilename) + postStr + htmlFooter() + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + return htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \ + postStr + htmlFooter() def htmlPostReplies(cssCache: {}, @@ -1724,4 +1744,7 @@ def htmlPostReplies(cssCache: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - return htmlHeaderWithExternalStyle(cssFilename) + repliesStr + htmlFooter() + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + return htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \ + repliesStr + htmlFooter() diff --git a/webapp_profile.py b/webapp_profile.py index bd75f4a1a..31c3b32c4 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -170,6 +170,10 @@ def htmlProfileAfterSearch(cssCache: {}, lockedAccount = getLockedAccount(profileJson) if lockedAccount: displayName += '🔒' + movedTo = '' + if profileJson.get('movedTo'): + movedTo = profileJson['movedTo'] + displayName += ' ⌂' followsYou = \ isFollowerOfPerson(baseDir, @@ -233,7 +237,8 @@ def htmlProfileAfterSearch(cssCache: {}, translate, displayName, followsYou, profileDescriptionShort, - avatarUrl, imageUrl) + avatarUrl, imageUrl, + movedTo) domainFull = getFullDomain(domain, port) @@ -288,7 +293,10 @@ def htmlProfileAfterSearch(cssCache: {}, if i >= 20: break - return htmlHeaderWithExternalStyle(cssFilename) + profileStr + htmlFooter() + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + return htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \ + profileStr + htmlFooter() def _getProfileHeader(baseDir: str, nickname: str, domain: str, @@ -298,7 +306,7 @@ def _getProfileHeader(baseDir: str, nickname: str, domain: str, avatarDescription: str, profileDescriptionShort: str, loginButton: str, avatarUrl: str, - theme: str) -> str: + theme: str, movedTo: str) -> str: """The header of the profile screen, containing background image and avatar """ @@ -318,6 +326,15 @@ def _getProfileHeader(baseDir: str, nickname: str, domain: str, htmlStr += ' ' + displayName + '\n' htmlStr += \ ' @' + nickname + '@' + domainFull + '\n' + if movedTo: + newNickname = getNicknameFromActor(movedTo) + newDomain, newPort = getDomainFromActor(movedTo) + newDomainFull = getFullDomain(newDomain, newPort) + if newNickname and newDomain: + htmlStr += \ + ' ' + translate['New account'] + ': ' + \ + '@' + \ + newNickname + '@' + newDomainFull + '\n' htmlStr += \ ' @' + searchNickname + '@' + searchDomainFull + '\n' if followsYou: htmlStr += ' ' + translate['Follows you'] + '\n' + if movedTo: + newNickname = getNicknameFromActor(movedTo) + newDomain, newPort = getDomainFromActor(movedTo) + newDomainFull = getFullDomain(newDomain, newPort) + if newNickname and newDomain: + newHandle = newNickname + '@' + newDomainFull + htmlStr += ' ' + translate['New account'] + \ + ': < a href="' + movedTo + '">@' + newHandle + '\n' + htmlStr += ' ' + profileDescriptionShort + '\n' htmlStr += ' \n' htmlStr += ' \n\n' @@ -585,6 +612,10 @@ def htmlProfile(rssIconAtTop: bool, avatarDescription = avatarDescription.replace('', '') avatarDescription = avatarDescription.replace('', '') + movedTo = '' + if profileJson.get('movedTo'): + movedTo = profileJson['movedTo'] + avatarUrl = profileJson['icon']['url'] profileHeaderStr = \ _getProfileHeader(baseDir, nickname, domain, @@ -592,7 +623,8 @@ def htmlProfile(rssIconAtTop: bool, defaultTimeline, displayName, avatarDescription, profileDescriptionShort, - loginButton, avatarUrl, theme) + loginButton, avatarUrl, theme, + movedTo) profileStr = profileHeaderStr + donateSection profileStr += '\n' @@ -680,8 +712,10 @@ def htmlProfile(rssIconAtTop: bool, nickname, domainFull, extraJson) + licenseStr + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') profileStr = \ - htmlHeaderWithExternalStyle(cssFilename) + \ + htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \ profileStr + htmlFooter() return profileStr @@ -898,8 +932,11 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, toxAddress = '' briarAddress = '' manuallyApprovesFollowers = '' + movedTo = '' actorJson = loadJson(actorFilename) if actorJson: + if actorJson.get('movedTo'): + movedTo = actorJson['movedTo'] donateUrl = getDonationUrl(actorJson) xmppAddress = getXmppAddress(actorJson) matrixAddress = getMatrixAddress(actorJson) @@ -1196,7 +1233,9 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, 'style="height:200px">' + peertubeInstancesStr + \ '\n' - editProfileForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + editProfileForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) # top banner editProfileForm += \ @@ -1240,6 +1279,12 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, editProfileForm += \ ' ' + \ bioStr + '\n' + + editProfileForm += '' + \ + translate['Moved to new account address'] + ':\n' + editProfileForm += \ + ' \n' editProfileForm += '' + \ translate['Donations link'] + '\n' editProfileForm += \ @@ -1521,26 +1566,35 @@ def _individualFollowAsHtml(translate: {}, buttons=[]) -> str: """An individual follow entry on the profile screen """ - nickname = getNicknameFromActor(followUrl) - domain, port = getDomainFromActor(followUrl) - titleStr = '@' + nickname + '@' + domain - if dormant: - titleStr += ' 💤' + followUrlNickname = getNicknameFromActor(followUrl) + followUrlDomain, followUrlPort = getDomainFromActor(followUrl) + followUrlDomainFull = getFullDomain(followUrlDomain, followUrlPort) + titleStr = '@' + followUrlNickname + '@' + followUrlDomainFull avatarUrl = getPersonAvatarUrl(baseDir, followUrl, personCache, True) if not avatarUrl: avatarUrl = followUrl + '/avatar.png' - if domain not in followUrl: - (inboxUrl, pubKeyId, pubKey, - fromPersonId, sharedInbox, - avatarUrl2, displayName) = getPersonBox(baseDir, session, - cachedWebfingers, - personCache, projectVersion, - httpPrefix, nickname, - domain, 'outbox', 43036) - if avatarUrl2: - avatarUrl = avatarUrl2 - if displayName: - titleStr = displayName + ' ' + titleStr + + # lookup the correct webfinger for the followUrl + followUrlHandle = followUrlNickname + '@' + followUrlDomainFull + followUrlWf = \ + webfingerHandle(session, followUrlHandle, httpPrefix, + cachedWebfingers, + domain, __version__) + + (inboxUrl, pubKeyId, pubKey, + fromPersonId, sharedInbox, + avatarUrl2, displayName) = getPersonBox(baseDir, session, + followUrlWf, + personCache, projectVersion, + httpPrefix, followUrlNickname, + domain, 'outbox', 43036) + if avatarUrl2: + avatarUrl = avatarUrl2 + if displayName: + titleStr = displayName + + if dormant: + titleStr += ' 💤' buttonsStr = '' if authorized: diff --git a/webapp_search.py b/webapp_search.py index 126722058..c833a9419 100644 --- a/webapp_search.py +++ b/webapp_search.py @@ -10,6 +10,7 @@ import os from shutil import copyfile import urllib.parse from datetime import datetime +from utils import getConfigParam from utils import getFullDomain from utils import isEditor from utils import loadJson @@ -50,7 +51,9 @@ def htmlSearchEmoji(cssCache: {}, translate: {}, emojiLookupFilename = baseDir + '/emoji/emoji.json' # create header - emojiForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + emojiForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) emojiForm += '' + \ translate['Emoji Search'] + \ '' @@ -110,8 +113,10 @@ def htmlSearchSharedItems(cssCache: {}, translate: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') sharedItemsForm = \ - htmlHeaderWithExternalStyle(cssFilename) + htmlHeaderWithExternalStyle(cssFilename, instanceTitle) sharedItemsForm += \ '' + \ '' + \ @@ -285,7 +290,9 @@ def htmlSearchEmojiTextEntry(cssCache: {}, translate: {}, if os.path.isfile(baseDir + '/follow.css'): cssFilename = baseDir + '/follow.css' - emojiStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + emojiStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) emojiStr += '\n' emojiStr += ' \n' emojiStr += ' \n' @@ -325,7 +332,9 @@ def htmlSearch(cssCache: {}, translate: {}, if os.path.isfile(baseDir + '/search.css'): cssFilename = baseDir + '/search.css' - followStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + followStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) # show a banner above the search box searchBannerFile, searchBannerFilename = \ @@ -459,7 +468,9 @@ def htmlSkillsSearch(actor: str, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - skillSearchForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + skillSearchForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) skillSearchForm += \ '' + \ translate['Skills search'] + ': ' + \ @@ -525,8 +536,10 @@ def htmlHistorySearch(cssCache: {}, translate: {}, baseDir: str, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') historySearchForm = \ - htmlHeaderWithExternalStyle(cssFilename) + htmlHeaderWithExternalStyle(cssFilename, instanceTitle) # add the page title domainFull = getFullDomain(domain, port) @@ -650,8 +663,10 @@ def htmlHashtagSearch(cssCache: {}, endIndex = noOfLines - 1 # add the page title + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') hashtagSearchForm = \ - htmlHeaderWithExternalStyle(cssFilename) + htmlHeaderWithExternalStyle(cssFilename, instanceTitle) if nickname: hashtagSearchForm += '\n' + \ '#' + \ diff --git a/webapp_suspended.py b/webapp_suspended.py index 4ea824936..aacbaab19 100644 --- a/webapp_suspended.py +++ b/webapp_suspended.py @@ -7,6 +7,7 @@ __email__ = "bob@freedombone.net" __status__ = "Production" import os +from utils import getConfigParam from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlFooter @@ -19,7 +20,9 @@ def htmlSuspended(cssCache: {}, baseDir: str) -> str: if os.path.isfile(baseDir + '/suspended.css'): cssFilename = baseDir + '/suspended.css' - suspendedForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + suspendedForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) suspendedForm += '\n' suspendedForm += ' Account Suspended\n' suspendedForm += ' See Terms of Service\n' diff --git a/webapp_timeline.py b/webapp_timeline.py index e00afa944..5840234e3 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -8,6 +8,7 @@ __status__ = "Production" import os import time +from utils import getConfigParam from utils import getFullDomain from utils import isEditor from utils import removeIdEnding @@ -255,7 +256,9 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, eventsButton + '">' + translate['Events'] + \ '' - tlStr = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + tlStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) _logTimelineTiming(enableTimingLog, timelineStartTime, boxName, '4') diff --git a/webapp_tos.py b/webapp_tos.py index 346b86b6a..15e3869ab 100644 --- a/webapp_tos.py +++ b/webapp_tos.py @@ -37,7 +37,9 @@ def htmlTermsOfService(cssCache: {}, baseDir: str, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - TOSForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + TOSForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) TOSForm += '' + TOSText + '\n' if adminNickname: adminActor = httpPrefix + '://' + domainFull + \ diff --git a/webapp_utils.py b/webapp_utils.py index 02e30a78f..2de80bee8 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -42,7 +42,10 @@ def htmlFollowingList(cssCache: {}, baseDir: str, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - followingListHtml = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + followingListHtml = htmlHeaderWithExternalStyle(cssFilename, + instanceTitle) for followingAddress in followingList: if followingAddress: followingListHtml += \ @@ -61,7 +64,10 @@ def htmlHashtagBlocked(cssCache: {}, baseDir: str, translate: {}) -> str: if os.path.isfile(baseDir + '/suspended.css'): cssFilename = baseDir + '/suspended.css' - blockedHashtagForm = htmlHeaderWithExternalStyle(cssFilename) + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + blockedHashtagForm = htmlHeaderWithExternalStyle(cssFilename, + instanceTitle) blockedHashtagForm += '\n' blockedHashtagForm += \ ' ' + \ @@ -289,6 +295,7 @@ def updateAvatarImageCache(session, baseDir: str, httpPrefix: str, 'jpg': 'jpeg', 'jpeg': 'jpeg', 'gif': 'gif', + 'svg': 'svg+xml', 'webp': 'webp', 'avif': 'avif' } @@ -521,7 +528,8 @@ def getRightImageFile(baseDir: str, nickname, domain, theme) -def htmlHeaderWithExternalStyle(cssFilename: str, lang='en') -> str: +def htmlHeaderWithExternalStyle(cssFilename: str, instanceTitle: str, + lang='en') -> str: htmlStr = '\n' htmlStr += '\n' htmlStr += ' \n' @@ -530,7 +538,7 @@ def htmlHeaderWithExternalStyle(cssFilename: str, lang='en') -> str: htmlStr += ' \n' htmlStr += ' \n' htmlStr += ' \n' - htmlStr += ' Epicyon\n' + htmlStr += ' ' + instanceTitle + '\n' htmlStr += ' \n' htmlStr += ' \n' return htmlStr @@ -646,12 +654,14 @@ def getPostAttachmentsAsHtml(postJsonObject: {}, boxName: str, translate: {}, mediaType == 'image/jpeg' or \ mediaType == 'image/webp' or \ mediaType == 'image/avif' or \ + mediaType == 'image/svg+xml' or \ mediaType == 'image/gif': if attach['url'].endswith('.png') or \ attach['url'].endswith('.jpg') or \ attach['url'].endswith('.jpeg') or \ attach['url'].endswith('.webp') or \ attach['url'].endswith('.avif') or \ + attach['url'].endswith('.svg') or \ attach['url'].endswith('.gif'): if attachmentCtr > 0: attachmentStr += '' diff --git a/webfinger.py b/webfinger.py index fe31f6909..6fe57a80d 100644 --- a/webfinger.py +++ b/webfinger.py @@ -352,4 +352,4 @@ def webfingerUpdate(baseDir: str, nickname: str, domain: str, if _webfingerUpdateFromProfile(wfJson, actorJson): if saveJson(wfJson, filename): - cachedWebfingers[handle] = wfJson + storeWebfingerInCache(handle, wfJson, cachedWebfingers)
' + \ + translate['Receives posts from the following accounts'] + \ + ':
' + \ + translate['Sends out posts to the following accounts'] + \ + ':
' + translate['Follows you'] + '
' + \ + translate['New account'] + \ + ': @' + newHandle + '
' + translate['Email'] + \ diff --git a/webapp_post.py b/webapp_post.py index 136adfc7b..ff1bfea8d 100644 --- a/webapp_post.py +++ b/webapp_post.py @@ -22,6 +22,7 @@ from posts import getPersonBox from posts import isDM from posts import downloadAnnounce from posts import populateRepliesJson +from utils import getConfigParam from utils import getFullDomain from utils import isEditor from utils import locatePost @@ -61,6 +62,7 @@ from webapp_utils import getBrokenLinkSubstitute from webapp_media import addEmbeddedElements from webapp_question import insertQuestion from devices import E2EEdecryptMessageFromDevice +from webfinger import webfingerHandle def _logPostTiming(enableTimingLog: bool, postStartTime, debugId: str) -> None: @@ -1153,14 +1155,29 @@ def individualPostAsHtml(allowDownloads: bool, # get the display name if domainFull not in postActor: - (inboxUrl, pubKeyId, pubKey, - fromPersonId, sharedInbox, - avatarUrl2, displayName) = getPersonBox(baseDir, session, - cachedWebfingers, - personCache, - projectVersion, httpPrefix, - nickname, domain, 'outbox', - 72367) + # lookup the correct webfinger for the postActor + postActorNickname = getNicknameFromActor(postActor) + postActorDomain, postActorPort = getDomainFromActor(postActor) + postActorDomainFull = getFullDomain(postActorDomain, postActorPort) + postActorHandle = postActorNickname + '@' + postActorDomainFull + postActorWf = \ + webfingerHandle(session, postActorHandle, httpPrefix, + cachedWebfingers, + domain, __version__) + + avatarUrl2 = None + displayName = None + if postActorWf: + (inboxUrl, pubKeyId, pubKey, + fromPersonId, sharedInbox, + avatarUrl2, displayName) = getPersonBox(baseDir, session, + postActorWf, + personCache, + projectVersion, + httpPrefix, + nickname, domain, + 'outbox', 72367) + _logPostTiming(enableTimingLog, postStartTime, '6') if avatarUrl2: @@ -1689,7 +1706,10 @@ def htmlIndividualPost(cssCache: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - return htmlHeaderWithExternalStyle(cssFilename) + postStr + htmlFooter() + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + return htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \ + postStr + htmlFooter() def htmlPostReplies(cssCache: {}, @@ -1724,4 +1744,7 @@ def htmlPostReplies(cssCache: {}, if os.path.isfile(baseDir + '/epicyon.css'): cssFilename = baseDir + '/epicyon.css' - return htmlHeaderWithExternalStyle(cssFilename) + repliesStr + htmlFooter() + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + return htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \ + repliesStr + htmlFooter() diff --git a/webapp_profile.py b/webapp_profile.py index bd75f4a1a..31c3b32c4 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -170,6 +170,10 @@ def htmlProfileAfterSearch(cssCache: {}, lockedAccount = getLockedAccount(profileJson) if lockedAccount: displayName += '🔒' + movedTo = '' + if profileJson.get('movedTo'): + movedTo = profileJson['movedTo'] + displayName += ' ⌂' followsYou = \ isFollowerOfPerson(baseDir, @@ -233,7 +237,8 @@ def htmlProfileAfterSearch(cssCache: {}, translate, displayName, followsYou, profileDescriptionShort, - avatarUrl, imageUrl) + avatarUrl, imageUrl, + movedTo) domainFull = getFullDomain(domain, port) @@ -288,7 +293,10 @@ def htmlProfileAfterSearch(cssCache: {}, if i >= 20: break - return htmlHeaderWithExternalStyle(cssFilename) + profileStr + htmlFooter() + instanceTitle = \ + getConfigParam(baseDir, 'instanceTitle') + return htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \ + profileStr + htmlFooter() def _getProfileHeader(baseDir: str, nickname: str, domain: str, @@ -298,7 +306,7 @@ def _getProfileHeader(baseDir: str, nickname: str, domain: str, avatarDescription: str, profileDescriptionShort: str, loginButton: str, avatarUrl: str, - theme: str) -> str: + theme: str, movedTo: str) -> str: """The header of the profile screen, containing background image and avatar """ @@ -318,6 +326,15 @@ def _getProfileHeader(baseDir: str, nickname: str, domain: str, htmlStr += '
@' + nickname + '@' + domainFull + '\n' + if movedTo: + newNickname = getNicknameFromActor(movedTo) + newDomain, newPort = getDomainFromActor(movedTo) + newDomainFull = getFullDomain(newDomain, newPort) + if newNickname and newDomain: + htmlStr += \ + '
' + translate['New account'] + ': ' + \ + '@' + \ + newNickname + '@' + newDomainFull + '\n' htmlStr += \ ' @' + searchNickname + '@' + searchDomainFull + '\n' if followsYou: htmlStr += ' ' + translate['Follows you'] + '\n' + if movedTo: + newNickname = getNicknameFromActor(movedTo) + newDomain, newPort = getDomainFromActor(movedTo) + newDomainFull = getFullDomain(newDomain, newPort) + if newNickname and newDomain: + newHandle = newNickname + '@' + newDomainFull + htmlStr += ' ' + translate['New account'] + \ + ': < a href="' + movedTo + '">@' + newHandle + '
' + translate['New account'] + \ + ': < a href="' + movedTo + '">@' + newHandle + '
' + profileDescriptionShort + '
', '') avatarDescription = avatarDescription.replace('
Account Suspended
See Terms of Service
' + \ @@ -289,6 +295,7 @@ def updateAvatarImageCache(session, baseDir: str, httpPrefix: str, 'jpg': 'jpeg', 'jpeg': 'jpeg', 'gif': 'gif', + 'svg': 'svg+xml', 'webp': 'webp', 'avif': 'avif' } @@ -521,7 +528,8 @@ def getRightImageFile(baseDir: str, nickname, domain, theme) -def htmlHeaderWithExternalStyle(cssFilename: str, lang='en') -> str: +def htmlHeaderWithExternalStyle(cssFilename: str, instanceTitle: str, + lang='en') -> str: htmlStr = '\n' htmlStr += '\n' htmlStr += '