merge: upstream

packages/backend/src/core/MfmService.ts

@@ -276,9 +276,18 @@ export class MfmService {
 			},
 
 			fn: (node) => {
-				const el = doc.createElement('i');
-				appendChildren(node.children, el);
-				return el;
+				if (node.props.name === 'unixtime') {
+					const text = node.children[0]!.type === 'text' ? node.children[0].props.text : '';
+					const date = new Date(parseInt(text, 10) * 1000);
+					const el = doc.createElement('time');
+					el.setAttribute('datetime', date.toISOString());
+					el.textContent = date.toISOString();
+					return el;
+				} else {
+					const el = doc.createElement('i');
+					appendChildren(node.children, el);
+					return el;
+				}
 			},
 
 			blockCode: (node) => {

packages/backend/src/core/NoteCreateService.ts

@@ -696,11 +696,13 @@ export class NoteCreateService implements OnApplicationShutdown {
 				followeeId: user.id,
 				notify: 'normal',
 			}).then(followings => {
-				for (const following of followings) {
-					// TODO: ワードミュート考慮
-					this.notificationService.createNotification(following.followerId, 'note', {
-						noteId: note.id,
-					}, user.id);
+				if (note.visibility !== 'specified') {
+					for (const following of followings) {
+						// TODO: ワードミュート考慮
+						this.notificationService.createNotification(following.followerId, 'note', {
+							noteId: note.id,
+						}, user.id);
+					}
 				}
 			});
 		}

packages/backend/src/core/activitypub/ApRendererService.ts

@@ -485,7 +485,7 @@ export class ApRendererService {
 		const attachment = profile.fields.map(field => ({
 			type: 'PropertyValue',
 			name: field.name,
-			value: /^https?:/.test(field.value)
+			value: (field.value.startsWith('http://') || field.value.startsWith('https://'))
 				? `<a href="${new URL(field.value).href}" rel="me nofollow noopener" target="_blank">${new URL(field.value).href}</a>`
 				: field.value,
 		}));