0
0
Fork 0

コメント追加したり

This commit is contained in:
xeltica 2021-09-04 18:24:11 +09:00
parent 1c45e759c3
commit b9575d2c5b
22 changed files with 945 additions and 809 deletions

View file

@ -2,6 +2,9 @@ import { config } from '../../config';
import { User } from '../models/entities/user';
import { Score } from '../../common/types/score';
/**
* 稿
*/
export const defaultTemplate = `昨日のMisskeyの活動は
: {notesCount}({notesDelta})
@ -11,11 +14,17 @@ export const defaultTemplate = `昨日のMisskeyの活動は
{url}`;
/**
*
*/
export type Variable = {
description?: string;
replace?: string | ((score: Score, user: User) => string);
};
/**
*
*/
export const variables: Record<string, Variable> = {
notesCount: {
description: 'ノート数',
@ -61,6 +70,12 @@ export const variables: Record<string, Variable> = {
const variableRegex = /\{([a-zA-Z0-9_]+?)\}/g;
/**
*
* @param score
* @param user
* @returns
*/
export const format = (score: Score, user: User): string => {
const template = user.template || defaultTemplate;
return template.replace(variableRegex, (m, name) => {

View file

@ -2,6 +2,9 @@ import rndstr from 'rndstr';
import { UsedToken } from '../models/entities/used-token';
import { UsedTokens } from '../models';
/**
*
*/
export const genToken = async (): Promise<string> => {
let used: UsedToken | undefined = undefined;
let token: string;
@ -10,4 +13,4 @@ export const genToken = async (): Promise<string> => {
used = await UsedTokens.findOne({ token });
} while (used !== undefined);
return token;
};
};

View file

@ -3,6 +3,11 @@ import { Score } from '../../common/types/score';
import { api } from '../services/misskey';
import { toSignedString } from './to-signed-string';
/**
*
* @param user
* @returns
*/
export const getScores = async (user: User): Promise<Score> => {
const miUser = await api<Record<string, number>>(user.host, 'users/show', { username: user.username }, user.token);
if (miUser.error) {

View file

@ -1,14 +1,19 @@
import { Users } from '../models';
import { User } from '../models/entities/user';
/**
*
* @param limit
* @returns
*/
export const getRanking = async (limit: number | null = 10): Promise<User[]> => {
const query = Users.createQueryBuilder('user')
.where('"user"."bannedFromRanking" IS NOT TRUE')
.orderBy('"user".rating', 'DESC');
if (limit !== null) {
query.limit(limit);
}
return await query.getMany();
};
};

View file

@ -1 +1,6 @@
/**
*
* @param num
* @returns
*/
export const toSignedString = (num: number): string => num < 0 ? num.toString() : '+' + num;

View file

@ -4,6 +4,11 @@ import { User } from '../models/entities/user';
import { updateUser } from './users';
import { MiUser } from './update-score';
/**
*
* @param user
* @param miUser Misskeyのユーザー
*/
export const updateRating = async (user: User, miUser: MiUser): Promise<void> => {
const elapsedDays = dayjs().diff(dayjs(miUser.createdAt), 'd') + 1;
await updateUser(user.username, user.host, {

View file

@ -1,6 +1,9 @@
import { User } from '../models/entities/user';
import { updateUser } from './users';
/**
* Misskeyのユーザーモデル
*/
export type MiUser = {
notesCount: number,
followingCount: number,
@ -8,10 +11,15 @@ export type MiUser = {
createdAt: string,
};
export const updateScore = async (user: User, miUser: MiUser): Promise<void> => {
/**
*
* @param user
* @param miUser Misskeyのユーザー
*/
export const updateScore = async (user: User, miUser: MiUser): Promise<void> => {
await updateUser(user.username, user.host, {
prevNotesCount: miUser.notesCount ?? 0,
prevFollowingCount: miUser.followingCount ?? 0,
prevFollowersCount: miUser.followersCount ?? 0,
});
};
};

View file

@ -2,26 +2,47 @@ import { User } from '../models/entities/user';
import { Users } from '../models';
import { DeepPartial } from 'typeorm';
import { genToken } from './gen-token';
import pick from 'object.pick';
/**
*
* @param username
* @param host
* @returns
*/
export const getUser = (username: string, host: string): Promise<User | undefined> => {
return Users.findOne({ username, host });
};
/**
*
* @param user
* @returns
*/
export const updateUsersMisshaiToken = async (user: User | User['id']): Promise<string> => {
const u = typeof user === 'number'
const u = typeof user === 'number'
? user
: user.id;
const misshaiToken = await genToken();
Users.update(u, { misshaiToken });
return misshaiToken;
return misshaiToken;
};
/**
*
* @param token
* @returns
*/
export const getUserByMisshaiToken = (token: string): Promise<User | undefined> => {
return Users.findOne({ misshaiToken: token });
};
/**
*
* @param username
* @param host
* @param token
*/
export const upsertUser = async (username: string, host: string, token: string): Promise<void> => {
const u = await getUser(username, host);
if (u) {
@ -31,14 +52,29 @@ export const upsertUser = async (username: string, host: string, token: string):
}
};
/**
*
* @param username
* @param host
* @param record
*/
export const updateUser = async (username: string, host: string, record: DeepPartial<User>): Promise<void> => {
await Users.update({ username, host }, record);
};
/**
*
* @param username
* @param host
*/
export const deleteUser = async (username: string, host: string): Promise<void> => {
await Users.delete({ username, host });
};
/**
*
* @returns
*/
export const getUserCount = (): Promise<number> => {
return Users.count();
};
};