VSinerva/freesewing
1
0
Fork 0
Code Activity

chore(backend): Import user avatars but not sets (for now)

Browse source
This commit is contained in:
joostdecock 2023-08-13 18:57:07 +02:00
parent 6451222b2b
commit e36fbad721
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/send-real-email.mjs
View file

@ -76,7 +76,6 @@ const html = mustache.render(
*/ */
const batches = splitArray(users, 45) const batches = splitArray(users, 45)
let i = 0
const total = batches.length const total = batches.length
batches.forEach((batch, i) => { batches.forEach((batch, i) => {
/* /*

4
sites/backend/src/models/user.mjs
View file

@ -1289,7 +1289,6 @@ const migrateUser = (v2) => {
* This is a special route not available for API users * This is a special route not available for API users
*/ */
UserModel.prototype.import = async function (user) { UserModel.prototype.import = async function (user) {
let created = 0
if (user.status === 'active') { if (user.status === 'active') {
const data = migrateUser(user) const data = migrateUser(user)
if (user.consent.profile) data.consent++ if (user.consent.profile) data.consent++
@ -1303,7 +1302,7 @@ UserModel.prototype.import = async function (user) {
/* /*
* Skip images for now * Skip images for now
*/ */
if (false && data.img) { if (data.img) {
/* /*
* Figure out what image to grab from the FreeSewing v2 backend server * Figure out what image to grab from the FreeSewing v2 backend server
*/ */
@ -1333,7 +1332,6 @@ UserModel.prototype.import = async function (user) {
} }
try { try {
await this.createRecord(data) await this.createRecord(data)
created++
} catch (err) { } catch (err) {
log.warn(err, 'Could not create user record') log.warn(err, 'Could not create user record')
console.log(user) console.log(user)

14
sites/backend/src/utils/cloudflare-images.mjs
View file

@ -88,8 +88,20 @@ export async function importImage(props, isTest = false) {
// Bypass slow ass upload when testing import // Bypass slow ass upload when testing import
if (!config.import) return `default-avatar` if (!config.import) return `default-avatar`
// Only upload user images for now
if (props.id.slice(0, 5) !== 'user-') return `default-avatar`
const form = getFormData(props) const form = getFormData(props)
await axios.post(config.api, form, { headers }) /*
* The image may already exist, so swallow the error
*/
try {
await axios.post(config.api, form, { headers })
} catch {
// Do nothing
}
console.log('Imported img', props.id)
return props.id return props.id
} }