mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-23 23:58:02 -05:00
Add user country to contact messages
https://app.asana.com/0/54275583589675/64698696631078/f
This commit is contained in:
parent
b9deb363d2
commit
29892a9619
2 changed files with 3 additions and 2 deletions
|
@ -33,6 +33,7 @@ module.exports = class ContactModal extends ModalView
|
|||
res = tv4.validateMultiple contactMessage, contactSchema
|
||||
return forms.applyErrorsToForm @$el, res.errors unless res.valid
|
||||
@populateBrowserData contactMessage
|
||||
contactMessage.country = me.get('country')
|
||||
window.tracker?.trackEvent 'Sent Feedback', message: contactMessage
|
||||
sendContactMessage contactMessage, @$el
|
||||
$.post "/db/user/#{me.id}/track/contact_codecombat"
|
||||
|
|
|
@ -23,6 +23,7 @@ createMailContext = (req, done) ->
|
|||
user = req.user
|
||||
recipientID = req.body.recipientID
|
||||
subject = req.body.subject
|
||||
country = req.body.country
|
||||
|
||||
level = if user?.get('points') > 0 then Math.floor(5 * Math.log((1 / 100) * (user.get('points') + 100))) + 1 else 0
|
||||
premium = user?.isPremium()
|
||||
|
@ -30,7 +31,7 @@ createMailContext = (req, done) ->
|
|||
#{message}
|
||||
|
||||
--
|
||||
<a href='http://codecombat.com/user/#{user.get('slug') or user.get('_id')}'>#{user.get('name') or 'Anonymous'}</a> - Level #{level}#{if premium then ' - Subscriber' else ''}
|
||||
<a href='http://codecombat.com/user/#{user.get('slug') or user.get('_id')}'>#{user.get('name') or 'Anonymous'}</a> - Level #{level}#{if premium then ' - Subscriber' else ''}#{if country then ' - ' + country else ''}
|
||||
"""
|
||||
if req.body.browser
|
||||
content += "\n#{req.body.browser} - #{req.body.screenSize}"
|
||||
|
@ -46,7 +47,6 @@ createMailContext = (req, done) ->
|
|||
email_data:
|
||||
subject: "[CodeCombat] #{subject ? ('Feedback - ' + (sender or user.get('email')))}"
|
||||
content: content
|
||||
|
||||
if recipientID and (user.isAdmin() or ('employer' in (user.get('permissions') ? [])))
|
||||
User.findById(recipientID, 'email').exec (err, document) ->
|
||||
if err
|
||||
|
|
Loading…
Reference in a new issue