From 23db09f9b793bbe7de19fdf0f6fabd9cb5d883ec Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sun, 5 Jan 2025 14:52:27 -0500 Subject: [PATCH] core: Default to loading into the ssb app. No more messing around. --- apps/ssb/tf-app.js | 23 +++++++++++++---------- apps/ssb/tf-message.js | 5 ++++- src/util.js.c | 2 +- tools/autotest.py | 8 ++++---- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/apps/ssb/tf-app.js b/apps/ssb/tf-app.js index a6688609..55f13ee9 100644 --- a/apps/ssb/tf-app.js +++ b/apps/ssb/tf-app.js @@ -593,16 +593,19 @@ class TfElement extends LitElement { )} `; - let contents = - this.guest ? - html`
-

⚠️🦀 Must be logged in to Tilde Friends to scuttle here. 🦀⚠️

- -
` + let contents = this.guest + ? html`
+

⚠️🦀 Must be logged in to Tilde Friends to scuttle here. 🦀⚠️

+ +
` : !this.loaded || this.loading ? html`
this.message?.content?.text?.indexOf(typeof(x) === 'string' ? x : x.link) === -1 + (x) => + this.message?.content?.text?.indexOf( + typeof x === 'string' ? x : x.link + ) === -1 ); if (mentions.length) { let self = this; diff --git a/src/util.js.c b/src/util.js.c index b61969e8..6cf3c7aa 100644 --- a/src/util.js.c +++ b/src/util.js.c @@ -339,7 +339,7 @@ static JSValue _util_defaultGlobalSettings(JSContext* context, JSValueConst this .default_value = _is_mobile() ? JS_NewInt32(context, (int)(1.0f * 365 * 24 * 60 * 60)) : JS_UNDEFINED }, { .name = "fetch_hosts", .type = "string", .description = "Comma-separated list of host names to which HTTP fetch requests are allowed. None if empty." }, { .name = "http_redirect", .type = "string", .description = "If connecting by HTTP and HTTPS is configured, Location header prefix (ie, \"http://example.com\")" }, - { .name = "index", .type = "string", .description = "Default path.", .default_value = JS_NewString(context, "/~core/apps") }, + { .name = "index", .type = "string", .description = "Default path.", .default_value = JS_NewString(context, "/~core/ssb/") }, { .name = "index_map", .type = "textarea", .description = "Mappings from hostname to redirect path, one per line, as in: \"www.tildefriends.net=/~core/index/\"" }, { .name = "peer_exchange", .type = "boolean", diff --git a/tools/autotest.py b/tools/autotest.py index 00160cd3..cc730f01 100755 --- a/tools/autotest.py +++ b/tools/autotest.py @@ -71,7 +71,7 @@ try: driver = webdriver.Firefox(options = options, service = service) wait = WebDriverWait(driver, 10) - driver.get('http://localhost:8888') + driver.get('http://localhost:8888/~core/apps/') select(driver, ['tf-navigation', 'shadow_root', '=login'], ('click',)) select(driver, ['tf-auth', 'shadow_root', '#register_label'], ('click',)) select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'adminuser')) @@ -89,7 +89,7 @@ try: select(driver, ['tf-navigation', 'shadow_root', '#identity'], ('click',)) select(driver, ['tf-navigation', 'shadow_root', '#logout'], ('click',)) - driver.get('http://localhost:8888') + driver.get('http://localhost:8888/~core/apps/') select(driver, ['tf-navigation', 'shadow_root', '=login'], ('click',)) select(driver, ['tf-auth', 'shadow_root', '#register_label'], ('click',)) select(driver, ['tf-auth', 'shadow_root', '#name'], ('send_keys', 'testuser')) @@ -140,7 +140,7 @@ try: select(driver, ['tf-navigation', 'shadow_root', '#close_error'], ('click',)) select(driver, ['tf-navigation', 'shadow_root', '=edit'], ('click',)) - driver.get('http://localhost:8888') + driver.get('http://localhost:8888/~core/apps/') select(driver, ['#document', 'frame', '=identity']) @@ -170,7 +170,7 @@ try: id1 = select(driver, ['#document', 'frame', 'li']).text.split(' ')[-1] assert id0 == id1 - driver.get('http://localhost:8888') + driver.get('http://localhost:8888/~core/apps/') select(driver, ['#document', 'frame', '=ssb'], ('click',)) select(driver, ['#document', 'frame', 'tf-app', 'shadow_root', '#tf-tab-news', 'shadow_root', '#tf-compose', 'shadow_root', '#edit'], ('send_keys', 'Hello, world!')) select(driver, ['#document', 'frame', 'tf-app', 'shadow_root', '#tf-tab-news', 'shadow_root', '#tf-compose', 'shadow_root', '#submit'], ('click',))