| |
@@ -4,7 +4,9 @@
|
| |
import collections
|
| |
import datetime
|
| |
import requests
|
| |
+ from collections import OrderedDict as ordereddict
|
| |
|
| |
+ import hubs.models
|
| |
from hubs.utils import validators
|
| |
from hubs.utils.text import markup
|
| |
from hubs.widgets.base import Widget
|
| |
@@ -24,6 +26,7 @@
|
| |
validator=validators.Integer,
|
| |
help="The number of meetings to display.",
|
| |
)]
|
| |
+ hub_types = ["team", "stream"]
|
| |
|
| |
def get_template_environment(self):
|
| |
env = super(Meetings, self).get_template_environment()
|
| |
@@ -37,14 +40,18 @@
|
| |
def get_context(self, instance, *args, **kwargs):
|
| |
get_meetings = GetMeetings(instance)
|
| |
now = datetime.datetime.utcnow()
|
| |
+ results = get_meetings()
|
| |
meetings = {
|
| |
title: meeting
|
| |
- for title, meeting in get_meetings().items()
|
| |
+ for title, meeting in results["meetings"].items()
|
| |
if meeting['start_dt'] > now
|
| |
}
|
| |
+ meetings = ordereddict(sorted(meetings.items(),
|
| |
+ key=lambda x: x[1]["start_dt"]))
|
| |
return dict(
|
| |
- calendar=instance.hub.config.get("calendar"),
|
| |
+ calendars=results["calendars"],
|
| |
meetings=meetings,
|
| |
+ hub_type=instance.hub.hub_type,
|
| |
)
|
| |
|
| |
|
| |
@@ -53,33 +60,66 @@
|
| |
TOPIC = ".fedocal.calendar."
|
| |
invalidate_on_hub_config_change = True
|
| |
|
| |
+ def __init__(self, instance):
|
| |
+ self.instance = instance
|
| |
+ # there is no way to invalidate the cache if a
|
| |
+ # different hub config changes. Since streams
|
| |
+ # calendar pulls from the hubs the user is a member
|
| |
+ # of, we just invalidate the cache for streams.
|
| |
+ self.invalidate()
|
| |
+ if self.instance.hub.hub_type == "stream":
|
| |
+ self.invalidate()
|
| |
+
|
| |
def execute(self):
|
| |
calendar = self.instance.hub.config.get("calendar")
|
| |
+ calendars = []
|
| |
if calendar is None:
|
| |
- return {}
|
| |
- n_meetings = self.instance.config.get("n_meetings", 4)
|
| |
- base = ('https://apps.fedoraproject.org/calendar/api/meetings/'
|
| |
- '?calendar=%s')
|
| |
- url = base % calendar
|
| |
- response = requests.get(url).json()
|
| |
-
|
| |
- tmp = collections.defaultdict(list)
|
| |
- for meeting in response['meetings']:
|
| |
- if meeting.get('meeting_information_html'):
|
| |
- meeting['meeting_information_html'] = markup(
|
| |
- meeting['meeting_information'])
|
| |
- tmp[meeting['meeting_name']].append(meeting)
|
| |
-
|
| |
+ if self.instance.hub.hub_type == "stream":
|
| |
+ username = self.instance.hub.name
|
| |
+ user = hubs.models.User.by_username(username)
|
| |
+ for hub in user.memberships:
|
| |
+ if hub.name != username:
|
| |
+ c = hub.config.get("calendar")
|
| |
+ # if a hub admin adds a calendar, then removes it
|
| |
+ # the calendar value is '' rather than null. This
|
| |
+ # works around that.
|
| |
+ if c != '':
|
| |
+ calendars.append(hub.config.get("calendar"))
|
| |
+ if calendars is []:
|
| |
+ calendars = None
|
| |
+ else:
|
| |
+ calendars = None
|
| |
+ else:
|
| |
+ # if a hub admin adds a calendar, then removes it
|
| |
+ # the calendar value is '' rather than null. This
|
| |
+ # works around that.
|
| |
+ if calendar != '':
|
| |
+ calendars.append(calendar)
|
| |
meetings = {}
|
| |
- for title, items in tmp.items():
|
| |
- selected = next_meeting(items)
|
| |
- if not selected:
|
| |
- continue
|
| |
- meetings[title] = selected
|
| |
- if len(meetings) >= n_meetings:
|
| |
- break
|
| |
-
|
| |
- return meetings
|
| |
+ if calendars:
|
| |
+ for c in calendars:
|
| |
+ n_meetings = self.instance.config.get("n_meetings", 4)
|
| |
+ base = ('https://apps.fedoraproject.org/calendar/api/meetings/'
|
| |
+ '?calendar=%s')
|
| |
+ url = base % c
|
| |
+ response = requests.get(url).json()
|
| |
+
|
| |
+ tmp = collections.defaultdict(list)
|
| |
+ for meeting in response['meetings']:
|
| |
+ if meeting.get('meeting_information_html'):
|
| |
+ meeting['meeting_information_html'] = markup(
|
| |
+ meeting['meeting_information'])
|
| |
+ tmp[meeting['meeting_name']].append(meeting)
|
| |
+
|
| |
+ for title, items in tmp.items():
|
| |
+ selected = next_meeting(items)
|
| |
+ if not selected:
|
| |
+ continue
|
| |
+ meetings[title] = selected
|
| |
+ if len(meetings) >= n_meetings:
|
| |
+ break
|
| |
+
|
| |
+ return {"meetings": meetings, "calendars": calendars}
|
| |
|
| |
def should_invalidate(self, message):
|
| |
if self.TOPIC not in message["topic"]:
|
| |
abompard commented 6 years ago
There are two calls to
invalidate()here.However I'm thinking of a different approach. It will be common for widgets on stream pages to invalidate when the user hub config changes, since that's where the config is. So it should be centralized. I would recommend the following change:
diff --git a/hubs/models/hub.py b/hubs/models/hub.py index f09dbfdc..db58e228 100644 --- a/hubs/models/hub.py +++ b/hubs/models/hub.py @@ -214,7 +214,10 @@ class Hub(ObjectAuthzMixin, BASE): hubs.defaults.add_stream_widgets(self) def on_updated(self, old_config): - for widget_instance in self.widgets: + widgets = self.widgets + if self.hub_type == "user": + widgets.extend(Hub.by_name(self.name, "stream").widgets) + for widget_instance in widgets: if not widget_instance.enabled: continue widget = widget_instance.moduleThis way stream widgets that have asked to be reloaded on (user) hub config change will be reloaded too.