ruma / synapse-admin-api

Ruma API declarations for the synapse admin API
MIT License
8 stars 5 forks source link

add endpoint /_synapse/admin/v2/users/:user_id #5

Closed jamtwister closed 3 years ago

jamtwister commented 3 years ago
jplatte commented 3 years ago

Given the low number of endpoints, I also think that we probably don't need any module nesting below v1 / v2. The shared UserInformation type could just live in v2. WDYT?

jamtwister commented 3 years ago

I am fine with that. Will move it

jamtwister commented 3 years ago

Like this? Create die module v2 inside the files.

jplatte commented 3 years ago

Could you please rebase this (git rebase main from your branch)? The diff shows a bunch of things that are already in the main branch, making this hard to review.

jamtwister commented 3 years ago

rebase done

jplatte commented 3 years ago

Okay, maybe your local main branch was outdated, since nothing really changed. Can you try git rebase origin/main?

jamtwister commented 3 years ago

main should have be up to date. done git rebase origin/main, but I think there are no changes. I cannot see changes which are not already in main anymore???

jamtwister commented 3 years ago

I think I kown now what happend. Some how my different git identities and configs (of a totaly differen project) were mixed up. Within that config the IDE created a merge commit when I rebase from main.