Add s3address to public settings (for images preconnect link) (#149)

VernissageApp · Oct 17, 2024 · 13236fd · 13236fd
1 parent 5611624
commit 13236fd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Sources/VernissageServer/Controllers/SettingsController.swift b/Sources/VernissageServer/Controllers/SettingsController.swift
@@ -160,10 +160,14 @@ struct SettingsController {
         let settings = SettingsDto(basedOn: settingsFromDatabase)
         let webPushVapidPublicKey = settings.isWebPushEnabled ? settings.webPushVapidPublicKey : nil
 
+        let appplicationSettings = request.application.settings.cached
+        let s3Address = appplicationSettings?.s3Address
+
         let publicSettingsDto = PublicSettingsDto(webSentryDsn: webSentryDsn,
                                                   maximumNumberOfInvitations: settings.maximumNumberOfInvitations,
                                                   isOpenAIEnabled: settings.isOpenAIEnabled,
                                                   webPushVapidPublicKey: webPushVapidPublicKey,
+                                                  s3Address: s3Address,
                                                   patreonUrl: settings.patreonUrl,
                                                   mastodonUrl: settings.mastodonUrl,
                                                   totalCost: settings.totalCost,

diff --git a/Sources/VernissageServer/DataTransferObjects/PublicSettingsDto.swift b/Sources/VernissageServer/DataTransferObjects/PublicSettingsDto.swift
@@ -11,6 +11,7 @@ struct PublicSettingsDto {
     var maximumNumberOfInvitations: Int
     var isOpenAIEnabled: Bool
     var webPushVapidPublicKey: String?
+    var s3Address: String?
 
     var patreonUrl: String?
     var mastodonUrl: String?

diff --git a/Sources/VernissageServer/Services/ActivityPubService.swift b/Sources/VernissageServer/Services/ActivityPubService.swift
@@ -684,7 +684,7 @@ final class ActivityPubService: ActivityPubServiceType {
         let noteDto = try await self.downloadRemoteStatus(on: context, activityPubId: activityPubId)
 
         if noteDto.attachment?.contains(where: { $0.mediaType.starts(with: "image/") }) == false {
-            context.logger.error("Object doesn't contain any image media type attachments (status: \(noteDto.id).")
+            context.logger.warning("Object doesn't contain any image media type attachments (status: \(noteDto.id).")
             throw ActivityPubError.missingAttachments(activityPubId)
         }