Merge branch 'develop' into pr/ThatOneCalculator/8764

.github/workflows/labeler.yml

@@ -1,6 +1,8 @@
 name: "Pull Request Labeler"
 on:
-- pull_request_target
+  pull_request_target:
+    branches-ignore:
+      - 'l10n_develop'
 
 jobs:
   triage:

CHANGELOG.md

@@ -26,7 +26,7 @@ You should also include the user name that made the change.
   Your own theme color may be unset if it was in an invalid format.
   Admins should check their instance settings if in doubt.
 - Perform port diagnosis at startup only when Listen fails @mei23
-- Rate limiting is now also usable for non-authenticated users. @Johann150
+- Rate limiting is now also usable for non-authenticated users. @Johann150 @mei23
   Admins should make sure the reverse proxy sets the `X-Forwarded-For` header to the original address.
 - Migrate to Yarn v3.2.0 @ThatOneCalculator
 
@@ -44,6 +44,7 @@ You should also include the user name that made the change.
 - Server: use correct order of attachments on notes @Johann150
 - Server: prevent crash when processing certain PNGs @syuilo
 - Server: Fix unable to generate video thumbnails @mei23
+- Server: Fix `Cannot find module` issue @mei23
 
 ## 12.110.1 (2022/04/23)
 

cypress/integration/basic.js

@@ -1,11 +1,6 @@
 describe('Before setup instance', () => {
 	beforeEach(() => {
-		cy.window(win => {
+		cy.resetState();
-			win.indexedDB.deleteDatabase('keyval-store');
-		});
-		cy.request('POST', '/api/reset-db').as('reset');
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 	});
 
 	afterEach(() => {
@@ -35,18 +30,10 @@ describe('Before setup instance', () => {
 
 describe('After setup instance', () => {
 	beforeEach(() => {
-		cy.window(win => {
+		cy.resetState();
-			win.indexedDB.deleteDatabase('keyval-store');
-		});
-		cy.request('POST', '/api/reset-db').as('reset');
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 
 		// インスタンス初期セットアップ
-		cy.request('POST', '/api/admin/accounts/create', {
+		cy.registerUser('admin', 'pass', true);
-			username: 'admin',
-			password: 'pass',
-		}).its('body').as('admin');
 	});
 
 	afterEach(() => {
@@ -76,24 +63,13 @@ describe('After setup instance', () => {
 
 describe('After user signup', () => {
 	beforeEach(() => {
-		cy.window(win => {
+		cy.resetState();
-			win.indexedDB.deleteDatabase('keyval-store');
-		});
-		cy.request('POST', '/api/reset-db').as('reset');
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 
 		// インスタンス初期セットアップ
-		cy.request('POST', '/api/admin/accounts/create', {
+		cy.registerUser('admin', 'pass', true);
-			username: 'admin',
-			password: 'pass',
-		}).its('body').as('admin');
 
 		// ユーザー作成
-		cy.request('POST', '/api/signup', {
+		cy.registerUser('alice', 'alice1234');
-			username: 'alice',
-			password: 'alice1234',
-		}).its('body').as('alice');
 	});
 
 	afterEach(() => {
@@ -138,34 +114,15 @@ describe('After user signup', () => {
 
 describe('After user singed in', () => {
 	beforeEach(() => {
-		cy.window(win => {
+		cy.resetState();
-			win.indexedDB.deleteDatabase('keyval-store');
-		});
-		cy.request('POST', '/api/reset-db').as('reset');
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 
 		// インスタンス初期セットアップ
-		cy.request('POST', '/api/admin/accounts/create', {
+		cy.registerUser('admin', 'pass', true);
-			username: 'admin',
-			password: 'pass',
-		}).its('body').as('admin');
 
 		// ユーザー作成
-		cy.request('POST', '/api/signup', {
+		cy.registerUser('alice', 'alice1234');
-			username: 'alice',
-			password: 'alice1234',
-		}).its('body').as('alice');
 
-		cy.visit('/');
+		cy.login('alice', 'alice1234');
-
-		cy.intercept('POST', '/api/signin').as('signin');
-
-		cy.get('[data-cy-signin]').click();
-		cy.get('[data-cy-signin-username] input').type('alice');
-		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
-
-		cy.wait('@signin').as('signedIn');
 	});
 
 	afterEach(() => {

cypress/integration/widgets.js

@@ -1,34 +1,15 @@
 describe('After user signed in', () => {
 	beforeEach(() => {
-		cy.window(win => {
+		cy.resetState();
-			win.indexedDB.deleteDatabase('keyval-store');
-		});
 		cy.viewport('macbook-16');
-		cy.request('POST', '/api/reset-db').as('reset');
-		cy.get('@reset').its('status').should('equal', 204);
-		cy.reload(true);
 
 		// インスタンス初期セットアップ
-		cy.request('POST', '/api/admin/accounts/create', {
+		cy.registerUser('admin', 'pass', true);
-			username: 'admin',
-			password: 'pass',
-		}).its('body').as('admin');
 
 		// ユーザー作成
-		cy.request('POST', '/api/signup', {
+		cy.registerUser('alice', 'alice1234');
-			username: 'alice',
-			password: 'alice1234',
-		}).its('body').as('alice');
 
-		cy.visit('/');
+		cy.login('alice', 'alice1234');
-
-		cy.intercept('POST', '/api/signin').as('signin');
-
-		cy.get('[data-cy-signin]').click();
-		cy.get('[data-cy-signin-username] input').type('alice');
-		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
-
-		cy.wait('@signin').as('signedIn');
 	});
 
 	afterEach(() => {

cypress/support/commands.js

@@ -23,3 +23,33 @@
 //
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+
+Cypress.Commands.add('resetState', () => {
+	cy.window(win => {
+		win.indexedDB.deleteDatabase('keyval-store');
+	});
+	cy.request('POST', '/api/reset-db').as('reset');
+	cy.get('@reset').its('status').should('equal', 204);
+	cy.reload(true);
+});
+
+Cypress.Commands.add('registerUser', (username, password, isAdmin = false) => {
+	const route = isAdmin ? '/api/admin/accounts/create' : '/api/signup';
+
+	cy.request('POST', route, {
+		username: username,
+		password: password,
+	}).its('body').as(username);
+});
+
+Cypress.Commands.add('login', (username, password) => {
+	cy.visit('/');
+
+	cy.intercept('POST', '/api/signin').as('signin');
+
+	cy.get('[data-cy-signin]').click();
+	cy.get('[data-cy-signin-username] input').type(username);
+	cy.get('[data-cy-signin-password] input').type(`${password}{enter}`);
+
+	cy.wait('@signin').as('signedIn');
+});

packages/backend/src/mfm/from-html.ts

@@ -6,6 +6,9 @@ const urlRegex     = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
 const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/;
 
 export function fromHtml(html: string, hashtagNames?: string[]): string {
+	// some AP servers like Pixelfed use br tags as well as newlines
+	html = html.replace(/<br\s?\/?>\r?\n/gi, '\n');
+
 	const dom = parse5.parseFragment(html);
 
 	let text = '';

packages/backend/src/misc/get-ip-hash.ts

@@ -0,0 +1,9 @@
+import IPCIDR from 'ip-cidr';
+
+export function getIpHash(ip: string) {
+	// because a single person may control many IPv6 addresses,
+	// only a /64 subnet prefix of any IP will be taken into account.
+	// (this means for IPv4 the entire address is used)
+	const prefix = IPCIDR.createAddress(ip).mask(64);
+	return 'ip-' + BigInt('0b' + prefix).toString(36);
+}

packages/backend/src/queue/index.ts

@@ -305,11 +305,13 @@ export default function() {
 	systemQueue.add('resyncCharts', {
 	}, {
 		repeat: { cron: '0 0 * * *' },
+		removeOnComplete: true,
 	});
 
 	systemQueue.add('cleanCharts', {
 	}, {
 		repeat: { cron: '0 0 * * *' },
+		removeOnComplete: true,
 	});
 
 	systemQueue.add('checkExpiredMutings', {

packages/backend/src/server/api/call.ts

@@ -6,7 +6,7 @@ import endpoints, { IEndpointMeta } from './endpoints.js';
 import { ApiError } from './error.js';
 import { apiLogger } from './logger.js';
 import { AccessToken } from '@/models/entities/access-token.js';
-import IPCIDR from 'ip-cidr';
+import { getIpHash } from '@/misc/get-ip-hash.js';
 
 const accessDenied = {
 	message: 'Access denied.',
@@ -33,18 +33,13 @@ export default async (endpoint: string, user: CacheableLocalUser | null | undefi
 		throw new ApiError(accessDenied);
 	}
 
-	if (ep.meta.requireCredential && ep.meta.limit && !isModerator) {
+	if (ep.meta.limit && !isModerator) {
 		// koa will automatically load the `X-Forwarded-For` header if `proxy: true` is configured in the app.
 		let limitActor: string;
 		if (user) {
 			limitActor = user.id;
 		} else {
-			// because a single person may control many IPv6 addresses,
+			limitActor = getIpHash(ctx!.ip);
-			// only a /64 subnet prefix of any IP will be taken into account.
-			// (this means for IPv4 the entire address is used)
-			const ip = IPCIDR.createAddress(ctx.ip).mask(64);
-
-			limitActor = 'ip-' + parseInt(ip, 2).toString(36);
 		}
 
 		const limit = Object.assign({}, ep.meta.limit);

packages/backend/src/server/api/private/signin.ts

@@ -10,6 +10,7 @@ import { verifyLogin, hash } from '../2fa.js';
 import { randomBytes } from 'node:crypto';
 import { IsNull } from 'typeorm';
 import { limiter } from '../limiter.js';
+import { getIpHash } from '@/misc/get-ip-hash.js';
 
 export default async (ctx: Koa.Context) => {
 	ctx.set('Access-Control-Allow-Origin', config.url);
@@ -27,7 +28,7 @@ export default async (ctx: Koa.Context) => {
 
 	try {
 		// not more than 1 attempt per second and not more than 10 attempts per hour
-		await limiter({ key: 'signin', duration: 60 * 60 * 1000, max: 10, minInterval: 1000 }, ctx.ip);
+		await limiter({ key: 'signin', duration: 60 * 60 * 1000, max: 10, minInterval: 1000 }, getIpHash(ctx.ip));
 	} catch (err) {
 		ctx.status = 429;
 		ctx.body = {

packages/backend/src/services/note/create.ts

@@ -312,7 +312,8 @@ export default async (user: { id: User['id']; username: User['username']; host:
 		endedPollNotificationQueue.add({
 			noteId: note.id,
 		}, {
-			delay
+			delay,
+			removeOnComplete: true,
 		});
 	}
 

packages/client/src/ui/deck.vue

@@ -17,7 +17,7 @@
 			:key="ids[0]"
 			class="column"
 			:column="columns.find(c => c.id === ids[0])"
-			 :is-stacked="false"
+			:is-stacked="false"
 			:style="columns.find(c => c.id === ids[0])!.flexible ? { flex: 1, minWidth: '350px' } : { width: columns.find(c => c.id === ids[0])!.width + 'px' }"
 			@parent-focus="moveFocus(ids[0], $event)"
 		/>

packages/client/src/widgets/server-metric/net.vue

@@ -94,10 +94,10 @@ function onStats(connStats) {
 	inPolygonPoints = `${viewBoxX - (stats.length - 1)},${viewBoxY} ${inPolylinePoints} ${viewBoxX},${viewBoxY}`;
 	outPolygonPoints = `${viewBoxX - (stats.length - 1)},${viewBoxY} ${outPolylinePoints} ${viewBoxX},${viewBoxY}`;
 
-	inHeadX = inPolylinePoints[inPolylinePoints.length - 1][0];
+	inHeadX = inPolylinePointsStats[inPolylinePointsStats.length - 1][0];
-	inHeadY = inPolylinePoints[inPolylinePoints.length - 1][1];
+	inHeadY = inPolylinePointsStats[inPolylinePointsStats.length - 1][1];
-	outHeadX = outPolylinePoints[outPolylinePoints.length - 1][0];
+	outHeadX = outPolylinePointsStats[outPolylinePointsStats.length - 1][0];
-	outHeadY = outPolylinePoints[outPolylinePoints.length - 1][1];
+	outHeadY = outPolylinePointsStats[outPolylinePointsStats.length - 1][1];
 
 	inRecent = connStats.net.rx;
 	outRecent = connStats.net.tx;