sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
syuilo
2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/api/bot/core.ts
View File

@@ -67,7 +67,7 @@ export default class BotCore extends EventEmitter {
return await this.context.q(query);
}
if (/^@[a-zA-Z0-9-]+$/.test(query)) {
if (/^@[a-zA-Z0-9_]+$/.test(query)) {
return await this.showUserCommand(query);
}
@@ -208,7 +208,7 @@ class SigninContext extends Context {
if (this.temporaryUser == null) {
// Fetch user
const user: IUser = await User.findOne({
username_lower: query.toLowerCase(),
usernameLower: query.toLowerCase(),
host: null
}, {
fields: {
@@ -297,7 +297,7 @@ class TlContext extends Context {
private async getTl() {
const tl = await require('../endpoints/posts/timeline')({
limit: 5,
until_id: this.next ? this.next : undefined
untilId: this.next ? this.next : undefined
}, this.bot.user);
if (tl.length > 0) {
@@ -349,7 +349,7 @@ class NotificationsContext extends Context {
private async getNotifications() {
const notifications = await require('../endpoints/i/notifications')({
limit: 5,
until_id: this.next ? this.next : undefined
untilId: this.next ? this.next : undefined
}, this.bot.user);
if (notifications.length > 0) {