Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

First pass on fixes

Browse source
This commit is contained in:
Piotr Osiewicz 2025-08-19 14:23:59 +02:00
parent 5826d89b97
commit 2f3be75fc7
269 changed files with 1593 additions and 2574 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/collab/src/api/events.rs
View file

@ -149,8 +149,8 @@ pub async fn post_crash(
"crash report"
);
if let Some(kinesis_client) = app.kinesis_client.clone() {
if let Some(stream) = app.config.kinesis_stream.clone() {
if let Some(kinesis_client) = app.kinesis_client.clone()
&& let Some(stream) = app.config.kinesis_stream.clone() {
let properties = json!({
"app_version": report.header.app_version,
"os_version": report.header.os_version,
@ -178,7 +178,6 @@ pub async fn post_crash(
.await
.log_err();
}
}
if let Some(slack_panics_webhook) = app.config.slack_panics_webhook.clone() {
let payload = slack::WebhookBody::new(|w| {
@ -359,8 +358,8 @@ pub async fn post_panic(
"panic report"
);
if let Some(kinesis_client) = app.kinesis_client.clone() {
if let Some(stream) = app.config.kinesis_stream.clone() {
if let Some(kinesis_client) = app.kinesis_client.clone()
&& let Some(stream) = app.config.kinesis_stream.clone() {
let properties = json!({
"app_version": panic.app_version,
"os_name": panic.os_name,
@ -387,7 +386,6 @@ pub async fn post_panic(
.await
.log_err();
}
}
if !report_to_slack(&panic) {
return Ok(());
@ -518,8 +516,8 @@ pub async fn post_events(
let first_event_at = chrono::Utc::now()
- chrono::Duration::milliseconds(last_event.milliseconds_since_first_event);
if let Some(kinesis_client) = app.kinesis_client.clone() {
if let Some(stream) = app.config.kinesis_stream.clone() {
if let Some(kinesis_client) = app.kinesis_client.clone()
&& let Some(stream) = app.config.kinesis_stream.clone() {
let mut request = kinesis_client.put_records().stream_name(stream);
let mut has_records = false;
for row in for_snowflake(
@ -542,8 +540,7 @@ pub async fn post_events(
if has_records {
request.send().await.log_err();
}
}
};
};
Ok(())
}

4
crates/collab/src/api/extensions.rs
View file

@ -337,8 +337,7 @@ async fn fetch_extensions_from_blob_store(
if known_versions
.binary_search_by_key(&published_version, |known_version| known_version)
.is_err()
{
if let Some(extension) = fetch_extension_manifest(
&& let Some(extension) = fetch_extension_manifest(
blob_store_client,
blob_store_bucket,
extension_id,
@ -352,7 +351,6 @@ async fn fetch_extensions_from_blob_store(
.or_default()
.push(extension);
}
}
}
}

5
crates/collab/src/auth.rs
View file

@ -79,8 +79,8 @@ pub async fn validate_header<B>(mut req: Request<B>, next: Next<B>) -> impl Into
verify_access_token(access_token, user_id, &state.db).await
};
if let Ok(validate_result) = validate_result {
if validate_result.is_valid {
if let Ok(validate_result) = validate_result
&& validate_result.is_valid {
let user = state
.db
.get_user_by_id(user_id)
@ -100,7 +100,6 @@ pub async fn validate_header<B>(mut req: Request<B>, next: Next<B>) -> impl Into
};
return Ok::<_, Error>(next.run(req).await);
}
}
Err(Error::http(
StatusCode::UNAUTHORIZED,

10
crates/collab/src/db/queries/extensions.rs
View file

@ -87,11 +87,10 @@ impl Database {
continue;
};
if let Some((_, max_extension_version)) = &max_versions.get(&version.extension_id) {
if max_extension_version > &extension_version {
if let Some((_, max_extension_version)) = &max_versions.get(&version.extension_id)
&& max_extension_version > &extension_version {
continue;
}
}
if let Some(constraints) = constraints {
if !constraints
@ -331,11 +330,10 @@ impl Database {
.exec_without_returning(&*tx)
.await?;
if let Ok(db_version) = semver::Version::parse(&extension.latest_version) {
if db_version >= latest_version.version {
if let Ok(db_version) = semver::Version::parse(&extension.latest_version)
&& db_version >= latest_version.version {
continue;
}
}
let mut extension = extension.into_active_model();
extension.latest_version = ActiveValue::Set(latest_version.version.to_string());

5
crates/collab/src/db/queries/projects.rs
View file

@ -1321,11 +1321,10 @@ impl Database {
.await?;
let mut connection_ids = HashSet::default();
if let Some(host_connection) = project.host_connection().log_err() {
if !exclude_dev_server {
if let Some(host_connection) = project.host_connection().log_err()
&& !exclude_dev_server {
connection_ids.insert(host_connection);
}
}
while let Some(collaborator) = collaborators.next().await {
let collaborator = collaborator?;

24
crates/collab/src/rpc.rs
View file

@ -616,11 +616,10 @@ impl Server {
}
}
if let Some(live_kit) = livekit_client.as_ref() {
if delete_livekit_room {
if let Some(live_kit) = livekit_client.as_ref()
&& delete_livekit_room {
live_kit.delete_room(livekit_room).await.trace_err();
}
}
}
}
@ -1015,8 +1014,8 @@ impl Server {
inviter_id: UserId,
invitee_id: UserId,
) -> Result<()> {
if let Some(user) = self.app_state.db.get_user_by_id(inviter_id).await? {
if let Some(code) = &user.invite_code {
if let Some(user) = self.app_state.db.get_user_by_id(inviter_id).await?
&& let Some(code) = &user.invite_code {
let pool = self.connection_pool.lock();
let invitee_contact = contact_for_user(invitee_id, false, &pool);
for connection_id in pool.user_connection_ids(inviter_id) {
@ -1036,13 +1035,12 @@ impl Server {
)?;
}
}
}
Ok(())
}
pub async fn invite_count_updated(self: &Arc<Self>, user_id: UserId) -> Result<()> {
if let Some(user) = self.app_state.db.get_user_by_id(user_id).await? {
if let Some(invite_code) = &user.invite_code {
if let Some(user) = self.app_state.db.get_user_by_id(user_id).await?
&& let Some(invite_code) = &user.invite_code {
let pool = self.connection_pool.lock();
for connection_id in pool.user_connection_ids(user_id) {
self.peer.send(
@ -1057,7 +1055,6 @@ impl Server {
)?;
}
}
}
Ok(())
}
@ -1101,11 +1098,10 @@ fn broadcast<F>(
F: FnMut(ConnectionId) -> anyhow::Result<()>,
{
for receiver_id in receiver_ids {
if Some(receiver_id) != sender_id {
if let Err(error) = f(receiver_id) {
if Some(receiver_id) != sender_id
&& let Err(error) = f(receiver_id) {
tracing::error!("failed to send to {:?} {}", receiver_id, error);
}
}
}
}
@ -2294,12 +2290,10 @@ async fn update_language_server(
let db = session.db().await;
if let Some(proto::update_language_server::Variant::MetadataUpdated(update)) = &request.variant
{
if let Some(capabilities) = update.capabilities.clone() {
&& let Some(capabilities) = update.capabilities.clone() {
db.update_server_capabilities(project_id, request.language_server_id, capabilities)
.await?;
}
}
let project_connection_ids = db
.project_connection_ids(project_id, session.connection_id, true)

5
crates/collab/src/tests/random_project_collaboration_tests.rs
View file

@ -1162,8 +1162,8 @@ impl RandomizedTest for ProjectCollaborationTest {
Some((project, cx))
});
if !guest_project.is_disconnected(cx) {
if let Some((host_project, host_cx)) = host_project {
if !guest_project.is_disconnected(cx)
&& let Some((host_project, host_cx)) = host_project {
let host_worktree_snapshots =
host_project.read_with(host_cx, |host_project, cx| {
host_project
@ -1235,7 +1235,6 @@ impl RandomizedTest for ProjectCollaborationTest {
);
}
}
}
for buffer in guest_project.opened_buffers(cx) {
let buffer = buffer.read(cx);

18
crates/collab/src/tests/randomized_test_helpers.rs
View file

@ -198,12 +198,11 @@ pub async fn run_randomized_test<T: RandomizedTest>(
}
pub fn save_randomized_test_plan() {
if let Some(serialize_plan) = LAST_PLAN.lock().take() {
if let Some(path) = plan_save_path() {
if let Some(serialize_plan) = LAST_PLAN.lock().take()
&& let Some(path) = plan_save_path() {
eprintln!("saved test plan to path {:?}", path);
std::fs::write(path, serialize_plan()).unwrap();
}
}
}
impl<T: RandomizedTest> TestPlan<T> {
@ -290,11 +289,9 @@ impl<T: RandomizedTest> TestPlan<T> {
if let StoredOperation::Client {
user_id, batch_id, ..
} = operation
{
if batch_id == current_batch_id {
&& batch_id == current_batch_id {
return Some(user_id);
}
}
None
}));
user_ids.sort_unstable();
@ -366,11 +363,9 @@ impl<T: RandomizedTest> TestPlan<T> {
},
applied,
) = stored_operation
{
if user_id == &current_user_id {
&& user_id == &current_user_id {
return Some((operation.clone(), applied.clone()));
}
}
}
None
} else {
@ -550,12 +545,11 @@ impl<T: RandomizedTest> TestPlan<T> {
.unwrap();
let pool = server.connection_pool.lock();
for contact in contacts {
if let db::Contact::Accepted { user_id, busy, .. } = contact {
if user_id == removed_user_id {
if let db::Contact::Accepted { user_id, busy, .. } = contact
&& user_id == removed_user_id {
assert!(!pool.is_user_online(user_id));
assert!(!busy);
}
}
}
}

5
crates/collab/src/user_backfiller.rs
View file

@ -130,8 +130,8 @@ impl UserBackfiller {
.and_then(|value| value.parse::<i64>().ok())
.and_then(|value| DateTime::from_timestamp(value, 0));
if rate_limit_remaining == Some(0) {
if let Some(reset_at) = rate_limit_reset {
if rate_limit_remaining == Some(0)
&& let Some(reset_at) = rate_limit_reset {
let now = Utc::now();
if reset_at > now {
let sleep_duration = reset_at - now;
@ -142,7 +142,6 @@ impl UserBackfiller {
self.executor.sleep(sleep_duration.to_std().unwrap()).await;
}
}
}
response
.error_for_status()