Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4331 from h3poteto/dependabot/npm_and_yarn/megalodon-6.0.1

Browse Source 
build(deps): bump megalodon from 5.4.4 to 6.0.1
This commit is contained in:
AkiraFukushima 2023-04-30 00:26:26 +09:00 committed by GitHub
commit c08770fb17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -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",

1
spec/renderer/integration/store/TimelineSpace/Modals/AddListMember.spec.ts
View File

@ -40,6 +40,7 @@ const account: Entity.Account = {
acct: 'h3poteto@pleroma.io',
display_name: 'h3poteto',
locked: false,
group: false,
created_at: '2019-03-26T21:30:32',
followers_count: 10,
following_count: 10,

1
spec/renderer/integration/store/TimelineSpace/Modals/ListMembership.spec.ts
View File

@ -70,6 +70,7 @@ const account: Entity.Account = {
acct: 'h3poteto@pleroma.io',
display_name: 'h3poteto',
locked: false,
group: false,
created_at: '2019-03-26T21:30:32',
followers_count: 10,
following_count: 10,

3
src/main/index.ts
View File

@ -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
})

5
src/main/websocket.ts
View File

@ -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 }

19
yarn.lock
View File

@ -2826,6 +2826,15 @@ axios@1.3.5:
form-data "^4.0.0"
proxy-from-env "^1.1.0"
axios@1.3.6:
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"
@ -7885,14 +7894,14 @@ media-typer@0.3.0:
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"