Skip to content

fix: status and cid are strings in the query result #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidel merged 1 commit into from
Apr 4, 2022
Merged

fix: status and cid are strings in the query result #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions service/pins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const { ok, ok202, notFound } = require("./util")
* @returns {State}
*/
const init = ({
accessToken = null,
accessToken = null,
delegates = [
"/ip4/203.0.113.42/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ",
"/ip6/2001:db8::42/tcp/8080/p2p/QmYVEDcquBLjoMEz6qxTSm5AfQ3uUcvHdxC8VUJs6sB1oh",
Expand Down Expand Up @@ -184,14 +184,9 @@ exports.removePin = removePin
* @returns {boolean}
*/
const match = (query, { pin, status, created }) => {
// Workarounds https://github.com/ipfs/go-ipfs/issues/7827
const statuses =
/** @type {string[]} */([]).concat(...(query.status || []).map(($) => $.split(",")))

const cids = query.cid
? /** @type {string[]} */([]).concat(...query.cid.map(($) => $.split(",")))
: []

// Workarounds https://github.com/oas-tools/oas-tools/issues/248
const statuses = parseStringArr(query.status)
const cids = parseStringArr(query.cid)

const matched =
(query.cid == null || cids.includes(pin.cid)) &&
Expand Down Expand Up @@ -239,17 +234,33 @@ const deriveStatus = ({ name = "" }) => {

/**
* Parse the input using Date.parse, with special casing if the input is already a Date.
*
*
* @param {Date|string} d - a Date object or ISO-formatted date string.
* @returns {number|Date} - the number of milliseconds elapsed since January 1, 1970 00:00:00 UTC, or a Date instance
*/
const parseDate = (d) => {
if (d instanceof Date) {
if (d instanceof Date) {
return d
}
return Date.parse(d)
}

/**
* @param {string | string[]} [s]
* @returns {string[]}
*/
const parseStringArr = (s) => {
if (s == null) {
return []
}

if (typeof s === 'string') {
return s.split(',')
}

return s
}

/**
* @typedef {Object} State
* @property {string|null} accessToken
Expand Down