strip mention from messages & commands

commands/departures/index.js

@@ -69,7 +69,7 @@ const departures = async (ctx, next) => {
 
 	let where = await ctx.storage.getData('where')
 	if (!where) {
-		where = await parseWhere(ctx.message.text, ctx)
+		where = await parseWhere(ctx.message.textWithoutMention, ctx)
 		if (!where) return next() // await next message
 		await ctx.storage.putData('where', where)
 		await ctx.storage.incLocation(where.id)
@@ -80,7 +80,7 @@ const departures = async (ctx, next) => {
 
 	let when = await ctx.storage.getData('when')
 	if (!when) {
-		when = await parseWhen(ctx.message.text, ctx)
+		when = await parseWhen(ctx.message.textWithoutMention, ctx)
 		if (!when) return next() // await next message
 		await ctx.storage.putData('when', when)
 	}

commands/journeys/index.js

@@ -29,12 +29,12 @@ const textOrLocation = `\
 Only location names like "U mehringdamm", "Kaiserdamm 26" and locations are supported.`
 
 const parseWhere = async (msg, ctx) => {
-	if (msg.text) {
-		let [loc] = searchStations(msg.text, 1, false, false) // non-fuzzy
+	if (msg.textWithoutMention) {
+		let [loc] = searchStations(msg.textWithoutMention, 1, false, false) // non-fuzzy
 		if (loc) {
 			loc = allStations.find(s => s.id === loc.id) // get details
 		} else {
-			[loc] = await hafas.locations(msg.text, {results: 1})
+			[loc] = await hafas.locations(msg.textWithoutMention, {results: 1})
 		}
 		const text = loc ? `I found ${loc.name || loc.address}.` : unknownStation
 		await ctx.replyWithMarkdown(text)
@@ -103,7 +103,7 @@ const journeys = async (ctx, next) => {
 
 	let when = await ctx.storage.getData('when')
 	if (!when) {
-		when = await parseWhen(ctx.message.text, ctx)
+		when = await parseWhen(ctx.message.textWithoutMention, ctx)
 		if (!when) return next() // await next message
 		await ctx.storage.putData('when', when)
 	}

index.js

@@ -4,6 +4,7 @@ const path = require('path')
 const Bot = require('telegraf')
 const url = require('url')
 
+const textWithoutMention = require('./lib/text-without-mention')
 const logging = require('./lib/logging')
 const session = require('./lib/session')
 const storage = require('./lib/storage')
@@ -31,11 +32,11 @@ const pathToDb = path.join(__dirname, 'vbb-telegram.ldb')
 
 const bot = new Bot(TOKEN)
 bot.use(logging)
+bot.use(textWithoutMention)
 bot.use(session(pathToDb))
 bot.use(command)
 bot.use(storage)
 bot.use((ctx, next) => {
-	if (!ctx.message) return next()
 	const cmd = ctx.command || ctx.prevCommand || 'help'
 	ctx.storage.getData = ctx.storage.createGetData(cmd)
 	ctx.storage.putData = ctx.storage.createPutData(cmd)

lib/command.js

@@ -2,6 +2,14 @@
 
 const invisibleSpace = '\u2063'
 
+const HANDLE = process.env.HANDLE
+if (!HANDLE) {
+	console.error('Missing HANDLE env var.')
+	process.exit(1)
+}
+
+const mention = ('@' + HANDLE).toLowerCase()
+
 const commandMiddleware = async (ctx, next) => {
 	if (!ctx.message) return next()
 	if (!ctx.session) return Promise.reject('ctx.session is missing')
@@ -10,9 +18,13 @@ const commandMiddleware = async (ctx, next) => {
 	ctx.prevCommand = await ctx.session.get('cmd')
 
 	if (!Array.isArray(msg.entities)) return next()
-	const entity = msg.entities.find(e => e.type === 'bot_command' && e.offset === 0)
+	const entity = msg.entities.find(e => e.type === 'bot_command')
 	if (!entity) return next()
-	const cmd = msg.text.substr(entity.offset, entity.length).slice(1).toLowerCase()
+	const cmd = msg.text
+	.substr(entity.offset, entity.length)
+	.slice(1)
+	.toLowerCase()
+	.replace(mention, '')
 	ctx.command = cmd
 
 	const argsStart = entity.offset + entity.length + 1

lib/text-without-mention.js

@@ -0,0 +1,43 @@
+'use strict'
+
+const HANDLE = process.env.HANDLE
+if (!HANDLE) {
+	console.error('Missing HANDLE env var.')
+	process.exit(1)
+}
+
+const mention = ('@' + HANDLE).toLowerCase()
+
+// '/foo@bot bar' -> '/foo bar'
+// '/foo@bot' -> '/foo'
+// '/foo @bot bar' -> '/foo bar'
+// '/foo @bot' -> '/foo'
+// '@bot foo' -> 'foo'
+// '@bot' -> ''
+// '@bot /foo bar' -> '/foo bar'
+// ' @bot /foo bar' -> ' /foo bar'
+const textWithoutMention = (ctx, next) => {
+	if (!ctx.message || !ctx.message.text) { // ignore
+		next()
+		return
+	}
+	const text = ctx.message.text
+
+	const i = text.indexOf(mention)
+	if (i < 0) return null
+
+	const afterSpace = text[i - 1] === ' '
+	const atTheStart = i === 0
+	const beforeSpace = text[i + mention.length] === ' '
+	const atTheEnd = text.length === (i + mention.length)
+
+	let start = i, end = i + mention.length
+	if (afterSpace && atTheEnd) start--
+	else if (beforeSpace && atTheStart) end++
+	else if (beforeSpace && afterSpace) end++
+
+	ctx.message.textWithoutMention = text.slice(0, start) + text.slice(end)
+	next()
+}
+
+module.exports = textWithoutMention