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

src/boot/routes.js

@@ -20,9 +20,6 @@ import ShoutPanel from 'components/shout_panel/shout_panel.vue'
 import WhoToFollow from 'components/who_to_follow/who_to_follow.vue'
 import About from 'components/about/about.vue'
 import RemoteUserResolver from 'components/remote_user_resolver/remote_user_resolver.vue'
-import Lists from 'components/lists/lists.vue'
-import ListTimeline from 'components/list_timeline/list_timeline.vue'
-import ListEdit from 'components/list_edit/list_edit.vue'
 
 export default (store) => {
   const validateAuthenticatedRoute = (to, from, next) => {
@@ -72,10 +69,7 @@ export default (store) => {
     { name: 'search', path: '/search', component: Search, props: (route) => ({ query: route.query.query }) },
     { name: 'who-to-follow', path: '/who-to-follow', component: WhoToFollow, beforeEnter: validateAuthenticatedRoute },
     { name: 'about', path: '/about', component: About },
-    { name: 'user-profile', path: '/:_(users)?/:name', component: UserProfile },
+    { name: 'user-profile', path: '/:_(users)?/:name', component: UserProfile }
-    { name: 'lists', path: '/lists', component: Lists },
-    { name: 'list-timeline', path: '/lists/:id', component: ListTimeline },
-    { name: 'list-edit', path: '/lists/:id/edit', component: ListEdit }
   ]
 
   if (store.state.instance.pleromaChatMessagesAvailable) {

src/components/list_card/list_card.js

@@ -1,16 +0,0 @@
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faEllipsisH
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faEllipsisH
-)
-
-const ListCard = {
-  props: [
-    'list'
-  ]
-}
-
-export default ListCard

src/components/list_card/list_card.vue

@@ -1,51 +0,0 @@
-<template>
-  <div class="list-card">
-    <router-link
-      :to="{ name: 'list-timeline', params: { id: list.id } }"
-      class="list-name"
-    >
-      {{ list.title }}
-    </router-link>
-    <router-link
-      :to="{ name: 'list-edit', params: { id: list.id } }"
-      class="button-list-edit"
-    >
-      <FAIcon
-        class="fa-scale-110 fa-old-padding"
-        icon="ellipsis-h"
-      />
-    </router-link>
-  </div>
-</template>
-
-<script src="./list_card.js"></script>
-
-<style lang="scss">
-@import '../../_variables.scss';
-
-.list-card {
-  display: flex;
-}
-
-.list-name,
-.button-list-edit {
-  margin: 0;
-  padding: 1em;
-  color: $fallback--link;
-  color: var(--link, $fallback--link);
-
-  &:hover {
-    background-color: $fallback--lightBg;
-    background-color: var(--selectedMenu, $fallback--lightBg);
-    color: $fallback--link;
-    color: var(--selectedMenuText, $fallback--link);
-    --faint: var(--selectedMenuFaintText, $fallback--faint);
-    --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
-    --lightText: var(--selectedMenuLightText, $fallback--lightText);
-  }
-}
-
-.list-name {
-  flex-grow: 1;
-}
-</style>

src/components/list_edit/list_edit.js

@@ -1,109 +0,0 @@
-import { mapState, mapGetters } from 'vuex'
-import BasicUserCard from '../basic_user_card/basic_user_card.vue'
-import UserAvatar from '../user_avatar/user_avatar.vue'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faSearch,
-  faChevronLeft
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faSearch,
-  faChevronLeft
-)
-
-const ListNew = {
-  components: {
-    BasicUserCard,
-    UserAvatar
-  },
-  data () {
-    return {
-      title: '',
-      userIds: [],
-      selectedUserIds: [],
-      loading: false,
-      query: ''
-    }
-  },
-  created () {
-    this.$store.dispatch('fetchList', { id: this.id })
-      .then(() => { this.title = this.findListTitle(this.id) })
-    this.$store.dispatch('fetchListAccounts', { id: this.id })
-      .then(() => {
-        this.selectedUserIds = this.findListAccounts(this.id)
-        this.selectedUserIds.forEach(userId => {
-          this.$store.dispatch('fetchUserIfMissing', userId)
-        })
-      })
-  },
-  computed: {
-    id () {
-      return this.$route.params.id
-    },
-    users () {
-      return this.userIds.map(userId => this.findUser(userId))
-    },
-    selectedUsers () {
-      return this.selectedUserIds.map(userId => this.findUser(userId)).filter(user => user)
-    },
-    availableUsers () {
-      if (this.query.length !== 0) {
-        return this.users
-      } else {
-        return this.selectedUsers
-      }
-    },
-    ...mapState({
-      currentUser: state => state.users.currentUser
-    }),
-    ...mapGetters(['findUser', 'findListTitle', 'findListAccounts'])
-  },
-  methods: {
-    onInput () {
-      this.search(this.query)
-    },
-    selectUser (user) {
-      if (this.selectedUserIds.includes(user.id)) {
-        this.removeUser(user.id)
-      } else {
-        this.addUser(user)
-      }
-    },
-    isSelected (user) {
-      return this.selectedUserIds.includes(user.id)
-    },
-    addUser (user) {
-      this.selectedUserIds.push(user.id)
-    },
-    removeUser (userId) {
-      this.selectedUserIds = this.selectedUserIds.filter(id => id !== userId)
-    },
-    search (query) {
-      if (!query) {
-        this.loading = false
-        return
-      }
-
-      this.loading = true
-      this.userIds = []
-      this.$store.dispatch('search', { q: query, resolve: true, type: 'accounts', following: true })
-        .then(data => {
-          this.loading = false
-          this.userIds = data.accounts.map(a => a.id)
-        })
-    },
-    updateList () {
-      this.$store.dispatch('setList', { id: this.id, title: this.title })
-      this.$store.dispatch('setListAccounts', { id: this.id, accountIds: this.selectedUserIds })
-
-      this.$router.push({ name: 'list-timeline', params: { id: this.id } })
-    },
-    deleteList () {
-      this.$store.dispatch('deleteList', { id: this.id })
-      this.$router.push({ name: 'lists' })
-    }
-  }
-}
-
-export default ListNew

src/components/list_edit/list_edit.vue

@@ -1,108 +0,0 @@
-<template>
-  <div class="panel-default panel list-edit">
-    <div
-      ref="header"
-      class="panel-heading"
-    >
-      <button
-        class="button-unstyled go-back-button"
-        @click="$router.back"
-      >
-        <FAIcon
-          size="lg"
-          icon="chevron-left"
-        />
-      </button>
-    </div>
-    <div class="input-wrap">
-      <input
-        ref="title"
-        v-model="title"
-        :placeholder="$t('lists.title')"
-      >
-    </div>
-    <div class="input-wrap">
-      <div class="input-search">
-        <FAIcon
-          class="search-icon fa-scale-110 fa-old-padding"
-          icon="search"
-        />
-      </div>
-      <input
-        ref="search"
-        v-model="query"
-        :placeholder="$t('lists.search')"
-        @input="onInput"
-      >
-    </div>
-    <div class="member-list">
-      <div
-        v-for="user in availableUsers"
-        :key="user.id"
-        class="member"
-      >
-        <BasicUserCard
-          :user="user"
-          :class="isSelected(user) ? 'selected' : ''"
-          @click.capture.prevent="selectUser(user)"
-        />
-      </div>
-    </div>
-    <button
-      :disabled="title && title.length === 0"
-      class="btn button-default"
-      @click="updateList"
-    >
-      {{ $t('lists.save') }}
-    </button>
-    <button
-      class="btn button-default"
-      @click="deleteList"
-    >
-      {{ $t('lists.delete') }}
-    </button>
-  </div>
-</template>
-
-<script src="./list_edit.js"></script>
-
-<style lang="scss">
-@import '../../_variables.scss';
-
-.list-edit {
-  .input-wrap {
-    display: flex;
-    margin: 0.7em 0.5em 0.7em 0.5em;
-
-    input {
-      width: 100%;
-    }
-  }
-
-  .search-icon {
-    margin-right: 0.3em;
-  }
-
-  .member-list {
-    padding-bottom: 0.7rem;
-  }
-
-  .basic-user-card:hover,
-  .basic-user-card.selected {
-    cursor: pointer;
-    background-color: var(--selectedPost, $fallback--lightBg);
-  }
-
-  .go-back-button {
-    text-align: center;
-    line-height: 1;
-    height: 100%;
-    align-self: start;
-    width: var(--__panel-heading-height-inner);
-  }
-
-  .btn {
-    margin: 0.5em;
-  }
-}
-</style>

src/components/list_new/list_new.js

@@ -1,97 +0,0 @@
-import { mapState, mapGetters } from 'vuex'
-import BasicUserCard from '../basic_user_card/basic_user_card.vue'
-import UserAvatar from '../user_avatar/user_avatar.vue'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faSearch,
-  faChevronLeft
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faSearch,
-  faChevronLeft
-)
-
-const ListNew = {
-  components: {
-    BasicUserCard,
-    UserAvatar
-  },
-  data () {
-    return {
-      title: '',
-      userIds: [],
-      selectedUserIds: [],
-      loading: false,
-      query: ''
-    }
-  },
-  computed: {
-    users () {
-      return this.userIds.map(userId => this.findUser(userId))
-    },
-    selectedUsers () {
-      return this.selectedUserIds.map(userId => this.findUser(userId))
-    },
-    availableUsers () {
-      if (this.query.length !== 0) {
-        return this.users
-      } else {
-        return this.selectedUsers
-      }
-    },
-    ...mapState({
-      currentUser: state => state.users.currentUser
-    }),
-    ...mapGetters(['findUser'])
-  },
-  methods: {
-    goBack () {
-      this.$emit('cancel')
-    },
-    onInput () {
-      this.search(this.query)
-    },
-    selectUser (user) {
-      if (this.selectedUserIds.includes(user.id)) {
-        this.removeUser(user.id)
-      } else {
-        this.addUser(user)
-      }
-    },
-    isSelected (user) {
-      return this.selectedUserIds.includes(user.id)
-    },
-    addUser (user) {
-      this.selectedUserIds.push(user.id)
-    },
-    removeUser (userId) {
-      this.selectedUserIds = this.selectedUserIds.filter(id => id !== userId)
-    },
-    search (query) {
-      if (!query) {
-        this.loading = false
-        return
-      }
-
-      this.loading = true
-      this.userIds = []
-      this.$store.dispatch('search', { q: query, resolve: true, type: 'accounts', following: true })
-        .then(data => {
-          this.loading = false
-          this.userIds = data.accounts.map(a => a.id)
-        })
-    },
-    createList () {
-      // the API has two different endpoints for "creating a list with a name"
-      // and "updating the accounts on the list".
-      this.$store.dispatch('createList', { title: this.title })
-        .then((list) => {
-          this.$store.dispatch('setListAccounts', { id: list.id, accountIds: this.selectedUserIds })
-          this.$router.push({ name: 'list-timeline', params: { id: list.id } })
-        })
-    }
-  }
-}
-
-export default ListNew

src/components/list_new/list_new.vue

@@ -1,102 +0,0 @@
-<template>
-  <div class="panel-default panel list-new">
-    <div
-      ref="header"
-      class="panel-heading"
-    >
-      <button
-        class="button-unstyled go-back-button"
-        @click="goBack"
-      >
-        <FAIcon
-          size="lg"
-          icon="chevron-left"
-        />
-      </button>
-    </div>
-    <div class="input-wrap">
-      <input
-        ref="title"
-        v-model="title"
-        :placeholder="$t('lists.title')"
-      >
-    </div>
-    <div class="input-wrap">
-      <div class="input-search">
-        <FAIcon
-          class="search-icon fa-scale-110 fa-old-padding"
-          icon="search"
-        />
-      </div>
-      <input
-        ref="search"
-        v-model="query"
-        :placeholder="$t('lists.search')"
-        @input="onInput"
-      >
-    </div>
-    <div class="member-list">
-      <div
-        v-for="user in availableUsers"
-        :key="user.id"
-        class="member"
-      >
-        <BasicUserCard
-          :user="user"
-          :class="isSelected(user) ? 'selected' : ''"
-          @click.capture.prevent="selectUser(user)"
-        />
-      </div>
-    </div>
-    <button
-      :disabled="title && title.length === 0"
-      class="btn button-default"
-      @click="createList"
-    >
-      {{ $t('lists.create') }}
-    </button>
-  </div>
-</template>
-
-<script src="./list_new.js"></script>
-
-<style lang="scss">
-@import '../../_variables.scss';
-
-.list-new {
-  .input-wrap {
-    display: flex;
-    margin: 0.7em 0.5em 0.7em 0.5em;
-
-    input {
-      width: 100%;
-    }
-  }
-
-  .search-icon {
-    margin-right: 0.3em;
-  }
-
-  .member-list {
-    padding-bottom: 0.7rem;
-  }
-
-  .basic-user-card:hover,
-  .basic-user-card.selected {
-    cursor: pointer;
-    background-color: var(--selectedPost, $fallback--lightBg);
-  }
-
-  .go-back-button {
-    text-align: center;
-    line-height: 1;
-    height: 100%;
-    align-self: start;
-    width: var(--__panel-heading-height-inner);
-  }
-
-  .btn {
-    margin: 0.5em;
-  }
-}
-</style>

src/components/list_timeline/list_timeline.js

@@ -1,25 +0,0 @@
-import Timeline from '../timeline/timeline.vue'
-const ListTimeline = {
-  data () {
-    return {
-      listId: null
-    }
-  },
-  components: {
-    Timeline
-  },
-  computed: {
-    timeline () { return this.$store.state.statuses.timelines.list }
-  },
-  created () {
-    this.listId = this.$route.params.id
-    this.$store.dispatch('fetchList', { id: this.listId })
-    this.$store.dispatch('startFetchingTimeline', { timeline: 'list', listId: this.listId })
-  },
-  unmounted () {
-    this.$store.dispatch('stopFetchingTimeline', 'list')
-    this.$store.commit('clearTimeline', { timeline: 'list' })
-  }
-}
-
-export default ListTimeline

src/components/list_timeline/list_timeline.vue

@@ -1,10 +0,0 @@
-<template>
-  <Timeline
-    title="list.name"
-    :timeline="timeline"
-    :list-id="listId"
-    timeline-name="list"
-  />
-</template>
-
-<script src="./list_timeline.js"></script>

src/components/lists/lists.js

@@ -1,32 +0,0 @@
-import ListCard from '../list_card/list_card.vue'
-import ListNew from '../list_new/list_new.vue'
-
-const Lists = {
-  data () {
-    return {
-      isNew: false
-    }
-  },
-  components: {
-    ListCard,
-    ListNew
-  },
-  created () {
-    this.$store.dispatch('startFetchingLists')
-  },
-  computed: {
-    lists () {
-      return this.$store.state.lists.allLists
-    }
-  },
-  methods: {
-    cancelNewList () {
-      this.isNew = false
-    },
-    newList () {
-      this.isNew = true
-    }
-  }
-}
-
-export default Lists

src/components/lists/lists.vue

@@ -1,31 +0,0 @@
-<template>
-  <div v-if="isNew">
-    <ListNew @cancel="cancelNewList" />
-  </div>
-  <div
-    v-else
-    class="settings panel panel-default"
-  >
-    <div class="panel-heading">
-      <div class="title">
-        {{ $t('lists.lists') }}
-      </div>
-      <button
-        class="button-default"
-        @click="newList"
-      >
-        {{ $t("lists.new") }}
-      </button>
-    </div>
-    <div class="panel-body">
-      <ListCard
-        v-for="list in lists.slice().reverse()"
-        :key="list"
-        :list="list"
-        class="list-item"
-      />
-    </div>
-  </div>
-</template>
-
-<script src="./lists.js"></script>

src/components/mfm_content/mfm_content.jsx

@@ -234,8 +234,6 @@ export default defineComponent({
         }
 
         case 'emojiCode': {
-          const emoj = this.status.emojis.find((emoji) => emoji.shortcode === token.props.name)
-          if (emoj) {
           return [h('div', {
             class: 'still-image emoji img'
           },
@@ -246,9 +244,6 @@ export default defineComponent({
             src: this.status.emojis.find((emoji) => emoji.shortcode === token.props.name).static_url
           })]
           )]
-          } else {
-            return `:${token.props.name}:`
-          }
         }
 
         case 'unicodeEmoji': {

src/components/nav_panel/nav_panel.js

@@ -12,8 +12,7 @@ import {
   faComments,
   faBell,
   faInfoCircle,
-  faStream,
+  faStream
-  faList
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -26,8 +25,7 @@ library.add(
   faComments,
   faBell,
   faInfoCircle,
-  faStream,
+  faStream
-  faList
 )
 
 const NavPanel = {

src/components/nav_panel/nav_panel.vue

@@ -25,18 +25,6 @@
             <TimelineMenuContent class="timelines" />
           </div>
         </li>
-        <li v-if="currentUser">
-          <router-link
-            class="menu-item"
-            :to="{ name: 'lists' }"
-          >
-            <FAIcon
-              fixed-width
-              class="fa-scale-110"
-              icon="list"
-            />{{ $t("nav.lists") }}
-          </router-link>
-        </li>
         <li v-if="currentUser">
           <router-link
             class="menu-item"

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,
+    Popover
-    EmojiPicker
   },
   methods: {
-    addReaction (event, close) {
+    addReaction (event, emoji, close) {
-      const emoji = event.insertion
       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
+      <div class="reaction-picker-filter">
-        :enable-sticker-picker="false"
+        <input
-        @emoji="addReaction($event, close)"
+          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>

src/components/settings_modal/tabs/version_tab.js

@@ -1,7 +1,7 @@
 import { extractCommit } from 'src/services/version/version.service'
 
 const pleromaFeCommitUrl = 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/'
-const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commits/'
+const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commit/'
 
 const VersionTab = {
   data () {

src/components/side_drawer/side_drawer.js

@@ -14,8 +14,7 @@ import {
   faSearch,
   faTachometerAlt,
   faCog,
-  faInfoCircle,
+  faInfoCircle
-  faList
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -29,8 +28,7 @@ library.add(
   faSearch,
   faTachometerAlt,
   faCog,
-  faInfoCircle,
+  faInfoCircle
-  faList
 )
 
 const SideDrawer = {

src/components/side_drawer/side_drawer.vue

@@ -55,18 +55,6 @@
             /> {{ $t("nav.timelines") }}
           </router-link>
         </li>
-        <li
-          v-if="currentUser"
-          @click="toggleDrawer"
-        >
-          <router-link :to="{ name: 'lists' }">
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding"
-              icon="list"
-            /> {{ $t("nav.lists") }}
-          </router-link>
-        </li>
         <li
           v-if="currentUser && pleromaChatMessagesAvailable"
           @click="toggleDrawer"

src/components/timeline/timeline.js

@@ -18,7 +18,6 @@ const Timeline = {
     'timelineName',
     'title',
     'userId',
-    'listId',
     'tag',
     'embedded',
     'count',
@@ -102,7 +101,6 @@ const Timeline = {
       timeline: this.timelineName,
       showImmediately,
       userId: this.userId,
-      listId: this.listId,
       tag: this.tag
     })
   },
@@ -158,7 +156,6 @@ const Timeline = {
         older: true,
         showImmediately: true,
         userId: this.userId,
-        listId: this.listId,
         tag: this.tag
       }).then(({ statuses }) => {
         if (statuses && statuses.length === 0) {

src/components/timeline_menu/timeline_menu.js

@@ -58,9 +58,6 @@ const TimelineMenu = {
       if (route === 'tag-timeline') {
         return '#' + this.$route.params.tag
       }
-      if (route === 'list-timeline') {
-        return this.$store.getters.findListTitle(this.$route.params.id)
-      }
       const i18nkey = timelineNames()[this.$route.name]
       return i18nkey ? this.$t(i18nkey) : route
     }

src/i18n/en.json

@@ -146,8 +146,7 @@
     "who_to_follow": "Who to follow",
     "preferences": "Preferences",
     "timelines": "Timelines",
-    "chats": "Chats",
+    "chats": "Chats"
-    "lists": "Lists"
   },
   "notifications": {
     "broken_favorite": "Unknown status, searching for it…",
@@ -947,15 +946,6 @@
     "error_sending_message": "Something went wrong when sending the message.",
     "empty_chat_list_placeholder": "You don't have any chats yet. Start a new chat!"
   },
-  "lists": {
-    "lists": "Lists",
-    "new": "New List",
-    "title": "List title",
-    "search": "Search users",
-    "create": "Create",
-    "save": "Save changes",
-    "delete": "Delete list"
-  },
   "file_type": {
     "audio": "Audio",
     "video": "Video",

src/main.js

@@ -6,7 +6,6 @@ import './lib/event_target_polyfill.js'
 import interfaceModule from './modules/interface.js'
 import instanceModule from './modules/instance.js'
 import statusesModule from './modules/statuses.js'
-import listsModule from './modules/lists.js'
 import usersModule from './modules/users.js'
 import apiModule from './modules/api.js'
 import configModule from './modules/config.js'
@@ -71,7 +70,6 @@ const persistedStateOptions = {
       // TODO refactor users/statuses modules, they depend on each other
       users: usersModule,
       statuses: statusesModule,
-      lists: listsModule,
       api: apiModule,
       config: configModule,
       serverSideConfig: serverSideConfigModule,

src/modules/api.js

@@ -191,13 +191,12 @@ const api = {
     startFetchingTimeline (store, {
       timeline = 'friends',
       tag = false,
-      userId = false,
+      userId = false
-      listId = false
     }) {
       if (store.state.fetchers[timeline]) return
 
       const fetcher = store.state.backendInteractor.startFetchingTimeline({
-        timeline, store, userId, listId, tag
+        timeline, store, userId, tag
       })
       store.commit('addFetcher', { fetcherName: timeline, fetcher })
     },
@@ -249,18 +248,6 @@ const api = {
       store.commit('setFollowRequests', requests)
     },
 
-    // Lists
-    startFetchingLists (store) {
-      if (store.state.fetchers['lists']) return
-      const fetcher = store.state.backendInteractor.startFetchingLists({ store })
-      store.commit('addFetcher', { fetcherName: 'lists', fetcher })
-    },
-    stopFetchingLists (store) {
-      const fetcher = store.state.fetchers.lists
-      if (!fetcher) return
-      store.commit('removeFetcher', { fetcherName: 'lists', fetcher })
-    },
-
     // Pleroma websocket
     setWsToken (store, token) {
       store.commit('setWsToken', token)

src/modules/lists.js

@@ -1,90 +0,0 @@
-import { remove, find } from 'lodash'
-
-export const defaultState = {
-  allLists: [],
-  allListsObject: {}
-}
-
-export const mutations = {
-  setLists (state, value) {
-    state.allLists = value
-  },
-  setList (state, { id, title }) {
-    if (!state.allListsObject[id]) {
-      state.allListsObject[id] = {}
-    }
-    state.allListsObject[id].title = title
-
-    if (!find(state.allLists, { id })) {
-      state.allLists.push({ id, title })
-    } else {
-      find(state.allLists, { id }).title = title
-    }
-  },
-  setListAccounts (state, { id, accountIds }) {
-    if (!state.allListsObject[id]) {
-      state.allListsObject[id] = {}
-    }
-    state.allListsObject[id].accountIds = accountIds
-  },
-  deleteList (state, { id }) {
-    delete state.allListsObject[id]
-    remove(state.allLists, list => list.id === id)
-  }
-}
-
-const actions = {
-  setLists ({ commit }, value) {
-    commit('setLists', value)
-  },
-  createList ({ rootState, commit }, { title }) {
-    return rootState.api.backendInteractor.createList({ title })
-      .then((list) => {
-        commit('setList', { id: list.id, title })
-        return list
-      })
-  },
-  fetchList ({ rootState, commit }, { id }) {
-    return rootState.api.backendInteractor.getList({ id })
-      .then((list) => commit('setList', { id: list.id, title: list.title }))
-  },
-  fetchListAccounts ({ rootState, commit }, { id }) {
-    return rootState.api.backendInteractor.getListAccounts({ id })
-      .then((accountIds) => commit('setListAccounts', { id, accountIds }))
-  },
-  setList ({ rootState, commit }, { id, title }) {
-    rootState.api.backendInteractor.updateList({ id, title })
-    commit('setList', { id, title })
-  },
-  setListAccounts ({ rootState, commit }, { id, accountIds }) {
-    commit('setListAccounts', { id, accountIds })
-    rootState.api.backendInteractor.addAccountsToList({ id, accountIds })
-    rootState.api.backendInteractor.removeAccountsFromList({
-      id,
-      accountIds: rootState.lists.allListsObject[id].accountIds.filter(id => !accountIds.includes(id))
-    })
-  },
-  deleteList ({ rootState, commit }, { id }) {
-    rootState.api.backendInteractor.deleteList({ id })
-    commit('deleteList', { id })
-  }
-}
-
-export const getters = {
-  findListTitle: state => id => {
-    if (!state.allListsObject[id]) return
-    return state.allListsObject[id].title
-  },
-  findListAccounts: state => id => {
-    return state.allListsObject[id].accountIds
-  }
-}
-
-const lists = {
-  state: defaultState,
-  mutations,
-  actions,
-  getters
-}
-
-export default lists

src/modules/statuses.js

@@ -62,8 +62,7 @@ export const defaultState = () => ({
     friends: emptyTl(),
     tag: emptyTl(),
     dms: emptyTl(),
-    bookmarks: emptyTl(),
+    bookmarks: emptyTl()
-    list: emptyTl()
   }
 })
 

src/services/api/api.service.js

@@ -50,9 +50,6 @@ const MASTODON_STATUS_CONTEXT_URL = id => `/api/v1/statuses/${id}/context`
 const MASTODON_USER_URL = '/api/v1/accounts'
 const MASTODON_USER_RELATIONSHIPS_URL = '/api/v1/accounts/relationships'
 const MASTODON_USER_TIMELINE_URL = id => `/api/v1/accounts/${id}/statuses`
-const MASTODON_LIST_URL = id => `/api/v1/lists/${id}`
-const MASTODON_LIST_TIMELINE_URL = id => `/api/v1/timelines/list/${id}`
-const MASTODON_LIST_ACCOUNTS_URL = id => `/api/v1/lists/${id}/accounts`
 const MASTODON_TAG_TIMELINE_URL = tag => `/api/v1/timelines/tag/${tag}`
 const MASTODON_BOOKMARK_TIMELINE_URL = '/api/v1/bookmarks'
 const MASTODON_USER_BLOCKS_URL = '/api/v1/blocks/'
@@ -81,7 +78,6 @@ const MASTODON_SEARCH_2 = `/api/v2/search`
 const MASTODON_USER_SEARCH_URL = '/api/v1/accounts/search'
 const MASTODON_MASCOT_URL = '/api/v1/pleroma/mascot'
 const MASTODON_DOMAIN_BLOCKS_URL = '/api/v1/domain_blocks'
-const MASTODON_LISTS_URL = '/api/v1/lists'
 const MASTODON_STREAMING = '/api/v1/streaming'
 const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers'
 const PLEROMA_EMOJI_REACTIONS_URL = id => `/api/v1/pleroma/statuses/${id}/reactions`
@@ -386,81 +382,6 @@ const fetchFollowRequests = ({ credentials }) => {
     .then((data) => data.map(parseUser))
 }
 
-const fetchLists = ({ credentials }) => {
-  const url = MASTODON_LISTS_URL
-  return fetch(url, { headers: authHeaders(credentials) })
-    .then((data) => data.json())
-}
-
-const createList = ({ title, credentials }) => {
-  const url = MASTODON_LISTS_URL
-  const headers = authHeaders(credentials)
-  headers['Content-Type'] = 'application/json'
-
-  return fetch(url, {
-    method: 'POST',
-    headers: headers,
-    body: JSON.stringify({ title })
-  }).then((data) => data.json())
-}
-
-const getList = ({ id, credentials }) => {
-  const url = MASTODON_LIST_URL(id)
-  return fetch(url, { headers: authHeaders(credentials) })
-    .then((data) => data.json())
-}
-
-const updateList = ({ id, title, credentials }) => {
-  const url = MASTODON_LIST_URL(id)
-  const headers = authHeaders(credentials)
-  headers['Content-Type'] = 'application/json'
-
-  return fetch(url, {
-    method: 'PUT',
-    headers: headers,
-    body: JSON.stringify({ title })
-  })
-}
-
-const getListAccounts = ({ id, credentials }) => {
-  const url = MASTODON_LIST_ACCOUNTS_URL(id)
-  return fetch(url, { headers: authHeaders(credentials) })
-    .then((data) => data.json())
-    .then((data) => data.map(({ id }) => id))
-}
-
-const addAccountsToList = ({ id, accountIds, credentials }) => {
-  const url = MASTODON_LIST_ACCOUNTS_URL(id)
-  const headers = authHeaders(credentials)
-  headers['Content-Type'] = 'application/json'
-
-  return fetch(url, {
-    method: 'POST',
-    headers: headers,
-    body: JSON.stringify({ account_ids: accountIds })
-  })
-}
-
-const removeAccountsFromList = ({ id, accountIds, credentials }) => {
-  const url = MASTODON_LIST_ACCOUNTS_URL(id)
-  const headers = authHeaders(credentials)
-  headers['Content-Type'] = 'application/json'
-
-  return fetch(url, {
-    method: 'DELETE',
-    headers: headers,
-    body: JSON.stringify({ account_ids: accountIds })
-  })
-}
-
-const deleteList = ({ id, credentials }) => {
-  const url = MASTODON_LIST_URL(id)
-  return fetch(url, {
-    method: 'DELETE',
-    headers: authHeaders(credentials)
-  })
-}
-
 const fetchConversation = ({ id, credentials }) => {
   let urlContext = MASTODON_STATUS_CONTEXT_URL(id)
   return fetch(urlContext, { headers: authHeaders(credentials) })
@@ -582,7 +503,6 @@ const fetchTimeline = ({
   since = false,
   until = false,
   userId = false,
-  listId = false,
   tag = false,
   withMuted = false,
   replyVisibility = 'all'
@@ -595,7 +515,6 @@ const fetchTimeline = ({
     'publicAndExternal': MASTODON_PUBLIC_TIMELINE,
     user: MASTODON_USER_TIMELINE_URL,
     media: MASTODON_USER_TIMELINE_URL,
-    list: MASTODON_LIST_TIMELINE_URL,
     favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
     tag: MASTODON_TAG_TIMELINE_URL,
     bookmarks: MASTODON_BOOKMARK_TIMELINE_URL
@@ -609,10 +528,6 @@ const fetchTimeline = ({
     url = url(userId)
   }
 
-  if (timeline === 'list') {
-    url = url(listId)
-  }
-
   if (since) {
     params.push(['since_id', since])
   }
@@ -1433,14 +1348,6 @@ const apiService = {
   mfaSetupOTP,
   mfaConfirmOTP,
   fetchFollowRequests,
-  fetchLists,
-  createList,
-  getList,
-  updateList,
-  getListAccounts,
-  addAccountsToList,
-  removeAccountsFromList,
-  deleteList,
   approveUser,
   denyUser,
   suggestions,

src/services/backend_interactor_service/backend_interactor_service.js

@@ -2,11 +2,10 @@ import apiService, { getMastodonSocketURI, ProcessedWS } from '../api/api.servic
 import timelineFetcher from '../timeline_fetcher/timeline_fetcher.service.js'
 import notificationsFetcher from '../notifications_fetcher/notifications_fetcher.service.js'
 import followRequestFetcher from '../../services/follow_request_fetcher/follow_request_fetcher.service'
-import listsFetcher from '../../services/lists_fetcher/lists_fetcher.service.js'
 
 const backendInteractorService = credentials => ({
-  startFetchingTimeline ({ timeline, store, userId = false, listId = false, tag }) {
+  startFetchingTimeline ({ timeline, store, userId = false, tag }) {
-    return timelineFetcher.startFetching({ timeline, store, credentials, userId, listId, tag })
+    return timelineFetcher.startFetching({ timeline, store, credentials, userId, tag })
   },
 
   fetchTimeline (args) {
@@ -25,10 +24,6 @@ const backendInteractorService = credentials => ({
     return followRequestFetcher.startFetching({ store, credentials })
   },
 
-  startFetchingLists ({ store }) {
-    return listsFetcher.startFetching({ store, credentials })
-  },
-
   startUserSocket ({ store }) {
     const serv = store.rootState.instance.server.replace('http', 'ws')
     const url = serv + getMastodonSocketURI({ credentials, stream: 'user' })

src/services/lists_fetcher/lists_fetcher.service.js

@@ -1,22 +0,0 @@
-import apiService from '../api/api.service.js'
-import { promiseInterval } from '../promise_interval/promise_interval.js'
-
-const fetchAndUpdate = ({ store, credentials }) => {
-  return apiService.fetchLists({ credentials })
-    .then(lists => {
-      store.commit('setLists', lists)
-    }, () => {})
-    .catch(() => {})
-}
-
-const startFetching = ({ credentials, store }) => {
-  const boundFetchAndUpdate = () => fetchAndUpdate({ credentials, store })
-  boundFetchAndUpdate()
-  return promiseInterval(boundFetchAndUpdate, 240000)
-}
-
-const listsFetcher = {
-  startFetching
-}
-
-export default listsFetcher

src/services/timeline_fetcher/timeline_fetcher.service.js

@@ -3,13 +3,12 @@ import { camelCase } from 'lodash'
 import apiService from '../api/api.service.js'
 import { promiseInterval } from '../promise_interval/promise_interval.js'
 
-const update = ({ store, statuses, timeline, showImmediately, userId, listId, pagination }) => {
+const update = ({ store, statuses, timeline, showImmediately, userId, pagination }) => {
   const ccTimeline = camelCase(timeline)
 
   store.dispatch('addNewStatuses', {
     timeline: ccTimeline,
     userId,
-    listId,
     statuses,
     showImmediately,
     pagination
@@ -23,7 +22,6 @@ const fetchAndUpdate = ({
   older = false,
   showImmediately = false,
   userId = false,
-  listId = false,
   tag = false,
   until,
   since
@@ -46,7 +44,6 @@ const fetchAndUpdate = ({
   }
 
   args['userId'] = userId
-  args['listId'] = listId
   args['tag'] = tag
   args['withMuted'] = !hideMutedPosts
   if (loggedIn && ['friends', 'public', 'publicAndExternal'].includes(timeline)) {
@@ -65,7 +62,7 @@ const fetchAndUpdate = ({
       if (!older && statuses.length >= 20 && !timelineData.loading && numStatusesBeforeFetch > 0) {
         store.dispatch('queueFlush', { timeline: timeline, id: timelineData.maxId })
       }
-      update({ store, statuses, timeline, showImmediately, userId, listId, pagination })
+      update({ store, statuses, timeline, showImmediately, userId, pagination })
       return { statuses, pagination }
     })
     .catch((error) => {
@@ -78,15 +75,14 @@ const fetchAndUpdate = ({
     })
 }
 
-const startFetching = ({ timeline = 'friends', credentials, store, userId = false, listId = false, tag = false }) => {
+const startFetching = ({ timeline = 'friends', credentials, store, userId = false, tag = false }) => {
   const rootState = store.rootState || store.state
   const timelineData = rootState.statuses.timelines[camelCase(timeline)]
   const showImmediately = timelineData.visibleStatuses.length === 0
   timelineData.userId = userId
-  timelineData.listId = listId
+  fetchAndUpdate({ timeline, credentials, store, showImmediately, userId, tag })
-  fetchAndUpdate({ timeline, credentials, store, showImmediately, userId, listId, tag })
   const boundFetchAndUpdate = () =>
-    fetchAndUpdate({ timeline, credentials, store, userId, listId, tag })
+    fetchAndUpdate({ timeline, credentials, store, userId, tag })
   return promiseInterval(boundFetchAndUpdate, 20000)
 }
 const timelineFetcher = {

src/services/version/version.service.js

@@ -1,17 +1,6 @@
 
 export const extractCommit = versionString => {
-  // X.Y.Z-1337-gdeadbeef => deadbeef
+  const regex = /-g(\w+)/i
-  const commit = versionString.match(/-g(\w+)/i)
+  const matches = versionString.match(regex)
-  if (commit) {
+  return matches ? matches[1] : ''
-    return commit[1]
-  }
-
-  // X.Y.Z-develop => develop
-  const branch = versionString.match(/-([\w-/]+)$/i)
-  if (branch) {
-    return branch[1]
-  }
-
-  // X.Y.Z => vX.Y.Z
-  return 'v' + versionString
 }

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;" />

test/unit/specs/boot/routes.spec.js

@@ -37,28 +37,4 @@ describe('routes', () => {
 
     expect(matchedComponents[0].components.default.components.hasOwnProperty('UserCard')).to.eql(true)
   })
-
-  it('list view', async () => {
-    await router.push('/lists')
-
-    const matchedComponents = router.currentRoute.value.matched
-
-    expect(matchedComponents[0].components.default.components.hasOwnProperty('ListCard')).to.eql(true)
-  })
-
-  it('list timeline', async () => {
-    await router.push('/lists/1')
-
-    const matchedComponents = router.currentRoute.value.matched
-
-    expect(matchedComponents[0].components.default.components.hasOwnProperty('Timeline')).to.eql(true)
-  })
-
-  it('list edit', async () => {
-    await router.push('/lists/1/edit')
-
-    const matchedComponents = router.currentRoute.value.matched
-
-    expect(matchedComponents[0].components.default.components.hasOwnProperty('BasicUserCard')).to.eql(true)
-  })
 })

test/unit/specs/modules/lists.spec.js

@@ -1,83 +0,0 @@
-import { cloneDeep } from 'lodash'
-import { defaultState, mutations, getters } from '../../../../src/modules/lists.js'
-
-describe('The lists module', () => {
-  describe('mutations', () => {
-    it('updates array of all lists', () => {
-      const state = cloneDeep(defaultState)
-      const list = { id: '1', title: 'testList' }
-
-      mutations.setLists(state, [list])
-      expect(state.allLists).to.have.length(1)
-      expect(state.allLists).to.eql([list])
-    })
-
-    it('adds a new list with a title, updating the title for existing lists', () => {
-      const state = cloneDeep(defaultState)
-      const list = { id: '1', title: 'testList' }
-      const modList = { id: '1', title: 'anotherTestTitle' }
-
-      mutations.setList(state, list)
-      expect(state.allListsObject[list.id]).to.eql({ title: list.title })
-      expect(state.allLists).to.have.length(1)
-      expect(state.allLists[0]).to.eql(list)
-
-      mutations.setList(state, modList)
-      expect(state.allListsObject[modList.id]).to.eql({ title: modList.title })
-      expect(state.allLists).to.have.length(1)
-      expect(state.allLists[0]).to.eql(modList)
-    })
-
-    it('adds a new list with an array of IDs, updating the IDs for existing lists', () => {
-      const state = cloneDeep(defaultState)
-      const list = { id: '1', accountIds: ['1', '2', '3'] }
-      const modList = { id: '1', accountIds: ['3', '4', '5'] }
-
-      mutations.setListAccounts(state, list)
-      expect(state.allListsObject[list.id]).to.eql({ accountIds: list.accountIds })
-
-      mutations.setListAccounts(state, modList)
-      expect(state.allListsObject[modList.id]).to.eql({ accountIds: modList.accountIds })
-    })
-
-    it('deletes a list', () => {
-      const state = {
-        allLists: [{ id: '1', title: 'testList' }],
-        allListsObject: {
-          1: { title: 'testList', accountIds: ['1', '2', '3'] }
-        }
-      }
-      const id = '1'
-
-      mutations.deleteList(state, { id })
-      expect(state.allLists).to.have.length(0)
-      expect(state.allListsObject).to.eql({})
-    })
-  })
-
-  describe('getters', () => {
-    it('returns list title', () => {
-      const state = {
-        allLists: [{ id: '1', title: 'testList' }],
-        allListsObject: {
-          1: { title: 'testList', accountIds: ['1', '2', '3'] }
-        }
-      }
-      const id = '1'
-
-      expect(getters.findListTitle(state)(id)).to.eql('testList')
-    })
-
-    it('returns list accounts', () => {
-      const state = {
-        allLists: [{ id: '1', title: 'testList' }],
-        allListsObject: {
-          1: { title: 'testList', accountIds: ['1', '2', '3'] }
-        }
-      }
-      const id = '1'
-
-      expect(getters.findListAccounts(state)(id)).to.eql(['1', '2', '3'])
-    })
-  })
-})

test/unit/specs/services/version/version.service.spec.js

@@ -8,12 +8,4 @@ describe('extractCommit', () => {
   it('return short commit hash without branch name', () => {
     expect(extractCommit('1.0.0-45-g5e7aeebc-branch')).to.eql('5e7aeebc')
   })
-
-  it('return branch name', () => {
-    expect(extractCommit('1.0.0-branch')).to.eql('branch')
-  })
-
-  it('return version tag', () => {
-    expect(extractCommit('1.0.0')).to.eql('v1.0.0')
-  })
 })