Merge pull request #5368 from gitbutlerapp/e-branch-1

Align gravatar images and refresh the branch listing on commit changes

Author: estib-vega

apps/desktop/src/lib/branches/branchListing.ts

@@ -63,6 +63,18 @@ export class BranchListingService {
 		return store;
 	}
 
+	/**
+	 * Refresh the information for a particular branch.
+	 *
+	 * Will only fetch the information if the branch is already being tracked.
+	 */
+	refreshBranchListingDetails(branchName: string) {
+		if (!this.branchListingDetails.has(branchName)) {
+			return;
+		}
+		this.updateBranchListing(branchName);
+	}
+
 	private accumulatedBranchListings: string[] = [];
 	private updateBranchListingTimeout: ReturnType<typeof setTimeout> | undefined;
 	// Accumulates multiple update calls
@@ -341,6 +353,8 @@ export class Author {
 	name?: string | undefined;
 	/** The email of the author as configured in the git config */
 	email?: string | undefined;
+	/** The gravatar id of the author */
+	gravatarUrl?: string | undefined;
 }
 
 /** Represents a fat struct with all the data associated with a branch */

apps/desktop/src/lib/commit/CommitCard.svelte

@@ -104,7 +104,7 @@
 			console.error('Unable to undo commit');
 			return;
 		}
-		branchController.undoCommit(branch.id, commit.id);
+		branchController.undoCommit(branch.id, branch.name, commit.id);
 	}
 
 	let isUndoable = commit instanceof DetailedCommit && type !== 'remote';

apps/desktop/src/lib/commit/CommitDialog.svelte

@@ -33,6 +33,7 @@
 		try {
 			await branchController.commitBranch(
 				$branch.id,
+				$branch.name,
 				message.trim(),
 				$selectedOwnership.toString(),
 				$runCommitHooks

apps/desktop/src/lib/commit/StackingCommitCard.svelte

@@ -104,7 +104,7 @@
 			console.error('Unable to undo commit');
 			return;
 		}
-		branchController.undoCommit(branch.id, commit.id);
+		branchController.undoCommit(branch.id, branch.name, commit.id);
 	}
 
 	let isUndoable = commit instanceof DetailedCommit && type !== 'remote';

apps/desktop/src/lib/navigation/BranchListingSidebarEntry.svelte

@@ -100,7 +100,7 @@
 				branchListingDetails.authors.map(async (author) => {
 					return {
 						name: author.name || unknownName,
-						srcUrl: await gravatarUrlFromEmail(author.email || unknownEmail)
+						srcUrl: author.gravatarUrl ?? (await gravatarUrlFromEmail(author.email || unknownEmail))
 					};
 				})
 			);

apps/desktop/src/lib/vbranches/branchController.ts

@@ -3,6 +3,7 @@ import { showError, showToast } from '$lib/notifications/toasts';
 import * as toasts from '$lib/utils/toasts';
 import posthog from 'posthog-js';
 import type { BaseBranchService } from '$lib/baseBranch/baseBranchService';
+import type { BranchListingService } from '$lib/branches/branchListing';
 import type { RemoteBranchService } from '$lib/stores/remoteBranches';
 import type { BranchPushResult, ForgeIdentifier, Hunk, LocalFile, StackOrder } from './types';
 import type { VirtualBranchService } from './virtualBranch';
@@ -14,7 +15,8 @@ export class BranchController {
 		readonly projectId: string,
 		readonly vbranchService: VirtualBranchService,
 		readonly remoteBranchService: RemoteBranchService,
-		readonly baseBranchService: BaseBranchService
+		readonly baseBranchService: BaseBranchService,
+		private readonly branchListingService: BranchListingService
 	) {}
 
 	async setTarget(branch: string, pushRemote: string | undefined = undefined) {
@@ -51,19 +53,21 @@ export class BranchController {
 	}
 
 	async commitBranch(
-		branch: string,
+		branchId: string,
+		branchName: string,
 		message: string,
 		ownership: string | undefined = undefined,
 		runHooks = false
 	) {
 		try {
 			await invoke<void>('commit_virtual_branch', {
 				projectId: this.projectId,
-				branch,
+				branch: branchId,
 				message,
 				ownership,
 				runHooks: runHooks
 			});
+			this.branchListingService.refreshBranchListingDetails(branchName);
 			posthog.capture('Commit Successful');
 		} catch (err: any) {
 			if (err.code === 'errors.commit.signing_failed') {
@@ -543,13 +547,14 @@ export class BranchController {
 		}
 	}
 
-	async undoCommit(branchId: string, commitOid: string) {
+	async undoCommit(branchId: string, branchName: string, commitOid: string) {
 		try {
 			await invoke<void>('undo_commit', {
 				projectId: this.projectId,
 				branchId,
 				commitOid
 			});
+			this.branchListingService.refreshBranchListingDetails(branchName);
 		} catch (err: any) {
 			showError('Failed to amend commit', err);
 		}

apps/desktop/src/routes/[projectId]/+layout.ts

@@ -79,7 +79,8 @@ export const load: LayoutLoad = async ({ params, parent }) => {
 		projectId,
 		vbranchService,
 		remoteBranchService,
-		baseBranchService
+		baseBranchService,
+		branchListingService
 	);
 
 	const branchDragActionsFactory = new BranchDragActionsFactory(branchController);

crates/gitbutler-branch-actions/src/author.rs

@@ -1,5 +1,8 @@
+use bstr::ByteSlice;
 use serde::Serialize;
 
+use crate::gravatar::gravatar_url_from_email;
+
 #[derive(Debug, Serialize, Hash, Clone, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct Author {
@@ -13,11 +16,7 @@ impl From<git2::Signature<'_>> for Author {
         let name = value.name().unwrap_or_default().to_string();
         let email = value.email().unwrap_or_default().to_string();
 
-        let gravatar_url = url::Url::parse(&format!(
-            "https://www.gravatar.com/avatar/{:x}?s=100&r=g&d=retro",
-            md5::compute(email.to_lowercase())
-        ))
-        .unwrap();
+        let gravatar_url = gravatar_url_from_email(email.as_str()).unwrap();
 
         Author {
             name,
@@ -26,3 +25,15 @@ impl From<git2::Signature<'_>> for Author {
         }
     }
 }
+
+impl From<gix::actor::SignatureRef<'_>> for Author {
+    fn from(value: gix::actor::SignatureRef<'_>) -> Self {
+        let gravatar_url = gravatar_url_from_email(&value.email.to_str_lossy()).unwrap();
+
+        Author {
+            name: value.name.to_owned().to_string(),
+            email: value.email.to_owned().to_string(),
+            gravatar_url,
+        }
+    }
+}

crates/gitbutler-branch-actions/src/branch.rs

@@ -1,3 +1,4 @@
+use crate::gravatar::gravatar_url_from_email;
 use crate::{RemoteBranchFile, VirtualBranchesExt};
 use anyhow::{bail, Context, Result};
 use bstr::{BStr, ByteSlice};
@@ -421,26 +422,48 @@ pub struct BranchListing {
 
 /// Represents a "commit author" or "signature", based on the data from the git history
 #[derive(Debug, Clone, Serialize, PartialEq, Eq, Hash)]
+#[serde(rename_all = "camelCase")]
 pub struct Author {
     /// The name of the author as configured in the git config
     pub name: Option<BStringForFrontend>,
     /// The email of the author as configured in the git config
     pub email: Option<BStringForFrontend>,
+
+    pub gravatar_url: Option<BStringForFrontend>,
 }
 
 impl From<git2::Signature<'_>> for Author {
     fn from(value: git2::Signature) -> Self {
         let name = value.name().map(str::to_string).map(Into::into);
         let email = value.email().map(str::to_string).map(Into::into);
-        Author { name, email }
+
+        let gravatar_url = match value.email() {
+            Some(email) => gravatar_url_from_email(email)
+                .map(|url| url.as_ref().into())
+                .ok(),
+            None => None,
+        };
+
+        Author {
+            name,
+            email,
+            gravatar_url,
+        }
     }
 }
 
 impl From<gix::actor::SignatureRef<'_>> for Author {
     fn from(value: gix::actor::SignatureRef<'_>) -> Self {
+        let gravatar_url = {
+            gravatar_url_from_email(&value.email.to_str_lossy())
+                .map(|url| url.as_ref().into())
+                .ok()
+        };
+
         Author {
             name: Some(value.name.to_owned().into()),
             email: Some(value.email.to_owned().into()),
+            gravatar_url,
         }
     }
 }

crates/gitbutler-branch-actions/src/gravatar.rs

@@ -0,0 +1,9 @@
+use anyhow::Result;
+
+pub fn gravatar_url_from_email(email: &str) -> Result<url::Url> {
+    let gravatar_url = format!(
+        "https://www.gravatar.com/avatar/{:x}?s=100&r=g&d=retro",
+        md5::compute(email.to_lowercase())
+    );
+    url::Url::parse(gravatar_url.as_str()).map_err(Into::into)
+}