From 06b1fb3fe1d700253199d8d4520a9c751ec2791e Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Sat, 18 Aug 2018 04:05:00 +0900 Subject: [PATCH 1/2] Delete .autogen --- .autogen/README.md | 69 ---------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 .autogen/README.md diff --git a/.autogen/README.md b/.autogen/README.md deleted file mode 100644 index 4eea50655..000000000 --- a/.autogen/README.md +++ /dev/null @@ -1,69 +0,0 @@ - - -[![Misskey](/assets/title.png)](https://misskey.xyz/) -================================================================ - -[![][travis-badge]][travis-link] -[![][dependencies-badge]][dependencies-link] -[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Greenkeeper badge](https://badges.greenkeeper.io/syuilo/misskey.svg)](https://greenkeeper.io/) - -[Misskey](https://misskey.xyz) is an **advanced**, **redefined**, and ultimately **sophisticated** microblogging platform. - -Become a Patron! - -![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg) - -:sparkles: Features ----------------------------------------------------------------- -* Rich text contents -* Reactions -* User lists -* Customizable column view (called MisskeyDeck) - * and widgets! -* Private messages -* ActivityPub support - -and more! You can see it with your own eyes at [misskey.xyz](https://misskey.xyz). - -:package: Create your instance ----------------------------------------------------------------- -If you want to run your own instance of Misskey, -please see [Setup and installation guide](./docs/setup.en.md). - -:wrench: Contribute ----------------------------------------------------------------- -**[PR](https://github.com/syuilo/misskey/pulls)s welcome!** - -If you want to... -* i18n ... please see [Translation guide](./docs/translate.en.md). -* l10n ... please visit https://crowdin.com/project/misskey - -:heart: Backers & Sponsors ----------------------------------------------------------------- - - -:four_leaf_clover: Copyright ----------------------------------------------------------------- -> Copyright (c) 2014-2018 syuilo - -Misskey is an open-source software licensed under the [GNU AGPLv3](LICENSE). - -[![][agpl-3.0-badge]][AGPL-3.0] - -[agpl-3.0]: https://www.gnu.org/licenses/agpl-3.0.en.html -[agpl-3.0-badge]: https://img.shields.io/badge/license-AGPL--3.0-444444.svg?style=flat-square -[travis-link]: https://travis-ci.org/syuilo/misskey -[travis-badge]: http://img.shields.io/travis/syuilo/misskey/master.svg?style=flat-square -[dependencies-link]: https://david-dm.org/syuilo/misskey -[dependencies-badge]: https://img.shields.io/david/syuilo/misskey.svg?style=flat-square - -[backer-url]: #backers -[backer-badge]: https://opencollective.com/misskey/backers/badge.svg -[backers-image]: https://opencollective.com/misskey/backers.svg -[sponsor-url]: #sponsors -[sponsor-badge]: https://opencollective.com/misskey/sponsors/badge.svg -[sponsors-image]: https://opencollective.com/misskey/sponsors.svg -[support-url]: https://opencollective.com/misskey#support - -[syuilo-link]: https://syuilo.com -[syuilo-icon]: https://avatars2.githubusercontent.com/u/4439005?v=3&s=70 From eef09b8f3f1d9d2068fa11280996ec7b6e5ed79a Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Sat, 18 Aug 2018 04:13:25 +0900 Subject: [PATCH 2/2] Fix #2301 --- src/client/app/common/scripts/{get-kao.ts => get-face.ts} | 4 ++-- src/client/app/desktop/views/components/post-form.vue | 4 ++-- src/client/app/mobile/views/components/post-form.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/client/app/common/scripts/{get-kao.ts => get-face.ts} (62%) diff --git a/src/client/app/common/scripts/get-kao.ts b/src/client/app/common/scripts/get-face.ts similarity index 62% rename from src/client/app/common/scripts/get-kao.ts rename to src/client/app/common/scripts/get-face.ts index 2c9280c9b..79cf7a1be 100644 --- a/src/client/app/common/scripts/get-kao.ts +++ b/src/client/app/common/scripts/get-face.ts @@ -1,4 +1,4 @@ -const kaos = [ +const faces = [ '(=^・・^=)', 'v(\'ω\')v', '🐡( \'-\' 🐡 )ﾌｸﾞﾊﾟﾝﾁ!!!!', @@ -7,4 +7,4 @@ const kaos = [ '(Δ・x・Δ)' ]; -export default () => kaos[Math.floor(Math.random() * kaos.length)]; +export default () => faces[Math.floor(Math.random() * faces.length)]; diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index d5d160bd8..bacaea65e 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -58,7 +58,7 @@ import Vue from 'vue'; import insertTextAtCursor from 'insert-text-at-cursor'; import * as XDraggable from 'vuedraggable'; -import getKao from '../../../common/scripts/get-kao'; +import getFace from '../../../common/scripts/get-face'; import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue'; import parse from '../../../../../mfm/parse'; import { host } from '../../../config'; @@ -421,7 +421,7 @@ export default Vue.extend({ }, kao() { - this.text += getKao(); + this.text += getFace(); } } }); diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue index 466ca393d..a74df67c0 100644 --- a/src/client/app/mobile/views/components/post-form.vue +++ b/src/client/app/mobile/views/components/post-form.vue @@ -56,7 +56,7 @@ import Vue from 'vue'; import insertTextAtCursor from 'insert-text-at-cursor'; import * as XDraggable from 'vuedraggable'; import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue'; -import getKao from '../../../common/scripts/get-kao'; +import getFace from '../../../common/scripts/get-face'; import parse from '../../../../../mfm/parse'; import { host } from '../../../config'; @@ -313,7 +313,7 @@ export default Vue.extend({ }, kao() { - this.text += getKao(); + this.text += getFace(); } } });