Merge branch 'master' into feat/update-resource-discussion-types

dappforce · Oct 11, 2023 · 5e5546b · 5e5546b
2 parents ebdc034 + 555e3c9
commit 5e5546b
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.8.14 - 2023-05-31
+### Added
+- update `pinContent` method: add property 'asLink' that allow use ipfsCluster for pinning `@subsocial/utils`
+- remove `memoize` for createPostSlug fn
+
 ## 0.8.13 - 2023-05-31
 ### Added
 - add nacl realisation for asymmetric encryption to `@subsocial/utils`

diff --git a/package.json b/package.json
@@ -36,5 +36,5 @@
     "ts-jest": "^26.5.1",
     "typescript": "4.6.x"
   },
-  "version": "0.8.13"
+  "version": "0.8.15-beta.0"
 }
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@subsocial/api",
-  "version": "0.8.13",
+  "version": "0.8.15-beta.0",
   "description": "JavaScript API for Subsocial blockchain.",
   "author": "DappForce contributors",
   "license": "GPL-3.0-only",

diff --git a/packages/api/src/ipfs/index.ts b/packages/api/src/ipfs/index.ts
@@ -187,14 +187,14 @@ export class SubsocialIpfsApi {
             })
             content[cidStr] = res.value
           } else {
-            const res = await axios.get(
-              `${this._ipfsNodeUrl}/ipfs/${cid.toV1()}?timeout=${timeout}`
-            )
-            const data = res.data
+            const res = await this.client.cat(cid, { timeout })
 
-            if (typeof data === 'object') {
-              content[cidStr] = data
+            let data = ''
+            for await (const chunk of res) {
+              data += chunk.toString()
             }
+
+            content[cidStr] = JSON.parse(data)
           }
         } catch (err) {
           log.error(`Failed to load cid ${cid.toString()}:`, err)
@@ -211,13 +211,17 @@ export class SubsocialIpfsApi {
   }
 
   /** Pin content in IPFS */
-  async pinContent(cid: IpfsCid, properties?: Record<any, any>) {
+  async pinContent(cid: IpfsCid, props?: Record<'asLink' | string, any>) {
+    const url = props?.asLink
+      ? `${this._ipfsClusterUrl}/pins/${cid.toString()}`
+      : `${this._ipfsClusterUrl}/pins/`
+
     const data = {
       cid: cid.toString(),
-      ...properties
+      ...props
     }
 
-    const res = await axios.post(this._ipfsClusterUrl + '/pins/', data, {
+    const res = await axios.post(url, data, {
       headers: this.pinHeaders
     })
 

diff --git a/packages/definitions/package.json b/packages/definitions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@subsocial/definitions",
-  "version": "0.8.13",
+  "version": "0.8.15-beta.0",
   "description": "Subsocial definitions using @polkadot/typegen to generate type definitions",
   "main": "index.js",
   "repository": "https://github.com/dappforce/subsocial-js/packages/definitions",

diff --git a/packages/elasticsearch/package.json b/packages/elasticsearch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@subsocial/elasticsearch",
-  "version": "0.8.13",
+  "version": "0.8.15-beta.0",
   "description": "Elasticsearch API for Subsocial blockchain.",
   "author": "DappForce contributors",
   "license": "GPL-3.0-only",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@subsocial/utils",
-  "version": "0.8.13",
+  "version": "0.8.15-beta.0",
   "description": "JavaScript utils for Subsocial blockchain.",
   "author": "DappForce contributors",
   "main": "index.js",

diff --git a/packages/utils/src/slugify.ts b/packages/utils/src/slugify.ts
@@ -1,33 +1,35 @@
 import { nonEmptyStr } from './string'
 import slugify from '@sindresorhus/slugify'
 import { summarize } from './summarize'
-import memoize from 'lodash/memoize'
 
 const MAX_SLUG_LENGTH = 60
 const SLUG_SEPARATOR = '-'
 
 export type HasTitleOrBody = {
-  title?: string,
+  title?: string
   body: string
 }
 
 /** Create slug from the content title or body, appended with the id at the end */
-export const createPostSlug = memoize((postId: string, content?: HasTitleOrBody) => {
+export const createPostSlug = (postId: string, content?: HasTitleOrBody) => {
   let slug: string = '' + postId
 
   if (content) {
     const { title, body } = content
     const titleOrBody = nonEmptyStr(title) ? title : body
-    const summary = summarize(titleOrBody, { limit: MAX_SLUG_LENGTH, omission: '' })
+    const summary = summarize(titleOrBody, {
+      limit: MAX_SLUG_LENGTH,
+      omission: ''
+    })
     const slugifiedSummary = slugify(summary, { separator: SLUG_SEPARATOR })
-    
+
     if (nonEmptyStr(slugifiedSummary)) {
       slug = slugifiedSummary + '-' + slug
     }
   }
 
   return slug
-})
+}
 
 /** Extract post id from the slug generated from `createPostSlug` */
 export const getPostIdFromSlug = (slug: string): string | undefined => {