Update emoji API

closes: #75 (closed)

src/api/emojiPacks.js

@@ -2,40 +2,86 @@ import request from '@/utils/request'
 import { getToken } from '@/utils/auth'
 import { baseName } from './utils'
 
-import _ from 'lodash'
+export async function addNewEmojiFile(packName, file, shortcode, filename, host, token) {
+  const data = new FormData()
+  if (filename.trim() !== '') {
+    data.set('filename', filename)
+  }
+  if (shortcode.trim() !== '') {
+    data.set('shortcode', shortcode)
+  }
+  data.set('file', file)
 
-export async function deletePack(host, token, name) {
   return await request({
     baseURL: baseName(host),
-    url: `/api/pleroma/emoji/packs/${name}`,
-    method: 'delete',
-    headers: authHeaders(token)
+    url: `/api/pleroma/emoji/packs/${packName}/files`,
+    method: 'post',
+    headers: authHeaders(token),
+    data
   })
 }
 
-export async function reloadEmoji(host, token) {
+export function addressOfEmojiInPack(host, packName, name) {
+  return `${baseName(host)}/emoji/${packName}/${name}`
+}
+
+export async function createPack(host, token, packName) {
   return await request({
     baseURL: baseName(host),
-    url: '/api/pleroma/admin/reload_emoji',
+    url: `/api/pleroma/emoji/packs/${packName}`,
     method: 'post',
     headers: authHeaders(token)
   })
 }
 
-export async function importFromFS(host, token) {
+export async function deleteEmojiFile(packName, shortcode, host, token) {
+  return await request({
+    baseURL: baseName(host),
+    url: `/api/pleroma/emoji/packs/${packName}/files`,
+    method: 'delete',
+    headers: authHeaders(token),
+    data: { shortcode }
+  })
+}
+
+export async function deletePack(host, token, packName) {
   return await request({
     baseURL: baseName(host),
-    url: '/api/pleroma/emoji/packs/import_from_fs',
+    url: `/api/pleroma/emoji/packs/${packName}`,
+    method: 'delete',
+    headers: authHeaders(token)
+  })
+}
+
+export async function downloadFrom(host, instance, packName, as, token) {
+  if (as.trim() === '') {
+    as = null
+  }
+
+  return await request({
+    baseURL: baseName(host),
+    url: '/api/pleroma/emoji/packs/download',
     method: 'post',
+    headers: authHeaders(token),
+    data: { url: baseName(instance), name: packName, as },
+    timeout: 0
+  })
+}
+
+export async function fetchPack(packName, host, token) {
+  return await request({
+    baseURL: baseName(host),
+    url: `/api/pleroma/emoji/packs/${packName}`,
+    method: 'get',
     headers: authHeaders(token)
   })
 }
 
-export async function createPack(host, token, name) {
+export async function importFromFS(host, token) {
   return await request({
     baseURL: baseName(host),
-    url: `/api/pleroma/emoji/packs/${name}`,
-    method: 'put',
+    url: '/api/pleroma/emoji/packs/import',
+    method: 'get',
     headers: authHeaders(token)
   })
 }
@@ -51,106 +97,40 @@ export async function listPacks(host) {
 export async function listRemotePacks(host, token, instance) {
   return await request({
     baseURL: baseName(host),
-    url: `/api/pleroma/emoji/packs/list_from`,
-    method: 'post',
-    headers: authHeaders(token),
-    data: { instance_address: baseName(instance) }
+    url: `/api/pleroma/emoji/packs/remote?url=${baseName(instance)}`,
+    method: 'get',
+    headers: authHeaders(token)
   })
 }
 
-export async function downloadFrom(host, instance_address, pack_name, as, token) {
-  if (as.trim() === '') {
-    as = null
-  }
-
+export async function reloadEmoji(host, token) {
   return await request({
     baseURL: baseName(host),
-    url: '/api/pleroma/emoji/packs/download_from',
+    url: '/api/pleroma/admin/reload_emoji',
     method: 'post',
-    headers: authHeaders(token),
-    data: { instance_address: baseName(instance_address), pack_name, as },
-    timeout: 0
+    headers: authHeaders(token)
   })
 }
 
-export async function savePackMetadata(host, token, name, new_data) {
+export async function savePackMetadata(host, token, packName, metadata) {
   return await request({
     baseURL: baseName(host),
-    url: `/api/pleroma/emoji/packs/${name}/update_metadata`,
-    method: 'post',
+    url: `/api/pleroma/emoji/packs/${packName}`,
+    method: 'patch',
     headers: authHeaders(token),
-    data: { name, new_data },
+    data: { metadata },
     timeout: 0 // This might take a long time
   })
 }
 
-function fileUpdateFormData(d) {
-  const data = new FormData()
-
-  _.each(d, (v, k) => {
-    data.set(k, v)
-  })
-
-  return data
-}
-
-export async function updatePackFile(host, token, args) {
-  let data = null
-
-  switch (args.action) {
-    case 'add': {
-      const { shortcode, file, fileName } = args
-
-      data = fileUpdateFormData({
-        action: 'add',
-        shortcode: shortcode,
-        file: file
-      })
-      if (fileName.trim() !== '') {
-        data.set('filename', fileName)
-      }
-
-      break
-    }
-
-    case 'update': {
-      const { oldName, newName, newFilename } = args
-
-      data = fileUpdateFormData({
-        action: 'update',
-        shortcode: oldName,
-        new_shortcode: newName,
-        new_filename: newFilename
-      })
-
-      break
-    }
-
-    case 'remove': {
-      const { name } = args
-      data = fileUpdateFormData({
-        action: 'remove',
-        shortcode: name
-      })
-
-      break
-    }
-  }
-
-  const { packName } = args
-
+export async function updateEmojiFile(packName, shortcode, newShortcode, newFilename, force, host, token) {
   return await request({
     baseURL: baseName(host),
-    url: `/api/pleroma/emoji/packs/${packName}/update_file`,
-    method: 'post',
+    url: `/api/pleroma/emoji/packs/${packName}/files`,
+    method: 'patch',
     headers: authHeaders(token),
-    data: data,
-    timeout: 0
+    data: { shortcode, new_shortcode: newShortcode, new_filename: newFilename, force }
   })
 }
 
-export function addressOfEmojiInPack(host, packName, name) {
-  return `${baseName(host)}/emoji/${packName}/${name}`
-}
-
 const authHeaders = (token) => token ? { 'Authorization': `Bearer ${getToken()}` } : {}