Merge branch 'develop' into tabler-icons

CHANGELOG.md

@@ -9,7 +9,7 @@
 You should also include the user name that made the change.
 -->
 
-## 12.x.x (unreleased)
+## 12.111.0 (2022/06/11)
 ### Improvements
 - Supports Unicode Emoji 14.0 @mei23
 - プッシュ通知を複数アカウント対応に #7667 @tamaina
@@ -33,7 +33,6 @@ You should also include the user name that made the change.
 ### Bugfixes
 - Server: keep file order of note attachement @Johann150
 - Server: fix caching @Johann150
-- Server: await promises when following or unfollowing users @Johann150
 - Server: fix missing foreign key for reports leading to reports page being unusable @Johann150
 - Server: fix internal in-memory caching @Johann150
 - Server: use correct order of attachments on notes @Johann150
@@ -42,6 +41,7 @@ You should also include the user name that made the change.
 - Server: Fix `Cannot find module` issue @mei23
 - Federation: Add rel attribute to host-meta @mei23
 - Federation: add id for activitypub follows @Johann150
+- Federation: use `source` instead of `_misskey_content` @Johann150
 - Federation: ensure resolver does not fetch local resources via HTTP(S) @Johann150
 - Federation: correctly render empty note text @Johann150
 - Federation: Fix quote renotes containing no text being federated correctly @Johann150

locales/de-DE.yml

@@ -843,6 +843,8 @@ oneWeek: "Eine Woche"
 reflectMayTakeTime: "Es kann etwas dauern, bis sich dies widerspiegelt."
 failedToFetchAccountInformation: "Benutzerkontoinformationen konnten nicht abgefragt werden"
 rateLimitExceeded: "Versuchsanzahl überschritten"
+cropImage: "Bild zuschneiden"
+cropImageAsk: "Möchtest du das Bild zuschneiden?"
 _emailUnavailable:
   used: "Diese Email-Adresse wird bereits verwendet"
   format: "Das Format dieser Email-Adresse ist ungültig"

locales/en-US.yml

@@ -843,6 +843,8 @@ oneWeek: "One week"
 reflectMayTakeTime: "It may take some time for this to be reflected."
 failedToFetchAccountInformation: "Could not fetch account information"
 rateLimitExceeded: "Rate limit exceeded"
+cropImage: "Crop image"
+cropImageAsk: "Do you want to crop this image?"
 _emailUnavailable:
   used: "This email address is already being used"
   format: "The format of this email address is invalid"

locales/id-ID.yml

@@ -843,6 +843,8 @@ oneWeek: "1 Bulan"
 reflectMayTakeTime: "Mungkin perlu beberapa saat untuk dicerminkan."
 failedToFetchAccountInformation: "Gagal untuk mendapatkan informasi akun"
 rateLimitExceeded: "Batas sudah terlampaui"
+cropImage: "potong gambar"
+cropImageAsk: "Ingin memotong gambar?"
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"
   format: "Format tidak valid."

locales/nl-NL.yml

@@ -303,6 +303,8 @@ muteThread: "Discussies dempen "
 unmuteThread: "Dempen van discussie ongedaan maken"
 hide: "Verbergen"
 searchByGoogle: "Zoeken"
+cropImage: "Afbeelding bijsnijden"
+cropImageAsk: "Bijsnijdengevraagd"
 _email:
   _follow:
     title: "volgde jou"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "12.110.1",
+	"version": "12.111.0",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",

packages/client/src/components/cropper-dialog.vue

@@ -18,7 +18,7 @@
 				</div>
 			</Transition>
 			<div class="container">
-				<img ref="imgEl" crossorigin="anonymous" :src="file.url" style="display: none;" @load="onImageLoad">
+				<img ref="imgEl" :src="imgUrl" style="display: none;" @load="onImageLoad">
 			</div>
 		</div>
 	</template>
@@ -34,7 +34,8 @@ import XModalWindow from '@/components/ui/modal-window.vue';
 import * as os from '@/os';
 import { $i } from '@/account';
 import { defaultStore } from '@/store';
-import { apiUrl } from '@/config';
+import { apiUrl, url } from '@/config';
+import { query } from '@/scripts/url';
 
 const emit = defineEmits<{
 	(ev: 'ok', cropped: misskey.entities.DriveFile): void;
@@ -47,6 +48,9 @@ const props = defineProps<{
 	aspectRatio: number;
 }>();
 
+const imgUrl = `${url}/proxy/image.webp?${query({
+	url: props.file.url,
+})}`;
 let dialogEl = $ref<InstanceType<typeof XModalWindow>>();
 let imgEl = $ref<HTMLImageElement>();
 let cropper: Cropper | null = null;