README.md

@@ -1,22 +1,22 @@
-# Akkoma-FE 
+# Pleroma-FE 
 
 ![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet)
 
-This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkoma features such as:
+This is a fork of Pleroma-FE from the Pleroma project, with support for new Akkoma features such as:
 - MFM support via [marked-mfm](https://akkoma.dev/sfr/marked-mfm)
 - Custom emoji reactions
 
 # For Translators
 
-The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE. 
+The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Pleroma-FE. 
 
 Alternatively, edit/create `src/i18n/$LANGUAGE_CODE.json` (where `$LANGUAGE_CODE` is the [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language), then add your language to [src/i18n/messages.js](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/src/i18n/messages.js) if it doesn't already exist there.
 
-Akkoma-FE will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js.
+Pleroma-FE will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js.
 
 # FOR ADMINS
 
-To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/administration/CLI_tasks/frontend/) CLI task to install Akkoma-FE, then modify your configuration as described in the [Frontend Management](https://docs.akkoma.dev/stable/configuration/frontend_management/) doc.
+To use Pleroma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/administration/CLI_tasks/frontend/) CLI task to install Pleroma-FE, then modify your configuration as described in the [Frontend Management](https://docs.akkoma.dev/stable/configuration/frontend_management/) doc.
 
 ## Build Setup
 
@@ -52,4 +52,4 @@ Edit config.json for configuration.
 
 ### Login methods
 
-```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. 
+```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations.

package.json

@@ -25,7 +25,6 @@
     "@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",

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,
-    Blurhash
+    VideoAttachment
   },
   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/desktop_nav/desktop_nav.js

@@ -98,11 +98,15 @@ export default {
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
     privateMode () { return this.$store.state.instance.private },
+    federating () { return this.$store.state.instance.federating },
     shouldConfirmLogout () {
       return this.$store.getters.mergedConfig.modalOnLogout
     },
     showBubbleTimeline () {
       return this.$store.state.instance.localBubbleInstances.length > 0
+    },
+    restrictedTimelines () {
+      return this.$store.state.instance.restrict_unauthenticated.timelines
     }
   },
   methods: {

src/components/desktop_nav/desktop_nav.vue

@@ -44,6 +44,7 @@
             />
           </router-link>
           <router-link
+            v-if="currentUser || !(privateMode || restrictedTimelines.public)"
             :to="{ name: 'public-timeline' }"
             class="nav-icon"
           >
@@ -55,6 +56,7 @@
             />
           </router-link>
           <router-link
+            v-if="federating && (currentUser || !(privateMode || restrictedTimelines.federated))"
             :to="{ name: 'public-external-timeline' }"
             class="nav-icon"
           >

src/components/emoji_picker/emoji_picker.scss

@@ -1,16 +1,5 @@
 @import '../../_variables.scss';
 
-// The worst query selector ever
-// selects ONLY emojis pickers in replies in notifications
-// who thought this was a good idea?
-.notification > .Status > .status-container > .post-status-form > form > .form-group > .emoji-input > .emoji-picker {
-  max-width: 100%;
-  left: 0;
-  @media (min-width: 1300px) {
-    left: -30px;
-  }
-}
-
 .Notification {
   .emoji-picker {
     min-width: 160%;
@@ -29,10 +18,6 @@
       min-width: 50%;
       max-width: 130%;
     }
-
-    .Status > .emoji-picker {
-      z-index: 1000;
-    }
   }
 }
 .emoji-picker {

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/components/timeline_menu/timeline_menu_content.js

@@ -24,7 +24,8 @@ const TimelineMenuContent = {
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,
       federating: state => state.instance.federating,
-      showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0)
+      showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0),
+      restrictedTimelines: state => state.instance.restrict_unauthenticated.timelines
     })
   }
 }

src/components/timeline_menu/timeline_menu_content.vue

@@ -16,7 +16,7 @@
         >{{ $t("nav.home_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="currentUser || !privateMode">
+    <li v-if="currentUser || !(privateMode || restrictedTimelines.public)">
       <router-link
         class="menu-item"
         :to="{ name: 'public-timeline' }"
@@ -32,7 +32,7 @@
         >{{ $t("nav.public_tl") }}</span>
       </router-link>
     </li>
-    <li v-if="federating && (currentUser || !privateMode)">
+    <li v-if="federating && (currentUser || !(privateMode || restrictedTimelines.federated))">
       <router-link
         class="menu-item"
         :to="{ name: 'public-external-timeline' }"

src/components/user_profile/user_profile.js

@@ -10,13 +10,11 @@ import withLoadMore from '../../hocs/with_load_more/with_load_more'
 import { debounce } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faCircleNotch,
-  faCircleCheck
+  faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faCircleNotch,
-  faCircleCheck
+  faCircleNotch
 )
 
 const FollowerList = withLoadMore({

src/components/user_profile/user_profile.vue

@@ -37,15 +37,6 @@
               :html="field.value"
               :emoji="user.emoji"
             />
-            <span
-              v-if="field.verified_at"
-              class="user-profile-field-validated"
-            >
-              <FAIcon
-                icon="check-circle"
-                :title="$t('user_profile.field_validated')"
-              />
-            </span>
           </dd>
         </dl>
       </div>
@@ -105,9 +96,10 @@
           v-if="followsTabVisible"
           key="followees"
           :label="$t('user_card.followees')"
+          :disabled="!user.friends_count"
         >
           <FriendList :user-id="userId">
-            <template #item="{item}">
+            <template v-slot:item="{item}">
               <FollowCard :user="item" />
             </template>
           </FriendList>
@@ -116,9 +108,10 @@
           v-if="followersTabVisible"
           key="followers"
           :label="$t('user_card.followers')"
+          :disabled="!user.followers_count"
         >
           <FollowerList :user-id="userId">
-            <template #item="{item}">
+            <template v-slot:item="{item}">
               <FollowCard
                 :user="item"
                 :no-follows-you="isUs"
@@ -234,11 +227,6 @@
         padding: 0.5em 1.5em;
         box-sizing: border-box;
       }
-
-      .user-profile-field-validated {
-        margin-left: 1rem;
-        color: green;
-      }
     }
   }
 

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"
     },
@@ -1185,8 +1184,7 @@
     "user_profile": {
         "profile_does_not_exist": "Sorry, this profile does not exist.",
         "profile_loading_error": "Sorry, there was an error loading this profile.",
-        "timeline_title": "User timeline",
-        "field_validated": "Link Verified"
+        "timeline_title": "User timeline"
     },
     "user_reporting": {
         "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",

src/modules/config.js

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

src/services/entity_normalizer/entity_normalizer.service.js

@@ -68,15 +68,13 @@ export const parseUser = (data) => {
     output.fields_html = data.fields.map(field => {
       return {
         name: escape(field.name),
-        value: field.value,
-        verified_at: field.verified_at
+        value: field.value
       }
     })
     output.fields_text = data.fields.map(field => {
       return {
         name: unescape(field.name.replace(/<[^>]*>/g, '')),
-        value: unescape(field.value.replace(/<[^>]*>/g, '')),
-        verified_at: field.verified_at
+        value: unescape(field.value.replace(/<[^>]*>/g, ''))
       }
     })
 
@@ -234,14 +232,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
@@ -411,10 +408,8 @@ export const parseNotification = (data) => {
   if (masto) {
     output.type = mastoDict[data.type] || data.type
     output.seen = data.pleroma.is_seen
-    if (data.status) {
-      output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
-      output.action = output.status // TODO: Refactor, this is unneeded
-    }
+    output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
+    output.action = output.status // TODO: Refactor, this is unneeded
     output.target = output.type !== 'move'
       ? null
       : parseUser(data.target)

static/.tos

@@ -0,0 +1,45 @@
+<h4>Terms of Service</h4>
+
+<p>It's mainly "be nice"</p>
+
+<ol>
+    <li>
+        <h3>Don't be a big meanie</h4>
+        <p>Arguments are cool and all but don't make them into flamewars. Try to act in good faith - we want to be at least on good terms with people. Please act with understanding towards others on this instance. Most people here are probably struggling with a lot, be mindful of that.</p>
+    </li>
+    <li>
+        <h3>Mark your lewds!</h3>
+	<p>Reminder that lewd is bad and nobody wants to be forced to see that. Just mark it sensitive, and post unlisted. That is to say, anything suggestive/ecchi upwards should be marked. If you wouldn't look at it with your parents/boss in the room, mark it. It goes without saying that if you're <em>going</em> to post lewd stuff, keep it sensible. Obviously nothing underaged or otherwise questionable. Or you could just not post lewd stuff. Either/or.</p>
+    </li>
+    <li>
+	    <h3>This is a <b>Kink Shame Zone</b></h3>
+	    <p>Being a lewdie will be met with many anime girl reaction images shaming you for your lewdness. Go think about icky things on someone else's webzone™</p>
+    </li>
+    <li>
+	   <h3>Keep it legal!</h3>
+	   <p>Server is hosted in france, keep content legal for there (+ wherever you're browsing from)</p>
+    </li>
+    <li>
+	    <h3>No ads/spambots</h3>
+	    <p>I didn't think I'd have to specify this, but please do not set up bots solely for trying to advertise.</h3>
+    </li>
+    <li>
+	    <h3>Non-TOS recommendations</h3>
+	    <p>This is stuff that'd I'd <em>like</em> you to do, but I won't outright ban you if you don't follow them</p>
+	    <ul>
+		    <li>If someone is sadposting, don't antagonise them - they probably just want to vent</li>
+		    <li>Put walls of text behind a subject (CW) - helps the timeline not get flooded with text</li>
+	    </ul>
+    </li>
+
+    <li>
+	    <h3>Other</h3>
+	    <p>If you're here and you happen to play minecraft, feel free to message me with your username and come play with us sometime!</p>
+   </li>
+
+</ol>
+
+<p>So I guess yeah, that's about it. Try to be nice, eh? We're probably all sad here.</p>
+
+<br>
+<img src="/static/logo.png" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />

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"