Merge pull request #3044 from h3poteto/update/megalodon/3.7.1
Update megalodon version to 3.7.1 and call readNotification when pleroma
This commit is contained in:
AkiraFukushima
GitHub
commit
feb8ddb935
|
|
@ -89,7 +89,7 @@
|
|||
"i18next": "^21.6.4",
|
||||
"lodash": "^4.17.21",
|
||||
"lokijs": "^1.5.12",
|
||||
"megalodon": "3.6.7",
|
||||
"megalodon": "3.7.1",
|
||||
"minimist": "^1.2.5",
|
||||
"moment": "^2.29.1",
|
||||
"mousetrap": "^1.6.5",
|
||||
|
|
@ -143,6 +143,7 @@
|
|||
"babel-loader": "^8.2.3",
|
||||
"babel-plugin-istanbul": "^6.1.1",
|
||||
"babel-register": "^6.26.0",
|
||||
"bufferutil": "^4.0.5",
|
||||
"cfonts": "^2.10.0",
|
||||
"chai": "^4.3.4",
|
||||
"chalk": "^4.1.2",
|
||||
|
|
@ -197,6 +198,7 @@
|
|||
"ttfinfo": "^0.2.0",
|
||||
"typescript": "^4.5.4",
|
||||
"url-loader": "^4.1.1",
|
||||
"utf-8-validate": "^5.0.7",
|
||||
"vue-html-loader": "^1.2.4",
|
||||
"vue-loader": "^15.9.8",
|
||||
"vue-style-loader": "^4.1.3",
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ const actions: ActionTree<NotificationsState, RootState> = {
|
|||
return res.data
|
||||
}
|
||||
},
|
||||
lazyFetchNotifications: (
|
||||
lazyFetchNotifications: async (
|
||||
{ state, commit, rootState },
|
||||
lastNotification: Entity.Notification
|
||||
): Promise<Array<Entity.Notification> | null> => {
|
||||
|
|
@ -270,6 +270,9 @@ const actions: ActionTree<NotificationsState, RootState> = {
|
|||
rootState.App.userAgent
|
||||
)
|
||||
const res = await client.saveMarkers({ notifications: { last_read_id: notifications[0].id } })
|
||||
if (rootState.TimelineSpace.sns === 'pleroma') {
|
||||
await client.readNotifications({ max_id: notifications[0].id })
|
||||
}
|
||||
return res.data
|
||||
}
|
||||
}
|
||||
|
|
|
|||
69
yarn.lock
69
yarn.lock
|
|
@ -2573,12 +2573,12 @@ aws4@^1.8.0:
|
|||
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
|
||||
integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
|
||||
|
||||
axios@^0.21.0:
|
||||
version "0.21.1"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
|
||||
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
|
||||
axios@0.21.4:
|
||||
version "0.21.4"
|
||||
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
|
||||
integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
|
||||
dependencies:
|
||||
follow-redirects "^1.10.0"
|
||||
follow-redirects "^1.14.0"
|
||||
|
||||
axios@^0.24.0:
|
||||
version "0.24.0"
|
||||
|
|
@ -3116,6 +3116,13 @@ buffer@^5.1.0:
|
|||
base64-js "^1.3.1"
|
||||
ieee754 "^1.1.13"
|
||||
|
||||
bufferutil@^4.0.5:
|
||||
version "4.0.5"
|
||||
resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.5.tgz#da9ea8166911cc276bf677b8aed2d02d31f59028"
|
||||
integrity sha512-HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A==
|
||||
dependencies:
|
||||
node-gyp-build "^4.3.0"
|
||||
|
||||
builder-util-runtime@8.9.1:
|
||||
version "8.9.1"
|
||||
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz#25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"
|
||||
|
|
@ -5596,11 +5603,16 @@ flora-colossus@^1.0.0:
|
|||
debug "^4.1.1"
|
||||
fs-extra "^7.0.0"
|
||||
|
||||
follow-redirects@^1.0.0, follow-redirects@^1.10.0, follow-redirects@^1.14.4:
|
||||
follow-redirects@^1.0.0, follow-redirects@^1.14.4:
|
||||
version "1.14.4"
|
||||
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
|
||||
integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
|
||||
|
||||
follow-redirects@^1.14.0:
|
||||
version "1.14.6"
|
||||
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd"
|
||||
integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==
|
||||
|
||||
for-in@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
|
||||
|
|
@ -8196,23 +8208,23 @@ media-typer@0.3.0:
|
|||
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
|
||||
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
|
||||
|
||||
megalodon@3.6.7:
|
||||
version "3.6.7"
|
||||
resolved "https://registry.yarnpkg.com/megalodon/-/megalodon-3.6.7.tgz#2449fbe38d1d16615de3cce04c8ed9f0871d332f"
|
||||
integrity sha512-W54GCRqZdM4TE0ePfaYIfc3juyUiXgWsGCSX/r1lnUvhn9H6YaKkVSzYj0FegRtiU7b540/5cTDjSz/t+ypfZw==
|
||||
megalodon@3.7.1:
|
||||
version "3.7.1"
|
||||
resolved "https://registry.yarnpkg.com/megalodon/-/megalodon-3.7.1.tgz#ff3aeaba9bfbdc02b8a4bb5c719179ba387962ae"
|
||||
integrity sha512-HRPYUP6pBlmRuJTeg2Dn7KinRGSccv+K0iaq1aXpC9zSZpYGsNUVZOJf7smqgJi3VK0dTXSiSgzZP1URskPWPw==
|
||||
dependencies:
|
||||
"@types/oauth" "^0.9.0"
|
||||
"@types/ws" "^8.2.0"
|
||||
axios "^0.21.0"
|
||||
axios "0.21.4"
|
||||
dayjs "^1.10.4"
|
||||
form-data "^4.0.0"
|
||||
https-proxy-agent "^5.0.0"
|
||||
oauth "^0.9.15"
|
||||
object-assign-deep "^0.4.0"
|
||||
socks-proxy-agent "^6.1.0"
|
||||
typescript "4.2.4"
|
||||
typescript "4.5.4"
|
||||
uuid "^8.0.0"
|
||||
ws "7.5.5"
|
||||
ws "8.4.0"
|
||||
|
||||
memfs@^3.2.2:
|
||||
version "3.4.0"
|
||||
|
|
@ -8585,6 +8597,11 @@ node-forge@^0.10.0:
|
|||
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
|
||||
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
|
||||
|
||||
node-gyp-build@^4.3.0:
|
||||
version "4.3.0"
|
||||
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
|
||||
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
|
||||
|
||||
node-gyp@^8.4.1:
|
||||
version "8.4.1"
|
||||
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
|
||||
|
|
@ -11437,12 +11454,7 @@ typedarray@^0.0.6:
|
|||
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
|
||||
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
|
||||
|
||||
typescript@4.2.4:
|
||||
version "4.2.4"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
|
||||
integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
|
||||
|
||||
typescript@^4.5.4:
|
||||
typescript@4.5.4, typescript@^4.5.4:
|
||||
version "4.5.4"
|
||||
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
|
||||
integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
|
||||
|
|
@ -11651,6 +11663,13 @@ use@^3.1.0:
|
|||
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
|
||||
integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
|
||||
|
||||
utf-8-validate@^5.0.7:
|
||||
version "5.0.7"
|
||||
resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.7.tgz#c15a19a6af1f7ad9ec7ddc425747ca28c3644922"
|
||||
integrity sha512-vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q==
|
||||
dependencies:
|
||||
node-gyp-build "^4.3.0"
|
||||
|
||||
utf8-byte-length@^1.0.1:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61"
|
||||
|
|
@ -12221,16 +12240,16 @@ write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
|
|||
signal-exit "^3.0.2"
|
||||
typedarray-to-buffer "^3.1.5"
|
||||
|
||||
ws@7.5.5, ws@^7.4.5:
|
||||
version "7.5.5"
|
||||
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
|
||||
integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
|
||||
|
||||
ws@^8.1.0, ws@^8.2.3:
|
||||
ws@8.4.0, ws@^8.1.0, ws@^8.2.3:
|
||||
version "8.4.0"
|
||||
resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.0.tgz#f05e982a0a88c604080e8581576e2a063802bed6"
|
||||
integrity sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==
|
||||
|
||||
ws@^7.4.5:
|
||||
version "7.5.5"
|
||||
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
|
||||
integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
|
||||
|
||||
xdg-basedir@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
|
||||
|
|
|
|||
Loading…
Reference in New Issue