Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

chore: minor code refactor (#6348)

Bobby Johna1c3061c6c53
diff --git a/server/api/v1/attachment_service_storage.go b/server/api/v1/attachment_service_storage.go
index 06e2663a7..cdd60c324 100644
--- a/server/api/v1/attachment_service_storage.go
+++ b/server/api/v1/attachment_service_storage.go
@@ -205,7 +205,16 @@ func hasSameManagedStorageObject(left, right *store.Attachment) bool {
return left.Reference != "" && left.Reference == right.Reference
case storepb.AttachmentStorageType_S3:
leftObject, rightObject := left.Payload.GetS3Object(), right.Payload.GetS3Object()
- return leftObject != nil && rightObject != nil && leftObject.Key != "" && leftObject.Key == rightObject.Key && leftObject.StorageId == rightObject.StorageId
+
+ if leftObject == nil || rightObject == nil {
+ return false
+ }
+
+ if leftObject.Key == "" || rightObject.Key == "" {
+ return false
+ }
+
+ return leftObject.Key == rightObject.Key && leftObject.StorageId == rightObject.StorageId
default:
return false
}