Skip to content

Commit

Permalink
Merge branch 'develop' into feature/dashboard-dupe-page-results
Browse files Browse the repository at this point in the history
  • Loading branch information
blackforestboi committed May 7, 2024
2 parents 833ea42 + bc6e1a2 commit 4096fec
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 18 deletions.
2 changes: 1 addition & 1 deletion external/@worldbrain/memex-common
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "worldbrain-extension",
"version": "3.19.16",
"version": "3.19.17",
"homepage": "https://memex.garden",
"repository": "https://github.com/WorldBrain/Memex",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/content-scripts/content_script/global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -938,9 +938,10 @@ export async function main(
instaExecutePrompt: instaExecutePrompt ?? false,
})
},
createYoutubeTimestamp: async () => {
createYoutubeTimestamp: async (commentText: string) => {
await inPageUI.showSidebar({
action: 'youtube_timestamp',
commentText,
})
},
createTimestampWithAISummary: async (
Expand Down Expand Up @@ -1359,8 +1360,7 @@ export async function main(
askAI: annotationsFunctions.askAI(),
getHighlightColorsSettings: getHighlightColorSettings,
saveHighlightColorsSettings: saveHighlightColorSettings,
createYoutubeTimestamp: () =>
annotationsFunctions.createYoutubeTimestamp(),
createYoutubeTimestamp: annotationsFunctions.createYoutubeTimestamp,
})

// 9. Check for page activity status
Expand Down
14 changes: 1 addition & 13 deletions src/search-injection/components/youtubeActionBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export default class YoutubeButtonMenu extends React.Component<Props, State> {
}
}
// Logic for annotate button click
this.props.annotationsFunctions.createYoutubeTimestamp()
this.props.annotationsFunctions.createYoutubeTimestamp(timestampToSend)
}

createAhref = (videoURLWithTime, humanTimestamp) => {
Expand All @@ -247,18 +247,6 @@ export default class YoutubeButtonMenu extends React.Component<Props, State> {
}

handleSummarizeButtonClick = async (event) => {
// Logic for summarize button click
if (
(await this.props.syncSettings?.openAI?.get(
'videoPromptSetting',
)) != this.state.summarizePrompt
) {
await this.props.syncSettings?.openAI?.set(
'videoPromptSetting',
this.state.summarizePrompt,
)
}

const from = this.state.fromSecondsPosition
const to = this.state.toSecondsPosition

Expand Down

0 comments on commit 4096fec

Please sign in to comment.