Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions api/comms/chat.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,19 +71,24 @@ func chatCreate(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, p
}

for _, blast := range blasts {
messageId := trashid.BlastMessageID(blast.BlastID, params.ChatID)

_, err = db.Exec(ctx, `
insert into chat_message
(message_id, chat_id, user_id, created_at, blast_id)
values
($1, $2, $3, $4, $5)
on conflict do nothing
`, trashid.BlastMessageID(blast.BlastID, params.ChatID), params.ChatID, blast.FromUserID, blast.CreatedAt, blast.BlastID)
`, messageId, params.ChatID, blast.FromUserID, blast.CreatedAt.UTC(), blast.BlastID)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note here the usage of .UTC(). On my machine, when running this, the location() on this time.Time was being set to Local and that was causing us to insert messages in the past. Since chat_blast uses a timestamptz column type and chat_message uses a plain timestamp column type, pgx semantics when inserting will cause it to try and map from the timezone in the incoming variable to the timezone of the machine running postgres.
Kind of gnarly 😬

if err != nil {
return err
}
}

err = chatUpdateLatestFields(db, ctx, params.ChatID)
if err != nil {
return err
}

return err
}
Expand DownExpand Up@@ -317,37 +322,37 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
// see also: subtly different inverse query exists in chat_blast.go
// to fan out messages to existing chat
var findNewBlasts = `
with
last_permission_change as (
select max(t) as t from (
select updated_at as t from chat_permissions where user_id = $1
union
select created_at as t from chat_blocked_users where blocker_user_id = $1
union
select to_timestamp(0)
) as timestamp_subquery
WITH
last_permission_change AS (
SELECT max(t) AS t FROM (
SELECT updated_at AS t FROM chat_permissions WHERE user_id = @user_id
UNION
SELECT created_at AS t FROM chat_blocked_users WHERE blocker_user_id = @user_id
UNION
SELECT to_timestamp(0)
) AS timestamp_subquery
),
all_new as (
select *
from chat_blast blast
where
from_user_id in (
all_new AS (
SELECT *
FROM chat_blast blast
WHERE
from_user_id IN (
-- follower_audience
SELECT followee_user_id AS from_user_id
FROM follows
WHERE blast.audience = 'follower_audience'
AND follows.followee_user_id = blast.from_user_id
AND follows.follower_user_id = $1
AND follows.follower_user_id = @user_id
AND follows.is_delete = false
AND follows.created_at < blast.created_at
)
OR from_user_id in (
OR from_user_id IN (
-- tipper_audience
SELECT receiver_user_id
FROM user_tips tip
WHERE blast.audience = 'tipper_audience'
AND receiver_user_id = blast.from_user_id
AND sender_user_id = $1
AND sender_user_id = @user_id
AND tip.created_at < blast.created_at
)
OR from_user_id IN (
Expand All@@ -358,29 +363,31 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN tracks og ON remixes.parent_track_id = og.track_id
WHERE blast.audience = 'remixer_audience'
AND og.owner_id = blast.from_user_id
AND t.owner_id = $1
AND t.owner_id = @user_id
AND (
blast.audience_content_id IS NULL
OR (
blast.audience_content_type = 'track'
AND blast.audience_content_id = og.track_id
)
)
AND t.created_at < blast.created_at
)
OR from_user_id IN (
-- customer_audience
SELECT seller_user_id
FROM usdc_purchases p
WHERE blast.audience = 'customer_audience'
AND p.seller_user_id = blast.from_user_id
AND p.buyer_user_id = $1
AND p.buyer_user_id = @user_id
AND (
audience_content_id IS NULL
OR (
blast.audience_content_type = p.content_type::text
AND blast.audience_content_id = p.content_id
)
)
AND p.created_at < blast.created_at
)
OR from_user_id IN (
-- coin_holder_audience via sol_user_balances
Expand All@@ -389,19 +396,21 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN sol_user_balances sub ON sub.mint = ac.mint
WHERE blast.audience = 'coin_holder_audience'
AND ac.user_id = blast.from_user_id
AND sub.user_id = $1
AND sub.user_id = @user_id
AND sub.balance > 0
-- TODO: PE-6663 This isn't entirely correct yet, need to check "time of most recent membership"
AND sub.created_at < blast.created_at
)
)
select * from all_new
where created_at > (select t from last_permission_change)
and chat_allowed(from_user_id, $1)
order by created_at
`

rows, err := tx.Query(ctx, findNewBlasts, arg.UserID)
SELECT * FROM all_new
WHERE created_at > (select t from last_permission_change)
AND chat_allowed(from_user_id, @user_id)
ORDER BY created_at
;`

rows, err := tx.Query(ctx, findNewBlasts, pgx.NamedArgs{
"user_id": arg.UserID,
})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions api/comms/chat_blast.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,7 @@ import (

// Result struct to hold chat_id and to_user_id
type ChatBlastResult struct {
ChatID string `db:"chat_id"`
ToUserID int32 `db:"to_user_id"`
ChatID string `db:"chat_id"`
}

type OutgoingChatMessage struct {
Expand DownExpand Up@@ -80,11 +79,7 @@ func chatBlast(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, pa
defer rows.Close()

// Scan the results into the results slice
results, err = pgx.CollectRows(rows, func(row pgx.CollectableRow) (ChatBlastResult, error) {
var result ChatBlastResult
err := row.Scan(&result.ChatID, &result.ToUserID)
return result, err
})
results, err = pgx.CollectRows(rows, pgx.RowToStructByName[ChatBlastResult])
if err != nil {
return nil, err
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions api/comms/chat.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,19 +71,24 @@ func chatCreate(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, p
}

for _, blast := range blasts {
messageId := trashid.BlastMessageID(blast.BlastID, params.ChatID)

_, err = db.Exec(ctx, `
insert into chat_message
(message_id, chat_id, user_id, created_at, blast_id)
values
($1, $2, $3, $4, $5)
on conflict do nothing
`, trashid.BlastMessageID(blast.BlastID, params.ChatID), params.ChatID, blast.FromUserID, blast.CreatedAt, blast.BlastID)
`, messageId, params.ChatID, blast.FromUserID, blast.CreatedAt.UTC(), blast.BlastID)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note here the usage of .UTC(). On my machine, when running this, the location() on this time.Time was being set to Local and that was causing us to insert messages in the past. Since chat_blast uses a timestamptz column type and chat_message uses a plain timestamp column type, pgx semantics when inserting will cause it to try and map from the timezone in the incoming variable to the timezone of the machine running postgres.
Kind of gnarly 😬

if err != nil {
return err
}
}

err = chatUpdateLatestFields(db, ctx, params.ChatID)
if err != nil {
return err
}

return err
}
Expand DownExpand Up@@ -317,37 +322,37 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
// see also: subtly different inverse query exists in chat_blast.go
// to fan out messages to existing chat
var findNewBlasts = `
with
last_permission_change as (
select max(t) as t from (
select updated_at as t from chat_permissions where user_id = $1
union
select created_at as t from chat_blocked_users where blocker_user_id = $1
union
select to_timestamp(0)
) as timestamp_subquery
WITH
last_permission_change AS (
SELECT max(t) AS t FROM (
SELECT updated_at AS t FROM chat_permissions WHERE user_id = @user_id
UNION
SELECT created_at AS t FROM chat_blocked_users WHERE blocker_user_id = @user_id
UNION
SELECT to_timestamp(0)
) AS timestamp_subquery
),
all_new as (
select *
from chat_blast blast
where
from_user_id in (
all_new AS (
SELECT *
FROM chat_blast blast
WHERE
from_user_id IN (
-- follower_audience
SELECT followee_user_id AS from_user_id
FROM follows
WHERE blast.audience = 'follower_audience'
AND follows.followee_user_id = blast.from_user_id
AND follows.follower_user_id = $1
AND follows.follower_user_id = @user_id
AND follows.is_delete = false
AND follows.created_at < blast.created_at
)
OR from_user_id in (
OR from_user_id IN (
-- tipper_audience
SELECT receiver_user_id
FROM user_tips tip
WHERE blast.audience = 'tipper_audience'
AND receiver_user_id = blast.from_user_id
AND sender_user_id = $1
AND sender_user_id = @user_id
AND tip.created_at < blast.created_at
)
OR from_user_id IN (
Expand All@@ -358,29 +363,31 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN tracks og ON remixes.parent_track_id = og.track_id
WHERE blast.audience = 'remixer_audience'
AND og.owner_id = blast.from_user_id
AND t.owner_id = $1
AND t.owner_id = @user_id
AND (
blast.audience_content_id IS NULL
OR (
blast.audience_content_type = 'track'
AND blast.audience_content_id = og.track_id
)
)
AND t.created_at < blast.created_at
)
OR from_user_id IN (
-- customer_audience
SELECT seller_user_id
FROM usdc_purchases p
WHERE blast.audience = 'customer_audience'
AND p.seller_user_id = blast.from_user_id
AND p.buyer_user_id = $1
AND p.buyer_user_id = @user_id
AND (
audience_content_id IS NULL
OR (
blast.audience_content_type = p.content_type::text
AND blast.audience_content_id = p.content_id
)
)
AND p.created_at < blast.created_at
)
OR from_user_id IN (
-- coin_holder_audience via sol_user_balances
Expand All@@ -389,19 +396,21 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN sol_user_balances sub ON sub.mint = ac.mint
WHERE blast.audience = 'coin_holder_audience'
AND ac.user_id = blast.from_user_id
AND sub.user_id = $1
AND sub.user_id = @user_id
AND sub.balance > 0
-- TODO: PE-6663 This isn't entirely correct yet, need to check "time of most recent membership"
AND sub.created_at < blast.created_at
)
)
select * from all_new
where created_at > (select t from last_permission_change)
and chat_allowed(from_user_id, $1)
order by created_at
`

rows, err := tx.Query(ctx, findNewBlasts, arg.UserID)
SELECT * FROM all_new
WHERE created_at > (select t from last_permission_change)
AND chat_allowed(from_user_id, @user_id)
ORDER BY created_at
;`

rows, err := tx.Query(ctx, findNewBlasts, pgx.NamedArgs{
"user_id": arg.UserID,
})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions api/comms/chat_blast.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,7 @@ import (

// Result struct to hold chat_id and to_user_id
type ChatBlastResult struct {
ChatID string `db:"chat_id"`
ToUserID int32 `db:"to_user_id"`
ChatID string `db:"chat_id"`
}

type OutgoingChatMessage struct {
Expand DownExpand Up@@ -80,11 +79,7 @@ func chatBlast(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, pa
defer rows.Close()

// Scan the results into the results slice
results, err = pgx.CollectRows(rows, func(row pgx.CollectableRow) (ChatBlastResult, error) {
var result ChatBlastResult
err := row.Scan(&result.ChatID, &result.ToUserID)
return result, err
})
results, err = pgx.CollectRows(rows, pgx.RowToStructByName[ChatBlastResult])
if err != nil {
return nil, err
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions api/comms/chat.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,19 +71,24 @@ func chatCreate(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, p
}

for _, blast := range blasts {
messageId := trashid.BlastMessageID(blast.BlastID, params.ChatID)

_, err = db.Exec(ctx, `
insert into chat_message
(message_id, chat_id, user_id, created_at, blast_id)
values
($1, $2, $3, $4, $5)
on conflict do nothing
`, trashid.BlastMessageID(blast.BlastID, params.ChatID), params.ChatID, blast.FromUserID, blast.CreatedAt, blast.BlastID)
`, messageId, params.ChatID, blast.FromUserID, blast.CreatedAt.UTC(), blast.BlastID)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note here the usage of .UTC(). On my machine, when running this, the location() on this time.Time was being set to Local and that was causing us to insert messages in the past. Since chat_blast uses a timestamptz column type and chat_message uses a plain timestamp column type, pgx semantics when inserting will cause it to try and map from the timezone in the incoming variable to the timezone of the machine running postgres.
Kind of gnarly 😬

if err != nil {
return err
}
}

err = chatUpdateLatestFields(db, ctx, params.ChatID)
if err != nil {
return err
}

return err
}
Expand DownExpand Up@@ -317,37 +322,37 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
// see also: subtly different inverse query exists in chat_blast.go
// to fan out messages to existing chat
var findNewBlasts = `
with
last_permission_change as (
select max(t) as t from (
select updated_at as t from chat_permissions where user_id = $1
union
select created_at as t from chat_blocked_users where blocker_user_id = $1
union
select to_timestamp(0)
) as timestamp_subquery
WITH
last_permission_change AS (
SELECT max(t) AS t FROM (
SELECT updated_at AS t FROM chat_permissions WHERE user_id = @user_id
UNION
SELECT created_at AS t FROM chat_blocked_users WHERE blocker_user_id = @user_id
UNION
SELECT to_timestamp(0)
) AS timestamp_subquery
),
all_new as (
select *
from chat_blast blast
where
from_user_id in (
all_new AS (
SELECT *
FROM chat_blast blast
WHERE
from_user_id IN (
-- follower_audience
SELECT followee_user_id AS from_user_id
FROM follows
WHERE blast.audience = 'follower_audience'
AND follows.followee_user_id = blast.from_user_id
AND follows.follower_user_id = $1
AND follows.follower_user_id = @user_id
AND follows.is_delete = false
AND follows.created_at < blast.created_at
)
OR from_user_id in (
OR from_user_id IN (
-- tipper_audience
SELECT receiver_user_id
FROM user_tips tip
WHERE blast.audience = 'tipper_audience'
AND receiver_user_id = blast.from_user_id
AND sender_user_id = $1
AND sender_user_id = @user_id
AND tip.created_at < blast.created_at
)
OR from_user_id IN (
Expand All@@ -358,29 +363,31 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN tracks og ON remixes.parent_track_id = og.track_id
WHERE blast.audience = 'remixer_audience'
AND og.owner_id = blast.from_user_id
AND t.owner_id = $1
AND t.owner_id = @user_id
AND (
blast.audience_content_id IS NULL
OR (
blast.audience_content_type = 'track'
AND blast.audience_content_id = og.track_id
)
)
AND t.created_at < blast.created_at
)
OR from_user_id IN (
-- customer_audience
SELECT seller_user_id
FROM usdc_purchases p
WHERE blast.audience = 'customer_audience'
AND p.seller_user_id = blast.from_user_id
AND p.buyer_user_id = $1
AND p.buyer_user_id = @user_id
AND (
audience_content_id IS NULL
OR (
blast.audience_content_type = p.content_type::text
AND blast.audience_content_id = p.content_id
)
)
AND p.created_at < blast.created_at
)
OR from_user_id IN (
-- coin_holder_audience via sol_user_balances
Expand All@@ -389,19 +396,21 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN sol_user_balances sub ON sub.mint = ac.mint
WHERE blast.audience = 'coin_holder_audience'
AND ac.user_id = blast.from_user_id
AND sub.user_id = $1
AND sub.user_id = @user_id
AND sub.balance > 0
-- TODO: PE-6663 This isn't entirely correct yet, need to check "time of most recent membership"
AND sub.created_at < blast.created_at
)
)
select * from all_new
where created_at > (select t from last_permission_change)
and chat_allowed(from_user_id, $1)
order by created_at
`

rows, err := tx.Query(ctx, findNewBlasts, arg.UserID)
SELECT * FROM all_new
WHERE created_at > (select t from last_permission_change)
AND chat_allowed(from_user_id, @user_id)
ORDER BY created_at
;`

rows, err := tx.Query(ctx, findNewBlasts, pgx.NamedArgs{
"user_id": arg.UserID,
})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions api/comms/chat_blast.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,7 @@ import (

// Result struct to hold chat_id and to_user_id
type ChatBlastResult struct {
ChatID string `db:"chat_id"`
ToUserID int32 `db:"to_user_id"`
ChatID string `db:"chat_id"`
}

type OutgoingChatMessage struct {
Expand DownExpand Up@@ -80,11 +79,7 @@ func chatBlast(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, pa
defer rows.Close()

// Scan the results into the results slice
results, err = pgx.CollectRows(rows, func(row pgx.CollectableRow) (ChatBlastResult, error) {
var result ChatBlastResult
err := row.Scan(&result.ChatID, &result.ToUserID)
return result, err
})
results, err = pgx.CollectRows(rows, pgx.RowToStructByName[ChatBlastResult])
if err != nil {
return nil, err
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions api/comms/chat.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,19 +71,24 @@ func chatCreate(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, p
}

for _, blast := range blasts {
messageId := trashid.BlastMessageID(blast.BlastID, params.ChatID)

_, err = db.Exec(ctx, `
insert into chat_message
(message_id, chat_id, user_id, created_at, blast_id)
values
($1, $2, $3, $4, $5)
on conflict do nothing
`, trashid.BlastMessageID(blast.BlastID, params.ChatID), params.ChatID, blast.FromUserID, blast.CreatedAt, blast.BlastID)
`, messageId, params.ChatID, blast.FromUserID, blast.CreatedAt.UTC(), blast.BlastID)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note here the usage of .UTC(). On my machine, when running this, the location() on this time.Time was being set to Local and that was causing us to insert messages in the past. Since chat_blast uses a timestamptz column type and chat_message uses a plain timestamp column type, pgx semantics when inserting will cause it to try and map from the timezone in the incoming variable to the timezone of the machine running postgres.
Kind of gnarly 😬

if err != nil {
return err
}
}

err = chatUpdateLatestFields(db, ctx, params.ChatID)
if err != nil {
return err
}

return err
}
Expand DownExpand Up@@ -317,37 +322,37 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
// see also: subtly different inverse query exists in chat_blast.go
// to fan out messages to existing chat
var findNewBlasts = `
with
last_permission_change as (
select max(t) as t from (
select updated_at as t from chat_permissions where user_id = $1
union
select created_at as t from chat_blocked_users where blocker_user_id = $1
union
select to_timestamp(0)
) as timestamp_subquery
WITH
last_permission_change AS (
SELECT max(t) AS t FROM (
SELECT updated_at AS t FROM chat_permissions WHERE user_id = @user_id
UNION
SELECT created_at AS t FROM chat_blocked_users WHERE blocker_user_id = @user_id
UNION
SELECT to_timestamp(0)
) AS timestamp_subquery
),
all_new as (
select *
from chat_blast blast
where
from_user_id in (
all_new AS (
SELECT *
FROM chat_blast blast
WHERE
from_user_id IN (
-- follower_audience
SELECT followee_user_id AS from_user_id
FROM follows
WHERE blast.audience = 'follower_audience'
AND follows.followee_user_id = blast.from_user_id
AND follows.follower_user_id = $1
AND follows.follower_user_id = @user_id
AND follows.is_delete = false
AND follows.created_at < blast.created_at
)
OR from_user_id in (
OR from_user_id IN (
-- tipper_audience
SELECT receiver_user_id
FROM user_tips tip
WHERE blast.audience = 'tipper_audience'
AND receiver_user_id = blast.from_user_id
AND sender_user_id = $1
AND sender_user_id = @user_id
AND tip.created_at < blast.created_at
)
OR from_user_id IN (
Expand All@@ -358,29 +363,31 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN tracks og ON remixes.parent_track_id = og.track_id
WHERE blast.audience = 'remixer_audience'
AND og.owner_id = blast.from_user_id
AND t.owner_id = $1
AND t.owner_id = @user_id
AND (
blast.audience_content_id IS NULL
OR (
blast.audience_content_type = 'track'
AND blast.audience_content_id = og.track_id
)
)
AND t.created_at < blast.created_at
)
OR from_user_id IN (
-- customer_audience
SELECT seller_user_id
FROM usdc_purchases p
WHERE blast.audience = 'customer_audience'
AND p.seller_user_id = blast.from_user_id
AND p.buyer_user_id = $1
AND p.buyer_user_id = @user_id
AND (
audience_content_id IS NULL
OR (
blast.audience_content_type = p.content_type::text
AND blast.audience_content_id = p.content_id
)
)
AND p.created_at < blast.created_at
)
OR from_user_id IN (
-- coin_holder_audience via sol_user_balances
Expand All@@ -389,19 +396,21 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN sol_user_balances sub ON sub.mint = ac.mint
WHERE blast.audience = 'coin_holder_audience'
AND ac.user_id = blast.from_user_id
AND sub.user_id = $1
AND sub.user_id = @user_id
AND sub.balance > 0
-- TODO: PE-6663 This isn't entirely correct yet, need to check "time of most recent membership"
AND sub.created_at < blast.created_at
)
)
select * from all_new
where created_at > (select t from last_permission_change)
and chat_allowed(from_user_id, $1)
order by created_at
`

rows, err := tx.Query(ctx, findNewBlasts, arg.UserID)
SELECT * FROM all_new
WHERE created_at > (select t from last_permission_change)
AND chat_allowed(from_user_id, @user_id)
ORDER BY created_at
;`

rows, err := tx.Query(ctx, findNewBlasts, pgx.NamedArgs{
"user_id": arg.UserID,
})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions api/comms/chat_blast.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,7 @@ import (

// Result struct to hold chat_id and to_user_id
type ChatBlastResult struct {
ChatID string `db:"chat_id"`
ToUserID int32 `db:"to_user_id"`
ChatID string `db:"chat_id"`
}

type OutgoingChatMessage struct {
Expand DownExpand Up@@ -80,11 +79,7 @@ func chatBlast(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, pa
defer rows.Close()

// Scan the results into the results slice
results, err = pgx.CollectRows(rows, func(row pgx.CollectableRow) (ChatBlastResult, error) {
var result ChatBlastResult
err := row.Scan(&result.ChatID, &result.ToUserID)
return result, err
})
results, err = pgx.CollectRows(rows, pgx.RowToStructByName[ChatBlastResult])
if err != nil {
return nil, err
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions api/comms/chat.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,19 +71,24 @@ func chatCreate(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, p
}

for _, blast := range blasts {
messageId := trashid.BlastMessageID(blast.BlastID, params.ChatID)

_, err = db.Exec(ctx, `
insert into chat_message
(message_id, chat_id, user_id, created_at, blast_id)
values
($1, $2, $3, $4, $5)
on conflict do nothing
`, trashid.BlastMessageID(blast.BlastID, params.ChatID), params.ChatID, blast.FromUserID, blast.CreatedAt, blast.BlastID)
`, messageId, params.ChatID, blast.FromUserID, blast.CreatedAt.UTC(), blast.BlastID)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note here the usage of .UTC(). On my machine, when running this, the location() on this time.Time was being set to Local and that was causing us to insert messages in the past. Since chat_blast uses a timestamptz column type and chat_message uses a plain timestamp column type, pgx semantics when inserting will cause it to try and map from the timezone in the incoming variable to the timezone of the machine running postgres.
Kind of gnarly 😬

if err != nil {
return err
}
}

err = chatUpdateLatestFields(db, ctx, params.ChatID)
if err != nil {
return err
}

return err
}
Expand DownExpand Up@@ -317,37 +322,37 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
// see also: subtly different inverse query exists in chat_blast.go
// to fan out messages to existing chat
var findNewBlasts = `
with
last_permission_change as (
select max(t) as t from (
select updated_at as t from chat_permissions where user_id = $1
union
select created_at as t from chat_blocked_users where blocker_user_id = $1
union
select to_timestamp(0)
) as timestamp_subquery
WITH
last_permission_change AS (
SELECT max(t) AS t FROM (
SELECT updated_at AS t FROM chat_permissions WHERE user_id = @user_id
UNION
SELECT created_at AS t FROM chat_blocked_users WHERE blocker_user_id = @user_id
UNION
SELECT to_timestamp(0)
) AS timestamp_subquery
),
all_new as (
select *
from chat_blast blast
where
from_user_id in (
all_new AS (
SELECT *
FROM chat_blast blast
WHERE
from_user_id IN (
-- follower_audience
SELECT followee_user_id AS from_user_id
FROM follows
WHERE blast.audience = 'follower_audience'
AND follows.followee_user_id = blast.from_user_id
AND follows.follower_user_id = $1
AND follows.follower_user_id = @user_id
AND follows.is_delete = false
AND follows.created_at < blast.created_at
)
OR from_user_id in (
OR from_user_id IN (
-- tipper_audience
SELECT receiver_user_id
FROM user_tips tip
WHERE blast.audience = 'tipper_audience'
AND receiver_user_id = blast.from_user_id
AND sender_user_id = $1
AND sender_user_id = @user_id
AND tip.created_at < blast.created_at
)
OR from_user_id IN (
Expand All@@ -358,29 +363,31 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN tracks og ON remixes.parent_track_id = og.track_id
WHERE blast.audience = 'remixer_audience'
AND og.owner_id = blast.from_user_id
AND t.owner_id = $1
AND t.owner_id = @user_id
AND (
blast.audience_content_id IS NULL
OR (
blast.audience_content_type = 'track'
AND blast.audience_content_id = og.track_id
)
)
AND t.created_at < blast.created_at
)
OR from_user_id IN (
-- customer_audience
SELECT seller_user_id
FROM usdc_purchases p
WHERE blast.audience = 'customer_audience'
AND p.seller_user_id = blast.from_user_id
AND p.buyer_user_id = $1
AND p.buyer_user_id = @user_id
AND (
audience_content_id IS NULL
OR (
blast.audience_content_type = p.content_type::text
AND blast.audience_content_id = p.content_id
)
)
AND p.created_at < blast.created_at
)
OR from_user_id IN (
-- coin_holder_audience via sol_user_balances
Expand All@@ -389,19 +396,21 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN sol_user_balances sub ON sub.mint = ac.mint
WHERE blast.audience = 'coin_holder_audience'
AND ac.user_id = blast.from_user_id
AND sub.user_id = $1
AND sub.user_id = @user_id
AND sub.balance > 0
-- TODO: PE-6663 This isn't entirely correct yet, need to check "time of most recent membership"
AND sub.created_at < blast.created_at
)
)
select * from all_new
where created_at > (select t from last_permission_change)
and chat_allowed(from_user_id, $1)
order by created_at
`

rows, err := tx.Query(ctx, findNewBlasts, arg.UserID)
SELECT * FROM all_new
WHERE created_at > (select t from last_permission_change)
AND chat_allowed(from_user_id, @user_id)
ORDER BY created_at
;`

rows, err := tx.Query(ctx, findNewBlasts, pgx.NamedArgs{
"user_id": arg.UserID,
})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions api/comms/chat_blast.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,7 @@ import (

// Result struct to hold chat_id and to_user_id
type ChatBlastResult struct {
ChatID string `db:"chat_id"`
ToUserID int32 `db:"to_user_id"`
ChatID string `db:"chat_id"`
}

type OutgoingChatMessage struct {
Expand DownExpand Up@@ -80,11 +79,7 @@ func chatBlast(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, pa
defer rows.Close()

// Scan the results into the results slice
results, err = pgx.CollectRows(rows, func(row pgx.CollectableRow) (ChatBlastResult, error) {
var result ChatBlastResult
err := row.Scan(&result.ChatID, &result.ToUserID)
return result, err
})
results, err = pgx.CollectRows(rows, pgx.RowToStructByName[ChatBlastResult])
if err != nil {
return nil, err
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions api/comms/chat.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,19 +71,24 @@ func chatCreate(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, p
}

for _, blast := range blasts {
messageId := trashid.BlastMessageID(blast.BlastID, params.ChatID)

_, err = db.Exec(ctx, `
insert into chat_message
(message_id, chat_id, user_id, created_at, blast_id)
values
($1, $2, $3, $4, $5)
on conflict do nothing
`, trashid.BlastMessageID(blast.BlastID, params.ChatID), params.ChatID, blast.FromUserID, blast.CreatedAt, blast.BlastID)
`, messageId, params.ChatID, blast.FromUserID, blast.CreatedAt.UTC(), blast.BlastID)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note here the usage of .UTC(). On my machine, when running this, the location() on this time.Time was being set to Local and that was causing us to insert messages in the past. Since chat_blast uses a timestamptz column type and chat_message uses a plain timestamp column type, pgx semantics when inserting will cause it to try and map from the timezone in the incoming variable to the timezone of the machine running postgres.
Kind of gnarly 😬

if err != nil {
return err
}
}

err = chatUpdateLatestFields(db, ctx, params.ChatID)
if err != nil {
return err
}

return err
}
Expand DownExpand Up@@ -317,37 +322,37 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
// see also: subtly different inverse query exists in chat_blast.go
// to fan out messages to existing chat
var findNewBlasts = `
with
last_permission_change as (
select max(t) as t from (
select updated_at as t from chat_permissions where user_id = $1
union
select created_at as t from chat_blocked_users where blocker_user_id = $1
union
select to_timestamp(0)
) as timestamp_subquery
WITH
last_permission_change AS (
SELECT max(t) AS t FROM (
SELECT updated_at AS t FROM chat_permissions WHERE user_id = @user_id
UNION
SELECT created_at AS t FROM chat_blocked_users WHERE blocker_user_id = @user_id
UNION
SELECT to_timestamp(0)
) AS timestamp_subquery
),
all_new as (
select *
from chat_blast blast
where
from_user_id in (
all_new AS (
SELECT *
FROM chat_blast blast
WHERE
from_user_id IN (
-- follower_audience
SELECT followee_user_id AS from_user_id
FROM follows
WHERE blast.audience = 'follower_audience'
AND follows.followee_user_id = blast.from_user_id
AND follows.follower_user_id = $1
AND follows.follower_user_id = @user_id
AND follows.is_delete = false
AND follows.created_at < blast.created_at
)
OR from_user_id in (
OR from_user_id IN (
-- tipper_audience
SELECT receiver_user_id
FROM user_tips tip
WHERE blast.audience = 'tipper_audience'
AND receiver_user_id = blast.from_user_id
AND sender_user_id = $1
AND sender_user_id = @user_id
AND tip.created_at < blast.created_at
)
OR from_user_id IN (
Expand All@@ -358,29 +363,31 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN tracks og ON remixes.parent_track_id = og.track_id
WHERE blast.audience = 'remixer_audience'
AND og.owner_id = blast.from_user_id
AND t.owner_id = $1
AND t.owner_id = @user_id
AND (
blast.audience_content_id IS NULL
OR (
blast.audience_content_type = 'track'
AND blast.audience_content_id = og.track_id
)
)
AND t.created_at < blast.created_at
)
OR from_user_id IN (
-- customer_audience
SELECT seller_user_id
FROM usdc_purchases p
WHERE blast.audience = 'customer_audience'
AND p.seller_user_id = blast.from_user_id
AND p.buyer_user_id = $1
AND p.buyer_user_id = @user_id
AND (
audience_content_id IS NULL
OR (
blast.audience_content_type = p.content_type::text
AND blast.audience_content_id = p.content_id
)
)
AND p.created_at < blast.created_at
)
OR from_user_id IN (
-- coin_holder_audience via sol_user_balances
Expand All@@ -389,19 +396,21 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN sol_user_balances sub ON sub.mint = ac.mint
WHERE blast.audience = 'coin_holder_audience'
AND ac.user_id = blast.from_user_id
AND sub.user_id = $1
AND sub.user_id = @user_id
AND sub.balance > 0
-- TODO: PE-6663 This isn't entirely correct yet, need to check "time of most recent membership"
AND sub.created_at < blast.created_at
)
)
select * from all_new
where created_at > (select t from last_permission_change)
and chat_allowed(from_user_id, $1)
order by created_at
`

rows, err := tx.Query(ctx, findNewBlasts, arg.UserID)
SELECT * FROM all_new
WHERE created_at > (select t from last_permission_change)
AND chat_allowed(from_user_id, @user_id)
ORDER BY created_at
;`

rows, err := tx.Query(ctx, findNewBlasts, pgx.NamedArgs{
"user_id": arg.UserID,
})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions api/comms/chat_blast.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,7 @@ import (

// Result struct to hold chat_id and to_user_id
type ChatBlastResult struct {
ChatID string `db:"chat_id"`
ToUserID int32 `db:"to_user_id"`
ChatID string `db:"chat_id"`
}

type OutgoingChatMessage struct {
Expand DownExpand Up@@ -80,11 +79,7 @@ func chatBlast(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, pa
defer rows.Close()

// Scan the results into the results slice
results, err = pgx.CollectRows(rows, func(row pgx.CollectableRow) (ChatBlastResult, error) {
var result ChatBlastResult
err := row.Scan(&result.ChatID, &result.ToUserID)
return result, err
})
results, err = pgx.CollectRows(rows, pgx.RowToStructByName[ChatBlastResult])
if err != nil {
return nil, err
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions api/comms/chat.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,19 +71,24 @@ func chatCreate(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, p
}

for _, blast := range blasts {
messageId := trashid.BlastMessageID(blast.BlastID, params.ChatID)

_, err = db.Exec(ctx, `
insert into chat_message
(message_id, chat_id, user_id, created_at, blast_id)
values
($1, $2, $3, $4, $5)
on conflict do nothing
`, trashid.BlastMessageID(blast.BlastID, params.ChatID), params.ChatID, blast.FromUserID, blast.CreatedAt, blast.BlastID)
`, messageId, params.ChatID, blast.FromUserID, blast.CreatedAt.UTC(), blast.BlastID)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note here the usage of .UTC(). On my machine, when running this, the location() on this time.Time was being set to Local and that was causing us to insert messages in the past. Since chat_blast uses a timestamptz column type and chat_message uses a plain timestamp column type, pgx semantics when inserting will cause it to try and map from the timezone in the incoming variable to the timezone of the machine running postgres.
Kind of gnarly 😬

if err != nil {
return err
}
}

err = chatUpdateLatestFields(db, ctx, params.ChatID)
if err != nil {
return err
}

return err
}
Expand DownExpand Up@@ -317,37 +322,37 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
// see also: subtly different inverse query exists in chat_blast.go
// to fan out messages to existing chat
var findNewBlasts = `
with
last_permission_change as (
select max(t) as t from (
select updated_at as t from chat_permissions where user_id = $1
union
select created_at as t from chat_blocked_users where blocker_user_id = $1
union
select to_timestamp(0)
) as timestamp_subquery
WITH
last_permission_change AS (
SELECT max(t) AS t FROM (
SELECT updated_at AS t FROM chat_permissions WHERE user_id = @user_id
UNION
SELECT created_at AS t FROM chat_blocked_users WHERE blocker_user_id = @user_id
UNION
SELECT to_timestamp(0)
) AS timestamp_subquery
),
all_new as (
select *
from chat_blast blast
where
from_user_id in (
all_new AS (
SELECT *
FROM chat_blast blast
WHERE
from_user_id IN (
-- follower_audience
SELECT followee_user_id AS from_user_id
FROM follows
WHERE blast.audience = 'follower_audience'
AND follows.followee_user_id = blast.from_user_id
AND follows.follower_user_id = $1
AND follows.follower_user_id = @user_id
AND follows.is_delete = false
AND follows.created_at < blast.created_at
)
OR from_user_id in (
OR from_user_id IN (
-- tipper_audience
SELECT receiver_user_id
FROM user_tips tip
WHERE blast.audience = 'tipper_audience'
AND receiver_user_id = blast.from_user_id
AND sender_user_id = $1
AND sender_user_id = @user_id
AND tip.created_at < blast.created_at
)
OR from_user_id IN (
Expand All@@ -358,29 +363,31 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN tracks og ON remixes.parent_track_id = og.track_id
WHERE blast.audience = 'remixer_audience'
AND og.owner_id = blast.from_user_id
AND t.owner_id = $1
AND t.owner_id = @user_id
AND (
blast.audience_content_id IS NULL
OR (
blast.audience_content_type = 'track'
AND blast.audience_content_id = og.track_id
)
)
AND t.created_at < blast.created_at
)
OR from_user_id IN (
-- customer_audience
SELECT seller_user_id
FROM usdc_purchases p
WHERE blast.audience = 'customer_audience'
AND p.seller_user_id = blast.from_user_id
AND p.buyer_user_id = $1
AND p.buyer_user_id = @user_id
AND (
audience_content_id IS NULL
OR (
blast.audience_content_type = p.content_type::text
AND blast.audience_content_id = p.content_id
)
)
AND p.created_at < blast.created_at
)
OR from_user_id IN (
-- coin_holder_audience via sol_user_balances
Expand All@@ -389,19 +396,21 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN sol_user_balances sub ON sub.mint = ac.mint
WHERE blast.audience = 'coin_holder_audience'
AND ac.user_id = blast.from_user_id
AND sub.user_id = $1
AND sub.user_id = @user_id
AND sub.balance > 0
-- TODO: PE-6663 This isn't entirely correct yet, need to check "time of most recent membership"
AND sub.created_at < blast.created_at
)
)
select * from all_new
where created_at > (select t from last_permission_change)
and chat_allowed(from_user_id, $1)
order by created_at
`

rows, err := tx.Query(ctx, findNewBlasts, arg.UserID)
SELECT * FROM all_new
WHERE created_at > (select t from last_permission_change)
AND chat_allowed(from_user_id, @user_id)
ORDER BY created_at
;`

rows, err := tx.Query(ctx, findNewBlasts, pgx.NamedArgs{
"user_id": arg.UserID,
})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions api/comms/chat_blast.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,7 @@ import (

// Result struct to hold chat_id and to_user_id
type ChatBlastResult struct {
ChatID string `db:"chat_id"`
ToUserID int32 `db:"to_user_id"`
ChatID string `db:"chat_id"`
}

type OutgoingChatMessage struct {
Expand DownExpand Up@@ -80,11 +79,7 @@ func chatBlast(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, pa
defer rows.Close()

// Scan the results into the results slice
results, err = pgx.CollectRows(rows, func(row pgx.CollectableRow) (ChatBlastResult, error) {
var result ChatBlastResult
err := row.Scan(&result.ChatID, &result.ToUserID)
return result, err
})
results, err = pgx.CollectRows(rows, pgx.RowToStructByName[ChatBlastResult])
if err != nil {
return nil, err
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions api/comms/chat.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,19 +71,24 @@ func chatCreate(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, p
}

for _, blast := range blasts {
messageId := trashid.BlastMessageID(blast.BlastID, params.ChatID)

_, err = db.Exec(ctx, `
insert into chat_message
(message_id, chat_id, user_id, created_at, blast_id)
values
($1, $2, $3, $4, $5)
on conflict do nothing
`, trashid.BlastMessageID(blast.BlastID, params.ChatID), params.ChatID, blast.FromUserID, blast.CreatedAt, blast.BlastID)
`, messageId, params.ChatID, blast.FromUserID, blast.CreatedAt.UTC(), blast.BlastID)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note here the usage of .UTC(). On my machine, when running this, the location() on this time.Time was being set to Local and that was causing us to insert messages in the past. Since chat_blast uses a timestamptz column type and chat_message uses a plain timestamp column type, pgx semantics when inserting will cause it to try and map from the timezone in the incoming variable to the timezone of the machine running postgres.
Kind of gnarly 😬

if err != nil {
return err
}
}

err = chatUpdateLatestFields(db, ctx, params.ChatID)
if err != nil {
return err
}

return err
}
Expand DownExpand Up@@ -317,37 +322,37 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
// see also: subtly different inverse query exists in chat_blast.go
// to fan out messages to existing chat
var findNewBlasts = `
with
last_permission_change as (
select max(t) as t from (
select updated_at as t from chat_permissions where user_id = $1
union
select created_at as t from chat_blocked_users where blocker_user_id = $1
union
select to_timestamp(0)
) as timestamp_subquery
WITH
last_permission_change AS (
SELECT max(t) AS t FROM (
SELECT updated_at AS t FROM chat_permissions WHERE user_id = @user_id
UNION
SELECT created_at AS t FROM chat_blocked_users WHERE blocker_user_id = @user_id
UNION
SELECT to_timestamp(0)
) AS timestamp_subquery
),
all_new as (
select *
from chat_blast blast
where
from_user_id in (
all_new AS (
SELECT *
FROM chat_blast blast
WHERE
from_user_id IN (
-- follower_audience
SELECT followee_user_id AS from_user_id
FROM follows
WHERE blast.audience = 'follower_audience'
AND follows.followee_user_id = blast.from_user_id
AND follows.follower_user_id = $1
AND follows.follower_user_id = @user_id
AND follows.is_delete = false
AND follows.created_at < blast.created_at
)
OR from_user_id in (
OR from_user_id IN (
-- tipper_audience
SELECT receiver_user_id
FROM user_tips tip
WHERE blast.audience = 'tipper_audience'
AND receiver_user_id = blast.from_user_id
AND sender_user_id = $1
AND sender_user_id = @user_id
AND tip.created_at < blast.created_at
)
OR from_user_id IN (
Expand All@@ -358,29 +363,31 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN tracks og ON remixes.parent_track_id = og.track_id
WHERE blast.audience = 'remixer_audience'
AND og.owner_id = blast.from_user_id
AND t.owner_id = $1
AND t.owner_id = @user_id
AND (
blast.audience_content_id IS NULL
OR (
blast.audience_content_type = 'track'
AND blast.audience_content_id = og.track_id
)
)
AND t.created_at < blast.created_at
)
OR from_user_id IN (
-- customer_audience
SELECT seller_user_id
FROM usdc_purchases p
WHERE blast.audience = 'customer_audience'
AND p.seller_user_id = blast.from_user_id
AND p.buyer_user_id = $1
AND p.buyer_user_id = @user_id
AND (
audience_content_id IS NULL
OR (
blast.audience_content_type = p.content_type::text
AND blast.audience_content_id = p.content_id
)
)
AND p.created_at < blast.created_at
)
OR from_user_id IN (
-- coin_holder_audience via sol_user_balances
Expand All@@ -389,19 +396,21 @@ func getNewBlasts(tx dbv1.DBTX, ctx context.Context, arg getNewBlastsParams) ([]
JOIN sol_user_balances sub ON sub.mint = ac.mint
WHERE blast.audience = 'coin_holder_audience'
AND ac.user_id = blast.from_user_id
AND sub.user_id = $1
AND sub.user_id = @user_id
AND sub.balance > 0
-- TODO: PE-6663 This isn't entirely correct yet, need to check "time of most recent membership"
AND sub.created_at < blast.created_at
)
)
select * from all_new
where created_at > (select t from last_permission_change)
and chat_allowed(from_user_id, $1)
order by created_at
`

rows, err := tx.Query(ctx, findNewBlasts, arg.UserID)
SELECT * FROM all_new
WHERE created_at > (select t from last_permission_change)
AND chat_allowed(from_user_id, @user_id)
ORDER BY created_at
;`

rows, err := tx.Query(ctx, findNewBlasts, pgx.NamedArgs{
"user_id": arg.UserID,
})
if err != nil {
return nil, err
}
Expand Down
9 changes: 2 additions & 7 deletions api/comms/chat_blast.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,7 @@ import (

// Result struct to hold chat_id and to_user_id
type ChatBlastResult struct {
ChatID string `db:"chat_id"`
ToUserID int32 `db:"to_user_id"`
ChatID string `db:"chat_id"`
}

type OutgoingChatMessage struct {
Expand DownExpand Up@@ -80,11 +79,7 @@ func chatBlast(db dbv1.DBTX, ctx context.Context, userId int32, ts time.Time, pa
defer rows.Close()

// Scan the results into the results slice
results, err = pgx.CollectRows(rows, func(row pgx.CollectableRow) (ChatBlastResult, error) {
var result ChatBlastResult
err := row.Scan(&result.ChatID, &result.ToUserID)
return result, err
})
results, err = pgx.CollectRows(rows, pgx.RowToStructByName[ChatBlastResult])
if err != nil {
return nil, err
}
Expand Down
Loading
Loading