Compare commits
2 commits
8d91ec78a6
...
ac1678bfa8
Author | SHA1 | Date | |
---|---|---|---|
ac1678bfa8 | |||
642dbe5270 |
1 changed files with 1 additions and 22 deletions
|
@ -167,11 +167,6 @@ impl Member {
|
||||||
.and(fdsl::uuid2.eq(users::uuid))
|
.and(fdsl::uuid2.eq(users::uuid))
|
||||||
.or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))),
|
.or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))),
|
||||||
)
|
)
|
||||||
.order_by(coalesce(
|
|
||||||
dsl::nickname,
|
|
||||||
users::display_name,
|
|
||||||
users::username,
|
|
||||||
))
|
|
||||||
.select((
|
.select((
|
||||||
MemberBuilder::as_select(),
|
MemberBuilder::as_select(),
|
||||||
UserBuilder::as_select(),
|
UserBuilder::as_select(),
|
||||||
|
@ -206,11 +201,6 @@ impl Member {
|
||||||
.and(fdsl::uuid2.eq(users::uuid))
|
.and(fdsl::uuid2.eq(users::uuid))
|
||||||
.or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))),
|
.or(fdsl::uuid2.eq(me.uuid).and(fdsl::uuid1.eq(users::uuid)))),
|
||||||
)
|
)
|
||||||
.order_by(coalesce(
|
|
||||||
dsl::nickname,
|
|
||||||
users::display_name,
|
|
||||||
users::username,
|
|
||||||
))
|
|
||||||
.select((
|
.select((
|
||||||
MemberBuilder::as_select(),
|
MemberBuilder::as_select(),
|
||||||
UserBuilder::as_select(),
|
UserBuilder::as_select(),
|
||||||
|
@ -222,11 +212,6 @@ impl Member {
|
||||||
(member, user) = dsl::guild_members
|
(member, user) = dsl::guild_members
|
||||||
.filter(dsl::uuid.eq(uuid))
|
.filter(dsl::uuid.eq(uuid))
|
||||||
.inner_join(users::table)
|
.inner_join(users::table)
|
||||||
.order_by(coalesce(
|
|
||||||
dsl::nickname,
|
|
||||||
users::display_name,
|
|
||||||
users::username,
|
|
||||||
))
|
|
||||||
.select((MemberBuilder::as_select(), UserBuilder::as_select()))
|
.select((MemberBuilder::as_select(), UserBuilder::as_select()))
|
||||||
.get_result(conn)
|
.get_result(conn)
|
||||||
.await?;
|
.await?;
|
||||||
|
@ -283,13 +268,7 @@ impl Member {
|
||||||
.await,
|
.await,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
let member_count: i64 = dsl::guild_members
|
let pages = Member::count(conn, guild_uuid).await? as f32 / per_page as f32;
|
||||||
.filter(dsl::guild_uuid.eq(guild_uuid))
|
|
||||||
.count()
|
|
||||||
.get_result(conn)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let pages = member_count as f32 / per_page as f32;
|
|
||||||
|
|
||||||
let mut members = Pagination::<Member> {
|
let mut members = Pagination::<Member> {
|
||||||
objects: Vec::with_capacity(member_builders.len()),
|
objects: Vec::with_capacity(member_builders.len()),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue