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

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

main
Bob Mottram 2020-07-19 10:18:05 +01:00
parent 33f4d4e16f f85c08ac54
commit d31867c4b6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
daemon.py
View File

@ -1319,7 +1319,7 @@ class PubServer(BaseHTTPRequestHandler):
return return
# get fonts # get fonts
if htmlGET and '/fonts/' in self.path: if '/fonts/' in self.path:
fontStr = self.path.split('/fonts/')[1] fontStr = self.path.split('/fonts/')[1]
if fontStr.endswith('.otf') or \ if fontStr.endswith('.otf') or \
fontStr.endswith('.ttf') or \ fontStr.endswith('.ttf') or \
@ -1349,8 +1349,8 @@ class PubServer(BaseHTTPRequestHandler):
return return
else: else:
if os.path.isfile(fontFilename): if os.path.isfile(fontFilename):
with open(fontFilename, 'rb') as avFile: with open(fontFilename, 'rb') as fontFile:
fontBinary = avFile.read() fontBinary = fontFile.read()
self._set_headers_etag(fontFilename, self._set_headers_etag(fontFilename,
fontType, fontType,
fontBinary, cookie, fontBinary, cookie,
@ -1736,6 +1736,7 @@ class PubServer(BaseHTTPRequestHandler):
'/emoji/' not in self.path and \ '/emoji/' not in self.path and \
'/tags/' not in self.path and \ '/tags/' not in self.path and \
'/avatars/' not in self.path and \ '/avatars/' not in self.path and \
'/fonts/' not in self.path and \
'/icons/' not in self.path: '/icons/' not in self.path:
divertToLoginScreen = True divertToLoginScreen = True
if self.path.startswith('/users/'): if self.path.startswith('/users/'):

2
epicyon-notification
View File

@ -265,7 +265,7 @@ function notifications {
cp "$epicyonFollowFile" "$epicyonFollowNotificationsFile" cp "$epicyonFollowFile" "$epicyonFollowNotificationsFile"
chown ${PROJECT_NAME}:${PROJECT_NAME} "$epicyonFollowNotificationsFile" chown ${PROJECT_NAME}:${PROJECT_NAME} "$epicyonFollowNotificationsFile"
epicyonFollowMessage=$(notification_translate_text "New follow request")" ${EPICYON_DOMAIN_NAME}/users/${USERNAME}" epicyonFollowMessage=$(notification_translate_text "New follow request")" ${EPICYON_DOMAIN_NAME}/users/${USERNAME}/followers"
sendNotification "$USERNAME" "Epicyon" "$epicyonFollowMessage" sendNotification "$USERNAME" "Epicyon" "$epicyonFollowMessage"
fi fi
fi fi

5
webinterface.py
View File

@ -2247,7 +2247,7 @@ def getFontFromCss(css: str) -> (str, str):
""" """
if ' url(' not in css: if ' url(' not in css:
return None, None return None, None
fontName = css.split(" url('")[1].split("')")[0] fontName = css.split(" url(")[1].split(")")[0].replace("'", '')
fontFormat = css.split(" format('")[1].split("')")[0] fontFormat = css.split(" format('")[1].split("')")[0]
return fontName, fontFormat return fontName, fontFormat
@ -2699,8 +2699,7 @@ def htmlProfile(defaultTimeline: str,
httpPrefix + '://' + \ httpPrefix + '://' + \
followerHandle.split('@')[1] + \ followerHandle.split('@')[1] + \
'/users/' + followerHandle.split('@')[0] '/users/' + followerHandle.split('@')[0]
basePath = httpPrefix + '://' + domainFull + \ basePath = '/users/' + nickname
'/users/' + nickname
followApprovalsSection += '<div class="container">' followApprovalsSection += '<div class="container">'
followApprovalsSection += \ followApprovalsSection += \
'<a href="' + followerActor + '">' '<a href="' + followerActor + '">'