From 550d1547b444a07f61083bec676a46717f47240c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Wed, 22 Aug 2018 14:41:01 +0900 Subject: [PATCH 1/5] Add autogen.sh refs: https://github.com/syuilo/misskey/pull/2391#issuecomment-414915763 --- .autogen/autogen.sh | 86 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100755 .autogen/autogen.sh diff --git a/.autogen/autogen.sh b/.autogen/autogen.sh new file mode 100755 index 0000000000..1ea71ff00c --- /dev/null +++ b/.autogen/autogen.sh @@ -0,0 +1,86 @@ +#!/usr/bin/env bash +# BEARER_TOKEN= +# CAMPAIGN_ID= +# GITHUB_TOKEN= +# HEAD='acid-chicken:patch-autogen' +# REPO='syuilo/misskey' +test "$(curl -LSs -w '\n' -- "https://api.github.com/repos/$REPO/pulls?access_token=$GITHUB_TOKEN" | jq -r '.[].head.label' | grep $HEAD)" && exit 1 +cd "$(dirname $0)/.." && \ +touch null.cache && \ +rm *.cache && \ +git checkout master && \ +git pull origin master && \ +git pull upstream master && \ +git stash && \ +git rebase -f upstream/master && \ +git branch patch-autogen && \ +git checkout patch-autogen && \ +git reset --hard HEAD || \ +exit 1 +touch patreon.md.cache && \ +rm patreon.md.cache && \ +echo '' > patreon.md.cache && \ +URL="https://www.patreon.com/api/oauth2/v2/campaigns/$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 $BEARER_TOKEN" -- $URL > patreon.raw.cache && \ + touch patreon.cache && \ + rm patreon.cache && \ + cat patreon.raw.cache | \ + jq -r '(.data|map(select(.relationships.currently_entitled_tiers.data[]))|map(.relationships.user.data.id))as$data|.included|map(select(.attributes.hide_pledges==false))|map(select(.id as$id|$data|contains([$id])))|map(.attributes|[.full_name,.thumb_url,.url]|@tsv)|.[]|@text' >> patreon.cache && \ + echo '' >> patreon.md.cache && \ + cat patreon.cache | \ + awk -F'\t' '{print $2,$1}' | \ + sed -e 's/ /\\" alt=\\"/' | \ + xargs -I% echo '' >> patreon.md.cache && \ + echo '' >> patreon.md.cache && \ + cat patreon.cache | \ + awk -F'\t' '{print $3,$1}' | \ + sed -e 's/ /\\">/' | \ + xargs -I% echo '
" >> 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" = '' ]] + then + IGNORE='PATREON_INSIDE' + else + echo "$LINE" >> README.md + fi + else + if [[ "$LINE" = '' ]] + 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":"'$HEAD'","base":"master"}' -- "https://api.github.com/repos/$REPO/pulls?access_token=$GITHUB_TOKEN" +git stash +git checkout master +git branch -D patch-autogen From 9f49ca8fdb22a65f352fa2c1595c8da52c63f090 Mon Sep 17 00:00:00 2001 From: Tosuke Date: Wed, 22 Aug 2018 15:54:22 +0900 Subject: [PATCH 2/5] feature mute on mobile(#2354) --- .../mobile/views/components/follow-button.vue | 2 +- .../app/mobile/views/components/index.ts | 2 + .../mobile/views/components/mute-button.vue | 79 +++++++++++++++++++ src/client/app/mobile/views/pages/user.vue | 4 + 4 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 src/client/app/mobile/views/components/mute-button.vue diff --git a/src/client/app/mobile/views/components/follow-button.vue b/src/client/app/mobile/views/components/follow-button.vue index b6a52fe1ed..360ee91d4b 100644 --- a/src/client/app/mobile/views/components/follow-button.vue +++ b/src/client/app/mobile/views/components/follow-button.vue @@ -99,7 +99,7 @@ export default Vue.extend({ cursor pointer padding 0 16px margin 0 - min-width 150px + min-width 100px line-height 36px font-size 14px font-weight bold diff --git a/src/client/app/mobile/views/components/index.ts b/src/client/app/mobile/views/components/index.ts index 38c130ecbf..3e830f4e96 100644 --- a/src/client/app/mobile/views/components/index.ts +++ b/src/client/app/mobile/views/components/index.ts @@ -12,6 +12,7 @@ import noteCard from './note-card.vue'; import userCard from './user-card.vue'; import noteDetail from './note-detail.vue'; import followButton from './follow-button.vue'; +import muteButton from './mute-button.vue'; import friendsMaker from './friends-maker.vue'; import notification from './notification.vue'; import notifications from './notifications.vue'; @@ -36,6 +37,7 @@ Vue.component('mk-note-card', noteCard); Vue.component('mk-user-card', userCard); Vue.component('mk-note-detail', noteDetail); Vue.component('mk-follow-button', followButton); +Vue.component('mk-mute-button', muteButton); Vue.component('mk-friends-maker', friendsMaker); Vue.component('mk-notification', notification); Vue.component('mk-notifications', notifications); diff --git a/src/client/app/mobile/views/components/mute-button.vue b/src/client/app/mobile/views/components/mute-button.vue new file mode 100644 index 0000000000..3cb568615d --- /dev/null +++ b/src/client/app/mobile/views/components/mute-button.vue @@ -0,0 +1,79 @@ + + + + + + diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue index d573538fdd..e72867352f 100644 --- a/src/client/app/mobile/views/pages/user.vue +++ b/src/client/app/mobile/views/pages/user.vue @@ -11,6 +11,7 @@ avatar +
@@ -184,6 +185,9 @@ root(isDark) border 4px solid $bg border-radius 12px + > .mk-mute-button + float right + > .mk-follow-button float right From 7410f2f4c067d28afe78b69b9bfcee964e083b02 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Wed, 22 Aug 2018 14:55:38 +0000 Subject: [PATCH 3/5] fix(package): update summaly to version 2.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03bb4796ed..3b40ed1767 100644 --- a/package.json +++ b/package.json @@ -191,7 +191,7 @@ "style-loader": "0.22.1", "stylus": "0.54.5", "stylus-loader": "3.0.2", - "summaly": "2.1.3", + "summaly": "2.1.4", "systeminformation": "3.42.9", "syuilo-password-strength": "0.0.1", "textarea-caret": "3.1.0", From 2b54b4ac06e512c09b335433a9a935db7578fc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Thu, 23 Aug 2018 00:34:35 +0900 Subject: [PATCH 4/5] Update url-preview.vue --- .../common/views/components/url-preview.vue | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue index 95dafa8f4c..655958188e 100644 --- a/src/client/app/common/views/components/url-preview.vue +++ b/src/client/app/common/views/components/url-preview.vue @@ -1,5 +1,7 @@