From 74c71f5ce5d007d853f6789620b2c797ae73342a Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Sat, 13 Aug 2022 07:04:03 -0400
Subject: [PATCH 1/3] Remove twitter embed

Fixes https://akkoma.dev/FoundKeyGang/FoundKey/issues/46
---
 .../client/src/components/url-preview.vue     | 35 +------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/packages/client/src/components/url-preview.vue b/packages/client/src/components/url-preview.vue
index d33b154ea..d866fd9ea 100644
--- a/packages/client/src/components/url-preview.vue
+++ b/packages/client/src/components/url-preview.vue
@@ -3,9 +3,6 @@
 	<button class="disablePlayer" :title="i18n.ts.disablePlayer" @click="playerEnabled = false"><i class="fas fa-times"></i></button>
 	<iframe :src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen/>
 </div>
-<div v-else-if="tweetId && tweetExpanded" ref="twitter" class="twitter">
-	<iframe ref="tweet" scrolling="no" frameborder="no" :style="{ position: 'relative', width: '100%', height: `${tweetHeight}px` }" :src="`https://platform.twitter.com/embed/index.html?embedId=${embedId}&amp;hideCard=false&amp;hideThread=false&amp;lang=en&amp;theme=${$store.state.darkMode ? 'dark' : 'light'}&amp;id=${tweetId}`"></iframe>
-</div>
 <div v-else v-size="{ max: [400, 350] }" class="mk-url-preview">
 	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
 		<component :is="self ? 'MkA' : 'a'" v-if="!fetching" :class="{ compact }" :[attr]="self ? url.substr(local.length) : url" rel="nofollow noopener" :target="target" :title="url">
@@ -24,16 +21,10 @@
 			</article>
 		</component>
 	</transition>
-	<div v-if="tweetId" class="expandTweet">
-		<a @click="tweetExpanded = true">
-			<i class="fab fa-twitter"></i> {{ i18n.ts.expandTweet }}
-		</a>
-	</div>
 </div>
 </template>
 
 <script lang="ts" setup>
-import { onUnmounted } from 'vue';
 import { url as local, lang } from '@/config';
 import { i18n } from '@/i18n';
 
@@ -61,23 +52,14 @@ let player = $ref({
 	height: null,
 });
 let playerEnabled = $ref(false);
-let tweetId = $ref<string | null>(null);
-let tweetExpanded = $ref(props.detail);
-const embedId = `embed${Math.random().toString().replace(/\D/,'')}`;
-let tweetHeight = $ref(150);
 
 const requestUrl = new URL(props.url);
 
-if (requestUrl.hostname === 'twitter.com') {
-	const m = requestUrl.pathname.match(/^\/.+\/status(?:es)?\/(\d+)/);
-	if (m) tweetId = m[1];
-}
-
 if (requestUrl.hostname === 'music.youtube.com' && requestUrl.pathname.match('^/(?:watch|channel)')) {
 	requestUrl.hostname = 'www.youtube.com';
 }
 
-const requestLang = (lang || 'ja-JP').replace('ja-KS', 'ja-JP');
+const requestLang = lang || 'en-US';
 
 requestUrl.hash = '';
 
@@ -93,21 +75,6 @@ fetch(`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${requestLang}`).the
 		player = info.player;
 	});
 });
-
-function adjustTweetHeight(message: any) {
-	if (message.origin !== 'https://platform.twitter.com') return;
-	const embed = message.data?.['twttr.embed'];
-	if (embed?.method !== 'twttr.private.resize') return;
-	if (embed?.id !== embedId) return;
-	const height = embed?.params[0]?.height;
-	if (height) tweetHeight = height;
-}
-
-(window as any).addEventListener('message', adjustTweetHeight);
-
-onUnmounted(() => {
-	(window as any).removeEventListener('message', adjustTweetHeight);
-});
 </script>
 
 <style lang="scss" scoped>

From ec4e720f8fff88001f52175e0e8f38ed787e936e Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Sat, 13 Aug 2022 07:08:56 -0400
Subject: [PATCH 2/3] remove expandTweet from locales

---
 locales/ar-SA.yml | 1 -
 locales/bn-BD.yml | 1 -
 locales/de-DE.yml | 1 -
 locales/en-US.yml | 1 -
 locales/es-ES.yml | 1 -
 locales/fr-FR.yml | 1 -
 locales/id-ID.yml | 1 -
 locales/it-IT.yml | 1 -
 locales/ja-JP.yml | 1 -
 locales/ja-KS.yml | 1 -
 locales/ko-KR.yml | 1 -
 locales/pl-PL.yml | 1 -
 locales/ro-RO.yml | 1 -
 locales/ru-RU.yml | 1 -
 locales/sk-SK.yml | 1 -
 locales/uk-UA.yml | 1 -
 locales/vi-VN.yml | 1 -
 locales/zh-CN.yml | 1 -
 locales/zh-TW.yml | 1 -
 19 files changed, 19 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index cd0ba833e..78d1fe9fe 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -531,7 +531,6 @@ poll: "استطلاع رأي"
 useCw: "إخفاء المحتوى"
 enablePlayer: "افتح مشغل الفيديو"
 disablePlayer: "أغلق مشغل الفيديو"
-expandTweet: "وسّع التغريدة"
 themeEditor: "مصمم القوالب"
 description: "الوصف"
 describeFile: "أضف تعليقًا توضيحيًا"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 4a9ba0609..59b58e980 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -549,7 +549,6 @@ poll: "জরিপ"
 useCw: "কন্টেন্ট লুকান"
 enablePlayer: "ভিডিও প্লেয়ার খুলুন"
 disablePlayer: "ভিডিও প্লেয়ার বন্ধ করুন"
-expandTweet: "টুইট বিস্তারিত করুন"
 themeEditor: "থিম সম্পাদক"
 description: "বর্ণনা"
 describeFile: "ক্যাপশন যোগ করুন"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 6bdb01b74..535034f95 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -550,7 +550,6 @@ poll: "Umfrage"
 useCw: "Inhaltswarnung verwenden"
 enablePlayer: "Video-Player öffnen"
 disablePlayer: "Video-Player schließen"
-expandTweet: "Tweet ausklappen"
 themeEditor: "Farbschema-Editor"
 description: "Beschreibung"
 describeFile: "Beschreibung hinzufügen"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 2ae56ccee..0911a80f9 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -550,7 +550,6 @@ poll: "Poll"
 useCw: "Hide content"
 enablePlayer: "Open video player"
 disablePlayer: "Close video player"
-expandTweet: "Expand tweet"
 themeEditor: "Theme editor"
 description: "Description"
 describeFile: "Add caption"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 1e3aaed3f..e4cb56dbf 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -549,7 +549,6 @@ poll: "Encuesta"
 useCw: "Esconder contenidos"
 enablePlayer: "Abrir reproductor"
 disablePlayer: "Cerrar reproductor"
-expandTweet: "Expandir tweet"
 themeEditor: "Editor de temas"
 description: "Descripción"
 describeFile: "Añade una descripción"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 574881ce4..df45eb7f0 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -546,7 +546,6 @@ poll: "Sondage"
 useCw: "Masquer le contenu"
 enablePlayer: "Ouvrir dans le lecteur vidéo"
 disablePlayer: "Fermer le lecteur vidéo"
-expandTweet: "Étendre le tweet"
 themeEditor: "Éditeur de thèmes"
 description: "Description"
 describeFile: "Ajouter une description d'image"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 7dc47545c..fc1ce722f 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -549,7 +549,6 @@ poll: "Angket"
 useCw: "Sembunyikan konten"
 enablePlayer: "Buka pemutar video"
 disablePlayer: "Tutup pemutar video"
-expandTweet: "Perluas utas"
 themeEditor: "Penyunting tema"
 description: "Deskripsi"
 describeFile: "Tambahkan keterangan"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 06a3a7cf3..94d5174d4 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -545,7 +545,6 @@ poll: "Sondaggio"
 useCw: "Nascondere media"
 enablePlayer: "Apri in lettore video"
 disablePlayer: "Chiudi lettore video"
-expandTweet: "Espandi tweet"
 themeEditor: "Editor di temi"
 description: "Descrizione"
 describeFile: "Aggiungi una descrizione d'immagine"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 10974270c..b81462234 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -550,7 +550,6 @@ poll: "アンケート"
 useCw: "内容を隠す"
 enablePlayer: "プレイヤーを開く"
 disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ツイートを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
 describeFile: "キャプションを付ける"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index ec01bc1c8..1bafcc221 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -524,7 +524,6 @@ addedRelays: "追加済みのリレー"
 poll: "アンケート"
 enablePlayer: "プレイヤーを開く"
 disablePlayer: "プレイヤーを閉じる"
-expandTweet: "ツイートを展開する"
 themeEditor: "テーマエディター"
 description: "説明"
 author: "作者"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 30702d914..e0d95a07c 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -549,7 +549,6 @@ poll: "투표"
 useCw: "내용 숨기기"
 enablePlayer: "플레이어 열기"
 disablePlayer: "플레이어 닫기"
-expandTweet: "트윗 확장하기"
 themeEditor: "테마 에디터"
 description: "설명"
 describeFile: "캡션 추가"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index aaa5a5f3a..f4327573e 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -536,7 +536,6 @@ poll: "Ankieta"
 useCw: "Ukryj zawartość"
 enablePlayer: "Otwórz odtwarzacz wideo"
 disablePlayer: "Zamknij odtwarzacz wideo"
-expandTweet: "Rozwiń tweet"
 themeEditor: "Edytor motywu"
 description: "Opis"
 describeFile: "dodaj podpis"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 6cc51226c..43df076ee 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -549,7 +549,6 @@ poll: "Sondaj"
 useCw: "Ascunde conținutul"
 enablePlayer: "Deschide player-ul video"
 disablePlayer: "Închide player-ul video"
-expandTweet: "Expandează tweet"
 themeEditor: "Editor de teme"
 description: "Descriere"
 describeFile: "Adaugă titrări"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 1b2d8c780..7cd920b11 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -549,7 +549,6 @@ poll: "Опрос"
 useCw: "Скрывать содержимое под предупреждением"
 enablePlayer: "Включить проигрыватель"
 disablePlayer: "Выключить проигрыватель"
-expandTweet: "Развернуть твит"
 themeEditor: "Редактор темы оформления"
 description: "Описание"
 describeFile: "Добавить подпись"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index c801fc568..8ce299206 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -549,7 +549,6 @@ poll: "Hlasovanie"
 useCw: "Skryť obsah"
 enablePlayer: "Otvoriť video prehrávač"
 disablePlayer: "Zavrieť video prehrávač"
-expandTweet: "Rozšíriť tweet"
 themeEditor: "Editor tém"
 description: "Popis"
 describeFile: "Pridať nadpis"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 0a22807cc..92b06c31e 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -549,7 +549,6 @@ poll: "Опитування"
 useCw: "Приховати вміст"
 enablePlayer: "Відкрити відеоплеєр"
 disablePlayer: "Закрити відеоплеєр"
-expandTweet: "Розгорнути твіт"
 themeEditor: "Редактор тем"
 description: "Опис"
 describeFile: "Додати підпис"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 0d731f285..94ef82b52 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -549,7 +549,6 @@ poll: "Bình chọn"
 useCw: "Ẩn nội dung"
 enablePlayer: "Mở trình phát video"
 disablePlayer: "Đóng trình phát video"
-expandTweet: "Mở rộng tweet"
 themeEditor: "Công cụ thiết kế theme"
 description: "Mô tả"
 describeFile: "Thêm mô tả"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 575e242bd..f1a2939cd 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -549,7 +549,6 @@ poll: "调查问卷"
 useCw: "隐藏内容"
 enablePlayer: "打开播放器"
 disablePlayer: "关闭播放器"
-expandTweet: "展开帖子"
 themeEditor: "主题编辑器"
 description: "描述"
 describeFile: "添加标题"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index ced3a52e2..ed86e3f1e 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -549,7 +549,6 @@ poll: "投票"
 useCw: "隱藏內容"
 enablePlayer: "打開播放器"
 disablePlayer: "關閉播放器"
-expandTweet: "展開推文"
 themeEditor: "主題編輯器"
 description: "描述"
 describeFile: "添加標題 "

From 46d550687a7c980ae42b073c5c5e0c921f37377f Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Sat, 13 Aug 2022 07:16:03 -0400
Subject: [PATCH 3/3] Note change in CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 874ca31db..b317df8b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ For older Misskey versions, see [CHANGELOG-OLD.md](./CHANGELOG-OLD.md).
 ### Removed
 - Okteto config and Helm chart
 - Client: acrylic styling
+- Client: Twitter embeds, the standard URL preview is used instead.
 
 ### Fixed
 - Server: Blocking remote accounts