Compare commits
124 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
52d577c7dd | ||
|
|
cf757ed01e | ||
|
|
82dd88821c | ||
|
|
0e3e90f94f | ||
|
|
7c3086e9d9 | ||
|
|
202e943d55 | ||
|
|
36bcaaff55 | ||
|
|
967fae142b | ||
|
|
8f41dfec2e | ||
|
|
1f0abef084 | ||
|
|
0e6fbdfa5b | ||
|
|
e881e1bfb3 | ||
|
|
9e6cdd6106 | ||
|
|
d1efe1d208 | ||
|
|
2f2a8e537d | ||
|
|
82de8b7c50 | ||
|
|
fb194b855b | ||
|
|
a4a9b8707d | ||
|
|
c4c20bee7c | ||
|
|
41b491fa7c | ||
|
|
667d58bad4 | ||
|
|
630464f38d | ||
|
|
8050352ad8 | ||
|
|
b6d0d4eb99 | ||
|
|
70b129cc42 | ||
|
|
c52b504140 | ||
|
|
e987a50e9f | ||
|
|
d7e7848c92 | ||
|
|
9bb6dc52b8 | ||
|
|
73df95c42d | ||
|
|
f27e4033a6 | ||
|
|
e523e54881 | ||
|
|
606e5c0878 | ||
|
|
4b13431a19 | ||
|
|
87c8f9ff95 | ||
|
|
5e61c60f85 | ||
|
|
fbc9d5ecba | ||
|
|
d381d31e5e | ||
|
|
65e7204ec9 | ||
|
|
0b5e3a93a5 | ||
|
|
23d743bcae | ||
|
|
3e1596d5fb | ||
|
|
8a04fc3336 | ||
|
|
bffdfea58a | ||
|
|
449ea4b669 | ||
|
|
e632806349 | ||
|
|
9cc8b3656a | ||
|
|
a3fff800d2 | ||
|
|
48d767918f | ||
|
|
4f249159d3 | ||
|
|
0d19c2d42e | ||
|
|
e53a40658d | ||
|
|
0389e2c891 | ||
|
|
8aa089178a | ||
|
|
d3c8368b0c | ||
|
|
ca4f026533 | ||
|
|
7d02b36092 | ||
|
|
9e634360fa | ||
|
|
9cf811b048 | ||
|
|
b0d38446d7 | ||
|
|
dfe10ac61f | ||
|
|
f41c851108 | ||
|
|
522dbb1e13 | ||
|
|
bc4315da1e | ||
|
|
1a841b101e | ||
|
|
cbcf3b7599 | ||
|
|
4c4b3b8a8a | ||
|
|
c562d09479 | ||
|
|
ee7bef3395 | ||
|
|
80fa5c2e36 | ||
|
|
7212027937 | ||
|
|
16b5e121cd | ||
|
|
a87930542a | ||
|
|
e9ba81149d | ||
|
|
7ea207df5d | ||
|
|
aaa40e34c3 | ||
|
|
9b010074e1 | ||
|
|
0359db23d9 | ||
|
|
320f5fedfb | ||
|
|
3e2d2e5f6b | ||
|
|
b8d9dd15ac | ||
|
|
936fcfb1c7 | ||
|
|
fb60ffd319 | ||
|
|
8c9f8de6d2 | ||
|
|
18693fb380 | ||
|
|
cf9242053d | ||
|
|
47ee005457 | ||
|
|
5b965349a5 | ||
|
|
f7e9725e59 | ||
|
|
17dc50c242 | ||
|
|
deda2b2782 | ||
|
|
344e13ebcb | ||
|
|
a07d753da8 | ||
|
|
3003100443 | ||
|
|
bca4e5f0fa | ||
|
|
9b61306f59 | ||
|
|
b66e0b3ac5 | ||
|
|
4a9e9b4eea | ||
|
|
fc98552fdc | ||
|
|
4911a394a6 | ||
|
|
acc7a7e626 | ||
|
|
eaa6b35778 | ||
|
|
6059fb2aa6 | ||
|
|
dc3329bae2 | ||
|
|
41f4c247bc | ||
|
|
a3f75fe3f4 | ||
|
|
bf876f83df | ||
|
|
b3088facf4 | ||
|
|
44167ab84c | ||
|
|
eb745d2aa0 | ||
|
|
54bcb80b44 | ||
|
|
f871cf1053 | ||
|
|
8a484a623c | ||
|
|
1cb984ba79 | ||
|
|
4708b15c32 | ||
|
|
93c8ec631f | ||
|
|
a4ddd18f12 | ||
|
|
e4012e12f9 | ||
|
|
7427b4c839 | ||
|
|
c7c030bda6 | ||
|
|
64ebd808ef | ||
|
|
59028c234c | ||
|
|
a8c4058bdf | ||
|
|
87d17ccbfb |
@@ -1,3 +0,0 @@
|
|||||||
.[]
|
|
||||||
.head
|
|
||||||
.label
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
.links
|
|
||||||
.next
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
(
|
|
||||||
.data |
|
|
||||||
map(
|
|
||||||
select(
|
|
||||||
.relationships
|
|
||||||
.currently_entitled_tiers
|
|
||||||
.data[]
|
|
||||||
)
|
|
||||||
) |
|
|
||||||
map(
|
|
||||||
.relationships
|
|
||||||
.user
|
|
||||||
.data
|
|
||||||
.id
|
|
||||||
)
|
|
||||||
) as $data |
|
|
||||||
.included |
|
|
||||||
map(
|
|
||||||
select(
|
|
||||||
.id as $id |
|
|
||||||
$data |
|
|
||||||
contains(
|
|
||||||
[
|
|
||||||
$id
|
|
||||||
]
|
|
||||||
)
|
|
||||||
)
|
|
||||||
) |
|
|
||||||
map(
|
|
||||||
.attributes |
|
|
||||||
[
|
|
||||||
.full_name,
|
|
||||||
.thumb_url,
|
|
||||||
.url
|
|
||||||
] |
|
|
||||||
@tsv
|
|
||||||
) |
|
|
||||||
.[] |
|
|
||||||
@text
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# __MISSKEY_BEARER_TOKEN=
|
|
||||||
# __MISSKEY_CAMPAIGN_ID=
|
|
||||||
# __MISSKEY_GITHUB_TOKEN=
|
|
||||||
# __MISSKEY_HEAD=syuilo:patch-autogen
|
|
||||||
# __MISSKEY_REPO=syuilo/misskey
|
|
||||||
# __MISSKEY_BRANCH=develop
|
|
||||||
test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN" | jq -r -f check_pr.jq | grep $__MISSKEY_HEAD)" && exit 1
|
|
||||||
cd "$(dirname $0)/.." && \
|
|
||||||
touch null.cache && \
|
|
||||||
rm *.cache && \
|
|
||||||
git checkout $__MISSKEY_BRANCH && \
|
|
||||||
git pull origin $__MISSKEY_BRANCH && \
|
|
||||||
git pull upstream $__MISSKEY_BRANCH && \
|
|
||||||
git stash && \
|
|
||||||
git rebase -f upstream/$__MISSKEY_BRANCH && \
|
|
||||||
git branch patch-autogen && \
|
|
||||||
git checkout patch-autogen && \
|
|
||||||
git reset --hard HEAD || \
|
|
||||||
exit 1
|
|
||||||
touch patreon.md.cache && \
|
|
||||||
rm patreon.md.cache && \
|
|
||||||
echo '<!-- PATREON_START -->' > patreon.md.cache && \
|
|
||||||
url="https://www.patreon.com/api/oauth2/v2/campaigns/$__MISSKEY_CAMPAIGN_ID/members?include=currently_entitled_tiers,user&fields%5Btier%5D=title&fields%5Buser%5D=full_name,thumb_url,url,hide_pledges"
|
|
||||||
while :
|
|
||||||
do
|
|
||||||
touch patreon.raw.cache && \
|
|
||||||
rm patreon.raw.cache && \
|
|
||||||
curl -LSs -w '\n' -H "Authorization: Bearer $__MISSKEY_BEARER_TOKEN" -- $url > patreon.raw.cache && \
|
|
||||||
touch patreon.cache && \
|
|
||||||
rm patreon.cache && \
|
|
||||||
cat patreon.raw.cache | \
|
|
||||||
jq -r -f patreon.jq >> patreon.cache && \
|
|
||||||
echo '<table><tr>' >> patreon.md.cache && \
|
|
||||||
cat patreon.cache | \
|
|
||||||
awk -F'\t' '{print $2,$1}' | \
|
|
||||||
sed -e 's/ /\\" alt=\\"/' | \
|
|
||||||
xargs -I% echo '<td><img src="%" width="100"></td>' >> patreon.md.cache && \
|
|
||||||
echo '</tr><tr>' >> patreon.md.cache && \
|
|
||||||
cat patreon.cache | \
|
|
||||||
awk -F'\t' '{print $3,$1}' | \
|
|
||||||
sed -e 's/ /\\">/' | \
|
|
||||||
xargs -I% echo '<td><a href="%</a></td>' >> patreon.md.cache && \
|
|
||||||
echo '</tr></table>' >> patreon.md.cache || \
|
|
||||||
exit 1
|
|
||||||
new_url="$(cat patreon.raw.cache | jq -r -f next_url.jq)"
|
|
||||||
test "$new_url" = 'null' && \
|
|
||||||
break || \
|
|
||||||
URL="$url"
|
|
||||||
done
|
|
||||||
ignore= && \
|
|
||||||
echo -e "\n**Last updated:** $(date -uR | sed 's/\+0000/UTC/')\n<!-- PATREON_END -->" >> patreon.md.cache && \
|
|
||||||
touch README.md && \
|
|
||||||
touch .autogen/README.md && \
|
|
||||||
rm .autogen/README.md && \
|
|
||||||
mv README.md .autogen/README.md && \
|
|
||||||
cat .autogen/README.md | while IFS= read line;
|
|
||||||
do
|
|
||||||
if [[ -z "$ignore" ]]
|
|
||||||
then
|
|
||||||
if [[ "$line" = '<!-- PATREON_START -->' ]]
|
|
||||||
then
|
|
||||||
ignore='PATREON_INSIDE'
|
|
||||||
else
|
|
||||||
echo "$line" >> README.md
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ "$LINE" = '<!-- PATREON_END -->' ]]
|
|
||||||
then
|
|
||||||
ignore=
|
|
||||||
cat patreon.md.cache >> README.md
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
cat patreon.md.cache
|
|
||||||
touch null.cache && \
|
|
||||||
rm *.cache && \
|
|
||||||
diff .autogen/README.md README.md > diff.cache
|
|
||||||
cat diff.cache && \
|
|
||||||
test 4 -lt $(cat diff.cache | wc -l) && \
|
|
||||||
git add README.md && \
|
|
||||||
git commit -m 'Update README.md [AUTOGEN]' && \
|
|
||||||
git push -f origin patch-autogen && \
|
|
||||||
curl -LSs -w '\n' -X POST -d '{"title":"[AUTOMATED] Update README.md","body":"*This pull request was created by a tool.*","head":"'$__MISSKEY_HEAD'","base":"'$__MISSKEY_BRANCH'"}' -- "https://api.github.com/repos/$__MISSKEY_REPO/pulls?access_token=$__MISSKEY_GITHUB_TOKEN"
|
|
||||||
git stash
|
|
||||||
git checkout $__MISSKEY_BRANCH
|
|
||||||
git branch -D patch-autogen
|
|
||||||
20
.eslintrc
@@ -3,29 +3,11 @@
|
|||||||
"parser": "@typescript-eslint/parser"
|
"parser": "@typescript-eslint/parser"
|
||||||
},
|
},
|
||||||
"extends": [
|
"extends": [
|
||||||
"eslint:recommended",
|
"eslint:recommended"
|
||||||
"plugin:vue/recommended"
|
|
||||||
],
|
],
|
||||||
"rules": {
|
"rules": {
|
||||||
"vue/require-v-for-key": 0,
|
|
||||||
"vue/max-attributes-per-line": 0,
|
|
||||||
"vue/html-indent": 0,
|
|
||||||
"vue/html-self-closing": 0,
|
|
||||||
"vue/no-unused-vars": 0,
|
|
||||||
"vue/attributes-order": 0,
|
|
||||||
"vue/require-prop-types": 0,
|
|
||||||
"vue/require-default-prop": 0,
|
|
||||||
"vue/html-closing-bracket-spacing": 0,
|
|
||||||
"vue/singleline-html-element-content-newline": 0,
|
|
||||||
"vue/no-v-html": 0,
|
|
||||||
"no-console": 0,
|
"no-console": 0,
|
||||||
"no-unused-vars": 0,
|
"no-unused-vars": 0,
|
||||||
"no-empty": 0
|
"no-empty": 0
|
||||||
},
|
|
||||||
"globals": {
|
|
||||||
"ENV": true,
|
|
||||||
"VERSION": true,
|
|
||||||
"API": true,
|
|
||||||
"LANGS": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
v14.15.4
|
v14.15.5
|
||||||
|
|||||||
1
CHANGELOG.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
see [releases](https://github.com/syuilo/misskey/releases)
|
||||||
14
Dockerfile
@@ -1,4 +1,4 @@
|
|||||||
FROM node:14.15.4-alpine AS base
|
FROM node:14.15.5-alpine3.13 AS base
|
||||||
|
|
||||||
ENV NODE_ENV=production
|
ENV NODE_ENV=production
|
||||||
|
|
||||||
@@ -10,7 +10,6 @@ RUN apk add --no-cache \
|
|||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
file \
|
file \
|
||||||
git \
|
|
||||||
g++ \
|
g++ \
|
||||||
gcc \
|
gcc \
|
||||||
libc-dev \
|
libc-dev \
|
||||||
@@ -18,8 +17,10 @@ RUN apk add --no-cache \
|
|||||||
make \
|
make \
|
||||||
nasm \
|
nasm \
|
||||||
pkgconfig \
|
pkgconfig \
|
||||||
python \
|
python3 \
|
||||||
zlib-dev
|
zlib-dev \
|
||||||
|
vips-dev \
|
||||||
|
vips
|
||||||
|
|
||||||
COPY package.json yarn.lock ./
|
COPY package.json yarn.lock ./
|
||||||
RUN yarn install
|
RUN yarn install
|
||||||
@@ -30,8 +31,9 @@ FROM base AS runner
|
|||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
ffmpeg \
|
ffmpeg \
|
||||||
tini
|
tini \
|
||||||
RUN npm i -g web-push
|
vips
|
||||||
|
|
||||||
ENTRYPOINT ["/sbin/tini", "--"]
|
ENTRYPOINT ["/sbin/tini", "--"]
|
||||||
|
|
||||||
COPY --from=builder /misskey/node_modules ./node_modules
|
COPY --from=builder /misskey/node_modules ./node_modules
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
|
Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 441 B |
|
Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 441 B |
@@ -7,12 +7,12 @@
|
|||||||
"theme_color": "#86b300",
|
"theme_color": "#86b300",
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "/assets/icons/192.png",
|
"src": "/static-assets/icons/192.png",
|
||||||
"sizes": "192x192",
|
"sizes": "192x192",
|
||||||
"type": "image/png"
|
"type": "image/png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "/assets/icons/512.png",
|
"src": "/static-assets/icons/512.png",
|
||||||
"sizes": "512x512",
|
"sizes": "512x512",
|
||||||
"type": "image/png"
|
"type": "image/png"
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 424 B |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 290 KiB After Width: | Height: | Size: 290 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 102 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 658 B After Width: | Height: | Size: 658 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |