Merge branch 'master' into develop

public/src/client/topic.js

@@ -358,7 +358,6 @@ define('forum/topic', [
 						const postContent = link.parents('[component="topic"]').find('[component="post/content"]').first();
 						const postRect = postContent.offset();
 						const postWidth = postContent.width();
-						const linkRect = link.offset();
 						const { top } = link.get(0).getBoundingClientRect();
 						const dropup = top > window.innerHeight / 2;
 						tooltip.on('mouseenter', function () {
@@ -366,11 +365,16 @@ define('forum/topic', [
 						});
 						tooltip.one('mouseleave', destroyTooltip);
 						$(window).off('click', onClickOutside).one('click', onClickOutside);
-						tooltip.css({
-							top: dropup ? linkRect.top - tooltip.outerHeight() : linkRect.top + 30,
+						const css = {
 							left: postRect.left,
 							width: postWidth,
-						});
+						};
+						if (dropup) {
+							css.bottom = window.innerHeight - top - window.scrollY + 5;
+						} else {
+							css.top = top + window.scrollY + 30;
+						}
+						tooltip.css(css);
 					}
 				}
 

src/activitypub/mocks.js

@@ -104,7 +104,7 @@ Mocks._normalize = async (object) => {
 	if (image) {
 		const parsed = new URL(image);
 		const type = mime.getType(parsed.pathname);
-		if (!type || type.startsWith('image/')) {
+		if (!type || !type.startsWith('image/')) {
 			activitypub.helpers.log(`[activitypub/mocks.post] Received image not identified as image due to MIME type: ${image}`);
 			image = null;
 		}