@freakazoid Twidere can do this. Everything in one timeline, with colour codings. It can include twitter too. I used to use it. But it's not a great fedi client, since it's aimed at twitter. And it's slow, sluggish and unstable.
I'd love #Tusky to support this too! 🙂