run update first

.woodpecker.yml

@@ -3,7 +3,6 @@ pipeline:
     when:
       event:
       - push
-      - pull_request
     image: node:16
     commands:
     - yarn
@@ -14,7 +13,6 @@ pipeline:
     when:
       event:
       - push
-      - pull_request
     image: node:16
     commands:
     - apt update
@@ -34,7 +32,7 @@ pipeline:
   release:
     when:
       event:
-      - push
+      - tag
     image: node:16
     secrets:
     - SCW_ACCESS_KEY
@@ -47,4 +45,4 @@ pipeline:
       - chmod +x scaleway-cli
       - ./scaleway-cli object config install type=rclone
       - zip akkoma-fe.zip -r dist
-      - rclone copyto akkoma-fe.zip scaleway:akkoma-updates/frontend/$CI_COMMIT_BRANCH/akkoma-fe.zip
+      - rclone copyto akkoma-fe.zip scaleway:akkoma-updates/frontend/akkoma-fe.zip

src/components/react_button/react_button.js

@@ -1,5 +1,4 @@
 import Popover from '../popover/popover.vue'
-import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
 
@@ -13,12 +12,10 @@ const ReactButton = {
     }
   },
   components: {
-    Popover,
-    EmojiPicker
+    Popover
   },
   methods: {
-    addReaction (event, close) {
-      const emoji = event.insertion
+    addReaction (event, emoji, close) {
       const existingReaction = this.status.emoji_reactions.find(r => r.name === emoji)
       if (existingReaction && existingReaction.me) {
         this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
@@ -35,6 +32,40 @@ const ReactButton = {
     }
   },
   computed: {
+    commonEmojis () {
+      return [
+        { displayText: 'thumbsup', replacement: '👍' },
+        { displayText: 'angry', replacement: '😠' },
+        { displayText: 'eyes', replacement: '👀' },
+        { displayText: 'joy', replacement: '😂' },
+        { displayText: 'fire', replacement: '🔥' }
+      ]
+    },
+    emojis () {
+      if (this.filterWord !== '') {
+        const filterWordLowercase = this.filterWord.toLowerCase()
+        let orderedEmojiList = []
+        for (const emoji of [
+          ...this.$store.state.instance.emoji,
+          ...this.$store.state.instance.customEmoji
+        ]) {
+          if (emoji.replacement === this.filterWord) return [emoji]
+
+          const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
+          if (indexOfFilterWord > -1) {
+            if (!Array.isArray(orderedEmojiList[indexOfFilterWord])) {
+              orderedEmojiList[indexOfFilterWord] = []
+            }
+            orderedEmojiList[indexOfFilterWord].push(emoji)
+          }
+        }
+        return orderedEmojiList.flat()
+      }
+      return [
+        ...this.$store.state.instance.emoji,
+        ...this.$store.state.instance.customEmoji
+      ] || []
+    },
     mergedConfig () {
       return this.$store.getters.mergedConfig
     }

src/components/react_button/react_button.vue

@@ -9,10 +9,43 @@
     @show="focusInput"
   >
     <template v-slot:content="{close}">
-      <EmojiPicker
-        :enableStickerPicker="false"
-        @emoji="addReaction($event, close)"
-      />
+      <div class="reaction-picker-filter">
+        <input
+          v-model="filterWord"
+          size="1"
+          :placeholder="$t('emoji.search_emoji')"
+        >
+      </div>
+      <div class="reaction-picker">
+        <span
+          v-for="emoji in commonEmojis"
+          :key="emoji.replacement"
+          class="emoji-button"
+          :title="emoji.displayText"
+          @click="addReaction($event, emoji.replacement, close)"
+        >
+          {{ emoji.replacement }}
+        </span>
+        <div class="reaction-picker-divider" />
+        <span
+          v-for="(emoji, key) in emojis"
+          :key="key"
+          class="emoji-button"
+          :title="emoji.displayText"
+          @click="addReaction($event, emoji.replacement, close)"
+        >
+          <img
+            v-if="emoji.imageUrl !== false"
+            :src="emoji.imageUrl"
+            width="30px"
+            class="custom-reaction"
+          >
+          <span v-else>
+            {{ emoji.replacement }}
+          </span>
+        </span>
+        <div class="reaction-bottom-fader" />
+      </div>
     </template>
     <template v-slot:trigger>
       <button
@@ -103,11 +136,6 @@
       color: var(--text, $fallback--text);
     }
   }
-
-  .popover {
-    transform: translateX(-64px) translateY(5px);
-    min-width: 70%;
-  }
 }
 
 </style>

static/terms-of-service.html

@@ -1,3 +1,45 @@
 <h4>Terms of Service</h4>
 
-<p>This is a placeholder, overwrite this by putting a file at <pre>instance/static/terms_of_service.html</pre><p>
+<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.svg" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />