Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4270 from h3poteto/update/megalodon/5.4.2 

Update megalodon version to 5.4.2
This commit is contained in:
AkiraFukushima 2023-04-09 01:06:56 +09:00 committed by GitHub
parent 0485c8bf29 1440eeb40d
commit 7d825decc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -92,7 +92,7 @@
"element-plus": "^2.2.36",
"emoji-mart-vue-fast": "^12.0.1",
"i18next": "^22.4.11",
"megalodon": "5.2.0",
"megalodon": "5.4.2",
"minimist": "^1.2.8",
"mitt": "^3.0.0",
"moment": "^2.29.4",

4
src/renderer/components/TimelineSpace/Compose.vue
View File

@ -274,8 +274,8 @@ export default defineComponent({
}
const instance = await c.getInstance()
if (instance.data.max_toot_chars) {
maxStatusChars.value = instance.data.max_toot_chars
if (instance.data.configuration) {
maxStatusChars.value = instance.data.configuration.statuses.max_characters
}
const emojis = await c.getInstanceCustomEmojis()

3
src/renderer/store/TimelineSpace.ts
View File

@ -184,9 +184,6 @@ const actions: ActionTree<TimelineSpaceState, RootState> = {
}
const client = generator(state.server.sns, state.server.baseURL, null, rootState.App.userAgent)
const res = await client.getInstance()
if (res.data.max_toot_chars) {
commit(MUTATION_TYPES.UPDATE_TOOT_MAX, res.data.max_toot_chars)
}
if (res.data.configuration) {
commit(MUTATION_TYPES.UPDATE_TOOT_MAX, res.data.configuration.statuses.max_characters)
}

2
src/renderer/store/TimelineSpace/Modals/Report.ts
View File

@ -43,7 +43,7 @@ const actions: ActionTree<ReportState, RootState> = {
rootState.TimelineSpace.account!.accessToken,
rootState.App.userAgent
)
return client.report(account_id, comment, { status_ids: [status_id] })
return client.report(account_id, { comment: comment, status_ids: [status_id] })
}
}

43
yarn.lock
View File

@ -2767,15 +2767,6 @@ available-typed-arrays@^1.0.5:
resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
axios@1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.3.tgz#e7011384ba839b885007c9c9fae1ff23dceb295b"
integrity sha512-eYq77dYIFS77AQlhzEL937yUBSepBfPIe8FcgEDN35vMNZKMrs81pgnyrQpwfy4NF4b4XWX1Zgx7yX+25w8QJA==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
proxy-from-env "^1.1.0"
axios@1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.4.tgz#f5760cefd9cfb51fd2481acf88c05f67c4523024"
@ -7841,14 +7832,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.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/megalodon/-/megalodon-5.2.0.tgz#6ed748bbb6398469fce496a4082d60c2b11ed796"
integrity sha512-xyuLgcV1hw58a6+tlSiiS0ZW2NAFIOOD302zyXUjscxrjGW/KQ2ue25gm/WECsgEzUJ1TtHJo42vsqUuw4NDNg==
megalodon@5.4.2:
version "5.4.2"
resolved "https://registry.yarnpkg.com/megalodon/-/megalodon-5.4.2.tgz#f349821ea04c37edcc1173fd6f4c95558a5b3e17"
integrity sha512-jj8w38xtEwKXxxixb+i4x/VRiBuFNP0O6sKoJtgCXUJHWpixq2PRAwA7iOlprmxEq8GKAi+Lq8qEL0889klITg==
dependencies:
"@types/oauth" "^0.9.0"
"@types/ws" "^8.5.4"
axios "1.3.3"
axios "1.3.4"
dayjs "^1.11.7"
form-data "^4.0.0"
https-proxy-agent "^5.0.1"
@ -7856,9 +7847,9 @@ megalodon@5.2.0:
object-assign-deep "^0.4.0"
parse-link-header "^2.0.0"
socks-proxy-agent "^7.0.0"
typescript "4.9.5"
typescript "5.0.2"
uuid "^9.0.0"
ws "8.12.1"
ws "8.13.0"
memfs@^3.4.3:
version "3.4.13"
@ -10938,7 +10929,12 @@ typedarray-to-buffer@^3.1.5:
dependencies:
is-typedarray "^1.0.0"
typescript@4.9.5, typescript@^4.9.5:
typescript@5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.2.tgz#891e1a90c5189d8506af64b9ef929fca99ba1ee5"
integrity sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==
typescript@^4.9.5:
version "4.9.5"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
@ -11703,16 +11699,21 @@ write-file-atomic@^4.0.2:
imurmurhash "^0.1.4"
signal-exit "^3.0.7"
ws@8.12.1, ws@^8.11.0, ws@^8.4.2:
version "8.12.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.1.tgz#c51e583d79140b5e42e39be48c934131942d4a8f"
integrity sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==
ws@8.13.0:
version "8.13.0"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
ws@^7.4.6:
version "7.5.9"
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
ws@^8.11.0, ws@^8.4.2:
version "8.12.1"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.1.tgz#c51e583d79140b5e42e39be48c934131942d4a8f"
integrity sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==
xml-char-classes@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"