diff --git a/Changelog.md b/Changelog.md index c8fabc745..1aac93634 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,7 @@ ## Refactor * Cache local posts/comments count for statistics [#8241](https://github.com/diaspora/diaspora/pull/8241) * Fix html-syntax in some handlebars templates [#8251](https://github.com/diaspora/diaspora/pull/8251) +* Remove `chat_enabled` flag from archive export [#8265](https://github.com/diaspora/diaspora/pull/8265) ## Bug fixes diff --git a/app/serializers/export/aspect_serializer.rb b/app/serializers/export/aspect_serializer.rb index 938939ad9..478bef3fa 100644 --- a/app/serializers/export/aspect_serializer.rb +++ b/app/serializers/export/aspect_serializer.rb @@ -2,6 +2,6 @@ module Export class AspectSerializer < ActiveModel::Serializer - attributes :name, :chat_enabled + attributes :name end end diff --git a/lib/schemas/archive-format.json b/lib/schemas/archive-format.json index 9d839c5ac..79105232d 100644 --- a/lib/schemas/archive-format.json +++ b/lib/schemas/archive-format.json @@ -35,8 +35,7 @@ "items": { "type": "object", "properties": { - "name": { "type": "string" }, - "chat_enabled": { "type": "boolean" } + "name": { "type": "string" } }, "required": [ "name" diff --git a/spec/integration/exporter_spec.rb b/spec/integration/exporter_spec.rb index ac9bdbfd9..7794c07de 100644 --- a/spec/integration/exporter_spec.rb +++ b/spec/integration/exporter_spec.rb @@ -46,12 +46,10 @@ describe Diaspora::Exporter do user: { "contact_groups": [ { - "name": "generic", - "chat_enabled": false + "name": "generic" }, { - "name": "Work", - "chat_enabled": false + "name": "Work" } ] } diff --git a/spec/serializers/export/aspect_serializer_spec.rb b/spec/serializers/export/aspect_serializer_spec.rb index eba297f19..41ea5e874 100644 --- a/spec/serializers/export/aspect_serializer_spec.rb +++ b/spec/serializers/export/aspect_serializer_spec.rb @@ -6,8 +6,7 @@ describe Export::AspectSerializer do it "has aspect attributes" do expect(serializer.attributes).to eq( - name: aspect.name, - chat_enabled: aspect.chat_enabled + name: aspect.name ) end end