Mercurial Hosting > linkmystyle
changeset 4:f455bb813e2e default tip
remove facebook ads
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Thu, 06 Nov 2025 07:41:24 -0700 |
| parents | b016e4b7c8da |
| children | |
| files | src/add_link.js.luan src/admin.js src/facebook.js.luan src/lib/Facebook.luan src/lib/Shared.luan src/lib/main_html.luan src/private/Config_sample.luan src/register3.html.luan src/site.js |
| diffstat | 9 files changed, 0 insertions(+), 261 deletions(-) [+] |
line wrap: on
line diff
diff -r b016e4b7c8da -r f455bb813e2e src/add_link.js.luan --- a/src/add_link.js.luan Sat Jul 12 12:51:36 2025 -0600 +++ b/src/add_link.js.luan Thu Nov 06 07:41:24 2025 -0700 @@ -45,6 +45,5 @@ clearAddForm(); dragInit(); mixpanel.ours.track( 'Add Link' ); - fbTrack( 'track', 'AddToCart' ); <% end
diff -r b016e4b7c8da -r f455bb813e2e src/admin.js --- a/src/admin.js Sat Jul 12 12:51:36 2025 -0600 +++ b/src/admin.js Thu Nov 06 07:41:24 2025 -0700 @@ -192,9 +192,3 @@ } mixpanel.ours.people.unset(a); } - - - -if( !location.pathname.match(/^\/private\//) ) { - fbTrack( 'track', 'PageView' ); -}
diff -r b016e4b7c8da -r f455bb813e2e src/facebook.js.luan --- a/src/facebook.js.luan Sat Jul 12 12:51:36 2025 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -local Luan = require "luan:Luan.luan" -local error = Luan.error -local ipairs = Luan.ipairs or error() -local stringify = Luan.stringify or error() -local String = require "luan:String.luan" -local trim = String.trim or error() -local Table = require "luan:Table.luan" -local copy = Table.copy or error() -local Time = require "luan:Time.luan" -local time_now = Time.now or error() -local Parsers = require "luan:Parsers.luan" -local json_string = Parsers.json_string or error() -local json_parse = Parsers.json_parse or error() -local Http = require "luan:http/Http.luan" -local Shared = require "site:/lib/Shared.luan" -local is_test = not Shared.is_production -local has_facebook = not not Shared.has_facebook -local Utils = require "site:/lib/Utils.luan" -local to_list = Utils.to_list or error() -local User = require "site:/lib/User.luan" -local current_user = User.current or error() -local Facebook = require "site:/lib/Facebook.luan" -local call = Facebook.call or error() -local Logging = require "luan:logging/Logging.luan" -local logger = Logging.logger "facebook.js" - - -local function run() - if not has_facebook or is_test then return end - local user = current_user() - local request = Http.request - local user_data = { - fbp = request.cookies._fbp - fbc = request.cookies._fbc - client_user_agent = request.headers["User-Agent"] - client_ip_address = request.headers["X-Real-IP"] - } - if user ~= nil then - user_data.em = user.email or error() - user_data.external_id = user.id or error() - end - local request_parameters = request.parameters - local event = { - event_id = request_parameters.event_id or error() - event_time = time_now() // 1000 - user_data = user_data - action_source = "website" - event_source_url = request.headers["Referer"] - } - local event_names = request_parameters.event_name or error() - event_names = to_list(event_names) - local events = {} - for _, event_name in ipairs(event_names) do - local ev = copy(event) - ev.event_name = event_name - local props = request_parameters[event_name] - if props ~= nil then - ev.custom_data = json_parse(props) - end - events[#events+1] = ev - end - -- logger.info(stringify(events)) - try - local result = call(events) - logger.info(result) - catch e - local response_content = e.response_content - try - response_content = stringify(json_parse(response_content)) - catch e2 - end - logger.error(e.."\nresponse_content = "..e.response_content.."\nevents = "..stringify(events).."\n"..trim(request.raw_head).."\n") - end -end - -return function() - try - run() - catch e - logger.error(e.."\n"..trim(Http.request.raw_head).."\n") - end -end
diff -r b016e4b7c8da -r f455bb813e2e src/lib/Facebook.luan --- a/src/lib/Facebook.luan Sat Jul 12 12:51:36 2025 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -local Luan = require "luan:Luan.luan" -local error = Luan.error -local ipairs = Luan.ipairs or error() -local to_string = Luan.to_string or error() -local stringify = Luan.stringify or error() -local String = require "luan:String.luan" -local trim = String.trim or error() -local to_lower = String.lower or error() -local digest_message = String.digest_message or error() -local Time = require "luan:Time.luan" -local time_now = Time.now or error() -local Number = require "luan:Number.luan" -local long = Number.long or error() -local Parsers = require "luan:Parsers.luan" -local json_string = Parsers.json_string or error() -local json_parse = Parsers.json_parse or error() -local Io = require "luan:Io.luan" -local uri = Io.uri or error() -local Config = require "site:/private/Config.luan" -local access_token = Config.facebook.access_token or error() -local Shared = require "site:/lib/Shared.luan" -local is_test = not Shared.is_production -local Logging = require "luan:logging/Logging.luan" -local logger = Logging.logger "Facebook" - - -local pixel_id = "667025338202310" -local url = "https://graph.facebook.com/v17.0/"..pixel_id.."/events" - - -local Facebook = {} - -local function call(events) - local user_data = events[1].user_data -- assume they are all the same - local em = user_data.em - if em ~= nil then - em = to_lower(trim(em)) - user_data.em = digest_message("SHA-256",em) - end - local external_id = user_data.external_id - if external_id ~= nil then - external_id = to_string(external_id) - if is_test then - external_id = "test_"..external_id - end - user_data.external_id = digest_message("SHA-256",external_id) - end - if is_test then - for _, event in ipairs(events) do - event.event_name = "test_"..event.event_name - end - end - logger.info(json_string(events)) - local parameters = { - access_token = access_token - data = json_string(events) - } - if is_test then - parameters.test_event_code = "TEST" - end - local options = { - method = "POST" - parameters = parameters - } - return uri(url,options).read_text() -end -Facebook.call = call - -function Facebook.track_visit(user) - local user_data = { - em = user.email or error() - external_id = user.id or error() - } - local event_time = long( time_now() // 1000 ) - local events = { - { - event_name = "Contact" - event_time = event_time - user_data = user_data - action_source = "other" - } - { - event_name = "Purchase" - event_time = event_time - user_data = user_data - action_source = "other" - custom_data = { - value = 1 - currency = "USD" - } - } - } - try - local result = call(events) - logger.info(result) - catch e - logger.error(e.."\n"..e.response_content.."\nevents = "..stringify(events)) - end -end - -return Facebook
diff -r b016e4b7c8da -r f455bb813e2e src/lib/Shared.luan --- a/src/lib/Shared.luan Sat Jul 12 12:51:36 2025 -0600 +++ b/src/lib/Shared.luan Thu Nov 06 07:41:24 2025 -0700 @@ -39,8 +39,6 @@ local Shared = {} -Shared.has_facebook = false; - local started = Time.now() Shared.is_production = is_production
diff -r b016e4b7c8da -r f455bb813e2e src/lib/main_html.luan --- a/src/lib/main_html.luan Sat Jul 12 12:51:36 2025 -0600 +++ b/src/lib/main_html.luan Thu Nov 06 07:41:24 2025 -0700 @@ -16,7 +16,6 @@ local show_saved = Shared.show_saved or error() local call_mixpanel = Shared.call_mixpanel or error() local get_hashtags_list = Shared.get_hashtags_list or error() -local has_facebook = not not Shared.has_facebook local User = require "site:/lib/User.luan" local Link = require "site:/lib/Link.luan" local get_owner_links = Link.get_owner_links or error() @@ -24,8 +23,6 @@ local get_user_pics = Pic.get_user_pics or error() local Icon = require "site:/lib/Icon.luan" local get_user_icons = Icon.get_user_icons or error() -local Facebook = require "site:/lib/Facebook.luan" -local fb_track_visit = Facebook.track_visit or error() local Reporting = require "site:/lib/Reporting.luan" local maybe_track_visit = Reporting.maybe_track_visit or error() local should_track_visit = Reporting.should_track_visit or error() @@ -44,9 +41,6 @@ distinct_id = user.email } } - if has_facebook then - fb_track_visit(user) - end end end ) end @@ -81,9 +75,6 @@ let hashtags = <%=json_string(hashtags_set)%>; </script> <% pub_head(user) %> - <script> - fbTrack('trackCustom', 'View', {owner:'<%=user.name%>'}); - </script> </head> <body colored onload="mainInit()"> <% if is_saved then
diff -r b016e4b7c8da -r f455bb813e2e src/private/Config_sample.luan --- a/src/private/Config_sample.luan Sat Jul 12 12:51:36 2025 -0600 +++ b/src/private/Config_sample.luan Thu Nov 06 07:41:24 2025 -0700 @@ -9,8 +9,5 @@ public_key = "962640c4b84c779bca4f" secret_key = "xxx" } - facebook = { - access_token = "xxx" - } push_password = "xxx" }
diff -r b016e4b7c8da -r f455bb813e2e src/register3.html.luan --- a/src/register3.html.luan Sat Jul 12 12:51:36 2025 -0600 +++ b/src/register3.html.luan Thu Nov 06 07:41:24 2025 -0700 @@ -21,12 +21,6 @@ background-image: url(/images/picture.jpg); } </style> - <script> - if( hasCookies ) { - fbTrack( 'track', 'CompleteRegistration' ); - // fbTrack( 'track', 'Purchase', {value:1,currency:'USD'} ); - } - </script> </head> <body> <div page>
diff -r b016e4b7c8da -r f455bb813e2e src/site.js --- a/src/site.js Sat Jul 12 12:51:36 2025 -0600 +++ b/src/site.js Thu Nov 06 07:41:24 2025 -0700 @@ -166,57 +166,6 @@ } -// Facebook -let fbId = isProduction ? '667025338202310' : '1504114567086568'; -let fbOptions = {}; -if( window.UserEmail ) - fbOptions.em = window.UserEmail.trim().toLowerCase(); -if( cookies.user ) - fbOptions.external_id = cookies.user; -//console.log(fbOptions); - -!function(f,b,e,v,n,t,s) -{if(f.fbq)return;n=f.fbq=function(){n.callMethod? -n.callMethod.apply(n,arguments):n.queue.push(arguments)}; -if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0'; -n.queue=[];t=b.createElement(e);t.async=!0; -t.src=v;s=b.getElementsByTagName(e)[0]; -s.parentNode.insertBefore(t,s)}(window, document,'script', -'https://connect.facebook.net/en_US/fbevents.js'); -fbq('init', fbId, fbOptions); - -let fbEvents = null; - -function fbSendEvents() { - //console.log(fbEvents); - let eventID = Math.random().toString(); - let options = {eventID:eventID}; - let url = `/facebook.js?event_id=${eventID}`; - for( let event of fbEvents ) { - let name = event.name; - let props = event.properties; - fbq( event.action, name, props, options ); - url += `&event_name=${name}`; - if( props ) - url += `&${name}=${encodeURIComponent(JSON.stringify(props))}`; - } - ajax(url); - fbEvents = null; -} - -function fbTrack(action,name,properties) { - if( !fbEvents ) { - fbEvents = []; - setTimeout(fbSendEvents); - } - fbEvents.push({ - action: action, - name: name, - properties: properties, - }); -} - - function mainSelectHashtag(hashtag) { let style = document.querySelector('style[hashtag]'); if( hashtags[hashtag] ) {
