Ensure all old public rooms have aliases

This commit is contained in:
Erik Johnston 2016-03-23 13:49:10 +00:00
parent b2802a1351
commit 84afeb41f3
2 changed files with 26 additions and 4 deletions

View File

@ -119,7 +119,8 @@ class RoomCreationHandler(BaseHandler):
invite_3pid_list = config.get("invite_3pid", []) invite_3pid_list = config.get("invite_3pid", [])
is_public = config.get("visibility", None) == "public" visibility = config.get("visibility", None)
is_public = visibility == "public"
# autogen room IDs and try to create it. We may clash, so just # autogen room IDs and try to create it. We may clash, so just
# try a few times till one goes through, giving up eventually. # try a few times till one goes through, giving up eventually.
@ -155,9 +156,9 @@ class RoomCreationHandler(BaseHandler):
preset_config = config.get( preset_config = config.get(
"preset", "preset",
RoomCreationPreset.PUBLIC_CHAT RoomCreationPreset.PRIVATE_CHAT
if is_public if visibility == "private"
else RoomCreationPreset.PRIVATE_CHAT else RoomCreationPreset.PUBLIC_CHAT
) )
raw_initial_state = config.get("initial_state", []) raw_initial_state = config.get("initial_state", [])

View File

@ -0,0 +1,21 @@
/* Copyright 2016 OpenMarket Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* This release removes the restriction that published rooms must have an alias,
* so we go back and ensure the only 'public' rooms are ones with an alias.*/
UPDATE rooms SET is_public = 0 WHERE is_public = 1 AND room_id not in (
SELECT room_id FROM room_aliases
);