+
+Misskey
================================================================
[![][travis-badge]][travis-link]
@@ -7,57 +9,46 @@
[![][sakurako-badge]][himasaku]
[![][agpl-3.0-badge]][AGPL-3.0]
-[Misskey](https://misskey.xyz) is a completely open source,
+> Lead Maintainer: [syuilo][syuilo-link]
+
+**[Misskey](https://misskey.xyz)** is a completely open source,
ultimately sophisticated new type of mini-blog based SNS.
-
-
-Key features
+:sparkles: Features
----------------------------------------------------------------
* Automatically updated timeline
* Private messages
* Two-Factor Authentication support
* ServiceWorker support
* Web API for third-party applications
-* No ads
+* ActivityPub compatible
and more! You can touch with your own eyes at https://misskey.xyz/.
-Setup and Installation
+:package: Setup and Installation
----------------------------------------------------------------
If you want to run your own instance of Misskey,
please see [Setup and installation guide](./docs/setup.en.md).
-Contribution
+:yen: Donation
----------------------------------------------------------------
-Please see [Contribution guide](./CONTRIBUTING.md).
+If you want to donate to Misskey, please see [this](./docs/donate.ja.md).
-Release Notes
+[List of all donors](./DONORS.md)
+
+:mortar_board: Notable contributors
----------------------------------------------------------------
-Please see [ChangeLog](./CHANGELOG.md).
-
-Sponsors & Backers
-----------------------------------------------------------------
-Misskey has no 100+ GitHub stars currently. However, a donation is always welcome!
-If you want to donate to Misskey, please get in touch with [@syuilo][syuilo-link].
-
-**Note:** When you donate to Misskey, your name will be listed in [donors](./DONORS.md).
-
-Collaborators
-----------------------------------------------------------------
-| ![syuilo][syuilo-icon] | ![Morisawa Aya][ayamorisawa-icon] | ![otofune][otofune-icon] |
-|------------------------|-----------------------------------|---------------------------------|
-| [syuilo][syuilo-link] | [Aya Morisawa][ayamorisawa-link] | [otofune][otofune-link] |
+| ![syuilo][syuilo-icon] | ![Morisawa Aya][ayamorisawa-icon] | ![otofune][otofune-icon] | ![akihikodaki][akihikodaki-icon] | ![rinsuki][rinsuki-icon] |
+|:-:|:-:|:-:|:-:|:-:|
+| [syuilo][syuilo-link]
- ![]()
+ ![]()
{{ user.name }}
@{{ getAcct(user) }}
@@ -26,16 +26,16 @@
class="user"
:href="`/i/messaging/${getAcct(isMe(message) ? message.recipient : message.user)}`"
:data-is-me="isMe(message)"
- :data-is-read="message.is_read"
+ :data-is-read="message.isRead"
@click.prevent="navigate(isMe(message) ? message.recipient : message.user)"
:key="message.id"
>
%i18n:common.tags.mk-messaging-message.is-read%
+%i18n:common.tags.mk-messaging-message.is-read%
- @@ -43,7 +43,7 @@ export default Vue.extend({ return getAcct(this.message.user); }, isMe(): boolean { - return this.message.user_id == (this as any).os.i.id; + return this.message.userId == (this as any).os.i.id; }, urls(): string[] { if (this.message.ast) { diff --git a/src/server/web/app/common/views/components/messaging-room.vue b/src/server/web/app/common/views/components/messaging-room.vue index 6ff808b617..d30c64d74a 100644 --- a/src/server/web/app/common/views/components/messaging-room.vue +++ b/src/server/web/app/common/views/components/messaging-room.vue @@ -52,8 +52,8 @@ export default Vue.extend({ computed: { _messages(): any[] { return (this.messages as any).map(message => { - const date = new Date(message.created_at).getDate(); - const month = new Date(message.created_at).getMonth() + 1; + const date = new Date(message.createdAt).getDate(); + const month = new Date(message.createdAt).getMonth() + 1; message._date = date; message._datetext = `${month}月 ${date}日`; return message; @@ -123,9 +123,9 @@ export default Vue.extend({ const max = this.existMoreMessages ? 20 : 10; (this as any).api('messaging/messages', { - user_id: this.user.id, + userId: this.user.id, limit: max + 1, - until_id: this.existMoreMessages ? this.messages[0].id : undefined + untilId: this.existMoreMessages ? this.messages[0].id : undefined }).then(messages => { if (messages.length == max + 1) { this.existMoreMessages = true; @@ -158,7 +158,7 @@ export default Vue.extend({ const isBottom = this.isBottom(); this.messages.push(message); - if (message.user_id != (this as any).os.i.id && !document.hidden) { + if (message.userId != (this as any).os.i.id && !document.hidden) { this.connection.send({ type: 'read', id: message.id @@ -170,7 +170,7 @@ export default Vue.extend({ this.$nextTick(() => { this.scrollToBottom(); }); - } else if (message.user_id != (this as any).os.i.id) { + } else if (message.userId != (this as any).os.i.id) { // Notify this.notify('%i18n:common.tags.mk-messaging-room.new-message%'); } @@ -181,7 +181,7 @@ export default Vue.extend({ ids.forEach(id => { if (this.messages.some(x => x.id == id)) { const exist = this.messages.map(x => x.id).indexOf(id); - this.messages[exist].is_read = true; + this.messages[exist].isRead = true; } }); }, @@ -223,7 +223,7 @@ export default Vue.extend({ onVisibilitychange() { if (document.hidden) return; this.messages.forEach(message => { - if (message.user_id !== (this as any).os.i.id && !message.is_read) { + if (message.userId !== (this as any).os.i.id && !message.isRead) { this.connection.send({ type: 'read', id: message.id diff --git a/src/server/web/app/common/views/components/messaging.vue b/src/server/web/app/common/views/components/messaging.vue index 88574b94d1..8317c3738a 100644 --- a/src/server/web/app/common/views/components/messaging.vue +++ b/src/server/web/app/common/views/components/messaging.vue @@ -13,7 +13,7 @@ @click="navigate(user)" tabindex="-1" > -
- ![]()
+ ![]()
{{ isMe(message) ? message.recipient.name : message.user.name }}
@{{ getAcct(isMe(message) ? message.recipient : message.user) }}
-
{{ blackUser.name }}(黒) vs {{ whiteUser.name }}(白)
%i18n:common.tags.mk-messaging.you%:{{ message.text }}
@@ -95,19 +95,19 @@ export default Vue.extend({ methods: { getAcct, isMe(message) { - return message.user_id == (this as any).os.i.id; + return message.userId == (this as any).os.i.id; }, onMessage(message) { this.messages = this.messages.filter(m => !( - (m.recipient_id == message.recipient_id && m.user_id == message.user_id) || - (m.recipient_id == message.user_id && m.user_id == message.recipient_id))); + (m.recipientId == message.recipientId && m.userId == message.userId) || + (m.recipientId == message.userId && m.userId == message.recipientId))); this.messages.unshift(message); }, onRead(ids) { ids.forEach(id => { const found = this.messages.find(m => m.id == id); - if (found) found.is_read = true; + if (found) found.isRead = true; }); }, search() { diff --git a/src/server/web/app/common/views/components/othello.game.vue b/src/server/web/app/common/views/components/othello.game.vue index 414d819a55..f08742ad10 100644 --- a/src/server/web/app/common/views/components/othello.game.vue +++ b/src/server/web/app/common/views/components/othello.game.vue @@ -3,30 +3,30 @@
- ![]()
- ![]()
+ ![]()
+ ![]()
{{ logPos }}ターン目 黒:{{ o.blackCount }} 白:{{ o.whiteCount }} 合計:{{ o.blackCount + o.whiteCount }}
-
+
%fa:angle-double-left%
%fa:angle-left%
@@ -62,12 +62,12 @@ export default Vue.extend({
computed: {
iAmPlayer(): boolean {
if (!(this as any).os.isSignedIn) return false;
- return this.game.user1_id == (this as any).os.i.id || this.game.user2_id == (this as any).os.i.id;
+ return this.game.user1Id == (this as any).os.i.id || this.game.user2Id == (this as any).os.i.id;
},
myColor(): Color {
if (!this.iAmPlayer) return null;
- if (this.game.user1_id == (this as any).os.i.id && this.game.black == 1) return true;
- if (this.game.user2_id == (this as any).os.i.id && this.game.black == 2) return true;
+ if (this.game.user1Id == (this as any).os.i.id && this.game.black == 1) return true;
+ if (this.game.user2Id == (this as any).os.i.id && this.game.black == 2) return true;
return false;
},
opColor(): Color {
@@ -97,11 +97,11 @@ export default Vue.extend({
watch: {
logPos(v) {
- if (!this.game.is_ended) return;
+ if (!this.game.isEnded) return;
this.o = new Othello(this.game.settings.map, {
- isLlotheo: this.game.settings.is_llotheo,
- canPutEverywhere: this.game.settings.can_put_everywhere,
- loopedBoard: this.game.settings.looped_board
+ isLlotheo: this.game.settings.isLlotheo,
+ canPutEverywhere: this.game.settings.canPutEverywhere,
+ loopedBoard: this.game.settings.loopedBoard
});
this.logs.forEach((log, i) => {
if (i < v) {
@@ -116,9 +116,9 @@ export default Vue.extend({
this.game = this.initGame;
this.o = new Othello(this.game.settings.map, {
- isLlotheo: this.game.settings.is_llotheo,
- canPutEverywhere: this.game.settings.can_put_everywhere,
- loopedBoard: this.game.settings.looped_board
+ isLlotheo: this.game.settings.isLlotheo,
+ canPutEverywhere: this.game.settings.canPutEverywhere,
+ loopedBoard: this.game.settings.loopedBoard
});
this.game.logs.forEach(log => {
@@ -129,7 +129,7 @@ export default Vue.extend({
this.logPos = this.logs.length;
// 通信を取りこぼしてもいいように定期的にポーリングさせる
- if (this.game.is_started && !this.game.is_ended) {
+ if (this.game.isStarted && !this.game.isEnded) {
this.pollingClock = setInterval(() => {
const crc32 = CRC32.str(this.logs.map(x => x.pos.toString()).join(''));
this.connection.send({
@@ -154,7 +154,7 @@ export default Vue.extend({
methods: {
set(pos) {
- if (this.game.is_ended) return;
+ if (this.game.isEnded) return;
if (!this.iAmPlayer) return;
if (!this.isMyTurn) return;
if (!this.o.canPut(this.myColor, pos)) return;
@@ -194,16 +194,16 @@ export default Vue.extend({
},
checkEnd() {
- this.game.is_ended = this.o.isEnded;
- if (this.game.is_ended) {
+ this.game.isEnded = this.o.isEnded;
+ if (this.game.isEnded) {
if (this.o.winner === true) {
- this.game.winner_id = this.game.black == 1 ? this.game.user1_id : this.game.user2_id;
+ this.game.winnerId = this.game.black == 1 ? this.game.user1Id : this.game.user2Id;
this.game.winner = this.game.black == 1 ? this.game.user1 : this.game.user2;
} else if (this.o.winner === false) {
- this.game.winner_id = this.game.black == 1 ? this.game.user2_id : this.game.user1_id;
+ this.game.winnerId = this.game.black == 1 ? this.game.user2Id : this.game.user1Id;
this.game.winner = this.game.black == 1 ? this.game.user2 : this.game.user1;
} else {
- this.game.winner_id = null;
+ this.game.winnerId = null;
this.game.winner = null;
}
}
@@ -214,9 +214,9 @@ export default Vue.extend({
this.game = game;
this.o = new Othello(this.game.settings.map, {
- isLlotheo: this.game.settings.is_llotheo,
- canPutEverywhere: this.game.settings.can_put_everywhere,
- loopedBoard: this.game.settings.looped_board
+ isLlotheo: this.game.settings.isLlotheo,
+ canPutEverywhere: this.game.settings.canPutEverywhere,
+ loopedBoard: this.game.settings.loopedBoard
});
this.game.logs.forEach(log => {
diff --git a/src/server/web/app/common/views/components/othello.gameroom.vue b/src/server/web/app/common/views/components/othello.gameroom.vue
index 38a25f6686..dba9ccd16d 100644
--- a/src/server/web/app/common/views/components/othello.gameroom.vue
+++ b/src/server/web/app/common/views/components/othello.gameroom.vue
@@ -1,6 +1,6 @@
@@ -116,13 +116,13 @@ export default Vue.extend({
return categories.filter((item, pos) => categories.indexOf(item) == pos);
},
isAccepted(): boolean {
- if (this.game.user1_id == (this as any).os.i.id && this.game.user1_accepted) return true;
- if (this.game.user2_id == (this as any).os.i.id && this.game.user2_accepted) return true;
+ if (this.game.user1Id == (this as any).os.i.id && this.game.user1Accepted) return true;
+ if (this.game.user2Id == (this as any).os.i.id && this.game.user2Accepted) return true;
return false;
},
isOpAccepted(): boolean {
- if (this.game.user1_id != (this as any).os.i.id && this.game.user1_accepted) return true;
- if (this.game.user2_id != (this as any).os.i.id && this.game.user2_accepted) return true;
+ if (this.game.user1Id != (this as any).os.i.id && this.game.user1Accepted) return true;
+ if (this.game.user2Id != (this as any).os.i.id && this.game.user2Accepted) return true;
return false;
}
},
@@ -133,8 +133,8 @@ export default Vue.extend({
this.connection.on('init-form', this.onInitForm);
this.connection.on('message', this.onMessage);
- if (this.game.user1_id != (this as any).os.i.id && this.game.settings.form1) this.form = this.game.settings.form1;
- if (this.game.user2_id != (this as any).os.i.id && this.game.settings.form2) this.form = this.game.settings.form2;
+ if (this.game.user1Id != (this as any).os.i.id && this.game.settings.form1) this.form = this.game.settings.form1;
+ if (this.game.user2Id != (this as any).os.i.id && this.game.settings.form2) this.form = this.game.settings.form2;
},
beforeDestroy() {
@@ -162,8 +162,8 @@ export default Vue.extend({
},
onChangeAccepts(accepts) {
- this.game.user1_accepted = accepts.user1;
- this.game.user2_accepted = accepts.user2;
+ this.game.user1Accepted = accepts.user1;
+ this.game.user2Accepted = accepts.user2;
this.$forceUpdate();
},
@@ -185,12 +185,12 @@ export default Vue.extend({
},
onInitForm(x) {
- if (x.user_id == (this as any).os.i.id) return;
+ if (x.userId == (this as any).os.i.id) return;
this.form = x.form;
},
onMessage(x) {
- if (x.user_id == (this as any).os.i.id) return;
+ if (x.userId == (this as any).os.i.id) return;
this.messages.unshift(x.message);
},
diff --git a/src/server/web/app/common/views/components/othello.vue b/src/server/web/app/common/views/components/othello.vue
index d650322341..8f7d9dfd6a 100644
--- a/src/server/web/app/common/views/components/othello.vue
+++ b/src/server/web/app/common/views/components/othello.vue
@@ -31,28 +31,28 @@
![]()
- ![]()
+ ![]()
+ ![]()
{{ g.user1.name }} vs {{ g.user2.name }}
- {{ g.is_ended ? '終了' : '進行中' }}
+ {{ g.isEnded ? '終了' : '進行中' }}
![]()
- ![]()
+ ![]()
+ ![]()
{{ g.user1.name }} vs {{ g.user2.name }}
- {{ g.is_ended ? '終了' : '進行中' }}
+ {{ g.isEnded ? '終了' : '進行中' }}
@@ -133,7 +133,7 @@ export default Vue.extend({
methods: {
go(game) {
(this as any).api('othello/games/show', {
- game_id: game.id
+ gameId: game.id
}).then(game => {
this.matching = null;
this.game = game;
@@ -147,7 +147,7 @@ export default Vue.extend({
username
}).then(user => {
(this as any).api('othello/match', {
- user_id: user.id
+ userId: user.id
}).then(res => {
if (res == null) {
this.matching = user;
@@ -164,7 +164,7 @@ export default Vue.extend({
},
accept(invitation) {
(this as any).api('othello/match', {
- user_id: invitation.parent.id
+ userId: invitation.parent.id
}).then(game => {
if (game) {
this.matching = null;
diff --git a/src/server/web/app/common/views/components/poll.vue b/src/server/web/app/common/views/components/poll.vue
index 8156c8bc58..711d89720e 100644
--- a/src/server/web/app/common/views/components/poll.vue
+++ b/src/server/web/app/common/views/components/poll.vue
@@ -4,7 +4,7 @@
-
- %fa:check%
+ %fa:check%
{{ choice.text }}
({{ '%i18n:common.tags.mk-poll.vote-count%'.replace('{}', choice.votes) }})
@@ -36,7 +36,7 @@ export default Vue.extend({
return this.poll.choices.reduce((a, b) => a + b.votes, 0);
},
isVoted(): boolean {
- return this.poll.choices.some(c => c.is_voted);
+ return this.poll.choices.some(c => c.isVoted);
}
},
created() {
@@ -47,15 +47,15 @@ export default Vue.extend({
this.showResult = !this.showResult;
},
vote(id) {
- if (this.poll.choices.some(c => c.is_voted)) return;
+ if (this.poll.choices.some(c => c.isVoted)) return;
(this as any).api('posts/polls/vote', {
- post_id: this.post.id,
+ postId: this.post.id,
choice: id
}).then(() => {
this.poll.choices.forEach(c => {
if (c.id == id) {
c.votes++;
- Vue.set(c, 'is_voted', true);
+ Vue.set(c, 'isVoted', true);
}
});
this.showResult = true;
diff --git a/src/server/web/app/common/views/components/post-menu.vue b/src/server/web/app/common/views/components/post-menu.vue
index a53680e55a..35116db7e2 100644
--- a/src/server/web/app/common/views/components/post-menu.vue
+++ b/src/server/web/app/common/views/components/post-menu.vue
@@ -2,7 +2,7 @@
@@ -51,7 +51,7 @@ export default Vue.extend({
methods: {
pin() {
(this as any).api('i/pin', {
- post_id: this.post.id
+ postId: this.post.id
}).then(() => {
this.$destroy();
});
diff --git a/src/server/web/app/common/views/components/reaction-picker.vue b/src/server/web/app/common/views/components/reaction-picker.vue
index df8100f2fc..bcb6b2b965 100644
--- a/src/server/web/app/common/views/components/reaction-picker.vue
+++ b/src/server/web/app/common/views/components/reaction-picker.vue
@@ -69,7 +69,7 @@ export default Vue.extend({
methods: {
react(reaction) {
(this as any).api('posts/reactions/create', {
- post_id: this.post.id,
+ postId: this.post.id,
reaction: reaction
}).then(() => {
if (this.cb) this.cb();
diff --git a/src/server/web/app/common/views/components/reactions-viewer.vue b/src/server/web/app/common/views/components/reactions-viewer.vue
index f6a27d9139..246451008f 100644
--- a/src/server/web/app/common/views/components/reactions-viewer.vue
+++ b/src/server/web/app/common/views/components/reactions-viewer.vue
@@ -20,7 +20,7 @@ export default Vue.extend({
props: ['post'],
computed: {
reactions(): number {
- return this.post.reaction_counts;
+ return this.post.reactionCounts;
}
}
});
diff --git a/src/server/web/app/common/views/components/signin.vue b/src/server/web/app/common/views/components/signin.vue
index 2434684085..17154e6b31 100644
--- a/src/server/web/app/common/views/components/signin.vue
+++ b/src/server/web/app/common/views/components/signin.vue
@@ -1,12 +1,12 @@
-
diff --git a/src/server/web/app/common/views/components/othello.room.vue b/src/server/web/app/common/views/components/othello.room.vue
index 3965414836..a32be6b74f 100644
--- a/src/server/web/app/common/views/components/othello.room.vue
+++ b/src/server/web/app/common/views/components/othello.room.vue
@@ -41,9 +41,9 @@
ルール
- 対局の招待があります！:
- ![]()
+ ![]()
{{ i.parent.name }}
@{{ i.parent.username }}
-