Compare commits

..

No commits in common. "4ae0a16457260f01b9021b6f0aaa726129a730c9" and "6a6c2da5842faf71a29cae6accd6583d7c6a1d47" have entirely different histories.

2 changed files with 3 additions and 21 deletions

View File

@ -144,24 +144,6 @@ export async function handle(rcMessage: RcMessage): Promise<void> {
) )
return return
} }
const roomCreatorId = (
await axios.get(`/_synapse/admin/v1/rooms/${room_id}`)
).data.creator
if (!roomCreatorId) {
log.warn(
`Could not determine room creator for room ${room_id}, using admin credentials.`
)
}
log.warn(
`Room creator ${roomCreatorId}.`
)
if (roomCreatorId == matrixUser) {
log.warn(
`Room creator left room ${room_id}, skipping to prevent being unable to rejoin.`
)
return
}
log.http(`User ${matrixUser} leaves room ${room_id}`) log.http(`User ${matrixUser} leaves room ${room_id}`)
await axios.post( await axios.post(

View File

@ -84,8 +84,8 @@ async function registerUser(user: MatrixUser): Promise<AccessToken> {
async function getUserData(user: MatrixUser): Promise<UserInfo> { async function getUserData(user: MatrixUser): Promise<UserInfo> {
return (await axios.get('/_synapse/admin/v2/users/@' + user.username + ":" + getUserDomain())).data return (await axios.get('/_synapse/admin/v2/users/@' + user.username + ":" + getUserDomain())).data
} }
async function loginUser(user: MatrixUser): Promise<AccessToken> { async function getUserLogin(user: MatrixUser): Promise<AccessToken> {
return (await axios.post('/_synapse/admin/v1/users/@' + user.username + ":" + getUserDomain() + "/login")).data return (await axios.get('/_synapse/admin/v1/users/@' + user.username + ":" + getUserDomain() + "/login")).data
} }
async function parseUserMemberships(rcUser: RcUser): Promise<void> { async function parseUserMemberships(rcUser: RcUser): Promise<void> {
@ -143,7 +143,7 @@ export async function createUser(rcUser: RcUser): Promise<MatrixUser> {
user.user_id = userData.name user.user_id = userData.name
user.displayname = userData.displayname user.displayname = userData.displayname
user.admin = user.admin || userData.admin user.admin = user.admin || userData.admin
const accessToken = await loginUser(user) const accessToken = await getUserLogin(user)
user.access_token = accessToken.access_token user.access_token = accessToken.access_token
log.info(`User ${rcUser.username} exists:`, user) log.info(`User ${rcUser.username} exists:`, user)
} else { } else {