Merge pull request #1366 from akihikodaki/misc

Introduce acct directory
This commit is contained in:
syuilo 2018-04-02 13:46:31 +09:00 committed by GitHub
commit 64da9afc33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 58 additions and 58 deletions

View file

@ -229,7 +229,7 @@
</style> </style>
<script lang="typescript"> <script lang="typescript">
import getAcct from '../../../../user/get-acct'; import getAcct from '../../../../acct/render';
this.post = this.opts.post; this.post = this.opts.post;
this.form = this.opts.form; this.form = this.opts.form;

View file

@ -21,7 +21,7 @@
import Vue from 'vue'; import Vue from 'vue';
import * as emojilib from 'emojilib'; import * as emojilib from 'emojilib';
import contains from '../../../common/scripts/contains'; import contains from '../../../common/scripts/contains';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
const lib = Object.entries(emojilib.lib).filter((x: any) => { const lib = Object.entries(emojilib.lib).filter((x: any) => {
return x[1].category != 'flags'; return x[1].category != 'flags';

View file

@ -34,7 +34,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse'; import parse from '../../../../../text/parse';
export default Vue.extend({ export default Vue.extend({

View file

@ -51,7 +51,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: { props: {

View file

@ -1,7 +1,7 @@
import Vue from 'vue'; import Vue from 'vue';
import * as emojilib from 'emojilib'; import * as emojilib from 'emojilib';
import parse from '../../../../../text/parse'; import parse from '../../../../../text/parse';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import { url } from '../../../config'; import { url } from '../../../config';
import MkUrl from './url.vue'; import MkUrl from './url.vue';

View file

@ -24,7 +24,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View file

@ -22,7 +22,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View file

@ -8,7 +8,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { url } from '../../../config'; import { url } from '../../../config';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -102,7 +102,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import getPostSummary from '../../../../../renderers/get-post-summary'; import getPostSummary from '../../../../../renderers/get-post-summary';
export default Vue.extend({ export default Vue.extend({

View file

@ -28,7 +28,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View file

@ -78,7 +78,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse'; import parse from '../../../../../text/parse';
import MkPostFormWindow from './post-form-window.vue'; import MkPostFormWindow from './post-form-window.vue';

View file

@ -21,7 +21,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View file

@ -21,7 +21,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View file

@ -85,7 +85,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify'; import dateStringify from '../../../common/scripts/date-stringify';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse'; import parse from '../../../../../text/parse';
import MkPostFormWindow from './post-form-window.vue'; import MkPostFormWindow from './post-form-window.vue';

View file

@ -13,7 +13,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View file

@ -29,8 +29,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as anime from 'animejs'; import * as anime from 'animejs';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import parseAcct from '../../../../../user/parse-acct'; import parseAcct from '../../../../../acct/parse';
export default Vue.extend({ export default Vue.extend({
props: { props: {

View file

@ -19,7 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -7,7 +7,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../user/parse-acct'; import parseAcct from '../../../../../acct/parse';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View file

@ -13,7 +13,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../user/get-acct'; import getAcct from '../../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -20,7 +20,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../user/get-acct'; import getAcct from '../../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -22,7 +22,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../user/get-acct'; import getAcct from '../../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -9,7 +9,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import parseAcct from '../../../../../../user/parse-acct'; import parseAcct from '../../../../../../acct/parse';
import Progress from '../../../../common/scripts/loading'; import Progress from '../../../../common/scripts/loading';
import XHeader from './user.header.vue'; import XHeader from './user.header.vue';
import XHome from './user.home.vue'; import XHome from './user.home.vue';

View file

@ -43,7 +43,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { docsUrl, copyright, lang } from '../../../config'; import { docsUrl, copyright, lang } from '../../../config';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
const shares = [ const shares = [
'Everything!', 'Everything!',

View file

@ -19,7 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View file

@ -16,7 +16,7 @@
<script lang="ts"> <script lang="ts">
import define from '../../../common/define-widget'; import define from '../../../common/define-widget';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default define({ export default define({
name: 'polls', name: 'polls',

View file

@ -15,7 +15,7 @@
<script lang="ts"> <script lang="ts">
import define from '../../../common/define-widget'; import define from '../../../common/define-widget';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default define({ export default define({
name: 'trends', name: 'trends',

View file

@ -23,7 +23,7 @@
<script lang="ts"> <script lang="ts">
import define from '../../../common/define-widget'; import define from '../../../common/define-widget';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
const limit = 3; const limit = 3;

View file

@ -79,7 +79,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getPostSummary from '../../../../../renderers/get-post-summary'; import getPostSummary from '../../../../../renderers/get-post-summary';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['notification'], props: ['notification'],

View file

@ -15,7 +15,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import summary from '../../../../../renderers/get-post-summary'; import summary from '../../../../../renderers/get-post-summary';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View file

@ -20,7 +20,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View file

@ -80,7 +80,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse'; import parse from '../../../../../text/parse';
import MkPostMenu from '../../../common/views/components/post-menu.vue'; import MkPostMenu from '../../../common/views/components/post-menu.vue';

View file

@ -20,7 +20,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View file

@ -20,7 +20,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['post'], props: ['post'],

View file

@ -77,7 +77,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse'; import parse from '../../../../../text/parse';
import MkPostMenu from '../../../common/views/components/post-menu.vue'; import MkPostMenu from '../../../common/views/components/post-menu.vue';

View file

@ -13,7 +13,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -17,7 +17,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -19,7 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../user/parse-acct'; import parseAcct from '../../../../../acct/parse';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View file

@ -19,7 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../user/parse-acct'; import parseAcct from '../../../../../acct/parse';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View file

@ -10,7 +10,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import parseAcct from '../../../../../user/parse-acct'; import parseAcct from '../../../../../acct/parse';
export default Vue.extend({ export default Vue.extend({
data() { data() {

View file

@ -7,7 +7,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
mounted() { mounted() {

View file

@ -60,8 +60,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as age from 's-age'; import * as age from 's-age';
import getAcct from '../../../../../user/get-acct'; import getAcct from '../../../../../acct/render';
import getAcct from '../../../../../user/parse-acct'; import getAcct from '../../../../../acct/parse';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import XHome from './user/home.vue'; import XHome from './user/home.vue';

View file

@ -12,7 +12,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../user/get-acct'; import getAcct from '../../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -14,7 +14,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../../user/get-acct'; import getAcct from '../../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],

View file

@ -14,7 +14,7 @@ import DriveFile, { getGridFSBucket } from '../models/drive-file';
import DriveFolder from '../models/drive-folder'; import DriveFolder from '../models/drive-folder';
import { pack } from '../models/drive-file'; import { pack } from '../models/drive-file';
import event, { publishDriveStream } from '../publishers/stream'; import event, { publishDriveStream } from '../publishers/stream';
import getAcct from '../user/get-acct'; import getAcct from '../acct/render';
import config from '../config'; import config from '../config';
const gm = _gm.subClass({ const gm = _gm.subClass({

View file

@ -1,5 +1,5 @@
import { IUser, isLocalUser } from '../models/user'; import { IUser, isLocalUser } from '../models/user';
import getAcct from '../user/get-acct'; import getAcct from '../acct/render';
/** /**
* *

View file

@ -3,7 +3,7 @@ import * as express from 'express';
import { parseRequest, verifySignature } from 'http-signature'; import { parseRequest, verifySignature } from 'http-signature';
import User, { IRemoteUser } from '../../models/user'; import User, { IRemoteUser } from '../../models/user';
import queue from '../../queue'; import queue from '../../queue';
import parseAcct from '../../user/parse-acct'; import parseAcct from '../../acct/parse';
const app = express(); const app = express();
app.disable('x-powered-by'); app.disable('x-powered-by');

View file

@ -1,7 +1,7 @@
import * as express from 'express'; import * as express from 'express';
import context from '../../remote/activitypub/renderer/context'; import context from '../../remote/activitypub/renderer/context';
import render from '../../remote/activitypub/renderer/note'; import render from '../../remote/activitypub/renderer/note';
import parseAcct from '../../user/parse-acct'; import parseAcct from '../../acct/parse';
import Post from '../../models/post'; import Post from '../../models/post';
import User from '../../models/user'; import User from '../../models/user';

View file

@ -1,4 +1,4 @@
import parseAcct from '../../user/parse-acct'; import parseAcct from '../../acct/parse';
import User from '../../models/user'; import User from '../../models/user';
export default (redirect, respond) => async (req, res, next) => { export default (redirect, respond) => async (req, res, next) => {

View file

@ -5,7 +5,7 @@ import User, { IUser, init as initUser, ILocalUser } from '../../../models/user'
import getPostSummary from '../../../renderers/get-post-summary'; import getPostSummary from '../../../renderers/get-post-summary';
import getUserSummary from '../../../renderers/get-user-summary'; import getUserSummary from '../../../renderers/get-user-summary';
import parseAcct from '../../../user/parse-acct'; import parseAcct from '../../../acct/parse';
import getNotificationSummary from '../../../renderers/get-notification-summary'; import getNotificationSummary from '../../../renderers/get-notification-summary';
const hmm = [ const hmm = [

View file

@ -7,8 +7,8 @@ import config from '../../../../config';
import BotCore from '../core'; import BotCore from '../core';
import _redis from '../../../../db/redis'; import _redis from '../../../../db/redis';
import prominence = require('prominence'); import prominence = require('prominence');
import getAcct from '../../../../user/get-acct'; import getAcct from '../../../../acct/render';
import parseAcct from '../../../../user/parse-acct'; import parseAcct from '../../../../acct/parse';
import getPostSummary from '../../../../renderers/get-post-summary'; import getPostSummary from '../../../../renderers/get-post-summary';
const redis = prominence(_redis); const redis = prominence(_redis);

View file

@ -18,8 +18,8 @@ import watch from '../../common/watch-post';
import stream, { publishChannelStream } from '../../../../publishers/stream'; import stream, { publishChannelStream } from '../../../../publishers/stream';
import notify from '../../../../publishers/notify'; import notify from '../../../../publishers/notify';
import pushSw from '../../../../publishers/push-sw'; import pushSw from '../../../../publishers/push-sw';
import getAcct from '../../../../user/get-acct'; import getAcct from '../../../../acct/render';
import parseAcct from '../../../../user/parse-acct'; import parseAcct from '../../../../acct/parse';
import config from '../../../../config'; import config from '../../../../config';
/** /**

View file

@ -3,7 +3,7 @@ import * as debug from 'debug';
import limiterDB from '../../db/redis'; import limiterDB from '../../db/redis';
import { Endpoint } from './endpoints'; import { Endpoint } from './endpoints';
import { IAuthContext } from './authenticate'; import { IAuthContext } from './authenticate';
import getAcct from '../../user/get-acct'; import getAcct from '../../acct/render';
const log = debug('misskey:limitter'); const log = debug('misskey:limitter');

View file

@ -1,5 +1,5 @@
import config from '../config'; import config from '../config';
import parseAcct from '../user/parse-acct'; import parseAcct from '../acct/parse';
import User from '../models/user'; import User from '../models/user';
const express = require('express'); const express = require('express');

View file

@ -1,7 +1,7 @@
/** /**
* Mention * Mention
*/ */
import parseAcct from '../../../user/parse-acct'; import parseAcct from '../../../acct/parse';
module.exports = text => { module.exports = text => {
const match = text.match(/^(?:@[a-zA-Z0-9\-]+){1,2}/); const match = text.match(/^(?:@[a-zA-Z0-9\-]+){1,2}/);