moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Resolve #3676 (#3677)

Browse Source
This commit is contained in:
Acid Chicken (硫酸鶏) 2018-12-19 21:20:25 +09:00 committed by syuilo
parent acc6f54557
commit c81a94ff75
14 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/app/common/scripts/compose-notification.ts
View File

@ -22,7 +22,7 @@ export default function(type, data): Notification {
case 'unreadMessagingMessage':
return {
title: '%i18n:common.notification.message-from%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.message-from%'.split("{}")[1] ,
title: '%i18n:common.notification.message-from%'.split('{}')[0] + `${getUserName(data.user)}` + '%i18n:common.notification.message-from%'.split('{}')[1] ,
body: data.text, // TODO: getMessagingMessageSummary(data),
icon: data.user.avatarUrl
};
@ -30,7 +30,7 @@ export default function(type, data): Notification {
case 'reversiInvited':
return {
title: '%i18n:common.notification.reversi-invited%',
body: '%i18n:common.notification.reversi-invited-by%'.split("{}")[0] + `${getUserName(data.parent)}` + '%i18n:common.notification.reversi-invited-by%'.split("{}")[1],
body: '%i18n:common.notification.reversi-invited-by%'.split('{}')[0] + `${getUserName(data.parent)}` + '%i18n:common.notification.reversi-invited-by%'.split('{}')[1],
icon: data.parent.avatarUrl
};
@ -38,21 +38,21 @@ export default function(type, data): Notification {
switch (data.type) {
case 'mention':
return {
title: '%i18n:common.notification.notified-by%'.split("{}")[0] + `${getUserName(data.user)}:` + '%i18n:common.notification.notified-by%'.split("{}")[1],
title: '%i18n:common.notification.notified-by%'.split('{}')[0] + `${getUserName(data.user)}:` + '%i18n:common.notification.notified-by%'.split('{}')[1],
body: getNoteSummary(data),
icon: data.user.avatarUrl
};
case 'reply':
return {
title: '%i18n:common.notification.reply-from%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.reply-from%'.split("{}")[1],
title: '%i18n:common.notification.reply-from%'.split('{}')[0] + `${getUserName(data.user)}` + '%i18n:common.notification.reply-from%'.split('{}')[1],
body: getNoteSummary(data),
icon: data.user.avatarUrl
};
case 'quote':
return {
title: '%i18n:common.notification.quoted-by%'.split("{}")[0] + `${getUserName(data.user)}` + '%i18n:common.notification.quoted-by%'.split("{}")[1],
title: '%i18n:common.notification.quoted-by%'.split('{}')[0] + `${getUserName(data.user)}` + '%i18n:common.notification.quoted-by%'.split('{}')[1],
body: getNoteSummary(data),
icon: data.user.avatarUrl
};

2
src/client/app/common/scripts/format-uptime.ts
View File

@ -15,7 +15,7 @@ export default function(sec) {
const t
= tod < 60 ? `${Math.floor(tod)} sec`
: tod < 3600 ? `${Math.floor(tod / 60)} min`
: `${Math.floor(tod / 60 / 60)}:${Math.floor((tod / 60) % 60).toString().padStart(2, "0")}`;
: `${Math.floor(tod / 60 / 60)}:${Math.floor((tod / 60) % 60).toString().padStart(2, '0')}`;
let str = '';
if (d) str += `${d}, `;

4
src/client/app/common/scripts/get-md5.ts
View File

@ -3,8 +3,8 @@
export default (data: ArrayBuffer) => {
//const buf = new Buffer(data);
//const hash = crypto.createHash("md5");
//const hash = crypto.createHash('md5');
//hash.update(buf);
//return hash.digest("hex");
//return hash.digest('hex');
return '';
};

2
src/client/app/v.d.ts vendored
View File

@ -1,4 +1,4 @@
declare module "*.vue" {
declare module '*.vue' {
import Vue from 'vue';
export default Vue;
}

2
src/games/reversi/core.ts
View File

@ -1,4 +1,4 @@
import { count, concat } from "../../prelude/array";
import { count, concat } from '../../prelude/array';
// MISSKEY REVERSI ENGINE

2
src/mfm/syntax-highlight.ts
View File

@ -1,4 +1,4 @@
import { capitalize, toUpperCase } from "../prelude/string";
import { capitalize, toUpperCase } from '../prelude/string';
function escape(text: string) {
return text

2
src/misc/fetch-meta.ts
View File

@ -17,7 +17,7 @@ const defaultMeta: any = {
enableGithubIntegration: false,
enableDiscordIntegration: false,
enableExternalUserRecommendation: false,
externalUserRecommendationEngine: "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}",
externalUserRecommendationEngine: 'https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}',
externalUserRecommendationTimeout: 300000,
errorImageUrl: 'https://ai.misskey.xyz/aiart/yubitun.png'
};

2
src/prelude/string.ts
View File

@ -1,5 +1,5 @@
export function concat(xs: string[]): string {
return xs.reduce((a, b) => a + b, "");
return xs.reduce((a, b) => a + b, '');
}
export function capitalize(s: string): string {

2
src/remote/activitypub/models/tag.ts
View File

@ -1,4 +1,4 @@
import { IIcon } from "./icon";
import { IIcon } from './icon';
/***
* tag (ActivityPub)

2
src/remote/activitypub/renderer/block.ts
View File

@ -1,5 +1,5 @@
import config from '../../../config';
import { ILocalUser, IRemoteUser } from "../../../models/user";
import { ILocalUser, IRemoteUser } from '../../../models/user';
export default (blocker?: ILocalUser, blockee?: IRemoteUser) => ({
type: 'Block',

2
src/remote/activitypub/renderer/delete.ts
View File

@ -1,5 +1,5 @@
import config from '../../../config';
import { ILocalUser } from "../../../models/user";
import { ILocalUser } from '../../../models/user';
export default (object: any, user: ILocalUser) => ({
type: 'Delete',

2
src/remote/activitypub/renderer/undo.ts
View File

@ -1,5 +1,5 @@
import config from '../../../config';
import { ILocalUser, IUser } from "../../../models/user";
import { ILocalUser, IUser } from '../../../models/user';
export default (object: any, user: ILocalUser | IUser) => ({
type: 'Undo',

2
src/tools/add-emoji.ts
View File

@ -1,5 +1,5 @@
import * as debug from 'debug';
import Emoji from "../models/emoji";
import Emoji from '../models/emoji';
debug.enable('*');

2
src/tools/resync-remote-user.ts
View File

@ -1,4 +1,4 @@
import parseAcct from "../misc/acct/parse";
import parseAcct from '../misc/acct/parse';
import resolveUser from '../remote/resolve-user';
import * as debug from 'debug';