Revert "add language input"

This reverts commit 68f2b0cf8e.

package.json

@@ -18,21 +18,19 @@
   "dependencies": {
     "@babel/runtime": "7.17.8",
     "@chenfengyuan/vue-qrcode": "2.0.0",
-    "@floatingghost/pinch-zoom-element": "^1.3.1",
     "@fortawesome/fontawesome-svg-core": "1.3.0",
     "@fortawesome/free-regular-svg-icons": "^6.1.2",
     "@fortawesome/free-solid-svg-icons": "^6.2.0",
     "@fortawesome/vue-fontawesome": "3.0.1",
+    "@floatingghost/pinch-zoom-element": "^1.3.1",
     "@vuelidate/core": "^2.0.0",
     "@vuelidate/validators": "^2.0.0",
-    "blurhash": "^2.0.4",
     "body-scroll-lock": "2.7.1",
     "chromatism": "3.0.0",
     "click-outside-vue3": "4.0.1",
     "cropperjs": "1.5.12",
     "diff": "3.5.0",
     "escape-html": "1.0.3",
-    "iso-639-1": "^2.1.15",
     "js-cookie": "^3.0.1",
     "localforage": "1.10.0",
     "parse-link-header": "^2.0.0",
@@ -84,6 +82,7 @@
     "html-webpack-plugin": "^5.5.0",
     "http-proxy-middleware": "0.21.0",
     "inject-loader": "2.0.1",
+    "iso-639-1": "2.1.15",
     "isparta-loader": "2.0.0",
     "json-loader": "0.5.7",
     "karma": "6.3.17",

src/components/attachment/attachment.js

@@ -18,7 +18,6 @@ import {
   faPencilAlt,
   faAlignRight
 } from '@fortawesome/free-solid-svg-icons'
-import Blurhash from '../blurhash/Blurhash.vue'
 
 library.add(
   faFile,
@@ -64,8 +63,7 @@ const Attachment = {
   components: {
     Flash,
     StillImage,
-    VideoAttachment,
+    VideoAttachment
-    Blurhash
   },
   computed: {
     classNames () {
@@ -86,9 +84,6 @@ const Attachment = {
     useContainFit () {
       return this.$store.getters.mergedConfig.useContainFit
     },
-    useBlurhash () {
-      return this.$store.getters.mergedConfig.useBlurhash
-    },
     placeholderName () {
       if (this.attachment.description === '' || !this.attachment.description) {
         return this.type.toUpperCase()

src/components/attachment/attachment.vue

@@ -64,15 +64,7 @@
         :title="attachment.description"
         @click.prevent.stop="toggleHidden"
       >
-        <Blurhash
-          v-if="useBlurhash && attachment.blurhash"
-          :height="512"
-          :width="1024"
-          :hash="attachment.blurhash"
-          :punch="1"
-        />
         <img
-          v-else
           :key="nsfwImage"
           class="nsfw"
           :src="nsfwImage"

src/components/blurhash/Blurhash.vue

@@ -1,66 +0,0 @@
-<template>
-  <canvas
-    ref="canvas"
-    class="blurhash"
-  />
-</template>
-
-<script>
-import { decode } from "blurhash";
-
-export default {
-  name: 'Blurhash',
-  props: {
-    hash: {
-      type: String,
-      required: true,
-    },
-    width: {
-      type: Number,
-      required: true,
-    },
-    height: {
-      type: Number,
-      required: true,
-    },
-    punch: {
-      type: Number,
-      default: null,
-    },
-  },
-  data() {
-    return {
-      canvas: null,
-      ctx: null,
-    };
-  },
-  mounted() {
-    this.canvas = this.$refs.canvas;
-    this.ctx = this.canvas.getContext('2d');
-    this.canvas.width = 1024;
-    this.canvas.height = 512;
-    this.draw();
-  },
-  methods: {
-    draw() {
-      const pixels = decode(this.hash, this.width, this.height, this.punch);
-      const imageData = this.ctx.createImageData(this.width, this.height);
-      imageData.data.set(pixels);
-      this.ctx.putImageData(imageData, 0, 0);
-      fetch("/static/blurhash-overlay.png")
-        .then((response) => response.blob())
-        .then((blob) => {
-          const img = new Image();
-          img.src = URL.createObjectURL(blob);
-          img.onload = () => {
-            this.ctx.drawImage(img, 0, 0, this.width, this.height);
-          };
-        });
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/components/extra_buttons/extra_buttons.js

@@ -144,7 +144,6 @@ const ExtraButtons = {
           statusPoll: this.status.poll,
           statusFiles: [...this.status.attachments],
           statusScope: this.status.visibility,
-          statusLanguage: this.status.language,
           statusContentType: data.content_type
         }))
       this.doDeleteStatus()

src/components/post_status_form/post_status_form.js

@@ -13,7 +13,6 @@ import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters, mapState } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
 import Select from '../select/select.vue'
-import iso6391 from 'iso-639-1'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -64,7 +63,6 @@ const PostStatusForm = {
     'statusMediaDescriptions',
     'statusScope',
     'statusContentType',
-    'statusLanguage',
     'replyTo',
     'quoteId',
     'repliedUser',
@@ -130,7 +128,7 @@ const PostStatusForm = {
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
 
-    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject } = this.$store.getters.mergedConfig
 
     let statusParams = {
       spoilerText: this.subject || '',
@@ -141,7 +139,6 @@ const PostStatusForm = {
       poll: {},
       mediaDescriptions: {},
       visibility: this.suggestedVisibility(),
-      language: interfaceLanguage,
       contentType
     }
 
@@ -156,7 +153,6 @@ const PostStatusForm = {
         poll: this.statusPoll || {},
         mediaDescriptions: this.statusMediaDescriptions || {},
         visibility: this.statusScope || this.suggestedVisibility(),
-        language: this.statusLanguage || interfaceLanguage,
         contentType: statusContentType
       }
     }
@@ -263,10 +259,7 @@ const PostStatusForm = {
     ...mapGetters(['mergedConfig']),
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
-    }),
+    })
-    isoLanguages () {
-      return iso6391.getAllCodes();
-    }
   },
   watch: {
     'newStatus': {
@@ -289,7 +282,6 @@ const PostStatusForm = {
         files: [],
         visibility: newStatus.visibility,
         contentType: newStatus.contentType,
-        language: newStatus.language,
         poll: {},
         mediaDescriptions: {}
       }
@@ -349,7 +341,6 @@ const PostStatusForm = {
         inReplyToStatusId: this.replyTo,
         quoteId: this.quoteId,
         contentType: newStatus.contentType,
-        language: newStatus.language,
         poll,
         idempotencyKey: this.idempotencyKey
       }
@@ -384,7 +375,6 @@ const PostStatusForm = {
         inReplyToStatusId: this.replyTo,
         quoteId: this.quoteId,
         contentType: newStatus.contentType,
-        language: newStatus.language,
         poll: {},
         preview: true
       }).then((data) => {

src/components/post_status_form/post_status_form.vue

@@ -194,23 +194,6 @@
             :on-scope-change="changeVis"
           />
 
-          <div
-            class="language-selector"
-            >
-            <Select
-              id="post-language"
-              v-model="newStatus.language"
-              class="form-control"
-            >
-              <option
-                v-for="language in isoLanguages"
-                :key="language"
-                :value="language"
-              >
-                {{ language }}
-              </option>
-            </Select>
-          </div>
           <div
             v-if="postFormats.length > 1"
             class="text-format"

src/components/settings_modal/tabs/general_tab.vue

@@ -407,15 +407,6 @@
               {{ $t('settings.preload_images') }}
             </BooleanSetting>
           </li>
-          <li>
-            <BooleanSetting
-              path="useBlurhash"
-              expert="1"
-              :disabled="!hideNsfw"
-            >
-              {{ $t('settings.use_blurhash') }}
-            </BooleanSetting>
-          </li>
           <li>
             <BooleanSetting
               path="useOneClickNsfw"

src/i18n/en.json

@@ -939,7 +939,6 @@
             "title": "Version"
         },
         "virtual_scrolling": "Optimize timeline rendering",
-        "use_blurhash": "Use blurhashes for NSFW thumbnails",
         "word_filter": "Word filter",
         "wordfilter": "Wordfilter"
     },

src/modules/config.js

@@ -117,8 +117,7 @@ export const defaultState = {
   maxDepthInThread: undefined, // instance default
   translationLanguage: undefined, // instance default,
   supportedTranslationLanguages: {}, // instance default
-  userProfileDefaultTab: 'statuses',
+  userProfileDefaultTab: 'statuses'
-  useBlurhash: true,
 }
 
 // caching the instance default properties

src/services/api/api.service.js

@@ -872,8 +872,7 @@ const postStatus = ({
   quoteId,
   contentType,
   preview,
-  idempotencyKey,
+  idempotencyKey
-  language
 }) => {
   const form = new FormData()
   const pollOptions = poll.options || []
@@ -884,7 +883,6 @@ const postStatus = ({
   if (visibility) form.append('visibility', visibility)
   if (sensitive) form.append('sensitive', sensitive)
   if (contentType) form.append('content_type', contentType)
-  if (language) form.append('language', language)
   mediaIds.forEach(val => {
     form.append('media_ids[]', val)
   })

src/services/entity_normalizer/entity_normalizer.service.js

@@ -235,14 +235,13 @@ export const parseAttachment = (data) => {
   if (masto) {
     // Not exactly same...
     output.mimetype = data.pleroma ? data.pleroma.mime_type : data.type
-    output.meta = data.meta
+    output.meta = data.meta // not present in BE yet
     output.id = data.id
   } else {
     output.mimetype = data.mimetype
     // output.meta = ??? missing
   }
 
-  output.blurhash = data.blurhash
   output.url = data.url
   output.large_thumb_url = data.preview_url
   output.description = data.description

src/services/status_poster/status_poster.service.js

@@ -13,8 +13,7 @@ const postStatus = ({
   quoteId = undefined,
   contentType = 'text/plain',
   preview = false,
-  idempotencyKey = '',
+  idempotencyKey = ''
-  language
 }) => {
   const mediaIds = map(media, 'id')
 
@@ -30,8 +29,7 @@ const postStatus = ({
     contentType,
     poll,
     preview,
-    idempotencyKey,
+    idempotencyKey
-    language
   })
     .then((data) => {
       if (!data.error && !preview) {

yarn.lock

@@ -2494,11 +2494,6 @@ binary-extensions@^2.0.0:
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-blurhash@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.4.tgz#60642a823b50acaaf3732ddb6c7dfd721bdfef2a"
-  integrity sha512-r/As72u2FbucLoK5NTegM/GucxJc3d8GvHc4ngo13IO/nt2HU4gONxNLq1XPN6EM/V8Y9URIa7PcSz2RZu553A==
-
 body-parser@1.19.2:
   version "1.19.2"
   resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"
@@ -5095,9 +5090,9 @@ isexe@^2.0.0:
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-iso-639-1@^2.1.15:
+iso-639-1@2.1.15:
   version "2.1.15"
-  resolved "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-2.1.15.tgz#20cf78a4f691aeb802c16f17a6bad7d99271e85d"
+  resolved "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz"
   integrity sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==
 
 isobject@^3.0.1: