···154154 let mut stmt = conn.prepare(
155155 r#"
156156 SELECT
157157- date_trunc('day', created_at) AS date,
158158- COUNT(DISTINCT scrobbles.created_at) AS count
159159- FROM
160160- scrobbles
161161- WHERE
162162- created_at BETWEEN ? AND ?
163163- GROUP BY
164164- date_trunc('day', created_at)
165165- ORDER BY
166166- date;
157157+ date_trunc('day', s.created_at) AS date,
158158+ COUNT(DISTINCT (u.did, s.created_at)) AS count
159159+ FROM scrobbles s
160160+ JOIN users u ON u.id = s.user_id
161161+ WHERE s.created_at BETWEEN ? AND ?
162162+ GROUP BY 1
163163+ ORDER BY 1;
167164 "#,
168165 )?;
169166 let scrobbles = stmt.query_map([start, end], |row| {