Merge branch 'main' into move_views_to_diesel

ansible/VERSION

@@ -1 +1 @@
-v0.8.9
+v0.8.10

docker/dev/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - postgres
       - iframely
   lemmy-ui:
-    image: dessalines/lemmy-ui:v0.8.9
+    image: dessalines/lemmy-ui:v0.8.10
     ports:
       - "1235:1234"
     restart: always

docker/federation/docker-compose.yml

@@ -29,7 +29,7 @@ services:
       - ./volumes/pictrs_alpha:/mnt
 
   lemmy-alpha-ui:
-    image: dessalines/lemmy-ui:v0.8.9
+    image: dessalines/lemmy-ui:v0.8.10
     environment:
       - LEMMY_INTERNAL_HOST=lemmy-alpha:8541
       - LEMMY_EXTERNAL_HOST=localhost:8541
@@ -68,7 +68,7 @@ services:
       - ./volumes/postgres_alpha:/var/lib/postgresql/data
 
   lemmy-beta-ui:
-    image: dessalines/lemmy-ui:v0.8.9
+    image: dessalines/lemmy-ui:v0.8.10
     environment:
       - LEMMY_INTERNAL_HOST=lemmy-beta:8551
       - LEMMY_EXTERNAL_HOST=localhost:8551
@@ -107,7 +107,7 @@ services:
       - ./volumes/postgres_beta:/var/lib/postgresql/data
 
   lemmy-gamma-ui:
-    image: dessalines/lemmy-ui:v0.8.9
+    image: dessalines/lemmy-ui:v0.8.10
     environment:
       - LEMMY_INTERNAL_HOST=lemmy-gamma:8561
       - LEMMY_EXTERNAL_HOST=localhost:8561
@@ -147,7 +147,7 @@ services:
 
   # An instance with only an allowlist for beta
   lemmy-delta-ui:
-    image: dessalines/lemmy-ui:v0.8.9
+    image: dessalines/lemmy-ui:v0.8.10
     environment:
       - LEMMY_INTERNAL_HOST=lemmy-delta:8571
       - LEMMY_EXTERNAL_HOST=localhost:8571
@@ -187,7 +187,7 @@ services:
 
   # An instance who has a blocklist, with lemmy-alpha blocked
   lemmy-epsilon-ui:
-    image: dessalines/lemmy-ui:v0.8.9
+    image: dessalines/lemmy-ui:v0.8.10
     environment:
       - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581
       - LEMMY_EXTERNAL_HOST=localhost:8581

docker/prod/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.8.9
+    image: dessalines/lemmy:v0.8.10
     ports:
       - "127.0.0.1:8536:8536"
     restart: always
@@ -26,7 +26,7 @@ services:
       - iframely
 
   lemmy-ui:
-    image: dessalines/lemmy-ui:v0.8.9
+    image: dessalines/lemmy-ui:v0.8.10
     ports:
       - "1235:1234"
     restart: always

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.8.9
-docker push dessalines/lemmy:v0.8.9
+  dessalines/lemmy:v0.8.10
+docker push dessalines/lemmy:v0.8.10

docs/src/lemmy_council.md

@@ -28,7 +28,7 @@ Every week, the council should make a thread on Lemmy that details its activity
 
 At the same time, users can give feedback and suggestions in this thread. This should be taken into account by the council. Council members can call for a vote on any controversial issues, if they can't be resolved by discussion.
 
-## 2. Voting Process
+## 3. Voting Process
 
 Most of the time, we keep each other up to date through the Matrix chat, and take informal decisions on uncontroversial issues. For example, a user clearly violating the site rules could be banned by a single person, or ideally after discussing it with at least one other member.
 
@@ -76,3 +76,4 @@ General Contact [@LemmyDev Mastodon](https://mastodon.social/@LemmyDev)
 - [AgreeableLandscape](https://lemmy.ml/u/AgreeableLandscape)
 - [fruechtchen](https://lemmy.ml/u/fruechtchen)
 - [kixiQu](https://lemmy.ml/u/kixiQu)
+- [Karanja](https://baraza.africa/u/mwalimu)

lemmy_api/src/version.rs

@@ -1 +1 @@
-pub const VERSION: &str = "v0.8.9";
+pub const VERSION: &str = "v0.8.10";

lemmy_db/src/post_view.rs

@@ -280,7 +280,7 @@ impl<'a> PostQueryBuilder<'a> {
     if let Some(for_community_name) = self.for_community_name {
       query = query
         .filter(community_name.eq(for_community_name))
-        .filter(local.eq(true))
+        .filter(community_local.eq(true))
         .then_order_by(stickied.desc());
     }