Merge branch 'move_views_to_diesel' into remove_travis_and_federation_docker

This commit is contained in:
Dessalines 2021-01-13 14:20:21 -05:00
commit 15c5e5c502
11 changed files with 27 additions and 17 deletions

View File

@ -78,6 +78,7 @@ steps:
password:
from_secret: docker_password
repo: dessalines/lemmy
auto_tag: true
when:
ref:
- refs/tags/*

View File

@ -3,8 +3,11 @@ name = "lemmy_server"
version = "0.0.1"
edition = "2018"
#[profile.release]
#lto = true
[profile.dev]
debug = 0
[profile.release]
lto = true
[workspace]
members = [

View File

@ -1 +1 @@
v0.8.10
0.9.0-rc.4

View File

@ -17,7 +17,7 @@ services:
- iframely
lemmy-ui:
image: dessalines/lemmy-ui:v0.8.10
image: dessalines/lemmy-ui:0.9.0-rc.4
ports:
- "1235:1234"
restart: always

View File

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

View File

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

2
docs

@ -1 +1 @@
Subproject commit 93ede3dd623a40f408baf70d68dd868ea5163c53
Subproject commit cf3236bb620048897048027d8cdff34401ad85ee

View File

@ -152,7 +152,7 @@ impl Perform for CreateComment {
comment_view.comment.read = true;
}
let res = CommentResponse {
let mut res = CommentResponse {
comment_view,
recipient_ids,
form_id: data.form_id.to_owned(),
@ -164,6 +164,8 @@ impl Perform for CreateComment {
websocket_id,
});
res.recipient_ids = Vec::new(); // Necessary to avoid doubles
Ok(res)
}
}

View File

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

View File

@ -321,7 +321,12 @@ impl<'a> CommentQueryBuilder<'a> {
if let Some(recipient_id) = self.recipient_id {
query = query
// TODO needs lots of testing
.filter(user_alias_1::id.eq(recipient_id))
.filter(user_alias_1::id.eq(recipient_id)) // Gets the comment replies
.or_filter(
comment::parent_id
.is_null()
.and(post::creator_id.eq(recipient_id)),
) // Gets the top level replies
.filter(comment::deleted.eq(false))
.filter(comment::removed.eq(false));
}

View File

@ -335,6 +335,7 @@ impl ChatServer {
// Send it to the post room
let mut comment_post_sent = comment_reply_sent.clone();
// Remove the recipients here to separate mentions / user messages from post or community comments
comment_post_sent.recipient_ids = Vec::new();
self.send_post_room_message(
user_operation,
@ -352,8 +353,6 @@ impl ChatServer {
websocket_id,
)?;
// Remove the form id here to separate mentions / user messages from post or community comments
comment_reply_sent.form_id = None;
// Send it to the recipient(s) including the mentioned users
for recipient_id in &comment_reply_sent.recipient_ids {
self.send_user_room_message(