Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-07 12:28:59 +01:00
parent 7d59e25fbd 6d7daf6154
commit abcba5c198
59 changed files with 873 additions and 467 deletions
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -49,6 +49,8 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
      'Application'
    elsif object.bot?
      'Service'
+    elsif object.group?
+      'Group'
    else
      'Person'
    end