diff --git a/d2m/actions/create-room.test.js b/d2m/actions/create-room.test.js index 93f9203..e40bf6f 100644 --- a/d2m/actions/create-room.test.js +++ b/d2m/actions/create-room.test.js @@ -5,34 +5,7 @@ const {kstateStripConditionals} = require("../../matrix/kstate") const {test} = require("supertape") const testData = require("../../test/data") -const passthrough = require("../../passthrough") -const {db} = passthrough - -test("channel2room: discoverable privacy room", async t => { - db.prepare("UPDATE guild_space SET privacy_level = 2").run() - t.deepEqual( - kstateStripConditionals(await channelToKState(testData.channel.general, testData.guild.general).then(x => x.channelKState)), - Object.assign({}, testData.room.general, { - "m.room.guest_access/": {guest_access: "forbidden"}, - "m.room.join_rules/": {join_rule: "public"}, - "m.room.history_visibility/": {history_visibility: "world_readable"} - }) - ) -}) - -test("channel2room: linkable privacy room", async t => { - db.prepare("UPDATE guild_space SET privacy_level = 1").run() - t.deepEqual( - kstateStripConditionals(await channelToKState(testData.channel.general, testData.guild.general).then(x => x.channelKState)), - Object.assign({}, testData.room.general, { - "m.room.guest_access/": {guest_access: "forbidden"}, - "m.room.join_rules/": {join_rule: "public"} - }) - ) -}) - -test("channel2room: invite-only privacy room", async t => { - db.prepare("UPDATE guild_space SET privacy_level = 0").run() +test("channel2room: general", async t => { t.deepEqual( kstateStripConditionals(await channelToKState(testData.channel.general, testData.guild.general).then(x => x.channelKState)), testData.room.general diff --git a/registration.example.yaml b/registration.example.yaml index 9e7cd2c..bad42fe 100644 --- a/registration.example.yaml +++ b/registration.example.yaml @@ -19,5 +19,4 @@ ooye: server_name: [the part after the colon in your matrix id, like cadence.moe] server_origin: [the full protocol and domain of your actual matrix server's location, with no trailing slash, like https://matrix.cadence.moe] invite: - # uncomment this to auto-invite the named user to newly created spaces and mark them as admin (PL 100) everywhere - # - @cadence:cadence.moe + # - @cadence:cadence.moe # uncomment this to auto-invite the named user to newly created spaces diff --git a/test/data.js b/test/data.js index c5a1f8e..4919beb 100644 --- a/test/data.js +++ b/test/data.js @@ -44,9 +44,6 @@ module.exports = { "m.room.power_levels/": { events: { "m.room.avatar": 0 - }, - users: { - "@test_auto_invite:example.org": 100 } }, "chat.schildi.hide_ui/read_receipts": {hidden: true}, diff --git a/test/test.js b/test/test.js index 5e15a14..280503d 100644 --- a/test/test.js +++ b/test/test.js @@ -14,7 +14,6 @@ const db = new sqlite(":memory:") const reg = require("../matrix/read-registration") reg.ooye.server_origin = "https://matrix.cadence.moe" // so that tests will pass even when hard-coded -reg.ooye.invite = ["@test_auto_invite:example.org"] const sync = new HeatSync({watchFS: false})