mirror of
https://github.com/hotomoe/hotomoe
synced 2024-12-05 18:28:12 +09:00
Merge pull request #1366 from akihikodaki/misc
Introduce acct directory
This commit is contained in:
commit
64da9afc33
@ -229,7 +229,7 @@
|
||||
|
||||
</style>
|
||||
<script lang="typescript">
|
||||
import getAcct from '../../../../user/get-acct';
|
||||
import getAcct from '../../../../acct/render';
|
||||
|
||||
this.post = this.opts.post;
|
||||
this.form = this.opts.form;
|
||||
|
@ -21,7 +21,7 @@
|
||||
import Vue from 'vue';
|
||||
import * as emojilib from 'emojilib';
|
||||
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) => {
|
||||
return x[1].category != 'flags';
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
export default Vue.extend({
|
||||
|
@ -51,7 +51,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: {
|
||||
|
@ -1,7 +1,7 @@
|
||||
import Vue from 'vue';
|
||||
import * as emojilib from 'emojilib';
|
||||
import parse from '../../../../../text/parse';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import { url } from '../../../config';
|
||||
import MkUrl from './url.vue';
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
@ -8,7 +8,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import { url } from '../../../config';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -102,7 +102,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import getPostSummary from '../../../../../renderers/get-post-summary';
|
||||
|
||||
export default Vue.extend({
|
||||
|
@ -28,7 +28,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
@ -78,7 +78,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
import MkPostFormWindow from './post-form-window.vue';
|
||||
|
@ -21,7 +21,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
@ -21,7 +21,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
@ -85,7 +85,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import dateStringify from '../../../common/scripts/date-stringify';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
import MkPostFormWindow from './post-form-window.vue';
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
@ -29,8 +29,8 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import * as anime from 'animejs';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import parseAcct from '../../../../../acct/parse';
|
||||
|
||||
export default Vue.extend({
|
||||
props: {
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -7,7 +7,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
import parseAcct from '../../../../../acct/parse';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import parseAcct from '../../../../../../user/parse-acct';
|
||||
import parseAcct from '../../../../../../acct/parse';
|
||||
import Progress from '../../../../common/scripts/loading';
|
||||
import XHeader from './user.header.vue';
|
||||
import XHome from './user.home.vue';
|
||||
|
@ -43,7 +43,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import { docsUrl, copyright, lang } from '../../../config';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
const shares = [
|
||||
'Everything!',
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import define from '../../../common/define-widget';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default define({
|
||||
name: 'polls',
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import define from '../../../common/define-widget';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default define({
|
||||
name: 'trends',
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import define from '../../../common/define-widget';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
const limit = 3;
|
||||
|
||||
|
@ -79,7 +79,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getPostSummary from '../../../../../renderers/get-post-summary';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['notification'],
|
||||
|
@ -15,7 +15,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import summary from '../../../../../renderers/get-post-summary';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
@ -80,7 +80,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
import MkPostMenu from '../../../common/views/components/post-menu.vue';
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['post'],
|
||||
|
@ -77,7 +77,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import parse from '../../../../../text/parse';
|
||||
|
||||
import MkPostMenu from '../../../common/views/components/post-menu.vue';
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -19,7 +19,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
import parseAcct from '../../../../../acct/parse';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
@ -19,7 +19,7 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
import parseAcct from '../../../../../acct/parse';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import parseAcct from '../../../../../user/parse-acct';
|
||||
import parseAcct from '../../../../../acct/parse';
|
||||
|
||||
export default Vue.extend({
|
||||
data() {
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
mounted() {
|
||||
|
@ -60,8 +60,8 @@
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import * as age from 's-age';
|
||||
import getAcct from '../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../user/parse-acct';
|
||||
import getAcct from '../../../../../acct/render';
|
||||
import getAcct from '../../../../../acct/parse';
|
||||
import Progress from '../../../common/scripts/loading';
|
||||
import XHome from './user/home.vue';
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
<script lang="ts">
|
||||
import Vue from 'vue';
|
||||
import getAcct from '../../../../../../user/get-acct';
|
||||
import getAcct from '../../../../../../acct/render';
|
||||
|
||||
export default Vue.extend({
|
||||
props: ['user'],
|
||||
|
@ -14,7 +14,7 @@ import DriveFile, { getGridFSBucket } from '../models/drive-file';
|
||||
import DriveFolder from '../models/drive-folder';
|
||||
import { pack } from '../models/drive-file';
|
||||
import event, { publishDriveStream } from '../publishers/stream';
|
||||
import getAcct from '../user/get-acct';
|
||||
import getAcct from '../acct/render';
|
||||
import config from '../config';
|
||||
|
||||
const gm = _gm.subClass({
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { IUser, isLocalUser } from '../models/user';
|
||||
import getAcct from '../user/get-acct';
|
||||
import getAcct from '../acct/render';
|
||||
|
||||
/**
|
||||
* ユーザーを表す文字列を取得します。
|
||||
|
@ -3,7 +3,7 @@ import * as express from 'express';
|
||||
import { parseRequest, verifySignature } from 'http-signature';
|
||||
import User, { IRemoteUser } from '../../models/user';
|
||||
import queue from '../../queue';
|
||||
import parseAcct from '../../user/parse-acct';
|
||||
import parseAcct from '../../acct/parse';
|
||||
|
||||
const app = express();
|
||||
app.disable('x-powered-by');
|
||||
|
@ -1,7 +1,7 @@
|
||||
import * as express from 'express';
|
||||
import context from '../../remote/activitypub/renderer/context';
|
||||
import render from '../../remote/activitypub/renderer/note';
|
||||
import parseAcct from '../../user/parse-acct';
|
||||
import parseAcct from '../../acct/parse';
|
||||
import Post from '../../models/post';
|
||||
import User from '../../models/user';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import parseAcct from '../../user/parse-acct';
|
||||
import parseAcct from '../../acct/parse';
|
||||
import User from '../../models/user';
|
||||
|
||||
export default (redirect, respond) => async (req, res, next) => {
|
||||
|
@ -5,7 +5,7 @@ import User, { IUser, init as initUser, ILocalUser } from '../../../models/user'
|
||||
|
||||
import getPostSummary from '../../../renderers/get-post-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';
|
||||
|
||||
const hmm = [
|
||||
|
@ -7,8 +7,8 @@ import config from '../../../../config';
|
||||
import BotCore from '../core';
|
||||
import _redis from '../../../../db/redis';
|
||||
import prominence = require('prominence');
|
||||
import getAcct from '../../../../user/get-acct';
|
||||
import parseAcct from '../../../../user/parse-acct';
|
||||
import getAcct from '../../../../acct/render';
|
||||
import parseAcct from '../../../../acct/parse';
|
||||
import getPostSummary from '../../../../renderers/get-post-summary';
|
||||
|
||||
const redis = prominence(_redis);
|
||||
|
@ -18,8 +18,8 @@ import watch from '../../common/watch-post';
|
||||
import stream, { publishChannelStream } from '../../../../publishers/stream';
|
||||
import notify from '../../../../publishers/notify';
|
||||
import pushSw from '../../../../publishers/push-sw';
|
||||
import getAcct from '../../../../user/get-acct';
|
||||
import parseAcct from '../../../../user/parse-acct';
|
||||
import getAcct from '../../../../acct/render';
|
||||
import parseAcct from '../../../../acct/parse';
|
||||
import config from '../../../../config';
|
||||
|
||||
/**
|
||||
|
@ -3,7 +3,7 @@ import * as debug from 'debug';
|
||||
import limiterDB from '../../db/redis';
|
||||
import { Endpoint } from './endpoints';
|
||||
import { IAuthContext } from './authenticate';
|
||||
import getAcct from '../../user/get-acct';
|
||||
import getAcct from '../../acct/render';
|
||||
|
||||
const log = debug('misskey:limitter');
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import config from '../config';
|
||||
import parseAcct from '../user/parse-acct';
|
||||
import parseAcct from '../acct/parse';
|
||||
import User from '../models/user';
|
||||
const express = require('express');
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
/**
|
||||
* Mention
|
||||
*/
|
||||
import parseAcct from '../../../user/parse-acct';
|
||||
import parseAcct from '../../../acct/parse';
|
||||
|
||||
module.exports = text => {
|
||||
const match = text.match(/^(?:@[a-zA-Z0-9\-]+){1,2}/);
|
||||
|
Loading…
Reference in New Issue
Block a user