From 34ddee3e401ba86b2909ba98d2d9e9f1272cbf9f Mon Sep 17 00:00:00 2001
From: xMartin <xmartin@siarp.de>
Date: Thu, 12 Sep 2019 03:07:16 +0200
Subject: [PATCH] update meetup widgets to API v3 - fixes #263

---
 _includes/_scripts.html |  1 +
 _layouts/city.html      |  4 ++--
 index.html              | 12 +++++++----
 scripts/widgets.js      | 46 +++++++++++++++++++++++++++--------------
 4 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/_includes/_scripts.html b/_includes/_scripts.html
index ba9bba3..03c5770 100644
--- a/_includes/_scripts.html
+++ b/_includes/_scripts.html
@@ -19,6 +19,7 @@
     {%comment%} city|jsonify does not work with collections. :( {%endcomment%}
     "{{meetup}}": {
       page: {{key | jsonify}},
+      isActive: !{{city.is_inactive | jsonify}}
     }{% unless forloop.last %},{% endunless %}
     {% endfor %}
     }
diff --git a/_layouts/city.html b/_layouts/city.html
index b600c0d..e4b5896 100644
--- a/_layouts/city.html
+++ b/_layouts/city.html
@@ -127,11 +127,11 @@ <h3>You?</h3>
 <script src="/scripts/widgets.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript" charset="utf-8">
    $(function() {
-    React.renderComponent(OTS.Widgets.UpcomingEventsPreview({teams: OTS.config.chapters, path:"events", page: 5, hideTeams: true, params: {group_urlname: '{{meetup}}'}}), document.getElementById('upcomingEvents'));
+    React.renderComponent(OTS.Widgets.UpcomingEventsPreview({teams: OTS.config.chapters, chapterNames: ['{{meetup}}'], page: 5, hideTeams: true}), document.getElementById('upcomingEvents'));
 
     React.renderComponent(OTS.Widgets.ChapterConversations({teams: OTS.config.chapters, path:"/category/chapters/{{key}}.json"}), document.getElementById('chapterConversations'));
 
-    React.renderComponent(OTS.Widgets.MembersCounter({path:"groups", params: {group_urlname: '{{meetup}}'}}), document.getElementById('membersCount'));
+    React.renderComponent(OTS.Widgets.MembersCounter({chapterName: '{{meetup}}'}), document.getElementById('membersCount'));
 
 
   {% if page.discourse_group %}
diff --git a/index.html b/index.html
index ac764da..f24d908 100644
--- a/index.html
+++ b/index.html
@@ -120,13 +120,17 @@ <h4>and</h4>
 <script src="/scripts/widgets.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript" charset="utf-8">
    $(function() {
+    var eventChapterNames = [];
+    for (var name in OTS.config.chapters) {
+      if (OTS.config.chapters[name].isActive) {
+        eventChapterNames.push(name);
+      }
+    }
     React.renderComponent(
       OTS.Widgets.UpcomingEventsPreview({
         teams: OTS.config.chapters,
-        page: 5,
-        params: {
-          text: 'opentechschool'
-        }
+        chapterNames: eventChapterNames,
+        page: 5
       }),
       document.getElementById('upcomingEvents')
     );
diff --git a/scripts/widgets.js b/scripts/widgets.js
index f16042d..2036652 100644
--- a/scripts/widgets.js
+++ b/scripts/widgets.js
@@ -45,7 +45,7 @@
         ]),
         React.DOM.div({className: "details"}, [
           React.DOM.h3({className: "title"},
-            React.DOM.a({href: cal_event.event_url}, cal_event.name)
+            React.DOM.a({href: cal_event.link}, cal_event.name)
           ),
           React.DOM.span({className: "venue"}, cal_event.venue ? cal_event.venue.name : "TBA"),
           this.props.hideTeams ? React.DOM.span() : React.DOM.span({className: "team", onClick: this.teamClicked}, cal_event.group.name.replace("OpenTechSchool", ""))
@@ -208,22 +208,35 @@
 
   var MeetupMixin = {
     componentWillMount: function() {
-      var params = $.extend({}, { key: meetupcom_key, sign: true, page: 200}, this.props.params ),
+      var params = $.extend({key: meetupcom_key, sign: true, page: 200}, this.props.params),
           path = this.props.path || 'open_events';
-      $.getJSON('https://api.meetup.com/2/' + path + '?callback=?', params).
-        then(function(data){
-          this.resultsReceived(data);
-        }.bind(this)
-      );
+      $.getJSON('https://api.meetup.com/2/' + path + '?callback=?', params)
+      .then(function(data){
+        this.resultsReceived(data);
+      }.bind(this));
     }
   };
 
 
   OTS.Widgets.UpcomingEventsPreview = React.createClass({
-    mixins: [MeetupMixin],
-
-    resultsReceived: function(data){
-      this.setState({events: this.props.page ? data.results.splice(0, this.props.page) : data.results});
+    componentWillMount: function() {
+      var requests = this.props.chapterNames.map(function (chapterName) {
+        return $.getJSON('https://api.meetup.com/' + chapterName + '/events?callback=?', {page: this.props.page});
+      }.bind(this));
+      Promise.all(requests)
+      .then(function(results) {
+        var events = [];
+        for (var i = 0; i < results.length; ++i) {
+          events = events.concat(results[i].data);
+        }
+        events.sort(function(a, b) {
+          return a.time < b.time ? -1 : 1;
+        });
+        if (this.props.page) {
+          events =  events.splice(0, this.props.page);
+        }
+        this.setState({events: events});
+      }.bind(this));
     },
 
     getInitialState: function() {
@@ -402,11 +415,12 @@
 
 
   OTS.Widgets.MembersCounter = React.createClass({
-    mixins: [MeetupMixin],
-
-    resultsReceived: function(data){
-      var group = data.results[0];
-      this.setState({members: group.members, who: group.who});
+    componentWillMount: function() {
+      $.getJSON('https://api.meetup.com/' + this.props.chapterName + '?callback=?')
+      .then(function(data) {
+        var group = data.data;
+        this.setState({members: group.members, who: group.who});
+      }.bind(this));
     },
 
     getInitialState: function() {