nefrace
/
godotbot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes in DB, again

This commit is contained in:
Nefrace 2021-04-12 23:12:03 +03:00
parent 9335a31582
commit 3d8825404d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
index.js
View File

@ -348,7 +348,8 @@ bot.onText(/^\/top/, async msg => {
message += `\n*${currentPlace} место* \\(${lastKarma}\\): ` message += `\n*${currentPlace} место* \\(${lastKarma}\\): `
lastPlace = currentPlace lastPlace = currentPlace
} }
let name = markdowned(user.name) console.log(user)
let name = markdowned(user.full_name)
if(user.uid == msg.from.id){ if(user.uid == msg.from.id){
name = "*" + name + "*" name = "*" + name + "*"
} }
@ -388,7 +389,7 @@ bot.onText(/^\/bottom/, async msg => {
message += `\n*${currentPlace} место* \\(${markdowned(lastKarma)}\\): ` message += `\n*${currentPlace} место* \\(${markdowned(lastKarma)}\\): `
lastPlace = currentPlace lastPlace = currentPlace
} }
let name = markdowned(user.name) let name = markdowned(user.full_name)
if(user.uid == msg.from.id){ if(user.uid == msg.from.id){
name = "*" + name + "*" name = "*" + name + "*"
} }
@ -435,7 +436,7 @@ bot.onText(/^\/stats/, async msg => {
} }
} }
let message = ` let message = `
Вот информация о тебе, *${markdowned(user.name)}*: Вот информация о тебе, *${markdowned(user.full_name)}*:
Карма: *${markdowned(user.karma)}* Карма: *${markdowned(user.karma)}*
Место среди пользователей: *${lessKarma+1}* ${sameMessage} Место среди пользователей: *${lessKarma+1}* ${sameMessage}
@ -496,13 +497,13 @@ async function getUser(u) {
let full_name = u.first_name + (u.last_name? " " + u.last_name : "") let full_name = u.first_name + (u.last_name? " " + u.last_name : "")
let user = await User.findOne({uid: u.id}) let user = await User.findOne({uid: u.id})
if (!user) { if (!user) {
user = new User({uid: u.id, name: full_name, username: u.username }) user = new User({uid: u.id, full_name: full_name, username: u.username })
user.save((err, user) => { user.save((err, user) => {
if(err) return console.error(err) if(err) return console.error(err)
return user return user
}) })
} else { } else {
user.name = full_name user.full_name = full_name
user.username = u.username user.username = u.username
await user.save() await user.save()
} }
@ -626,7 +627,7 @@ async function processKarma(msg, match, settings={}) {
$inc: {karmaChanged: 1} $inc: {karmaChanged: 1}
} }
).exec() ).exec()
const message = `*${markdowned(fromDB.name)} \\(${markdowned(fromDB.karma)}\\)* ${changeMessage} карму *${markdowned(toDB.name)} \\(${markdowned(toDB.karma + updateValue)}\\)*` const message = `*${markdowned(fromDB.full_name)} \\(${markdowned(fromDB.karma)}\\)* ${changeMessage} карму *${markdowned(toDB.full_name)} \\(${markdowned(toDB.karma + updateValue)}\\)*`
console.log(message) console.log(message)
bot.sendMessage(chat_id, message, {parse_mode: "MarkdownV2"}) bot.sendMessage(chat_id, message, {parse_mode: "MarkdownV2"})
} }
@ -644,7 +645,8 @@ async function updateDB(id) {
continue continue
} }
const u = chatMember.user const u = chatMember.user
user.name = u.first_name + (u.last_name? " " + u.last_name : "") user.name = null
user.full_name = u.first_name + (u.last_name? " " + u.last_name : "")
user.username = u.username || null user.username = u.username || null
await user.save() await user.save()
console.log(`USER ${user.uid} SAVED`) console.log(`USER ${user.uid} SAVED`)

2
schemas.js
View File

@ -2,7 +2,7 @@ const mongoose = require('mongoose');
const userSchema = new mongoose.Schema({ const userSchema = new mongoose.Schema({
uid: Number, uid: Number,
name: String, full_name: String,
username: String, username: String,
messagesCount: {type: Number, default: 0}, messagesCount: {type: Number, default: 0},
karma: {type: Number, default: 0}, karma: {type: Number, default: 0},