One could argue that we don't need both query_map and query_type since they are the same, except that query_map checks for an IntoIterator<Item=(String,String)> bound.

Yeah I would say we should only have the more general one. I wonder if another name would be more intuitive, too. But everything I've come up with so far seems awkward... query_all and query_flatten both seem suboptimal.

I agree that the name is not ideal. I got query_full or query_wrapper…

Hm, I guess query_all and query_full are least likely to be interpreted to mean sth. else? I'd be okay with either given we have nothing better.

Alright, I chose query_all

I might be a bit too late.
What I would think could also work and match the behaviour of: #[ruma_api(body)]
is to rename #[ruma_api(query)] to #[ruma_api(query_parameter)] and make #[ruma_api(query)] behave like query_full

But I guess this is too much of a breaking change.

query_object would also make sense imo

query_object also seems better than query_type, but I think it's less self-explanatory than query_all.

Thank you two for getting this merged so quickly!