Fix tags url in tags array

VernissageApp · Sep 25, 2024 · cf163e6 · cf163e6
1 parent 9ef1491
commit cf163e6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/Sources/VernissageServer/Controllers/ActivityPubActorsController.swift b/Sources/VernissageServer/Controllers/ActivityPubActorsController.swift
@@ -113,17 +113,17 @@ struct ActivityPubActorsController {
     ///     "summary": "#iOS/#dotNET developer, #Apple  fanboy, 📷 aspiring photographer",
     ///     "tag": [
     ///         {
-    ///             "href": "https://example.com/hashtag/Apple",
+    ///             "href": "https://example.com/tags/Apple",
     ///             "name": "Apple",
     ///             "type": "Hashtag"
     ///         },
     ///         {
-    ///             "href": "https://example.com/hashtag/dotNET",
+    ///             "href": "https://example.com/tags/dotNET",
     ///             "name": "dotNET",
     ///             "type": "Hashtag"
     ///         },
     ///         {
-    ///             "href": "https://example.com/hashtag/iOS",
+    ///             "href": "https://example.com/tags/iOS",
     ///             "name": "iOS",
     ///             "type": "Hashtag"
     ///         }
@@ -178,7 +178,7 @@ struct ActivityPubActorsController {
                                   endpoints: PersonEndpointsDto(sharedInbox: "\(baseAddress)/shared/inbox"),
                                   attachment: attachments.map({ PersonAttachmentDto(name: $0.key ?? "",
                                                                                     value: $0.htmlValue(baseAddress: baseAddress)) }),
-                                  tag: hashtags.map({ PersonHashtagDto(type: .hashtag, name: $0.hashtag, href: "\(baseAddress)/hashtag/\($0.hashtag)") })
+                                  tag: hashtags.map({ PersonHashtagDto(type: .hashtag, name: $0.hashtag, href: "\(baseAddress)/tags/\($0.hashtag)") })
         )
 
         return try await personDto.encodeActivityResponse(for: request)
@@ -580,12 +580,12 @@ struct ActivityPubActorsController {
     ///     "sensitive": false,
     ///     "tag": [
     ///         {
-    ///             "href": "https://vernissage.photos/hashtag/blackandwhite",
+    ///             "href": "https://vernissage.photos/tags/blackandwhite",
     ///             "name": "#blackandwhite",
     ///             "type": "Hashtag"
     ///         },
     ///         {
-    ///             "href": "https://vernissage.photos/hashtag/streetphotography",
+    ///             "href": "https://vernissage.photos/tags/streetphotography",
     ///             "name": "#streetphotography",
     ///             "type": "Hashtag"
     ///         }

diff --git a/Sources/VernissageServer/Controllers/TimelinesController.swift b/Sources/VernissageServer/Controllers/TimelinesController.swift
@@ -427,7 +427,7 @@ struct TimelinesController {
     ///             "tags": [
     ///                 {
     ///                     "name": "street",
-    ///                     "url": "https://vernissage.photos/hashtag/street"
+    ///                     "url": "https://vernissage.photos/tags/street"
     ///                 }
     ///             ],
     ///             "updatedAt": "2024-02-10T06:16:39.852Z",

diff --git a/Sources/VernissageServer/Controllers/TrendingController.swift b/Sources/VernissageServer/Controllers/TrendingController.swift
@@ -302,31 +302,31 @@ struct TrendingController {
     ///     "data": [
     ///         {
     ///             "name": "analogvibes",
-    ///             "url": "https://vernissage.photos/hashtag/analogvibes"
+    ///             "url": "https://vernissage.photos/tags/analogvibes"
     ///         },
     ///         {
     ///             "name": "experimentalfilm",
-    ///             "url": "https://vernissage.photos/hashtag/experimentalfilm"
+    ///             "url": "https://vernissage.photos/tags/experimentalfilm"
     ///         },
     ///         {
     ///             "name": "fomapan100",
-    ///             "url": "https://vernissage.photos/hashtag/fomapan100"
+    ///             "url": "https://vernissage.photos/tags/fomapan100"
     ///         },
     ///         {
     ///             "name": "fotoperiodismo",
-    ///             "url": "https://vernissage.photos/hashtag/fotoperiodismo"
+    ///             "url": "https://vernissage.photos/tags/fotoperiodismo"
     ///         },
     ///         {
     ///             "name": "mediumformatfilm",
-    ///             "url": "https://vernissage.photos/hashtag/mediumformatfilm"
+    ///             "url": "https://vernissage.photos/tags/mediumformatfilm"
     ///         },
     ///         {
     ///             "name": "photography",
-    ///             "url": "https://vernissage.photos/hashtag/photography"
+    ///             "url": "https://vernissage.photos/tags/photography"
     ///         },
     ///         {
     ///             "name": "portrait",
-    ///             "url": "https://vernissage.photos/hashtag/portrait"
+    ///             "url": "https://vernissage.photos/tags/portrait"
     ///         }
     ///     ],
     ///     "maxId": "7333887748636758017",
@@ -353,7 +353,7 @@ struct TrendingController {
 
         let trending = try await trendingService.hashtags(on: request.db, linkableParams: linkableParams, period: period.translate())
         let hashtagDtos = await trending.data.asyncMap({
-            HashtagDto(url: "\(baseAddress)/hashtag/\($0.hashtag)", name: $0.hashtag)
+            HashtagDto(url: "\(baseAddress)/tags/\($0.hashtag)", name: $0.hashtag)
         })
 
         return LinkableResultDto(

diff --git a/Sources/VernissageServer/DataTransferObjects/StatusDto.swift b/Sources/VernissageServer/DataTransferObjects/StatusDto.swift
@@ -202,7 +202,7 @@ extension StatusDto {
             activityPubId: status.activityPubId,
             activityPubUrl: status.activityPubUrl,
             attachments: attachments,
-            tags: status.hashtags.map({ HashtagDto(url: "\(baseAddress)/hashtag/\($0.hashtag)", name: $0.hashtag) }),
+            tags: status.hashtags.map({ HashtagDto(url: "\(baseAddress)/tags/\($0.hashtag)", name: $0.hashtag) }),
             reblog: reblog,
             category: CategoryDto(from: status.category),
             application: status.application,

diff --git a/Tests/ActivityPubKitTests/ActivityDtoDeserialization.swift b/Tests/ActivityPubKitTests/ActivityDtoDeserialization.swift
@@ -223,7 +223,7 @@ struct ActivityDtoDeserialization {
     "summary": "Test summary",
     "tag": [
         {
-            "href": "https://example.com/hashtag/Apple",
+            "href": "https://example.com/tags/Apple",
             "name": "Apple",
             "type": "Emoji"
         }