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

Show who sent calendar entry

merge-requests/30/head
Bob Mottram 2021-03-06 18:12:43 +00:00
parent beba75f9bc
commit 6b89f77ce6
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -11472,7 +11472,8 @@ class PubServer(BaseHTTPRequestHandler):
if htmlGET and usersInPath: if htmlGET and usersInPath:
if '/calendar' in self.path: if '/calendar' in self.path:
# show the calendar screen # show the calendar screen
msg = htmlCalendar(self.server.cssCache, msg = htmlCalendar(self.server.personCache,
self.server.cssCache,
self.server.translate, self.server.translate,
self.server.baseDir, self.path, self.server.baseDir, self.path,
self.server.httpPrefix, self.server.httpPrefix,

16
webapp_calendar.py
View File

@ -10,6 +10,7 @@ import os
from datetime import datetime from datetime import datetime
from datetime import date from datetime import date
from shutil import copyfile from shutil import copyfile
from utils import getDisplayName
from utils import getConfigParam from utils import getConfigParam
from utils import getNicknameFromActor from utils import getNicknameFromActor
from utils import getDomainFromActor from utils import getDomainFromActor
@ -94,7 +95,7 @@ def htmlCalendarDeleteConfirm(cssCache: {}, translate: {}, baseDir: str,
return deletePostStr return deletePostStr
def _htmlCalendarDay(cssCache: {}, translate: {}, def _htmlCalendarDay(personCache: {}, cssCache: {}, translate: {},
baseDir: str, path: str, baseDir: str, path: str,
year: int, monthNumber: int, dayNumber: int, year: int, monthNumber: int, dayNumber: int,
nickname: str, domain: str, dayEvents: [], nickname: str, domain: str, dayEvents: [],
@ -134,6 +135,12 @@ def _htmlCalendarDay(cssCache: {}, translate: {},
eventDescription = None eventDescription = None
eventPlace = None eventPlace = None
postId = None postId = None
# get display name from sending actor
senderName = ''
if eventPost.get('actor'):
actor = eventPost['actor']
senderName = '<a href="' + actor + '">' + \
getDisplayName(baseDir, actor, personCache) + '</a>: '
# get the time place and description # get the time place and description
for ev in eventPost: for ev in eventPost:
if ev['type'] == 'Event': if ev['type'] == 'Event':
@ -145,7 +152,7 @@ def _htmlCalendarDay(cssCache: {}, translate: {},
"%Y-%m-%dT%H:%M:%S%z") "%Y-%m-%dT%H:%M:%S%z")
eventTime = eventDate.strftime("%H:%M").strip() eventTime = eventDate.strftime("%H:%M").strip()
if ev.get('name'): if ev.get('name'):
eventDescription = ev['name'].strip() eventDescription = senderName + ev['name'].strip()
elif ev['type'] == 'Place': elif ev['type'] == 'Place':
if ev.get('name'): if ev.get('name'):
eventPlace = ev['name'] eventPlace = ev['name']
@ -200,7 +207,7 @@ def _htmlCalendarDay(cssCache: {}, translate: {},
return calendarStr return calendarStr
def htmlCalendar(cssCache: {}, translate: {}, def htmlCalendar(personCache: {}, cssCache: {}, translate: {},
baseDir: str, path: str, baseDir: str, path: str,
httpPrefix: str, domainFull: str, httpPrefix: str, domainFull: str,
textModeBanner: str) -> str: textModeBanner: str) -> str:
@ -259,7 +266,8 @@ def htmlCalendar(cssCache: {}, translate: {},
if events: if events:
if events.get(str(dayNumber)): if events.get(str(dayNumber)):
dayEvents = events[str(dayNumber)] dayEvents = events[str(dayNumber)]
return _htmlCalendarDay(cssCache, translate, baseDir, path, return _htmlCalendarDay(personCache, cssCache,
translate, baseDir, path,
year, monthNumber, dayNumber, year, monthNumber, dayNumber,
nickname, domain, dayEvents, nickname, domain, dayEvents,
monthName, actor) monthName, actor)

2
webapp_profile.py
View File

@ -1757,7 +1757,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
# danger zone section # danger zone section
editProfileForm += ' <details><summary class="cw">' + \ editProfileForm += ' <details><summary class="cw">' + \
translate['Danger Zone'] + '</summary>\n' translate['Danger Zone'] + '</summary>\n'
editProfileForm += ' <div class="container">\n' editProfileForm += ' <div class="container">\n'
editProfileForm += ' <b><label class="labels">' + \ editProfileForm += ' <b><label class="labels">' + \
translate['Danger Zone'] + '</label></b><br>\n' translate['Danger Zone'] + '</label></b><br>\n'