Skip to content
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.

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

make root FeedDetails be same shape #62

Merged
merged 7 commits into from
Sep 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 16 additions & 8 deletions api.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,7 @@ exports.init = function (sbot, config) {
sbot.metafeeds.query.getSeed((err, seed) => {
if (err) return cb(err)
if (!seed) return cb(null, null)
const metafeed = {
seed,
keys: sbot.metafeeds.keys.deriveRootMetaFeedKeyFromSeed(seed),
}
cb(null, metafeed)
cb(null, buildRootFeedDetails(seed))
})
}

Expand All @@ -179,11 +175,10 @@ exports.init = function (sbot, config) {
const opts = optsForSeed(mfKeys, sbot.id, seed)
const [err2] = await run(sbot.db.create)(opts)
if (err2) return cb(err2)
mf = { seed, keys: mfKeys }
mf = buildRootFeedDetails(seed)
} else {
debug('loaded seed')
const mfKeys = deriveRootMetaFeedKeyFromSeed(loadedSeed)
mf = { seed: loadedSeed, keys: mfKeys }
mf = buildRootFeedDetails(loadedSeed)
}

// Ensure root meta feed announcement exists on the main feed
Expand Down Expand Up @@ -214,6 +209,19 @@ exports.init = function (sbot, config) {
rootMetaFeedLock.release(null, mf)
}

function buildRootFeedDetails(seed) {
const keys = sbot.metafeeds.keys.deriveRootMetaFeedKeyFromSeed(seed)
return {
metafeed: null,
subfeed: keys.id,
feedpurpose: 'root',
feedformat: 'bendybutt-v1',
seed,
keys,
metadata: {},
}
}

return {
getRoot,
findOrCreate,
Expand Down
41 changes: 39 additions & 2 deletions test/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ test('findOrCreate is idempotent', (t) => {

tape('findOrCreate() a sub feed', (t) => {
sbot.metafeeds.getRoot((err, mf) => {
t.error(err, 'no err')
t.error(err, 'gets rootFeed')

// lets create a new chess feed
sbot.metafeeds.findOrCreate(
Expand All @@ -85,7 +85,6 @@ tape('findOrCreate() a sub feed', (t) => {
metadata: { score: 0 },
},
(err, feed) => {
t.error(err, 'no err')
t.equals(feed.feedpurpose, 'chess', 'it is the chess feed')
t.equals(feed.metadata.score, 0, 'it has metadata')
t.end()
Expand All @@ -94,6 +93,44 @@ tape('findOrCreate() a sub feed', (t) => {
})
})

tape('all FeedDetails have same format', (t) => {
sbot.metafeeds.getRoot((err, mf) => {
if (err) throw err
sbot.metafeeds.findOrCreate(
null,
() => true,
{},
(err, _mf) => {
if (err) throw err

t.deepEquals(
mf,
_mf,
'getRoot and findOrCreate return the same root FeedDetails'
)

sbot.metafeeds.findOrCreate(
mf,
(f) => f.feedpurpose === 'chess',
{
feedpurpose: 'chess',
feedformat: 'classic',
metadata: { score: 0 },
},
(err, feed) => {
t.deepEquals(
Object.keys(mf).sort(),
Object.keys(feed).sort(),
'root & chess FeedDetails have same data structure'
)
t.end()
}
)
}
)
})
})

tape('findOrCreate() a sub meta feed', (t) => {
sbot.metafeeds.findOrCreate((err, mf) => {
sbot.metafeeds.findOrCreate(
Expand Down