Browse Source

Fix community_view clippy

remove_user_content
Dessalines 1 year ago
parent
commit
abadc79756
  1. 2
      ansible/VERSION
  2. 2
      docker/prod/docker-compose.yml
  3. 4
      docker/travis/docker_push.sh
  4. 3
      server/lemmy_db/src/community_view.rs
  5. 2
      server/src/version.rs
  6. 2
      ui/package.json

2
ansible/VERSION

@ -1 +1 @@
v0.7.50
v0.7.51

2
docker/prod/docker-compose.yml

@ -12,7 +12,7 @@ services:
restart: always
lemmy:
image: dessalines/lemmy:v0.7.50
image: dessalines/lemmy:v0.7.51
ports:
- "127.0.0.1:8536:8536"
restart: always

4
docker/travis/docker_push.sh

@ -1,5 +1,5 @@
#!/bin/sh
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
docker tag dessalines/lemmy:travis \
dessalines/lemmy:v0.7.50
docker push dessalines/lemmy:v0.7.50
dessalines/lemmy:v0.7.51
docker push dessalines/lemmy:v0.7.51

3
server/lemmy_db/src/community_view.rs

@ -245,7 +245,8 @@ impl<'a> CommunityQueryBuilder<'a> {
.filter(user_id.is_null())
}
},
SortType::Hot | _ => {
// Covers all other sorts, including hot
_ => {
query = query
.order_by(hot_rank.desc())
.then_order_by(number_of_subscribers.desc())

2
server/src/version.rs

@ -1 +1 @@
pub const VERSION: &str = "v0.7.50";
pub const VERSION: &str = "v0.7.51";

2
ui/package.json

@ -73,7 +73,7 @@
"engineStrict": true,
"husky": {
"hooks": {
"pre-commit": "cargo clippy --manifest-path ../server/Cargo.toml --all-targets --workspace -- -D warnings && lint-staged"
"pre-commit": "cargo +nightly clippy --manifest-path ../server/Cargo.toml --all-targets --workspace -- -D warnings && lint-staged"
}
},
"lint-staged": {

Loading…
Cancel
Save