diff options
| author | Dennis Schubert <mail@dennis-schubert.de> | 2019-10-19 00:14:14 +0300 |
|---|---|---|
| committer | Dennis Schubert <mail@dennis-schubert.de> | 2019-10-19 00:14:14 +0300 |
| commit | 862fa38f8b4b4a2e96f1919807f20c33b5399d9e (patch) | |
| tree | 6e87b49f4d96125aa3f2996d5fce7f7d974b5878 /lib | |
| parent | 995f3394a86ae1df2814d8242771d44d86bf4bc0 (diff) | |
Remove the JSXC/Prosody integration.
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718, nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/archive_importer.rb | 2 | ||||
| -rw-r--r-- | lib/schemas/archive-format.json | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/archive_importer.rb b/lib/archive_importer.rb index c989c1b06..8eb3a2342 100644 --- a/lib/archive_importer.rb +++ b/lib/archive_importer.rb @@ -66,7 +66,7 @@ class ArchiveImporter def import_aspects contact_groups.each do |group| begin - user.aspects.create!(group.slice("name", "chat_enabled")) + user.aspects.create!(group.slice("name")) rescue ActiveRecord::RecordInvalid => e logger.warn "#{self}: #{e}" end diff --git a/lib/schemas/archive-format.json b/lib/schemas/archive-format.json index 77ef84fb2..0bb79017e 100644 --- a/lib/schemas/archive-format.json +++ b/lib/schemas/archive-format.json @@ -30,8 +30,7 @@ "items": { "type": "object", "properties": { - "name": { "type": "string" }, - "chat_enabled": { "type": "boolean" } + "name": { "type": "string" } }, "required": [ "name" |