94571394

Build Type

github

Committed by GitHub

Commit Message

Merge d5f044216 into 243752d61

Pull Request Pull Request #97: Charts round 2. Bug Fixes of charts and localization

Run Details

87 of 736 branches covered (11.82%)

Branch coverage included in aggregate %.

4 of 12 new or added lines in 4 files covered. (33.33%)

51 existing lines in 13 files now uncovered.

501 of 1169 relevant lines covered (42.86%)

0.92 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

22.73

/server/src/bots/telegram/services/registry/withTwoArgumentsAfterCommand.ts

import {
    CallBackQueryHandlerWithCommandArgument,
    CallBackQueryParameters,
} from '../../models';
import * as TelegramBot from 'node-telegram-bot-api';
import { LogCategory } from '../../../../models/constants';
import { logger } from '../../../../utils/logger';
import { noResponse } from '../../botResponse/noResponse';
import { MessageHandlerRegistry } from './messageHandlerRegistry';

/**
 * This function is wrapper around the original User's query handler
 * It adds an additional two parameters (if such exists) to original handler,
 * which will be parameters following after command
 * @example /trends Ukraine monthly
 */
export const withTwoArgumentsAfterCommand = (
    context: MessageHandlerRegistry,
    handlerFn: CallBackQueryHandlerWithCommandArgument
): CallBackQueryHandlerWithCommandArgument => {
    return ({
        bot,
        message,
        chatId,
        user,
        commandParameter,
    }: CallBackQueryParameters): Promise<TelegramBot.Message> => {
        try {
            const [arg1, arg2] = splitArgument(commandParameter);
            return handlerFn.call(context, {
                bot,
                message,
                user,
                chatId,
                commandParameter:
                    (arg1 && arg1.toLowerCase()) || commandParameter,
                secondCommandParameter: arg2 && arg2.toLowerCase(),
            });
        } catch (err) {
            logger.error(
                `Error happend inside withTwoArgumentsAfterCommand() for ${chatId} with message: ${message.text} and commandParameter: ${commandParameter}`,
                err,
                LogCategory.Command,
                chatId
            );

            return noResponse({ bot, message, user, chatId });
        }
    };
};

const splitArgsRegexp = new RegExp(
    '"(?<firstArg>.+)"[\\s.,;]+(?<secondArg>[^ ]+)'
);

function splitArgument(argument: string): [string, string] {
    const match = splitArgsRegexp.exec(argument);
    if (!match) {
        return [undefined, undefined];
    }

    /* tslint:disable:no-string-literal */
    return [match.groups['firstArg'], match.groups['secondArg']];
}

1	import {
2	CallBackQueryHandlerWithCommandArgument,
3	CallBackQueryParameters,
4	} from '../../models';
5	import * as TelegramBot from 'node-telegram-bot-api';
6	import { LogCategory } from '../../../../models/constants';	1✔
7	import { logger } from '../../../../utils/logger';	1✔
8	import { noResponse } from '../../botResponse/noResponse';	1✔
9	import { MessageHandlerRegistry } from './messageHandlerRegistry';
10
11	/**
12	* This function is wrapper around the original User's query handler
13	* It adds an additional two parameters (if such exists) to original handler,
14	* which will be parameters following after command
15	* @example /trends Ukraine monthly
16	*/
17	export const withTwoArgumentsAfterCommand = (	1✔
18	context: MessageHandlerRegistry,
19	handlerFn: CallBackQueryHandlerWithCommandArgument
20	): CallBackQueryHandlerWithCommandArgument => {
UNCOV 21	return ({	×
22	bot,
23	message,
24	chatId,
25	user,
26	commandParameter,
27	}: CallBackQueryParameters): Promise<TelegramBot.Message> => {
28	try {	×
29	const [arg1, arg2] = splitArgument(commandParameter);	×
30	return handlerFn.call(context, {	×
31	bot,
32	message,
33	user,
34	chatId,
35	commandParameter:
36	(arg1 && arg1.toLowerCase()) \|\| commandParameter,	×
37	secondCommandParameter: arg2 && arg2.toLowerCase(),	×
38	});
39	} catch (err) {
40	logger.error(	×
41	`Error happend inside withTwoArgumentsAfterCommand() for ${chatId} with message: ${message.text} and commandParameter: ${commandParameter}`,
42	err,
43	LogCategory.Command,
44	chatId
45	);
46
47	return noResponse({ bot, message, user, chatId });	×
48	}
49	};
50	};
51
52	const splitArgsRegexp = new RegExp(	1✔
53	'"(?<firstArg>.+)"[\\s.,;]+(?<secondArg>[^ ]+)'
54	);
55
56	function splitArgument(argument: string): [string, string] {
57	const match = splitArgsRegexp.exec(argument);	×
58	if (!match) {	×
59	return [undefined, undefined];	×
60	}
61
62	/* tslint:disable:no-string-literal */
63	return [match.groups['firstArg'], match.groups['secondArg']];	×
64	}

danbilokha / covid19liveupdates / 94571394

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous