Browse Source

Merge pull request #4147 from pixelfed/staging

Staging
daniel 2 years ago
parent
commit
922da916b7

+ 1 - 0
CHANGELOG.md

@@ -92,6 +92,7 @@
 - Update Like model, increase rate limit to 500 likes per day ([ab7676f9](https://github.com/pixelfed/pixelfed/commit/ab7676f9))
 - Update ComposeController, fix validation issue ([80e6a5a9](https://github.com/pixelfed/pixelfed/commit/80e6a5a9))
 - Update reply view, fix visibility filtering ([d419af4b](https://github.com/pixelfed/pixelfed/commit/d419af4b))
+- Update AP helpers, ingest attachments in replies ([c504e643](https://github.com/pixelfed/pixelfed/commit/c504e643))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

+ 3 - 0
app/Util/ActivityPub/Helpers.php

@@ -496,6 +496,9 @@ class Helpers {
 		if($reply_to == null) {
 			self::importNoteAttachment($activity, $status);
 		} else {
+			if(isset($activity['attachment']) && !empty($activity['attachment'])) {
+				self::importNoteAttachment($activity, $status);
+			}
 			StatusReplyPipeline::dispatch($status);
 		}
 

BIN
public/js/daci.chunk.4e49bec856ffd88e.js


BIN
public/js/daci.chunk.fc282ba63a43593c.js


BIN
public/js/discover~findfriends.chunk.53fdd18a929791f0.js


BIN
public/js/discover~findfriends.chunk.cc989090c726b4b0.js


BIN
public/js/discover~memories.chunk.1cb17840dc8aea5f.js


BIN
public/js/discover~memories.chunk.fe415377e8207e21.js


BIN
public/js/discover~myhashtags.chunk.618830aef5559bf1.js


BIN
public/js/discover~myhashtags.chunk.8cbed746da3c3307.js


BIN
public/js/discover~serverfeed.chunk.88749601266fb795.js


BIN
public/js/discover~serverfeed.chunk.a24b7b8c20612b1b.js


BIN
public/js/discover~settings.chunk.4fbc8bb8149db211.js


BIN
public/js/discover~settings.chunk.9e385ba7c7242192.js


BIN
public/js/home.chunk.8c3769fdc92892bd.js


BIN
public/js/home.chunk.c5608f771be873ca.js


BIN
public/js/manifest.js


BIN
public/js/post.chunk.02abe63d47f8d51e.js


BIN
public/js/post.chunk.a99f16eef68087b8.js


BIN
public/js/profile.chunk.cdad3298b78ff083.js


BIN
public/js/profile.chunk.eb0b0c1747789bd3.js


BIN
public/mix-manifest.json