sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
syuilo
2019-05-05 20:33:44 +09:00
parent f74e0d9123 8a79ba0e2b
commit 1092532292
47 changed files with 160 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app/app.styl
View File

@@ -34,7 +34,7 @@ body
.peg
display block
position absolute
right 0px
right 0
width 100px
height 100%
box-shadow 0 0 10px var(--primary), 0 0 5px var(--primary)

2
src/client/app/auth/views/index.vue
View File

@@ -98,7 +98,7 @@ export default Vue.extend({
margin 0 auto
text-align center
background #fff
box-shadow 0px 4px 16px rgba(#000, 0.2)
box-shadow 0 4px 16px rgba(#000, 0.2)
> .fetching
margin 0

2
src/client/app/common/hotkey.ts
View File

@@ -52,7 +52,7 @@ function match(e: KeyboardEvent, patterns: action['patterns']): boolean {
pattern.ctrl == e.ctrlKey &&
pattern.shift == e.shiftKey &&
pattern.alt == e.altKey &&
e.metaKey == false
!e.metaKey
);
}

6
src/client/app/common/scripts/should-mute-note.ts
View File

@@ -11,9 +11,9 @@ export default function(me, settings, note) {
return (
(!isMyNote && note.reply && includesMutedWords(note.reply.text)) ||
(!isMyNote && note.renote && includesMutedWords(note.renote.text)) ||
(settings.showMyRenotes === false && isMyNote && isPureRenote) ||
(settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) ||
(settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) ||
(!settings.showMyRenotes && isMyNote && isPureRenote) ||
(!settings.showRenotedMyNotes && isPureRenote && note.renote.userId == me.id) ||
(!settings.showLocalRenotes && isPureRenote && note.renote.user.host == null) ||
(!isMyNote && includesMutedWords(note.text))
);
}

2
src/client/app/common/views/components/analog-clock.vue
View File

@@ -80,7 +80,7 @@ export default Vue.extend({
ms(): number {
return this.now.getMilliseconds() * this.smooth;
}
},
s(): number {
return this.now.getSeconds();
},

2
src/client/app/common/views/components/messaging.vue
View File

@@ -202,7 +202,7 @@ export default Vue.extend({
left 0
z-index 1
width 100%
box-shadow 0 0px 2px rgba(#000, 0.2)
box-shadow 0 0 2px rgba(#000, 0.2)
> .form
background rgba(0, 0, 0, 0.02)

2
src/client/app/common/views/components/page-editor/page-editor.blocks.vue
View File

@@ -14,7 +14,7 @@ import XImage from './els/page-editor.el.image.vue';
import XButton from './els/page-editor.el.button.vue';
import XTextInput from './els/page-editor.el.text-input.vue';
import XTextareaInput from './els/page-editor.el.textarea-input.vue';
import XNumberInput from './els/page-editor.el.text-input.vue';
import XNumberInput from './els/page-editor.el.number-input.vue';
import XSwitch from './els/page-editor.el.switch.vue';
import XIf from './els/page-editor.el.if.vue';
import XPost from './els/page-editor.el.post.vue';

6
src/client/app/common/views/components/page-editor/page-editor.vue
View File

@@ -36,10 +36,10 @@
</ui-select>
<div class="eyeCatch">
<ui-button v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catchig-image') }}</ui-button>
<ui-button v-if="eyeCatchingImageId == null && !readonly" @click="setEyeCatchingImage()"><fa :icon="faPlus"/> {{ $t('set-eye-catching-image') }}</ui-button>
<div v-else-if="eyeCatchingImage">
<img :src="eyeCatchingImage.url" :alt="eyeCatchingImage.name"/>
<ui-button @click="removeEyeCatchingImage()" v-if="!readonly"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catchig-image') }}</ui-button>
<ui-button @click="removeEyeCatchingImage()" v-if="!readonly"><fa :icon="faTrashAlt"/> {{ $t('remove-eye-catching-image') }}</ui-button>
</div>
</div>
</template>
@@ -337,7 +337,7 @@ export default Vue.extend({
getScriptBlockList(type: string = null) {
const list = [];
const blocks = blockDefs.filter(block => type === null || block.out === null || block.out === type);
const blocks = blockDefs.filter(block => type === null || block.out === null || block.out === type || typeof block.out === 'number');
for (const block of blocks) {
const category = list.find(x => x.category === block.category);

6
src/client/app/common/views/components/settings/integration.vue
View File

@@ -54,7 +54,11 @@ export default Vue.extend({
},
mounted() {
document.cookie = `i=${this.$store.state.i.token}`;
if (!document.cookie.match(/i=(\w+)/)) {
document.cookie = `i=${this.$store.state.i.token}; path=/;` +
` domain=${document.location.hostname}; max-age=31536000;` +
(document.location.protocol.startsWith('https') ? ' secure' : '');
}
this.$watch('$store.state.i', () => {
if (this.$store.state.i.twitter) {
if (this.twitterForm) this.twitterForm.close();

2
src/client/app/common/views/components/settings/theme.vue
View File

@@ -273,7 +273,7 @@ export default Vue.extend({
import_() {
(this.$refs.file as any).click();
}
},
export_() {
const blob = new Blob([this.selectedThemeCode], {

6
src/client/app/common/views/components/signin.vue
View File

@@ -15,9 +15,9 @@
<template #prefix><fa icon="gavel"/></template>
</ui-input>
<ui-button type="submit" :disabled="signing">{{ signing ? $t('signing-in') : $t('@.signin') }}</ui-button>
<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`">{{ $t('signin-with-twitter') }}</a></p>
<p v-if="meta && meta.enableGithubIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`">{{ $t('signin-with-github') }}</a></p>
<p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`">{{ $t('signin-with-discord') /* TODO: Make these layouts better */ }}</a></p>
<p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`"><fa :icon="['fab', 'twitter']"/> {{ $t('signin-with-twitter') }}</a></p>
<p v-if="meta && meta.enableGithubIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`"><fa :icon="['fab', 'github']"/> {{ $t('signin-with-github') }}</a></p>
<p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`"><fa :icon="['fab', 'discord']"/> {{ $t('signin-with-discord') /* TODO: Make these layouts better */ }}</a></p>
</form>
</template>

2
src/client/app/common/views/components/ui/input.vue
View File

@@ -322,7 +322,7 @@ root(fill)
> .value
display block
width 0%
width 0
height 100%
background transparent
border-radius 6px

2
src/client/app/common/views/components/user-list.vue
View File

@@ -166,7 +166,7 @@ export default Vue.extend({
> .follow-button
position absolute
top 8px
right 0px
right 0
> .more
display block

2
src/client/app/common/views/deck/deck.column.vue
View File

@@ -160,7 +160,7 @@ export default Vue.extend({
this.$emit('top');
}
if (this.$store.state.settings.fetchOnScroll !== false) {
if (this.$store.state.settings.fetchOnScroll) {
const current = this.$refs.body.scrollTop + this.$refs.body.clientHeight;
if (current > this.$refs.body.scrollHeight - 1) this.$emit('bottom');
}

2
src/client/app/common/views/deck/deck.user-column.vue
View File

@@ -205,7 +205,7 @@ export default Vue.extend({
top -32px
left 0
right 0
width 0px
width 0
margin 0 auto
border-top solid 16px transparent
border-left solid 16px transparent

4
src/client/app/common/views/directives/autocomplete.ts
View File

@@ -102,7 +102,7 @@ class Autocomplete {
}
}
if (isHashtag && opened == false) {
if (isHashtag && !opened) {
const hashtag = text.substr(hashtagIndex + 1);
if (!hashtag.includes(' ')) {
this.open('hashtag', hashtag);
@@ -110,7 +110,7 @@ class Autocomplete {
}
}
if (isEmoji && opened == false) {
if (isEmoji && !opened) {
const emoji = text.substr(emojiIndex + 1);
if (!emoji.includes(' ')) {
this.open('emoji', emoji);

2
src/client/app/common/views/pages/page/page.vue
View File

@@ -47,7 +47,7 @@ class Script {
public interpolate(str: string) {
if (str == null) return null;
return str.replace(/\{(.+?)\}/g, match => {
return str.replace(/{(.+?)}/g, match => {
const v = this.vars[match.slice(1, -1).trim()];
return v == null ? 'NULL' : v.toString();
});

9
src/client/app/desktop/views/components/drive.vue
View File

@@ -750,12 +750,17 @@ export default Vue.extend({
bottom 0
animation-delay -1.0s
@keyframes sk-rotate { 100% { transform: rotate(360deg); }}
@keyframes sk-rotate {
100% {
transform: rotate(360deg);
}
}
@keyframes sk-bounce {
0%, 100% {
transform: scale(0.0);
} 50% {
}
50% {
transform: scale(1.0);
}
}

2
src/client/app/desktop/views/components/notes.vue
View File

@@ -181,7 +181,7 @@ export default Vue.extend({
this.releaseQueue();
}
if (this.$store.state.settings.fetchOnScroll !== false) {
if (this.$store.state.settings.fetchOnScroll) {
const current = window.scrollY + window.innerHeight;
if (current > document.body.offsetHeight - 8) this.fetchMore();
}

2
src/client/app/desktop/views/components/post-form.vue
View File

@@ -377,7 +377,7 @@ export default Vue.extend({
}, err => {
this.$root.dialog({
type: 'error',
title: this.$t('error')
title: this.$t('error'),
text: err.message
});
}, {

2
src/client/app/desktop/views/components/window.vue
View File

@@ -480,7 +480,7 @@ export default Vue.extend({
&:focus
&:not([data-is-modal])
> .body
box-shadow 0 0 0px 1px var(--primaryAlpha05), 0 2px 12px 0 var(--desktopWindowShadow)
box-shadow 0 0 0 1px var(--primaryAlpha05), 0 2px 12px 0 var(--desktopWindowShadow)
> .handle
$size = 8px

2
src/client/app/desktop/views/pages/welcome.vue
View File

@@ -352,7 +352,7 @@ export default Vue.extend({
padding 0 16px
line-height 48px
background var(--faceHeader)
box-shadow 0 1px 0px rgba(0, 0, 0, 0.1)
box-shadow 0 1px 0 rgba(0, 0, 0, 0.1)
& + div
max-height calc(100% - 48px)

2
src/client/app/mios.ts
View File

@@ -505,7 +505,7 @@ class WindowSystem extends EventEmitter {
function urlBase64ToUint8Array(base64String: string): Uint8Array {
const padding = '='.repeat((4 - base64String.length % 4) % 4);
const base64 = (base64String + padding)
.replace(/\-/g, '+')
.replace(/-/g, '+')
.replace(/_/g, '/');
const rawData = window.atob(base64);

15
src/client/app/mobile/views/components/drive.vue
View File

@@ -83,7 +83,7 @@ export default Vue.extend({
hierarchyFolders: [],
selectedFiles: [],
info: null,
connection: null
connection: null,
fetching: true,
fetchingMoreFiles: false,
@@ -385,7 +385,7 @@ export default Vue.extend({
createFolder() {
this.$root.dialog({
title: this.$t('folder-name')
title: this.$t('folder-name'),
input: {
default: this.folder.name
}
@@ -415,7 +415,7 @@ export default Vue.extend({
return;
}
this.$root.dialog({
title: this.$t('folder-name')
title: this.$t('folder-name'),
input: {
default: this.folder.name
}
@@ -597,12 +597,17 @@ export default Vue.extend({
bottom 0
animation-delay -1.0s
@keyframes sk-rotate { 100% { transform: rotate(360deg); }}
@keyframes sk-rotate {
100% {
transform: rotate(360deg);
}
}
@keyframes sk-bounce {
0%, 100% {
transform: scale(0.0);
} 50% {
}
50% {
transform: scale(1.0);
}
}

2
src/client/app/mobile/views/components/notes.vue
View File

@@ -175,7 +175,7 @@ export default Vue.extend({
this.releaseQueue();
}
if (this.$store.state.settings.fetchOnScroll !== false) {
if (this.$store.state.settings.fetchOnScroll) {
// 親要素が display none だったら弾く
// https://github.com/syuilo/misskey/issues/1569
// http://d.hatena.ne.jp/favril/20091105/1257403319

2
src/client/app/mobile/views/components/notifications.vue
View File

@@ -115,7 +115,7 @@ export default Vue.extend({
},
onScroll() {
if (this.$store.state.settings.fetchOnScroll !== false) {
if (this.$store.state.settings.fetchOnScroll) {
// 親要素が display none だったら弾く
// https://github.com/syuilo/misskey/issues/1569
// http://d.hatena.ne.jp/favril/20091105/1257403319

4
src/client/app/mobile/views/components/post-form.vue
View File

@@ -295,7 +295,7 @@ export default Vue.extend({
}, err => {
this.$root.dialog({
type: 'error',
title: this.$t('error')
title: this.$t('error'),
text: err.message
});
}, {
@@ -341,7 +341,7 @@ export default Vue.extend({
post() {
this.posting = true;
const viaMobile = this.$store.state.settings.disableViaMobile !== true;
const viaMobile = !this.$store.state.settings.disableViaMobile;
this.$root.api('notes/create', {
text: this.text == '' ? undefined : this.text,
fileIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,

2
src/client/app/mobile/views/components/ui.header.vue
View File

@@ -49,7 +49,7 @@ export default Vue.extend({
padding 0 8px
&.shadow
box-shadow 0 0px 8px rgba(0, 0, 0, 0.25)
box-shadow 0 0 8px rgba(0, 0, 0, 0.25)
&, *
user-select none

2
src/client/app/reset.styl
View File

@@ -1,5 +1,5 @@
input
min-width 0px
min-width 0
input:not([type])
input[type='text']

2
src/client/app/store.ts
View File

@@ -126,7 +126,7 @@ export default (os: MiOS) => new Vuex.Store({
logout(ctx) {
ctx.commit('updateI', null);
document.cookie = 'i=;';
document.cookie = `i=; max-age=0; domain=${document.location.hostname}`;
localStorage.removeItem('i');
},