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

build(deps): bump megalodon from 5.4.4 to 6.0.1 #4331

Merged
merged 2 commits into from
Apr 29, 2023
Merged

build(deps): bump megalodon from 5.4.4 to 6.0.1 #4331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bef6637
build(deps): bump megalodon from 5.4.4 to 6.0.1
dependabot[bot] Apr 27, 2023
107e885
Fix types
h3poteto Apr 29, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"element-plus": "^2.3.3",
"emoji-mart-vue-fast": "^12.0.1",
"i18next": "^22.4.14",
"megalodon": "5.4.4",
"megalodon": "6.0.1",
"minimist": "^1.2.8",
"mitt": "^3.0.0",
"moment": "^2.29.4",
Expand Down
1 change: 1 addition & 0 deletions spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const account: Entity.Account = {
acct: '[email protected]',
display_name: 'h3poteto',
locked: false,
group: false,
created_at: '2019-03-26T21:30:32',
followers_count: 10,
following_count: 10,
Expand Down
1 change: 1 addition & 0 deletions spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ const account: Entity.Account = {
acct: '[email protected]',
display_name: 'h3poteto',
locked: false,
group: false,
created_at: '2019-03-26T21:30:32',
followers_count: 10,
following_count: 10,
Expand Down
3 changes: 3 additions & 0 deletions src/main/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,9 @@ app.on('activate', () => {
ipcMain.handle('add-server', async (_: IpcMainInvokeEvent, domain: string) => {
const proxy = await proxyConfiguration.forMastodon()
const sns = await detector(`https://${domain}`, proxy)
if (sns === 'friendica') {
return new Promise((_resolve, reject) => reject('friendica is not supported yet'))
}
const server = await insertServer(db, `https://${domain}`, domain, sns, null)
return server
})
Expand Down
5 changes: 4 additions & 1 deletion src/main/websocket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ const StreamingURL = async (
}
const client = generator(sns, server.baseURL, account.accessToken, 'Whalebird', proxy)
const res = await client.getInstance()
return res.data.urls.streaming_api
if (res.data.urls) {
return res.data.urls.streaming_api
}
return new Promise((_resolve, reject) => reject('streaming URL does not exist'))
}

export { StreamingURL }
Expand Down
19 changes: 14 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2826,6 +2826,15 @@ [email protected]:
form-data "^4.0.0"
proxy-from-env "^1.1.0"

[email protected]:
version "1.3.6"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.6.tgz#1ace9a9fb994314b5f6327960918406fa92c6646"
integrity sha512-PEcdkk7JcdPiMDkvM4K6ZBRYq9keuVJsToxm2zQIM70Qqo2WHTdJZMXcG9X+RmRp2VPNUQC8W1RAGbgt6b1yMg==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
proxy-from-env "^1.1.0"

babel-jest@^26.6.3:
version "26.6.3"
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
Expand Down Expand Up @@ -7885,14 +7894,14 @@ [email protected]:
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==

megalodon@5.4.4:
version "5.4.4"
resolved "https://registry.yarnpkg.com/megalodon/-/megalodon-5.4.4.tgz#bbe55d663814c1ce44e21a23d6197b5cb089fbda"
integrity sha512-QZDrHGxfkc+ROiULIAxO1U8xHgYxtSGTUOZyIvxfHBamfreQ9jdAod0+VjS5U1O6CjSQ4ofpW7ABXuEh+UthxQ==
megalodon@6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/megalodon/-/megalodon-6.0.1.tgz#046f5a0237de835cdfa0fba7100456f7a151dcce"
integrity sha512-kXDwMfCBCXRbyxPo7yz6WbCi7UFmWFSqbC8RWJl3TuFm1zzrsV1mZveiiiEKeWUq/TWqqo8H9KPQzcuCDKNtTQ==
dependencies:
"@types/oauth" "^0.9.0"
"@types/ws" "^8.5.4"
axios "1.3.5"
axios "1.3.6"
dayjs "^1.11.7"
form-data "^4.0.0"
https-proxy-agent "^5.0.1"
Expand Down