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.

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

Support Mastodon 3.0 RC1 #130

Merged
merged 8 commits into from
Sep 25, 2019
Merged

Support Mastodon 3.0 RC1 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
607c16b
Update dependencies
neet Sep 25, 2019
77ce598
Add trend API back
neet Sep 25, 2019
01d2956
Add marker API
neet Sep 25, 2019
4bdf5ba
Add test cases
neet Sep 25, 2019
cfdfefb
Add featured tags API
neet Sep 25, 2019
d05fe7d
Add profile directory API
neet Sep 25, 2019
43ae869
Change return type of authorize/rejectFollowRequest
neet Sep 25, 2019
fd4fceb
Add `category` key to emoji entity
neet Sep 25, 2019
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
32 changes: 16 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,40 +23,40 @@
"eventemitter3": "^4.0.0",
"isomorphic-form-data": "^2.0.0",
"isomorphic-ws": "^4.0.1",
"normalize-url": "^4.3.0",
"normalize-url": "^4.4.1",
"semver": "^6.3.0",
"ts-optchain": "^0.1.8",
"ws": "^7.1.2"
},
"devDependencies": {
"@types/jest": "^24.0.18",
"@types/node": "^12.7.3",
"@types/semver": "^6.0.0",
"@typescript-eslint/eslint-plugin": "^2.0.0",
"@typescript-eslint/parser": "^2.0.0",
"codecov": "^3.5.0",
"eslint": "^6.3.0",
"eslint-config-prettier": "^6.1.0",
"@types/node": "^12.7.7",
"@types/semver": "^6.0.2",
"@typescript-eslint/eslint-plugin": "^2.3.1",
"@typescript-eslint/parser": "^2.3.1",
"codecov": "^3.6.1",
"eslint": "^6.4.0",
"eslint-config-prettier": "^6.3.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-prettier": "^3.1.1",
"husky": "^3.0.5",
"jest": "^24.9.0",
"lint-staged": "^9.2.5",
"lint-staged": "^9.3.0",
"npm-run-all": "^4.1.5",
"prettier": "^1.18.2",
"rollup": "^1.20.3",
"rollup": "^1.21.4",
"rollup-plugin-auto-external": "^2.0.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-builtins": "^2.1.2",
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-typescript2": "^0.24.0",
"ts-jest": "^24.0.2",
"rollup-plugin-terser": "^5.1.2",
"rollup-plugin-typescript2": "^0.24.2",
"ts-jest": "^24.1.0",
"typedoc": "^0.15.0",
"typedoc-plugin-markdown": "^2.1.7",
"typescript": "3.6.2"
"typedoc-plugin-markdown": "^2.2.6",
"typescript": "3.6.3"
},
"files": [
"README.md",
Expand Down
134 changes: 134 additions & 0 deletions src/clients/masto/__tests__/__snapshots__/masto.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,25 @@ exports[`Masto createApp 1`] = `
}
`;

exports[`Masto createFeaturedTag 1`] = `
[MockFunction] {
"calls": Array [
Array [
"/api/v1/featured_tags",
Object {
"name": "mastodon",
},
],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
}
`;

exports[`Masto createFiler 1`] = `
[MockFunction] {
"calls": Array [
Expand Down Expand Up @@ -214,6 +233,30 @@ exports[`Masto createList 1`] = `
}
`;

exports[`Masto createMarkers 1`] = `
[MockFunction] {
"calls": Array [
Array [
"/api/v1/markers",
Object {
"home": Object {
"last_read_id": "123123",
},
"notifications": Object {
"last_read_id": "123123",
},
},
],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
}
`;

exports[`Masto createStatus with Idempotency-Key 1`] = `
[MockFunction] {
"calls": Array [
Expand Down Expand Up @@ -615,6 +658,27 @@ exports[`Masto fetchDirectTimeline 1`] = `
}
`;

exports[`Masto fetchDirectory 1`] = `
[MockFunction] {
"calls": Array [
Array [
"/api/v1/directory",
Object {
"limit": 20,
"local": false,
"order": "active",
},
],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
}
`;

exports[`Masto fetchDomainBlocks 1`] = `
[MockFunction] {
"calls": Array [
Expand Down Expand Up @@ -676,6 +740,22 @@ exports[`Masto fetchFavourites 1`] = `
}
`;

exports[`Masto fetchFeaturedTags 1`] = `
[MockFunction] {
"calls": Array [
Array [
"/api/v1/featured_tags",
],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
}
`;

exports[`Masto fetchFilter 1`] = `
[MockFunction] {
"calls": Array [
Expand Down Expand Up @@ -876,6 +956,28 @@ exports[`Masto fetchLists 1`] = `
}
`;

exports[`Masto fetchMarkers 1`] = `
[MockFunction] {
"calls": Array [
Array [
"/api/v1/markers",
Object {
"timeline": Array [
"home",
"notifications",
],
},
],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
}
`;

exports[`Masto fetchMutes 1`] = `
[MockFunction] {
"calls": Array [
Expand Down Expand Up @@ -1171,6 +1273,22 @@ exports[`Masto fetchTagTimeline 1`] = `
}
`;

exports[`Masto fetchTrends 1`] = `
[MockFunction] {
"calls": Array [
Array [
"/api/v1/trends",
],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
}
`;

exports[`Masto followAccount 1`] = `
[MockFunction] {
"calls": Array [
Expand Down Expand Up @@ -1334,6 +1452,22 @@ exports[`Masto removeAccountFromList 1`] = `
}
`;

exports[`Masto removeFeaturedTag 1`] = `
[MockFunction] {
"calls": Array [
Array [
"/api/v1/featured_tags/123",
],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
}
`;

exports[`Masto removeFilter 1`] = `
[MockFunction] {
"calls": Array [
Expand Down
46 changes: 46 additions & 0 deletions src/clients/masto/__tests__/masto.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,4 +895,50 @@ describe('Masto', () => {
expect(mockGet).toBeCalledTimes(1);
expect(mockGet).toMatchSnapshot();
});

test('fetchTrends', async () => {
await masto.fetchTrends();
expect(mockGet).toBeCalledTimes(1);
expect(mockGet).toMatchSnapshot();
});

test('fetchMarkers', async () => {
await masto.fetchMarkers({ timeline: ['home', 'notifications'] });
expect(mockGet).toBeCalledTimes(1);
expect(mockGet).toMatchSnapshot();
});

test('createMarkers', async () => {
await masto.createMarkers({
home: { last_read_id: '123123' },
notifications: { last_read_id: '123123' },
});

expect(mockPost).toBeCalledTimes(1);
expect(mockPost).toMatchSnapshot();
});

test('fetchFeaturedTags', async () => {
await masto.fetchFeaturedTags();
expect(mockGet).toBeCalledTimes(1);
expect(mockGet).toMatchSnapshot();
});

test('createFeaturedTag', async () => {
await masto.createFeaturedTag({ name: 'mastodon' });
expect(mockPost).toBeCalledTimes(1);
expect(mockPost).toMatchSnapshot();
});

test('removeFeaturedTag', async () => {
await masto.removeFeaturedTag('123');
expect(mockDelete).toBeCalledTimes(1);
expect(mockDelete).toMatchSnapshot();
});

test('fetchDirectory', async () => {
await masto.fetchDirectory({ limit: 20, order: 'active', local: false });
expect(mockGet).toBeCalledTimes(1);
expect(mockGet).toMatchSnapshot();
});
});
Loading