tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix weird #\[0] artifacts appearing in posts and translated from english bugs

Browse Source 
This changes the preloader to load things right away and fixes a bunch
of bugs

Changelog-Fixed: Fix weird #\[0] artifacts appearing in posts
Changelog-Fixed: Fix "translated from english" bugs
This commit is contained in:
William Casarin
2023-05-02 06:45:41 -07:00
parent 61c9732acd
commit 4889c0a7d9
2 changed files with 32 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
damus/Util/EventCache.swift
View File

@@ -298,18 +298,6 @@ func should_preload_translation(event: NostrEvent, our_keypair: Keypair, current
} }
} }
struct PreloadResult {
let event: NostrEvent
let artifacts: NoteArtifacts?
let translations: TranslateStatus?
let preview: Preview?
let timeago: String
let note_language: String
}
struct PreloadPlan { struct PreloadPlan {
let data: EventData let data: EventData
let event: NostrEvent let event: NostrEvent
@@ -349,16 +337,19 @@ func get_preload_plan(cache: EventData, ev: NostrEvent, our_keypair: Keypair, se
return PreloadPlan(data: cache, event: ev, load_artifacts: load_artifacts, load_translations: load_translations, load_preview: load_preview) return PreloadPlan(data: cache, event: ev, load_artifacts: load_artifacts, load_translations: load_translations, load_preview: load_preview)
} }
func preload_event(plan: PreloadPlan, profiles: Profiles, our_keypair: Keypair, settings: UserSettingsStore) async -> PreloadResult { func preload_event(plan: PreloadPlan, profiles: Profiles, our_keypair: Keypair, settings: UserSettingsStore) async {
var artifacts: NoteArtifacts? = nil var artifacts: NoteArtifacts? = plan.data.artifacts.artifacts
var translations: TranslateStatus? = nil
var preview: Preview? = nil
print("Preloading event \(plan.event.content)") print("Preloading event \(plan.event.content)")
if plan.load_artifacts { if artifacts == nil && plan.load_artifacts {
artifacts = render_note_content(ev: plan.event, profiles: profiles, privkey: our_keypair.privkey) let arts = render_note_content(ev: plan.event, profiles: profiles, privkey: our_keypair.privkey)
let arts = artifacts! artifacts = arts
// we need these asap
DispatchQueue.main.async {
plan.data.artifacts_model.state = .loaded(arts)
}
for url in arts.images { for url in arts.images {
print("Preloading image \(url.absoluteString)") print("Preloading image \(url.absoluteString)")
@@ -369,50 +360,35 @@ func preload_event(plan: PreloadPlan, profiles: Profiles, our_keypair: Keypair,
} }
if plan.load_preview { if plan.load_preview {
if let arts = artifacts ?? plan.data.artifacts.artifacts { let arts = artifacts ?? render_note_content(ev: plan.event, profiles: profiles, privkey: our_keypair.privkey)
preview = await load_preview(artifacts: arts) let preview = await load_preview(artifacts: arts)
} else { DispatchQueue.main.async {
print("couldnt preload preview") if let preview {
plan.data.preview_model.state = .loaded(preview)
} else {
plan.data.preview_model.state = .loaded(.failed)
}
} }
} }
let note_language = plan.event.note_language(our_keypair.privkey) ?? current_language() let note_language = plan.data.translations_model.note_language ?? plan.event.note_language(our_keypair.privkey) ?? current_language()
if plan.load_translations, should_translate(event: plan.event, our_keypair: our_keypair, settings: settings, note_lang: note_language) { var translations: TranslateStatus? = nil
// We have to recheck should_translate here now that we have note_language
if plan.load_translations && should_translate(event: plan.event, our_keypair: our_keypair, settings: settings, note_lang: note_language) && settings.auto_translate
{
translations = await translate_note(profiles: profiles, privkey: our_keypair.privkey, event: plan.event, settings: settings, note_lang: note_language) translations = await translate_note(profiles: profiles, privkey: our_keypair.privkey, event: plan.event, settings: settings, note_lang: note_language)
} }
return PreloadResult(event: plan.event, artifacts: artifacts, translations: translations, preview: preview, timeago: format_relative_time(plan.event.created_at), note_language: note_language) let timeago = format_relative_time(plan.event.created_at)
} let ts = translations
DispatchQueue.main.async {
func set_preload_results(plan: PreloadPlan, res: PreloadResult, privkey: String?) { if let ts {
if plan.load_translations { plan.data.translations_model.state = ts
if let translations = res.translations {
plan.data.translations_model.state = translations
} else {
// failed
plan.data.translations_model.state = .not_needed
} }
plan.data.relative_time.value = timeago
plan.data.translations_model.note_language = note_language
} }
if plan.load_artifacts, case .loading = plan.data.artifacts {
if let artifacts = res.artifacts {
plan.data.artifacts_model.state = .loaded(artifacts)
} else {
plan.data.artifacts_model.state = .loaded(.just_content(plan.event.get_content(privkey)))
}
}
if plan.load_preview, case .loading = plan.data.preview {
if let preview = res.preview {
plan.data.preview_model.state = .loaded(preview)
} else {
plan.data.preview_model.state = .loaded(.failed)
}
}
plan.data.translations_model.note_language = res.note_language
plan.data.relative_time.value = res.timeago
} }
func preload_events(event_cache: EventCache, events: [NostrEvent], profiles: Profiles, our_keypair: Keypair, settings: UserSettingsStore) { func preload_events(event_cache: EventCache, events: [NostrEvent], profiles: Profiles, our_keypair: Keypair, settings: UserSettingsStore) {
@@ -423,11 +399,7 @@ func preload_events(event_cache: EventCache, events: [NostrEvent], profiles: Pro
Task.init { Task.init {
for plan in plans { for plan in plans {
let res = await preload_event(plan: plan, profiles: profiles, our_keypair: our_keypair, settings: settings) await preload_event(plan: plan, profiles: profiles, our_keypair: our_keypair, settings: settings)
// dispatch results right away
DispatchQueue.main.async { [plan] in
set_preload_results(plan: plan, res: res, privkey: our_keypair.privkey)
}
} }
} }

6
damus/Views/NoteContentView.swift
View File

@@ -164,11 +164,7 @@ struct NoteContentView: View {
return return
} }
let result = await preload_event(plan: plan, profiles: damus_state.profiles, our_keypair: damus_state.keypair, settings: damus_state.settings) await preload_event(plan: plan, profiles: damus_state.profiles, our_keypair: damus_state.keypair, settings: damus_state.settings)
DispatchQueue.main.async {
set_preload_results(plan: plan, res: result, privkey: damus_state.keypair.privkey)
}
} }
var body: some View { var body: some View {