From d01142c049db7d690fd170b6c67eeb9fb4d652ff Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Wed, 11 Oct 2023 14:35:34 -0700 Subject: [PATCH 1/8] Increase retries and delay --- .../verified-uploads/src/handlers/users.js | 63 ++++++++++--------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js index d361335853b..fbd9a356820 100644 --- a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js +++ b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js @@ -36,41 +36,44 @@ export default async ({ user_id, blocknumber }) => { const is_verified = current.is_verified const handle = current.handle - const data = await retry( - async (_) => { - const { data } = await axios - .get(social_handle_url(handle)) - .catch(console.error) + let source: str + try { + const data = await retry( + async (_) => { + const { data } = await axios + .get(social_handle_url(handle)) + .catch(console.error) - if (Object.keys(data).length === 0) { - // wait for identity to load - await new Promise((resolve) => { - setTimeout(resolve, 1000) - }) - throw new Error('social handles not in identity yet') - } + if (Object.keys(data).length === 0) { + // wait for identity to load + await new Promise((resolve) => { + setTimeout(resolve, 5000) + }) + throw new Error('social handles not in identity yet') + } - return data - }, - { retries: 5 } - ) + return data + }, + { retries: 100 } + ) + const { twitterVerified, instagramVerified, tikTokVerified } = data - const { twitterVerified, instagramVerified, tikTokVerified } = data - - let source = 'unknown' - if (twitterVerified) { - source = 'twitter' - } - if (instagramVerified) { - source = 'instagram' - } - if (tikTokVerified) { - source = 'tiktok' + if (twitterVerified) { + source = 'twitter' + } + if (instagramVerified) { + source = 'instagram' + } + if (tikTokVerified) { + source = 'tiktok' + } + } catch (e) { + source = "could not figure out source!" + console.error(e) } - const header = `User *${handle}* ${ - is_verified ? 'is now' : 'is no longer' - } verified via ${source}!` + const header = `User *${handle}* ${is_verified ? 'is now' : 'is no longer' + } verified via ${source}!` const body = { userId: user_id, From 9f03b3da3ec979698c3c43e4023e928ba9dcc73e Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Wed, 11 Oct 2023 16:01:59 -0600 Subject: [PATCH 2/8] types --- .../plugins/verified-uploads/src/handlers/users.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js index fbd9a356820..c75bc901d29 100644 --- a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js +++ b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js @@ -36,7 +36,7 @@ export default async ({ user_id, blocknumber }) => { const is_verified = current.is_verified const handle = current.handle - let source: str + let source try { const data = await retry( async (_) => { @@ -68,12 +68,13 @@ export default async ({ user_id, blocknumber }) => { source = 'tiktok' } } catch (e) { - source = "could not figure out source!" + source = 'could not figure out source!' console.error(e) } - const header = `User *${handle}* ${is_verified ? 'is now' : 'is no longer' - } verified via ${source}!` + const header = `User *${handle}* ${ + is_verified ? 'is now' : 'is no longer' + } verified via ${source}!` const body = { userId: user_id, From e9e2e40206b6941f456fa3c502392c2bfd662a28 Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Wed, 11 Oct 2023 16:14:33 -0600 Subject: [PATCH 3/8] current undefined check --- .../plugins/verified-uploads/src/handlers/users.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js index c75bc901d29..8e268ea9f23 100644 --- a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js +++ b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js @@ -29,7 +29,8 @@ export default async ({ user_id, blocknumber }) => { db: dp_db }) - const user_became_verified = current.is_verified !== old.is_verified + const user_became_verified = + current !== undefined && current.is_verified !== old.is_verified const new_user_is_verified = old === undefined && current.is_verified if (user_became_verified || new_user_is_verified) { From 48a6e5604a1bab118675739f71a135c846760935 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Thu, 12 Oct 2023 09:38:43 -0700 Subject: [PATCH 4/8] Fix type --- .../plugins/verified-uploads/src/handlers/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js index fbd9a356820..bf46ac98836 100644 --- a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js +++ b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js @@ -36,7 +36,7 @@ export default async ({ user_id, blocknumber }) => { const is_verified = current.is_verified const handle = current.handle - let source: str + let source try { const data = await retry( async (_) => { From 6e3bb706107883e3a678781c658e696937a85f88 Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Thu, 12 Oct 2023 11:33:13 -0600 Subject: [PATCH 5/8] add more verifications of inputs --- .../verified-uploads/src/handlers/users.js | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js index 8e268ea9f23..8ad4134a618 100644 --- a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js +++ b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js @@ -29,11 +29,26 @@ export default async ({ user_id, blocknumber }) => { db: dp_db }) - const user_became_verified = - current !== undefined && current.is_verified !== old.is_verified - const new_user_is_verified = old === undefined && current.is_verified + console.log({ current, old, user_id, blocknumber }) - if (user_became_verified || new_user_is_verified) { + if (current === undefined) { + console.warn( + { user_id, blocknumber }, + 'user does not have a current record' + ) + return + } + + const is_new_user = old === undefined + const new_user_is_verified = is_new_user && current.is_verified + const is_existing_user = !is_new_user + const existing_user_previously_unverified = + is_existing_user && old.is_verified === false + const user_currently_verified = current.is_verified === true + const existing_user_became_verified = + user_currently_verified !== existing_user_previously_unverified + + if (existing_user_became_verified || new_user_is_verified) { const is_verified = current.is_verified const handle = current.handle From 653e564884fe2e95c7838c26cf382287de916d06 Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Thu, 12 Oct 2023 11:40:18 -0600 Subject: [PATCH 6/8] logs to view working --- .../plugins/verified-uploads/src/handlers/users.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js index 8ad4134a618..2277e266784 100644 --- a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js +++ b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js @@ -48,6 +48,14 @@ export default async ({ user_id, blocknumber }) => { const existing_user_became_verified = user_currently_verified !== existing_user_previously_unverified + console.log({ + user_id, + existing_user_became_verified, + new_user_is_verified, + is_new_user, + is_existing_user + }) + if (existing_user_became_verified || new_user_is_verified) { const is_verified = current.is_verified const handle = current.handle From ae3e3cfcf517f8d56122216a216f3c85ef33dff6 Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Thu, 12 Oct 2023 11:46:41 -0600 Subject: [PATCH 7/8] bad bool --- .../plugins/verified-uploads/src/handlers/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js index 2277e266784..eeae9ba6b62 100644 --- a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js +++ b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js @@ -46,7 +46,7 @@ export default async ({ user_id, blocknumber }) => { is_existing_user && old.is_verified === false const user_currently_verified = current.is_verified === true const existing_user_became_verified = - user_currently_verified !== existing_user_previously_unverified + user_currently_verified && existing_user_previously_unverified console.log({ user_id, From 814a30393d793b72e8172d95009029eaedb978a8 Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Thu, 12 Oct 2023 11:47:15 -0600 Subject: [PATCH 8/8] adjust message --- .../plugins/verified-uploads/src/handlers/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js index eeae9ba6b62..9e5ed235f0e 100644 --- a/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js +++ b/packages/discovery-provider/plugins/verified-uploads/src/handlers/users.js @@ -107,7 +107,7 @@ export default async ({ user_id, blocknumber }) => { source } - console.log({ to_slack: body }, 'sending to slack') + console.log({ to_slack: body }, 'user verification') await slack.sendMsg(USERS_SLACK_CHANNEL, header, body).catch(console.error) } }