Merge branch 'master' into mobile

Freegle · Dec 30, 2019 · dc840ad · dc840ad
2 parents 044c950 + f694d8b
commit dc840ad
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 14 deletions.
diff --git a/http/js/iznik/views/pages/user/newsfeed.js b/http/js/iznik/views/pages/user/newsfeed.js
@@ -1448,14 +1448,39 @@ define([
               }
             }
 
-            var replies = self.model.get('replies')
-            self.replies = new Iznik.Collections.Replies(replies)
+            var origreplies = self.model.get('replies')
+            var replies = []
+            var users = [];
+
             self.contributors = []
-            _.each(replies, function (reply) {
-              if (reply.user) {
-                self.contributors[reply.user.id] = reply.user.displayname
+
+            function unnest(origreplies) {
+              _.each(origreplies, function(reply) {
+                replies.push(reply)
+
+                if (reply.user) {
+                  self.contributors[reply.user.id] = reply.user.displayname
+                  users[reply.user.id] = reply.user
+                }
+
+                if (reply.replies && reply.replies.length) {
+                  // In the new version of FD we have nested replies.  Make sure we at least display these (flattened) in
+                  // this version.
+                  unnest(reply.replies)
+                }
+              })
+            }
+
+            unnest(origreplies)
+            console.log("Replies", replies)
+
+            for (var i = 0; i < replies.length; i++) {
+              if (!replies[i].user && replies[i].userid) {
+                replies[i].user = users[replies[i].userid]
               }
-            })
+            }
+
+            self.replies = new Iznik.Collections.Replies(replies)
 
             var replyel = self.$('.js-replies')
 

diff --git a/http/js/iznik/views/pages/user/pages.js b/http/js/iznik/views/pages/user/pages.js
@@ -325,14 +325,16 @@ define([
                         self.listenToOnce(Iznik.Session, 'isLoggedIn', function (loggedIn) {
                             // We have some groups near their chosen location.
                             var mygroups = Iznik.Session.get('groups');
-                            mygroups.each(function(group) {
-                                if (group.get('type') == 'Freegle' &&
-                                    group.get('privategroup')) {
-                                    // We are a member of a private group.  That should appear at the top.
-                                    groups.append('<option value="' + group.get('id') + '" />');
-                                    groups.find('option:last').text(group.get('namedisplay'));
-                                }
-                            });
+                            if (mygroups) {
+                                mygroups.each(function(group) {
+                                    if (group.get('type') == 'Freegle' &&
+                                      group.get('privategroup')) {
+                                        // We are a member of a private group.  That should appear at the top.
+                                        groups.append('<option value="' + group.get('id') + '" />');
+                                        groups.find('option:last').text(group.get('namedisplay'));
+                                    }
+                                });
+                            }
 
                             var homegroup = null;
                             var homegrouptime = null;

diff --git a/http/template/modtools/user/logentry.html b/http/template/modtools/user/logentry.html
@@ -55,6 +55,8 @@
             Outcome for #{{msgid}}: {{text}}
             <% } else if (subtype == 'Autoapproved') { %>
             Auto-approved #{{msgid}} - either Yahoo problems or not moderated
+            <% } else if (subtype == 'WorryWords') { %>
+            Message #{{msgid}} {{text}}
             <% } else { %>
                     <div class="text-muted">Unknown log type {{type}} subtype {{subtype}}</div>
             <% } %>