Skip to content

Commit 35869bf

Browse files
committed
fix id different not found when callback
1 parent ed45a20 commit 35869bf

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ FROM node:10.16.0-alpine
22
WORKDIR /app
33
COPY . /app
44
ENV NODE_PRODUTION true
5-
RUN npm install --production
6-
RUN find node_modules -type f | egrep "(.idea|.vscode|benchmark.js|.eslintrc.js|changelog|AUTHORS|AUTHORSon|license|LICENSE|.travis.yml|.eslintrc.json|.eslintrc.yml|Makefile|.npmignore|.DS_Store|.jshintrc|.eslintrc.BSD|.editorconfig|tsconfig.json|tsconfig.jsonon|.coveralls.yml|appveyor.yml|.gitattributes|.eslintignore|.eslintrc|.eslintignore.BSD|.babelrc)" | xargs rm -rf && \
5+
RUN npm install --production && find node_modules -type f | egrep "(.idea|.vscode|benchmark.js|.eslintrc.js|changelog|AUTHORS|AUTHORSon|license|LICENSE|.travis.yml|.eslintrc.json|.eslintrc.yml|Makefile|.npmignore|.DS_Store|.jshintrc|.eslintrc.BSD|.editorconfig|tsconfig.json|tsconfig.jsonon|.coveralls.yml|appveyor.yml|.gitattributes|.eslintignore|.eslintrc|.eslintignore.BSD|.babelrc)" | xargs rm -rf && \
76
find node_modules -type f | egrep "\.(md|mdon|markdown|log|ts|swp|jst|coffee|txt|BSD)$" | xargs rm -f &&\
87
find node_modules -type d | egrep "(test|docs|doc|examples|example|.githubs)" | xargs rm -rf
98
ENTRYPOINT npm run start

middlewares/send-error.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,16 @@ const logger = require('../utils/logger');
33
const errors = require('../utils/errors');
44
const USERS = require('../proxies/users');
55
module.exports = async (ctx, next) => {
6-
const user = await USERS.getUserById(ctx.message.chat.id);
6+
let id;
7+
switch (ctx.updateType) {
8+
case 'message':
9+
id = ctx.message.chat.id;
10+
break;
11+
case 'callback_query':
12+
id = ctx.callbackQuery.from.id;
13+
break;
14+
}
15+
const user = await USERS.getUserById(id);
716
if (user) ctx.state.lang = user.lang;
817
const lang = ctx.state.lang || require('../config').lang;
918
const m = await ctx.reply(i18n[lang]['PROCESSING']);

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)